namespace

.env.example

@@ -46,10 +46,4 @@ DRAWIO_URL=
 DISABLE_TELEMETRY=false
 
 # Enable debug logging in production (default: false)
-DEBUG_MODE=false
+DEBUG_MODE=false
-
-# Log database queries
-DEBUG_DB=false
-
-# Log http requests
-LOG_HTTP=false

apps/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "0.25.1",
+  "version": "0.24.1",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
@@ -24,6 +24,7 @@
     "@mantine/spotlight": "^8.3.12",
     "@tabler/icons-react": "^3.36.1",
     "@tanstack/react-query": "^5.90.17",
+    "@tiptap/extension-character-count": "^2.27.1",
     "alfaaz": "^1.1.0",
     "axios": "^1.13.2",
     "clsx": "^2.1.1",
@@ -53,6 +54,7 @@
     "react-router-dom": "^7.12.0",
     "semver": "^7.7.3",
     "socket.io-client": "^4.8.3",
+    "tippy.js": "^6.3.7",
     "tiptap-extension-global-drag-handle": "^0.1.18",
     "zod": "^3.25.76"
   },

apps/client/public/locales/de-DE/translation.json

@@ -29,7 +29,6 @@
   "Choose your preferred interface language.": "Wählen Sie Ihre bevorzugte Benutzersprache.",
   "Choose your preferred page width.": "Wählen Sie Ihre bevorzugte Seitenbreite.",
   "Confirm": "Bestätigen",
-  "Copy as Markdown": "Als Markdown kopieren",
   "Copy link": "Link kopieren",
   "Create": "Erstellen",
   "Create group": "Gruppe erstellen",
@@ -123,8 +122,6 @@
   "page": "Seite",
   "Page deleted successfully": "Seite erfolgreich gelöscht",
   "Page history": "Seitengeschichte",
-  "Select version": "Version auswählen",
-  "Highlight changes": "Änderungen hervorheben",
   "Page import is in progress. Please do not close this tab.": "Der Seitenimport läuft. Bitte schließen Sie diesen Tab nicht.",
   "Pages": "Seiten",
   "pages": "Seiten",
@@ -237,9 +234,7 @@
   "Anyone with this link can join this workspace.": "Jeder mit diesem Link kann dem Arbeitsbereich beitreten.",
   "Invite link": "Einladungslink",
   "Copy": "Kopieren",
-  "Copy to space": "In Raum kopieren",
   "Copied": "Kopiert",
-  "Duplicate": "Duplizieren",
   "Select a user": "Benutzer auswählen",
   "Select a group": "Gruppe auswählen",
   "Export all pages and attachments in this space.": "Alle Seiten und Anhänge in diesem Bereich exportieren.",
@@ -256,7 +251,6 @@
   "Export failed:": "Export fehlgeschlagen:",
   "export error": "Exportfehler",
   "Export page": "Seite exportieren",
-  "Export successful": "Export erfolgreich",
   "Export space": "Bereich exportieren",
   "Export {{type}}": "Exportiere {{type}}",
   "File exceeds the {{limit}} attachment limit": "Datei überschreitet das Anhängelimit von {{limit}}",
@@ -332,8 +326,6 @@
   "Upload any image from your device.": "Laden Sie ein beliebiges Bild von Ihrem Gerät hoch.",
   "Upload any video from your device.": "Laden Sie ein beliebiges Video von Ihrem Gerät hoch.",
   "Upload any file from your device.": "Laden Sie eine beliebige Datei von Ihrem Gerät hoch.",
-  "Uploading {{name}}": "Lade {{name}} hoch",
-  "Uploading file": "Datei wird hochgeladen",
   "Table": "Tabelle",
   "Insert a table.": "Tabelle einfügen.",
   "Insert collapsible block.": "Einklappbaren Block einfügen.",

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

@@ -29,7 +29,6 @@
   "Choose your preferred interface language.": "Choose your preferred interface language.",
   "Choose your preferred page width.": "Choose your preferred page width.",
   "Confirm": "Confirm",
-  "Copy as Markdown": "Copy as Markdown",
   "Copy link": "Copy link",
   "Create": "Create",
   "Create group": "Create group",
@@ -123,8 +122,6 @@
   "page": "page",
   "Page deleted successfully": "Page deleted successfully",
   "Page history": "Page history",
-  "Select version": "Select version",
-  "Highlight changes": "Highlight changes",
   "Page import is in progress. Please do not close this tab.": "Page import is in progress. Please do not close this tab.",
   "Pages": "Pages",
   "pages": "pages",
@@ -256,7 +253,6 @@
   "Export failed:": "Export failed:",
   "export error": "export error",
   "Export page": "Export page",
-  "Export successful": "Export successful",
   "Export space": "Export space",
   "Export {{type}}": "Export {{type}}",
   "File exceeds the {{limit}} attachment limit": "File exceeds the {{limit}} attachment limit",
@@ -332,8 +328,6 @@
   "Upload any image from your device.": "Upload any image from your device.",
   "Upload any video from your device.": "Upload any video from your device.",
   "Upload any file from your device.": "Upload any file from your device.",
-  "Uploading {{name}}": "Uploading {{name}}",
-  "Uploading file": "Uploading file",
   "Table": "Table",
   "Insert a table.": "Insert a table.",
   "Insert collapsible block.": "Insert collapsible block.",

apps/client/public/locales/es-ES/translation.json

@@ -29,7 +29,6 @@
   "Choose your preferred interface language.": "Elige tu idioma de interfaz preferido.",
   "Choose your preferred page width.": "Elige el ancho de página que prefieras.",
   "Confirm": "Confirmar",
-  "Copy as Markdown": "Copiar como Markdown",
   "Copy link": "Copiar enlace",
   "Create": "Crear",
   "Create group": "Crear grupo",
@@ -123,8 +122,6 @@
   "page": "página",
   "Page deleted successfully": "Página eliminada con éxito",
   "Page history": "Historial de la página",
-  "Select version": "Seleccionar versión",
-  "Highlight changes": "Resaltar cambios",
   "Page import is in progress. Please do not close this tab.": "La importación de la página está en curso. Por favor, no cierre esta pestaña.",
   "Pages": "Páginas",
   "pages": "páginas",
@@ -256,7 +253,6 @@
   "Export failed:": "Exportación fallida:",
   "export error": "error de exportación",
   "Export page": "Exportar página",
-  "Export successful": "Exportación exitosa",
   "Export space": "Exportar espacio",
   "Export {{type}}": "Exportar {{type}}",
   "File exceeds the {{limit}} attachment limit": "El archivo supera el límite de {{limit}} adjuntos",
@@ -332,8 +328,6 @@
   "Upload any image from your device.": "Sube cualquier imagen desde tu dispositivo.",
   "Upload any video from your device.": "Sube cualquier video desde tu dispositivo.",
   "Upload any file from your device.": "Sube cualquier archivo desde tu dispositivo.",
-  "Uploading {{name}}": "Subiendo {{name}}",
-  "Uploading file": "Subiendo archivo",
   "Table": "Tabla",
   "Insert a table.": "Insertar una tabla.",
   "Insert collapsible block.": "Insertar bloque desplegable.",

apps/client/public/locales/fr-FR/translation.json

@@ -29,7 +29,6 @@
   "Choose your preferred interface language.": "Choisissez votre langue d'interface préférée.",
   "Choose your preferred page width.": "Choisissez votre largeur de page préférée.",
   "Confirm": "Confirmer",
-  "Copy as Markdown": "Copier comme Markdown",
   "Copy link": "Copier le lien",
   "Create": "Créer",
   "Create group": "Créer groupe",
@@ -123,8 +122,6 @@
   "page": "page",
   "Page deleted successfully": "Page supprimée avec succès",
   "Page history": "Historique de la page",
-  "Select version": "Sélectionner la version",
-  "Highlight changes": "Mettre en évidence les changements",
   "Page import is in progress. Please do not close this tab.": "L'importation de la page est en cours. Veuillez ne pas fermer cet onglet.",
   "Pages": "Pages",
   "pages": "pages",
@@ -256,7 +253,6 @@
   "Export failed:": "Échec de l'exportation :",
   "export error": "exporter l'erreur",
   "Export page": "Exporter la page",
-  "Export successful": "Exportation réussie",
   "Export space": "Exporter l'espace",
   "Export {{type}}": "Exporter {{type}}",
   "File exceeds the {{limit}} attachment limit": "Le fichier dépasse la limite de {{limit}} pièces jointes",
@@ -332,8 +328,6 @@
   "Upload any image from your device.": "Téléchargez n'importe quelle image depuis votre appareil.",
   "Upload any video from your device.": "Téléchargez n'importe quelle vidéo depuis votre appareil.",
   "Upload any file from your device.": "Téléchargez n'importe quel fichier depuis votre appareil.",
-  "Uploading {{name}}": "Téléchargement de {{name}}",
-  "Uploading file": "Téléchargement du fichier",
   "Table": "Tableau",
   "Insert a table.": "Insérez un tableau.",
   "Insert collapsible block.": "Insérer un bloc repliable.",

apps/client/public/locales/it-IT/translation.json

@@ -29,7 +29,6 @@
   "Choose your preferred interface language.": "Scegli la lingua da utilizzare per l'interfaccia.",
   "Choose your preferred page width.": "Scegli la larghezza della pagina che preferisci.",
   "Confirm": "Conferma",
-  "Copy as Markdown": "Copia come Markdown",
   "Copy link": "Copia link",
   "Create": "Crea",
   "Create group": "Crea gruppo",
@@ -123,8 +122,6 @@
   "page": "pagina",
   "Page deleted successfully": "Pagina eliminata con successo",
   "Page history": "Cronologia della pagina",
-  "Select version": "Seleziona versione",
-  "Highlight changes": "Evidenzia modifiche",
   "Page import is in progress. Please do not close this tab.": "L'importazione della pagina è in corso. Si prega di non chiudere questa scheda.",
   "Pages": "Pagine",
   "pages": "pagine",
@@ -256,7 +253,6 @@
   "Export failed:": "Esportazione fallita:",
   "export error": "errore di esportazione",
   "Export page": "Esporta pagina",
-  "Export successful": "Esportazione riuscita",
   "Export space": "Esporta spazio",
   "Export {{type}}": "Esporta {{type}}",
   "File exceeds the {{limit}} attachment limit": "Il file supera il limite per gli allegati di {{limit}}",
@@ -332,8 +328,6 @@
   "Upload any image from your device.": "Carica un'immagine dal tuo dispositivo.",
   "Upload any video from your device.": "Carica qualsiasi video dal tuo dispositivo.",
   "Upload any file from your device.": "Carica qualsiasi file dal tuo dispositivo.",
-  "Uploading {{name}}": "Caricamento di {{name}}",
-  "Uploading file": "Caricamento file",
   "Table": "Tabella",
   "Insert a table.": "Inserisci una tabella.",
   "Insert collapsible block.": "Inserisci blocco comprimibile.",

apps/client/public/locales/ja-JP/translation.json

@@ -29,7 +29,6 @@
   "Choose your preferred interface language.": "お好みの言語を選択してください",
   "Choose your preferred page width.": "お好みのページ幅を選択してください",
   "Confirm": "確認",
-  "Copy as Markdown": "Markdownとしてコピー",
   "Copy link": "リンクをコピー",
   "Create": "新規作成",
   "Create group": "グループを作成",
@@ -123,8 +122,6 @@
   "page": "ページ",
   "Page deleted successfully": "ページを削除しました",
   "Page history": "ページ履歴",
-  "Select version": "バージョンを選択",
-  "Highlight changes": "変更を強調表示",
   "Page import is in progress. Please do not close this tab.": "ページをインポート中です。このタブを閉じないでください",
   "Pages": "ページ",
   "pages": "ページ",
@@ -256,7 +253,6 @@
   "Export failed:": "エクスポートに失敗しました:",
   "export error": "エクスポートエラー",
   "Export page": "エクスポートページ",
-  "Export successful": "エクスポート成功",
   "Export space": "エクスポートスペース",
   "Export {{type}}": "{{type}}をエクスポート",
   "File exceeds the {{limit}} attachment limit": "ファイルが{{limit}}の添付制限を超えています",
@@ -332,8 +328,6 @@
   "Upload any image from your device.": "デバイスから画像をアップロードします",
   "Upload any video from your device.": "デバイスから動画をアップロードします",
   "Upload any file from your device.": "デバイスからファイルをアップロードします",
-  "Uploading {{name}}": "{{name}} をアップロード中",
-  "Uploading file": "ファイルをアップロード中",
   "Table": "テーブル",
   "Insert a table.": "テーブルを挿入します",
   "Insert collapsible block.": "折りたたみブロックを挿入します",

apps/client/public/locales/ko-KR/translation.json

@@ -29,7 +29,6 @@
   "Choose your preferred interface language.": "선호하는 인터페이스 언어를 선택하세요.",
   "Choose your preferred page width.": "선호하는 페이지 너비를 선택하세요.",
   "Confirm": "확인",
-  "Copy as Markdown": "Markdown으로 복사",
   "Copy link": "링크 복사",
   "Create": "생성",
   "Create group": "팀 생성",
@@ -123,8 +122,6 @@
   "page": "페이지",
   "Page deleted successfully": "페이지 삭제 완료",
   "Page history": "페이지 기록",
-  "Select version": "버전 선택",
-  "Highlight changes": "변경 사항 강조",
   "Page import is in progress. Please do not close this tab.": "페이지 가져오기가 진행 중입니다. 이 탭을 닫지 마세요.",
   "Pages": "페이지",
   "pages": "페이지",
@@ -256,7 +253,6 @@
   "Export failed:": "내보내기 실패:",
   "export error": "내보내기 오류",
   "Export page": "페이지 내보내기",
-  "Export successful": "내보내기 성공",
   "Export space": "Space 내보내기",
   "Export {{type}}": "{{type}} 내보내기",
   "File exceeds the {{limit}} attachment limit": "첨부 파일 크기 제한 {{limit}}을 초과했습니다",
@@ -332,8 +328,6 @@
   "Upload any image from your device.": "기기에서 이미지를 업로드하세요.",
   "Upload any video from your device.": "기기에서 비디오를 업로드하세요.",
   "Upload any file from your device.": "기기에서 파일을 업로드하세요.",
-  "Uploading {{name}}": "{{name}} 업로드 중",
-  "Uploading file": "파일 업로드 중",
   "Table": "테이블",
   "Insert a table.": "테이블 삽입.",
   "Insert collapsible block.": "접을 수 있는 블록 삽입.",

apps/client/public/locales/nl-NL/translation.json

@@ -29,7 +29,6 @@
   "Choose your preferred interface language.": "Kies uw gewenste interfacetaal.",
   "Choose your preferred page width.": "Kies uw gewenste paginabreedte.",
   "Confirm": "Bevestig",
-  "Copy as Markdown": "Kopiëren als Markdown",
   "Copy link": "Link kopiëren",
   "Create": "Aanmaken",
   "Create group": "Groep aanmaken",
@@ -123,8 +122,6 @@
   "page": "pagina",
   "Page deleted successfully": "Pagina succesvol verwijderd",
   "Page history": "Pagina geschiedenis",
-  "Select version": "Selecteer versie",
-  "Highlight changes": "Wijzigingen markeren",
   "Page import is in progress. Please do not close this tab.": "Importeren van pagina's is bezig. Sluit dit tabblad niet.",
   "Pages": "Pagina's",
   "pages": "pagina's",
@@ -256,7 +253,6 @@
   "Export failed:": "Exporteren mislukt:",
   "export error": "Exporteer fout",
   "Export page": "Exporteer pagina",
-  "Export successful": "Export succesvol",
   "Export space": "Exporteer ruimte",
   "Export {{type}}": "Exporteer {{type}}",
   "File exceeds the {{limit}} attachment limit": "Bestand overschrijdt de bijlagelimiet van {{limit}}",
@@ -332,8 +328,6 @@
   "Upload any image from your device.": "Upload een afbeelding vanaf uw apparaat.",
   "Upload any video from your device.": "Upload een video vanaf uw apparaat.",
   "Upload any file from your device.": "Upload een bestand vanaf uw apparaat.",
-  "Uploading {{name}}": "Uploaden {{name}}",
-  "Uploading file": "Bestand uploaden",
   "Table": "Tabel",
   "Insert a table.": "Voeg een tabel in.",
   "Insert collapsible block.": "Inklapbaar blok invoegen.",

apps/client/public/locales/pt-BR/translation.json

@@ -29,7 +29,6 @@
   "Choose your preferred interface language.": "Escolha o idioma da interface.",
   "Choose your preferred page width.": "Escolha a largura preferida da página.",
   "Confirm": "Confirmar",
-  "Copy as Markdown": "Copiar como Markdown",
   "Copy link": "Copiar link",
   "Create": "Criar",
   "Create group": "Criar grupo",
@@ -123,8 +122,6 @@
   "page": "página",
   "Page deleted successfully": "Página excluída com sucesso",
   "Page history": "Histórico da página",
-  "Select version": "Selecionar versão",
-  "Highlight changes": "Destacar alterações",
   "Page import is in progress. Please do not close this tab.": "A importação da página está em andamento. Por favor, não feche esta aba.",
   "Pages": "Páginas",
   "pages": "páginas",
@@ -256,7 +253,6 @@
   "Export failed:": "Falha ao exportar:",
   "export error": "erro de exportação",
   "Export page": "Exportar página",
-  "Export successful": "Exportação bem-sucedida",
   "Export space": "Exportar espaço",
   "Export {{type}}": "Exportar para {{type}}",
   "File exceeds the {{limit}} attachment limit": "O arquivo excede o limite de anexos {{limit}}",
@@ -332,8 +328,6 @@
   "Upload any image from your device.": "Envie qualquer imagem do seu dispositivo.",
   "Upload any video from your device.": "Envie qualquer vídeo do seu dispositivo.",
   "Upload any file from your device.": "Envie qualquer arquivo do seu dispositivo.",
-  "Uploading {{name}}": "Enviando {{name}}",
-  "Uploading file": "Enviando arquivo",
   "Table": "Tabela",
   "Insert a table.": "Insira uma tabela.",
   "Insert collapsible block.": "Insira um bloco colapsável.",

apps/client/public/locales/ru-RU/translation.json

@@ -29,7 +29,6 @@
   "Choose your preferred interface language.": "Выберите предпочитаемый язык интерфейса.",
   "Choose your preferred page width.": "Выберите предпочитаемую ширину страницы.",
   "Confirm": "Подтвердить",
-  "Copy as Markdown": "Копировать как Markdown",
   "Copy link": "Копировать ссылку",
   "Create": "Создать",
   "Create group": "Создать группу",
@@ -123,8 +122,6 @@
   "page": "страница",
   "Page deleted successfully": "Страница успешно удалена",
   "Page history": "История страницы",
-  "Select version": "Выбрать версию",
-  "Highlight changes": "Выделить изменения",
   "Page import is in progress. Please do not close this tab.": "Импорт страницы в процессе. Пожалуйста, не закрывайте эту вкладку.",
   "Pages": "Страницы",
   "pages": "страницы",
@@ -256,7 +253,6 @@
   "Export failed:": "Экспортирование не удалось:",
   "export error": "ошибка экспорта",
   "Export page": "Экспорт страницы",
-  "Export successful": "Экспорт выполнен успешно",
   "Export space": "Экспорт пространства",
   "Export {{type}}": "Экспорт {{type}}",
   "File exceeds the {{limit}} attachment limit": "Файл превышает лимит вложений {{limit}}",
@@ -332,8 +328,6 @@
   "Upload any image from your device.": "Загрузить любое изображение с вашего устройства.",
   "Upload any video from your device.": "Загрузить любое видео с вашего устройства.",
   "Upload any file from your device.": "Загрузить любой файл с вашего устройства.",
-  "Uploading {{name}}": "Загрузка {{name}}",
-  "Uploading file": "Загрузка файла",
   "Table": "Таблица",
   "Insert a table.": "Вставить таблицу.",
   "Insert collapsible block.": "Вставить сворачиваемый блок.",

apps/client/public/locales/uk-UA/translation.json

@@ -29,7 +29,6 @@
   "Choose your preferred interface language.": "Оберіть бажану мову інтерфейсу.",
   "Choose your preferred page width.": "Оберіть бажану ширину сторінки.",
   "Confirm": "Підтвердити",
-  "Copy as Markdown": "Скопіювати як Markdown",
   "Copy link": "Копіювати посилання",
   "Create": "Створити",
   "Create group": "Створити групу",
@@ -123,8 +122,6 @@
   "page": "сторінка",
   "Page deleted successfully": "Сторінку успішно видалено",
   "Page history": "Історія сторінки",
-  "Select version": "Вибрати версію",
-  "Highlight changes": "Підсвітити зміни",
   "Page import is in progress. Please do not close this tab.": "Імпорт сторінки в процесі. Будь ласка, не закривайте цю вкладку.",
   "Pages": "Сторінки",
   "pages": "сторінки",
@@ -256,7 +253,6 @@
   "Export failed:": "Експортування не вдалося:",
   "export error": "помилка експорту",
   "Export page": "Експорт сторінки",
-  "Export successful": "Експорт виконано успішно",
   "Export space": "Експорт простору",
   "Export {{type}}": "Експорт {{type}}",
   "File exceeds the {{limit}} attachment limit": "Файл перевищує ліміт вкладень {{limit}}",
@@ -332,8 +328,6 @@
   "Upload any image from your device.": "Завантажити будь-яке зображення з вашого пристрою.",
   "Upload any video from your device.": "Завантажити будь-яке відео з вашого пристрою.",
   "Upload any file from your device.": "Завантажити будь-який файл з вашого пристрою.",
-  "Uploading {{name}}": "Завантаження {{name}}",
-  "Uploading file": "Завантаження файлу",
   "Table": "Таблиця",
   "Insert a table.": "Вставити таблицю.",
   "Insert collapsible block.": "Вставити блок, що згортається.",

apps/client/public/locales/zh-CN/translation.json

@@ -29,7 +29,6 @@
   "Choose your preferred interface language.": "选择您喜欢的界面语言。",
   "Choose your preferred page width.": "选择您喜欢的页面宽度。",
   "Confirm": "确认",
-  "Copy as Markdown": "复制为Markdown",
   "Copy link": "复制链接",
   "Create": "创建",
   "Create group": "创建群组",
@@ -123,8 +122,6 @@
   "page": "个页面",
   "Page deleted successfully": "页面已成功删除",
   "Page history": "页面历史",
-  "Select version": "选择版本",
-  "Highlight changes": "突出显示更改",
   "Page import is in progress. Please do not close this tab.": "页面导入正在进行中。请不要关闭此标签页。",
   "Pages": "页面",
   "pages": "个页面",
@@ -256,7 +253,6 @@
   "Export failed:": "导出失败：",
   "export error": "导出出错",
   "Export page": "导出页面",
-  "Export successful": "导出成功",
   "Export space": "导出空间",
   "Export {{type}}": "导出为 {{type}}",
   "File exceeds the {{limit}} attachment limit": "文件超出了 {{limit}} 类型附件限制",
@@ -332,8 +328,6 @@
   "Upload any image from your device.": "从设备上传任何图像",
   "Upload any video from your device.": "从设备上传任何视频",
   "Upload any file from your device.": "从设备上传任何文件",
-  "Uploading {{name}}": "正在上传{{name}}",
-  "Uploading file": "正在上传文件",
   "Table": "表格",
   "Insert a table.": "插入一个表格",
   "Insert collapsible block.": "插入一个折叠块",

apps/client/src/components/common/export-modal.tsx

@@ -30,11 +30,9 @@ export default function ExportModal({
   const [format, setFormat] = useState<ExportFormat>(ExportFormat.Markdown);
   const [includeChildren, setIncludeChildren] = useState<boolean>(false);
   const [includeAttachments, setIncludeAttachments] = useState<boolean>(false);
-  const [isExporting, setIsExporting] = useState<boolean>(false);
   const { t } = useTranslation();
 
   const handleExport = async () => {
-    setIsExporting(true);
     try {
       if (type === "page") {
         await exportPage({
@@ -47,9 +45,6 @@ export default function ExportModal({
       if (type === "space") {
         await exportSpace({ spaceId: id, format, includeAttachments });
       }
-      notifications.show({
-        message: t("Export successful"),
-      });
       onClose();
     } catch (err) {
       notifications.show({
@@ -57,8 +52,6 @@ export default function ExportModal({
         color: "red",
       });
       console.error("export error", err);
-    } finally {
-      setIsExporting(false);
     }
   };
 
@@ -143,7 +136,7 @@ export default function ExportModal({
             <Button onClick={onClose} variant="default">
               {t("Cancel")}
             </Button>
-            <Button onClick={handleExport} loading={isExporting}>{t("Export")}</Button>
+            <Button onClick={handleExport}>{t("Export")}</Button>
           </Group>
         </Modal.Body>
       </Modal.Content>

apps/client/src/components/common/paginate.tsx

@@ -2,17 +2,17 @@ import { Button, Group } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 
 export interface PagePaginationProps {
+  currentPage: number;
   hasPrevPage: boolean;
   hasNextPage: boolean;
-  onPrev: () => void;
+  onPageChange: (newPage: number) => void;
-  onNext: () => void;
 }
 
 export default function Paginate({
+  currentPage,
   hasPrevPage,
   hasNextPage,
-  onPrev,
+  onPageChange,
-  onNext,
 }: PagePaginationProps) {
   const { t } = useTranslation();
 
@@ -25,7 +25,7 @@ export default function Paginate({
       <Button
         variant="default"
         size="compact-sm"
-        onClick={onPrev}
+        onClick={() => onPageChange(currentPage - 1)}
         disabled={!hasPrevPage}
       >
         {t("Prev")}
@@ -34,7 +34,7 @@ export default function Paginate({
       <Button
         variant="default"
         size="compact-sm"
-        onClick={onNext}
+        onClick={() => onPageChange(currentPage + 1)}
         disabled={!hasNextPage}
       >
         {t("Next")}

apps/client/src/components/common/recent-changes.tsx

@@ -5,27 +5,26 @@ import {
   Badge,
   Table,
   ActionIcon,
-} from "@mantine/core";
+} from '@mantine/core';
-import { Link } from "react-router-dom";
+import {Link} from 'react-router-dom';
-import PageListSkeleton from "@/components/ui/page-list-skeleton.tsx";
+import PageListSkeleton from '@/components/ui/page-list-skeleton.tsx';
-import { buildPageUrl } from "@/features/page/page.utils.ts";
+import { buildPageUrl } from '@/features/page/page.utils.ts';
-import { formattedDate } from "@/lib/time.ts";
+import { formattedDate } from '@/lib/time.ts';
-import { useRecentChangesQuery } from "@/features/page/queries/page-query.ts";
+import { useRecentChangesQuery } from '@/features/page/queries/page-query.ts';
-import { IconFileDescription } from "@tabler/icons-react";
+import { IconFileDescription } from '@tabler/icons-react';
-import { getSpaceUrl } from "@/lib/config.ts";
+import { getSpaceUrl } from '@/lib/config.ts';
 import { useTranslation } from "react-i18next";
-import { getInitialsColor } from "@/lib/get-initials-color.ts";
 
 interface Props {
   spaceId?: string;
 }
 
-export default function RecentChanges({ spaceId }: Props) {
+export default function RecentChanges({spaceId}: Props) {
   const { t } = useTranslation();
-  const { data: pages, isLoading, isError } = useRecentChangesQuery(spaceId);
+  const {data: pages, isLoading, isError} = useRecentChangesQuery(spaceId);
 
   if (isLoading) {
-    return <PageListSkeleton />;
+    return <PageListSkeleton/>;
   }
 
   if (isError) {
@@ -45,8 +44,8 @@ export default function RecentChanges({ spaceId }: Props) {
                 >
                   <Group wrap="nowrap">
                     {page.icon || (
-                      <ActionIcon variant="transparent" color="gray" size={18}>
+                      <ActionIcon variant='transparent' color='gray' size={18}>
-                        <IconFileDescription size={18} />
+                        <IconFileDescription size={18}/>
                       </ActionIcon>
                     )}
 
@@ -59,23 +58,18 @@ export default function RecentChanges({ spaceId }: Props) {
               {!spaceId && (
                 <Table.Td>
                   <Badge
-                    color={getInitialsColor(page?.space.name)}
+                    color="blue"
                     variant="light"
                     component={Link}
                     to={getSpaceUrl(page?.space.slug)}
-                    style={{ cursor: "pointer" }}
+                    style={{cursor: 'pointer'}}
                   >
                     {page?.space.name}
                   </Badge>
                 </Table.Td>
               )}
               <Table.Td>
-                <Text
+                <Text c="dimmed" style={{whiteSpace: 'nowrap'}} size="xs" fw={500}>
-                  c="dimmed"
-                  style={{ whiteSpace: "nowrap" }}
-                  size="xs"
-                  fw={500}
-                >
                   {formattedDate(page.updatedAt)}
                 </Text>
               </Table.Td>

apps/client/src/components/settings/settings-queries.tsx

@@ -13,7 +13,7 @@ import { getShares } from "@/features/share/services/share-service.ts";
 import { getApiKeys } from "@/ee/api-key";
 
 export const prefetchWorkspaceMembers = () => {
-  const params: QueryParams = { limit: 100, query: "" };
+  const params = { limit: 100, page: 1, query: "" } as QueryParams;
   queryClient.prefetchQuery({
     queryKey: ["workspaceMembers", params],
     queryFn: () => getWorkspaceMembers(params),
@@ -22,15 +22,15 @@ export const prefetchWorkspaceMembers = () => {
 
 export const prefetchSpaces = () => {
   queryClient.prefetchQuery({
-    queryKey: ["spaces", {}],
+    queryKey: ["spaces", { page: 1 }],
-    queryFn: () => getSpaces({}),
+    queryFn: () => getSpaces({ page: 1 }),
   });
 };
 
 export const prefetchGroups = () => {
   queryClient.prefetchQuery({
-    queryKey: ["groups", {}],
+    queryKey: ["groups", { page: 1 }],
-    queryFn: () => getGroups({}),
+    queryFn: () => getGroups({ page: 1 }),
   });
 };
 
@@ -62,21 +62,21 @@ export const prefetchSsoProviders = () => {
 
 export const prefetchShares = () => {
   queryClient.prefetchQuery({
-    queryKey: ["share-list", {}],
+    queryKey: ["share-list", { page: 1 }],
-    queryFn: () => getShares({}),
+    queryFn: () => getShares({ page: 1, limit: 100 }),
   });
 };
 
 export const prefetchApiKeys = () => {
   queryClient.prefetchQuery({
-    queryKey: ["api-key-list", {}],
+    queryKey: ["api-key-list", { page: 1 }],
-    queryFn: () => getApiKeys({}),
+    queryFn: () => getApiKeys({ page: 1 }),
   });
 };
 
 export const prefetchApiKeyManagement = () => {
   queryClient.prefetchQuery({
-    queryKey: ["api-key-list", { adminView: true }],
+    queryKey: ["api-key-list", { page: 1 }],
-    queryFn: () => getApiKeys({ adminView: true }),
+    queryFn: () => getApiKeys({ page: 1, adminView: true }),
   });
 };

apps/client/src/components/ui/auto-tooltip-text.tsx

@@ -1,49 +0,0 @@
-import { useRef, useState, ReactNode } from "react";
-import { Text, TextProps, Tooltip } from "@mantine/core";
-
-type AutoTooltipTextProps = TextProps & {
-  children: ReactNode;
-  tooltipLabel?: string;
-  tooltipProps?: Omit<
-    React.ComponentProps<typeof Tooltip>,
-    "children" | "label"
-  >;
-};
-
-export function AutoTooltipText({
-  children,
-  tooltipLabel,
-  tooltipProps,
-  ...textProps
-}: AutoTooltipTextProps) {
-  const textRef = useRef<HTMLParagraphElement>(null);
-  const [isTruncated, setIsTruncated] = useState(false);
-
-  const handleMouseEnter = () => {
-    const element = textRef.current;
-    if (element) {
-      setIsTruncated(element.scrollWidth > element.clientWidth);
-    }
-  };
-
-  const label = tooltipLabel ?? (typeof children === "string" ? children : "");
-
-  return (
-    <Tooltip
-      label={label}
-      disabled={!isTruncated || !label}
-      multiline
-      withArrow
-      {...tooltipProps}
-    >
-      <Text
-        ref={textRef}
-        truncate
-        onMouseEnter={handleMouseEnter}
-        {...textProps}
-      >
-        {children}
-      </Text>
-    </Tooltip>
-  );
-}

apps/client/src/ee/api-key/pages/user-api-keys.tsx

@@ -10,19 +10,19 @@ import { ApiKeyCreatedModal } from "@/ee/api-key/components/api-key-created-moda
 import { UpdateApiKeyModal } from "@/ee/api-key/components/update-api-key-modal";
 import { RevokeApiKeyModal } from "@/ee/api-key/components/revoke-api-key-modal";
 import Paginate from "@/components/common/paginate";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
+import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search";
 import { useGetApiKeysQuery } from "@/ee/api-key/queries/api-key-query.ts";
 import { IApiKey } from "@/ee/api-key";
 
 export default function UserApiKeys() {
   const { t } = useTranslation();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const { page, setPage } = usePaginateAndSearch();
   const [createModalOpened, setCreateModalOpened] = useState(false);
   const [createdApiKey, setCreatedApiKey] = useState<IApiKey | null>(null);
   const [updateModalOpened, setUpdateModalOpened] = useState(false);
   const [revokeModalOpened, setRevokeModalOpened] = useState(false);
   const [selectedApiKey, setSelectedApiKey] = useState<IApiKey | null>(null);
-  const { data, isLoading } = useGetApiKeysQuery({ cursor });
+  const { data, isLoading } = useGetApiKeysQuery({ page });
 
   const handleCreateSuccess = (response: IApiKey) => {
     setCreatedApiKey(response);
@@ -65,10 +65,10 @@ export default function UserApiKeys() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
+          currentPage={page}
-          hasNextPage={data?.meta?.hasNextPage}
+          hasPrevPage={data?.meta.hasPrevPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
+          hasNextPage={data?.meta.hasNextPage}
-          onPrev={goPrev}
+          onPageChange={setPage}
         />
       )}
 

apps/client/src/ee/api-key/pages/workspace-api-keys.tsx

@@ -10,20 +10,20 @@ import { ApiKeyCreatedModal } from "@/ee/api-key/components/api-key-created-moda
 import { UpdateApiKeyModal } from "@/ee/api-key/components/update-api-key-modal";
 import { RevokeApiKeyModal } from "@/ee/api-key/components/revoke-api-key-modal";
 import Paginate from "@/components/common/paginate";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
+import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search";
 import { useGetApiKeysQuery } from "@/ee/api-key/queries/api-key-query.ts";
 import { IApiKey } from "@/ee/api-key";
 import useUserRole from '@/hooks/use-user-role.tsx';
 
 export default function WorkspaceApiKeys() {
   const { t } = useTranslation();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const { page, setPage } = usePaginateAndSearch();
   const [createModalOpened, setCreateModalOpened] = useState(false);
   const [createdApiKey, setCreatedApiKey] = useState<IApiKey | null>(null);
   const [updateModalOpened, setUpdateModalOpened] = useState(false);
   const [revokeModalOpened, setRevokeModalOpened] = useState(false);
   const [selectedApiKey, setSelectedApiKey] = useState<IApiKey | null>(null);
-  const { data, isLoading } = useGetApiKeysQuery({ cursor, adminView: true });
+  const { data, isLoading } = useGetApiKeysQuery({ page, adminView: true });
   const { isAdmin } = useUserRole();
 
   if (!isAdmin) {
@@ -76,10 +76,10 @@ export default function WorkspaceApiKeys() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
+          currentPage={page}
-          hasNextPage={data?.meta?.hasNextPage}
+          hasPrevPage={data?.meta.hasPrevPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
+          hasNextPage={data?.meta.hasNextPage}
-          onPrev={goPrev}
+          onPageChange={setPage}
         />
       )}
 

apps/client/src/ee/security/components/sso-provider-list.tsx

@@ -43,7 +43,7 @@ export default function SsoProviderList() {
     return null;
   }
 
-  if (data?.items.length === 0) {
+  if (data?.length === 0) {
     return <Text c="dimmed">{t("No SSO providers found.")}</Text>;
   }
 
@@ -81,7 +81,7 @@ export default function SsoProviderList() {
               </Table.Tr>
             </Table.Thead>
             <Table.Tbody>
-              {data?.items
+              {data
                 .sort((a, b) => {
                   const enabledDiff = Number(b.isEnabled) - Number(a.isEnabled);
                   if (enabledDiff !== 0) return enabledDiff;
@@ -104,11 +104,7 @@ export default function SsoProviderList() {
                       </Group>
                     </Table.Td>
                     <Table.Td>
-                      <Badge
+                      <Badge color={"gray"} variant="light" style={{ whiteSpace: "nowrap" }}>
-                        color={"gray"}
-                        variant="light"
-                        style={{ whiteSpace: "nowrap" }}
-                      >
                         {provider.type.toUpperCase()}
                       </Badge>
                     </Table.Td>
@@ -138,41 +134,41 @@ export default function SsoProviderList() {
                     </Table.Td>
                     <Table.Td>
                       <Group gap="xs" wrap="nowrap">
-                        <ActionIcon
+                      <ActionIcon
-                          variant="subtle"
+                        variant="subtle"
-                          color="gray"
+                        color="gray"
-                          onClick={() => handleEdit(provider)}
+                        onClick={() => handleEdit(provider)}
-                        >
+                      >
-                          <IconPencil size={16} />
+                        <IconPencil size={16} />
-                        </ActionIcon>
+                      </ActionIcon>
-                        <Menu
+                      <Menu
-                          transitionProps={{ transition: "pop" }}
+                        transitionProps={{ transition: "pop" }}
-                          withArrow
+                        withArrow
-                          position="bottom-end"
+                        position="bottom-end"
-                          withinPortal
+                        withinPortal
-                        >
+                      >
-                          <Menu.Target>
+                        <Menu.Target>
-                            <ActionIcon variant="subtle" color="gray">
+                          <ActionIcon variant="subtle" color="gray">
-                              <IconDots size={16} />
+                            <IconDots size={16} />
-                            </ActionIcon>
+                          </ActionIcon>
-                          </Menu.Target>
+                        </Menu.Target>
-                          <Menu.Dropdown>
+                        <Menu.Dropdown>
-                            <Menu.Item
+                          <Menu.Item
-                              onClick={() => handleEdit(provider)}
+                            onClick={() => handleEdit(provider)}
-                              leftSection={<IconPencil size={16} />}
+                            leftSection={<IconPencil size={16} />}
-                            >
+                          >
-                              {t("Edit")}
+                            {t("Edit")}
-                            </Menu.Item>
+                          </Menu.Item>
-                            <Menu.Item
+                          <Menu.Item
-                              onClick={() => openDeleteModal(provider.id)}
+                            onClick={() => openDeleteModal(provider.id)}
-                              leftSection={<IconTrash size={16} />}
+                            leftSection={<IconTrash size={16} />}
-                              color="red"
+                            color="red"
-                              disabled={provider.type === SSO_PROVIDER.GOOGLE}
+                            disabled={provider.type === SSO_PROVIDER.GOOGLE}
-                            >
+                          >
-                              {t("Delete")}
+                            {t("Delete")}
-                            </Menu.Item>
+                          </Menu.Item>
-                          </Menu.Dropdown>
+                        </Menu.Dropdown>
-                        </Menu>
+                      </Menu>
                       </Group>
                     </Table.Td>
                   </Table.Tr>

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

@@ -13,9 +13,8 @@ import {
 } from "@/ee/security/services/security-service.ts";
 import { notifications } from "@mantine/notifications";
 import { IAuthProvider } from "@/ee/security/types/security.types.ts";
-import { IPagination } from "@/lib/types.ts";
 
-export function useGetSsoProviders(): UseQueryResult<IPagination<IAuthProvider>, Error> {
+export function useGetSsoProviders(): UseQueryResult<IAuthProvider[], Error> {
   return useQuery({
     queryKey: ["sso-providers"],
     queryFn: () => getSsoProviders(),

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

@@ -1,6 +1,5 @@
 import api from "@/lib/api-client.ts";
 import { IAuthProvider } from "@/ee/security/types/security.types.ts";
-import { IPagination } from "@/lib/types.ts";
 
 export async function getSsoProviderById(data: {
   providerId: string;
@@ -9,8 +8,8 @@ export async function getSsoProviderById(data: {
   return req.data;
 }
 
-export async function getSsoProviders(): Promise<IPagination<IAuthProvider>> {
+export async function getSsoProviders(): Promise<IAuthProvider[]> {
-  const req = await api.post<IPagination<IAuthProvider>>("/sso/providers");
+  const req = await api.post<IAuthProvider[]>("/sso/providers");
   return req.data;
 }
 

apps/client/src/features/editor/components/attachment/attachment-view.tsx

@@ -1,13 +1,11 @@
 import { NodeViewProps, NodeViewWrapper } from "@tiptap/react";
-import { Group, Text, Paper, ActionIcon, Loader } from "@mantine/core";
+import { Group, Text, Paper, ActionIcon } from "@mantine/core";
 import { getFileUrl } from "@/lib/config.ts";
 import { IconDownload, IconPaperclip } from "@tabler/icons-react";
 import { useHover } from "@mantine/hooks";
 import { formatBytes } from "@/lib";
-import { useTranslation } from "react-i18next";
 
 export default function AttachmentView(props: NodeViewProps) {
-  const { t } = useTranslation();
   const { node, selected } = props;
   const { url, name, size } = node.attrs;
   const { hovered, ref } = useHover();
@@ -22,28 +20,26 @@ export default function AttachmentView(props: NodeViewProps) {
           wrap="nowrap"
           h={25}
         >
-          <Group wrap="nowrap" gap="sm" style={{ minWidth: 0, flex: 1 }}>
+          <Group justify="space-between" wrap="nowrap">
-            {url ? (
+            <IconPaperclip size={20} />
-              <IconPaperclip size={20} style={{ flexShrink: 0 }} />
-            ) : (
-              <Loader size={20} style={{ flexShrink: 0 }} />
-            )}
 
-            <Text component="span" size="md" truncate="end" style={{ minWidth: 0 }}>
+            <Text component="span" size="md" truncate="end">
-              {url ? name : t("Uploading {{name}}", { name })}
+              {name}
             </Text>
 
-            <Text component="span" size="sm" c="dimmed" style={{ flexShrink: 0 }}>
+            <Text component="span" size="sm" c="dimmed" inline>
               {formatBytes(size)}
             </Text>
           </Group>
 
-          {url && (selected || hovered) && (
+          {selected || hovered ? (
             <a href={getFileUrl(url)} target="_blank">
               <ActionIcon variant="default" aria-label="download file">
                 <IconDownload size={18} />
               </ActionIcon>
             </a>
+          ) : (
+            ""
           )}
         </Group>
       </Paper>

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

@@ -1,6 +1,10 @@
-import { BubbleMenu, BubbleMenuProps } from "@tiptap/react/menus";
+import {
-import { isNodeSelection, useEditorState } from "@tiptap/react";
+  BubbleMenu,
-import type { Editor } from "@tiptap/react";
+  BubbleMenuProps,
+  isNodeSelection,
+  useEditor,
+  useEditorState,
+} from "@tiptap/react";
 import { FC, useEffect, useRef, useState } from "react";
 import {
   IconBold,
@@ -34,7 +38,7 @@ export interface BubbleMenuItem {
 }
 
 type EditorBubbleMenuProps = Omit<BubbleMenuProps, "children" | "editor"> & {
-  editor: Editor | null;
+  editor: ReturnType<typeof useEditor>;
 };
 
 export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
@@ -129,9 +133,14 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
       }
       return isTextSelected(editor);
     },
-    options: {
+    tippyOptions: {
-      placement: "top",
+      moveTransition: "transform 0.15s ease-out",
-      offset: 8,
+      onCreate: (instance) => {
+        instance.popper.firstChild?.addEventListener("blur", (event) => {
+          event.preventDefault();
+          event.stopImmediatePropagation();
+        });
+      },
       onHide: () => {
         setIsNodeSelectorOpen(false);
         setIsTextAlignmentOpen(false);
@@ -147,7 +156,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
   const [isColorSelectorOpen, setIsColorSelectorOpen] = useState(false);
 
   return (
-    <BubbleMenu {...bubbleMenuProps} style={{ zIndex: 200, position: "relative"}}>
+    <BubbleMenu {...bubbleMenuProps}>
       <div className={classes.bubbleMenu}>
         <NodeSelector
           editor={props.editor}

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

@@ -1,5 +1,9 @@
-import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
+import {
-import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
+  BubbleMenu as BaseBubbleMenu,
+  findParentNode,
+  posToDOMRect,
+  useEditorState,
+} from "@tiptap/react";
 import React, { useCallback } from "react";
 import { Node as PMNode } from "prosemirror-model";
 import {
@@ -49,26 +53,17 @@ export function CalloutMenu({ editor }: EditorMenuProps) {
     },
   });
 
-  const getReferencedVirtualElement = useCallback(() => {
+  const getReferenceClientRect = useCallback(() => {
-    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "callout";
     const parent = findParentNode(predicate)(selection);
 
     if (parent) {
       const dom = editor.view.nodeDOM(parent?.pos) as HTMLElement;
-      const domRect = dom.getBoundingClientRect();
+      return dom.getBoundingClientRect();
-      return {
-        getBoundingClientRect: () => domRect,
-        getClientRects: () => [domRect],
-      };
     }
 
-    const domRect = posToDOMRect(editor.view, selection.from, selection.to);
+    return posToDOMRect(editor.view, selection.from, selection.to);
-    return {
-      getBoundingClientRect: () => domRect,
-      getClientRects: () => [domRect],
-    };
   }, [editor]);
 
   const setCalloutType = useCallback(
@@ -117,12 +112,14 @@ export function CalloutMenu({ editor }: EditorMenuProps) {
       editor={editor}
       pluginKey={`callout-menu`}
       updateDelay={0}
-      getReferencedVirtualElement={getReferencedVirtualElement}
+      tippyOptions={{
-      options={{
+        getReferenceClientRect,
+        offset: [0, 10],
         placement: "bottom",
-        // offset: 233, //      //         offset: [0, 10],
+        zIndex: 99,
-        // zIndex: 99,
+        popperOptions: {
-        flip: false,
+          modifiers: [{ name: "flip", enabled: false }],
+        },
       }}
       shouldShow={shouldShow}
     >

apps/client/src/features/editor/components/code-block/code-block-view.tsx

@@ -90,7 +90,6 @@ export default function CodeBlockView(props: NodeViewProps) {
           node.textContent.length > 0
         }
       >
-        {/* @ts-ignore */}
         <NodeViewContent as="code" className={`language-${language}`} />
       </pre>
 

apps/client/src/features/editor/components/common/editor-paste-handler.tsx

@@ -1,12 +1,13 @@
+import type { EditorView } from "@tiptap/pm/view";
 import { uploadImageAction } from "@/features/editor/components/image/upload-image-action.tsx";
 import { uploadVideoAction } from "@/features/editor/components/video/upload-video-action.tsx";
 import { uploadAttachmentAction } from "../attachment/upload-attachment-action";
 import { createMentionAction } from "@/features/editor/components/link/internal-link-paste.ts";
+import { Slice } from "@tiptap/pm/model";
 import { INTERNAL_LINK_REGEX } from "@/lib/constants.ts";
-import { Editor } from "@tiptap/core";
 
 export const handlePaste = (
-  editor: Editor,
+  view: EditorView,
   event: ClipboardEvent,
   pageId: string,
   creatorId?: string,
@@ -17,7 +18,7 @@ export const handlePaste = (
     // we have to do this validation here to allow the default link extension to takeover if needs be
     event.preventDefault();
     const url = clipboardData.trim();
-    const { from: pos, empty } = editor.state.selection;
+    const { from: pos, empty } = view.state.selection;
     const match = INTERNAL_LINK_REGEX.exec(url);
     const currentPageMatch = INTERNAL_LINK_REGEX.exec(window.location.href);
 
@@ -33,27 +34,19 @@ export const handlePaste = (
       return false;
     }
 
-    const anchorId = match[6] ? match[6].split("#")[0] : undefined;
+    const anchorId = match[6] ? match[6].split('#')[0] : undefined;
-    const urlWithoutAnchor = anchorId
+    const urlWithoutAnchor = anchorId ? url.substring(0, url.indexOf("#")) : url;
-      ? url.substring(0, url.indexOf("#"))
+    createMentionAction(urlWithoutAnchor, view, pos, creatorId, anchorId);
-      : url;
-    createMentionAction(
-      urlWithoutAnchor,
-      editor.view,
-      pos,
-      creatorId,
-      anchorId,
-    );
     return true;
   }
 
   if (event.clipboardData?.files.length) {
     event.preventDefault();
     for (const file of event.clipboardData.files) {
-      const pos = editor.state.selection.from;
+      const pos = view.state.selection.from;
-      uploadImageAction(file, editor, pos, pageId);
+      uploadImageAction(file, view, pos, pageId);
-      uploadVideoAction(file, editor, pos, pageId);
+      uploadVideoAction(file, view, pos, pageId);
-      uploadAttachmentAction(file, editor, pos, pageId);
+      uploadAttachmentAction(file, view, pos, pageId);
     }
     return true;
   }
@@ -61,7 +54,7 @@ export const handlePaste = (
 };
 
 export const handleFileDrop = (
-  editor: Editor,
+  view: EditorView,
   event: DragEvent,
   moved: boolean,
   pageId: string,
@@ -70,14 +63,14 @@ export const handleFileDrop = (
     event.preventDefault();
 
     for (const file of event.dataTransfer.files) {
-      const coordinates = editor.view.posAtCoords({
+      const coordinates = view.posAtCoords({
         left: event.clientX,
         top: event.clientY,
       });
 
-      uploadImageAction(file, editor, coordinates?.pos ?? 0 - 1, pageId);
+      uploadImageAction(file, view, coordinates?.pos ?? 0 - 1, pageId);
-      uploadVideoAction(file, editor, coordinates?.pos ?? 0 - 1, pageId);
+      uploadVideoAction(file, view, coordinates?.pos ?? 0 - 1, pageId);
-      uploadAttachmentAction(file, editor, coordinates?.pos ?? 0 - 1, pageId);
+      uploadAttachmentAction(file, view, coordinates?.pos ?? 0 - 1, pageId);
     }
     return true;
   }

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

@@ -1,6 +1,11 @@
-import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
+import {
-import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
+  BubbleMenu as BaseBubbleMenu,
+  findParentNode,
+  posToDOMRect,
+  useEditorState,
+} from "@tiptap/react";
 import { useCallback } from "react";
+import { sticky } from "tippy.js";
 import { Node as PMNode } from "prosemirror-model";
 import {
   EditorMenuProps,
@@ -35,26 +40,17 @@ export function DrawioMenu({ editor }: EditorMenuProps) {
     },
   });
 
-  const getReferencedVirtualElement = useCallback(() => {
+  const getReferenceClientRect = useCallback(() => {
-    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "drawio";
     const parent = findParentNode(predicate)(selection);
 
     if (parent) {
       const dom = editor.view.nodeDOM(parent?.pos) as HTMLElement;
-      const domRect = dom.getBoundingClientRect();
+      return dom.getBoundingClientRect();
-      return {
-        getBoundingClientRect: () => domRect,
-        getClientRects: () => [domRect],
-      };
     }
 
-    const domRect = posToDOMRect(editor.view, selection.from, selection.to);
+    return posToDOMRect(editor.view, selection.from, selection.to);
-    return {
-      getBoundingClientRect: () => domRect,
-      getClientRects: () => [domRect],
-    };
   }, [editor]);
 
   const onWidthChange = useCallback(
@@ -69,11 +65,15 @@ export function DrawioMenu({ editor }: EditorMenuProps) {
       editor={editor}
       pluginKey={`drawio-menu`}
       updateDelay={0}
-      getReferencedVirtualElement={getReferencedVirtualElement}
+      tippyOptions={{
-      options={{
+        getReferenceClientRect,
-        placement: "top",
+        offset: [0, 8],
-        offset: 8,
+        zIndex: 99,
-        flip: false,
+        popperOptions: {
+          modifiers: [{ name: "flip", enabled: false }],
+        },
+        plugins: [sticky],
+        sticky: "popper",
       }}
       shouldShow={shouldShow}
     >

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

@@ -66,7 +66,6 @@ export default function DrawioView(props: NodeViewProps) {
     const fileName = "diagram.drawio.svg";
     const drawioSVGFile = await svgStringToFile(svgString, fileName);
 
-    //@ts-ignore
     const pageId = editor.storage?.pageId;
 
     let attachment: IAttachment = null;

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

@@ -1,41 +1,16 @@
 import { ReactRenderer, useEditor } from "@tiptap/react";
 import EmojiList from "./emoji-list";
+import tippy from "tippy.js";
 import { init } from "emoji-mart";
-import {
-  autoUpdate,
-  computePosition,
-  flip,
-  offset,
-  shift,
-} from "@floating-ui/dom";
 
 const renderEmojiItems = () => {
   let component: ReactRenderer | null = null;
-  let popup: HTMLDivElement | null = null;
+  let popup: any | null = null;
-  let cleanup: (() => void) | null = null;
-  let getReferenceClientRect: (() => DOMRect) | null = null;
-
-  const destroy = () => {
-    if (cleanup) {
-      cleanup();
-      cleanup = null;
-    }
-
-    if (popup) {
-      popup.remove();
-      popup = null;
-    }
-
-    if (component) {
-      component.destroy();
-      component = null;
-    }
-  };
 
   return {
     onBeforeStart: (props: {
       editor: ReturnType<typeof useEditor>;
-      clientRect: () => DOMRect;
+      clientRect: DOMRect;
     }) => {
       init({
         data: async () => (await import("@emoji-mart/data")).default,
@@ -50,61 +25,51 @@ const renderEmojiItems = () => {
         return;
       }
 
-      getReferenceClientRect = props.clientRect;
+      // @ts-ignore
-      popup = document.createElement("div");
+      popup = tippy("body", {
-      popup.style.zIndex = "9999";
+        getReferenceClientRect: props.clientRect,
-      popup.style.position = "absolute";
+        appendTo: () => document.body,
-      popup.style.top = "0";
+        content: component.element,
-      popup.style.left = "0";
+        showOnCreate: true,
-      popup.appendChild(component.element);
+        interactive: true,
-      document.body.appendChild(popup);
+        trigger: "manual",
-
+        placement: "bottom",
-      const virtualElement = {
-        getBoundingClientRect: () => {
-          return getReferenceClientRect
-            ? getReferenceClientRect()
-            : new DOMRect(0, 0, 0, 0);
-        },
-      };
-
-      cleanup = autoUpdate(virtualElement, popup, () => {
-        if (!popup) return;
-
-        computePosition(virtualElement, popup, {
-          placement: "bottom-start",
-          middleware: [offset(10), flip(), shift()],
-        }).then(({ x, y }) => {
-          if (!popup) return;
-
-          Object.assign(popup.style, {
-            transform: `translate(${x}px, ${y}px)`,
-          });
-        });
       });
     },
     onStart: (props: {
       editor: ReturnType<typeof useEditor>;
-      clientRect: () => DOMRect;
+      clientRect: DOMRect;
     }) => {
-      component?.updateProps({ ...props, isLoading: false });
+      component?.updateProps({...props, isLoading: false});
 
-      if (props.clientRect) {
+      if (!props.clientRect) {
-        getReferenceClientRect = props.clientRect;
+        return;
       }
+
+      popup &&
+        popup[0].setProps({
+          getReferenceClientRect: props.clientRect,
+        });
     },
     onUpdate: (props: {
       editor: ReturnType<typeof useEditor>;
-      clientRect: () => DOMRect;
+      clientRect: DOMRect;
     }) => {
       component?.updateProps(props);
 
-      if (props.clientRect) {
+      if (!props.clientRect) {
-        getReferenceClientRect = props.clientRect;
+        return;
       }
+
+      popup &&
+        popup[0].setProps({
+          getReferenceClientRect: props.clientRect,
+        });
     },
     onKeyDown: (props: { event: KeyboardEvent }) => {
       if (props.event.key === "Escape") {
-        destroy();
+        popup?.[0].hide();
+        component?.destroy()
 
         return true;
       }
@@ -113,7 +78,13 @@ const renderEmojiItems = () => {
       return component?.ref?.onKeyDown(props);
     },
     onExit: () => {
-      destroy();
+      if (popup && !popup[0]?.state.isDestroyed) {
+        popup[0]?.destroy();
+      }
+
+      if (component) {
+        component?.destroy();
+      }
     },
   };
 };

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

@@ -1,6 +1,11 @@
-import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
+import {
-import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
+  BubbleMenu as BaseBubbleMenu,
+  findParentNode,
+  posToDOMRect,
+  useEditorState,
+} from "@tiptap/react";
 import { useCallback } from "react";
+import { sticky } from "tippy.js";
 import { Node as PMNode } from "prosemirror-model";
 import {
   EditorMenuProps,
@@ -37,26 +42,17 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) {
     },
   });
 
-  const getReferencedVirtualElement = useCallback(() => {
+  const getReferenceClientRect = useCallback(() => {
-    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "excalidraw";
     const parent = findParentNode(predicate)(selection);
 
     if (parent) {
       const dom = editor.view.nodeDOM(parent?.pos) as HTMLElement;
-      const domRect = dom.getBoundingClientRect();
+      return dom.getBoundingClientRect();
-      return {
-        getBoundingClientRect: () => domRect,
-        getClientRects: () => [domRect],
-      };
     }
 
-    const domRect = posToDOMRect(editor.view, selection.from, selection.to);
+    return posToDOMRect(editor.view, selection.from, selection.to);
-    return {
-      getBoundingClientRect: () => domRect,
-      getClientRects: () => [domRect],
-    };
   }, [editor]);
 
   const onWidthChange = useCallback(
@@ -69,13 +65,17 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) {
   return (
     <BaseBubbleMenu
       editor={editor}
-      pluginKey={`excalidraw-menu`}
+      pluginKey={`excalidraw-menu}`}
       updateDelay={0}
-      getReferencedVirtualElement={getReferencedVirtualElement}
+      tippyOptions={{
-      options={{
+        getReferenceClientRect,
-        placement: "top",
+        offset: [0, 8],
-        offset: 8,
+        zIndex: 99,
-        flip: false,
+        popperOptions: {
+          modifiers: [{ name: "flip", enabled: false }],
+        },
+        plugins: [sticky],
+        sticky: "popper",
       }}
       shouldShow={shouldShow}
     >

apps/client/src/features/editor/components/excalidraw/excalidraw-utils.ts

@@ -1,3 +1,5 @@
+import { ENCRYPTION_KEY_BITS } from "@excalidraw/common";
+
 type LibraryItems = any;
 
 type LibraryPersistedData = {
@@ -8,8 +10,8 @@ export interface LibraryPersistenceAdapter {
   load(metadata: { source: "load" | "save" }):
     | Promise<{ libraryItems: LibraryItems } | null>
     | {
-    libraryItems: LibraryItems;
+        libraryItems: LibraryItems;
-  }
+      }
     | null;
 
   save(libraryData: LibraryPersistedData): Promise<void> | void;
@@ -25,7 +27,10 @@ export const localStorageLibraryAdapter: LibraryPersistenceAdapter = {
         return JSON.parse(data);
       }
     } catch (e) {
-      console.error("Error downloading Excalidraw library from localStorage", e);
+      console.error(
+        "Error downloading Excalidraw library from localStorage",
+        e,
+      );
     }
     return null;
   },
@@ -40,3 +45,124 @@ export const localStorageLibraryAdapter: LibraryPersistenceAdapter = {
     }
   },
 };
+
+export const blobToArrayBuffer = (blob: Blob): Promise<ArrayBuffer> => {
+  if ("arrayBuffer" in blob) {
+    return blob.arrayBuffer();
+  }
+  // Safari
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onload = (event) => {
+      if (!event.target?.result) {
+        return reject(new Error("Couldn't convert blob to ArrayBuffer"));
+      }
+      resolve(event.target.result as ArrayBuffer);
+    };
+    reader.readAsArrayBuffer(blob);
+  });
+};
+
+export const IV_LENGTH_BYTES = 12;
+
+// Pre-transform error: No known conditions for "./data/encryption" specifier in "@excalidraw/excalidraw" package
+//   Plugin: vite:import-analysis
+//   File: /Users/lite/WebstormProjects/docmost-ee/apps/client/src/features/editor/components/excalidraw/use-excalidraw-collab.ts:11:7
+//   7  |    decryptData,
+//   8  |    encryptData
+//   9  |  } from "@excalidraw/excalidraw/data/encryption";
+
+//@ts-ignore
+export const createIV = (): Uint8Array<ArrayBuffer> => {
+  const arr = new Uint8Array(IV_LENGTH_BYTES);
+  return window.crypto.getRandomValues(arr);
+};
+
+export const generateEncryptionKey = async <
+  T extends "string" | "cryptoKey" = "string",
+>(
+  returnAs?: T,
+): Promise<T extends "cryptoKey" ? CryptoKey : string> => {
+  const key = await window.crypto.subtle.generateKey(
+    {
+      name: "AES-GCM",
+      length: ENCRYPTION_KEY_BITS,
+    },
+    true, // extractable
+    ["encrypt", "decrypt"],
+  );
+  return (
+    returnAs === "cryptoKey"
+      ? key
+      : (await window.crypto.subtle.exportKey("jwk", key)).k
+  ) as T extends "cryptoKey" ? CryptoKey : string;
+};
+
+export const getCryptoKey = (key: string, usage: KeyUsage) =>
+  window.crypto.subtle.importKey(
+    "jwk",
+    {
+      alg: "A128GCM",
+      ext: true,
+      k: key,
+      key_ops: ["encrypt", "decrypt"],
+      kty: "oct",
+    },
+    {
+      name: "AES-GCM",
+      length: ENCRYPTION_KEY_BITS,
+    },
+    false, // extractable
+    [usage],
+  );
+
+export const encryptData = async (
+  key: string | CryptoKey,
+  //@ts-ignore
+  data: Uint8Array<ArrayBuffer> | ArrayBuffer | Blob | File | string,
+  //@ts-ignore
+): Promise<{ encryptedBuffer: ArrayBuffer; iv: Uint8Array<ArrayBuffer> }> => {
+  const importedKey =
+    typeof key === "string" ? await getCryptoKey(key, "encrypt") : key;
+  const iv = createIV();
+  //@ts-ignore
+  const buffer: ArrayBuffer | Uint8Array<ArrayBuffer> =
+    typeof data === "string"
+      ? new TextEncoder().encode(data)
+      : data instanceof Uint8Array
+        ? data
+        : data instanceof Blob
+          ? await blobToArrayBuffer(data)
+          : data;
+
+  // We use symmetric encryption. AES-GCM is the recommended algorithm and
+  // includes checks that the ciphertext has not been modified by an attacker.
+  const encryptedBuffer = await window.crypto.subtle.encrypt(
+    {
+      name: "AES-GCM",
+      iv,
+    },
+    importedKey,
+    buffer,
+  );
+
+  return { encryptedBuffer, iv };
+};
+
+export const decryptData = async (
+  //@ts-ignore
+  iv: Uint8Array<ArrayBuffer>,
+  //@ts-ignore
+  encrypted: Uint8Array<ArrayBuffer> | ArrayBuffer,
+  privateKey: string,
+): Promise<ArrayBuffer> => {
+  const key = await getCryptoKey(privateKey, "decrypt");
+  return window.crypto.subtle.decrypt(
+    {
+      name: "AES-GCM",
+      iv,
+    },
+    key,
+    encrypted,
+  );
+};

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

@@ -8,13 +8,14 @@ import {
   Text,
   useComputedColorScheme,
 } from "@mantine/core";
-import { useState } from "react";
+import { useState, useCallback } from "react";
 import { uploadFile } from "@/features/page/services/page-service.ts";
 import { svgStringToFile } from "@/lib";
 import { useDisclosure } from "@mantine/hooks";
 import { getFileUrl } from "@/lib/config.ts";
 import "@excalidraw/excalidraw/index.css";
-import type { ExcalidrawImperativeAPI } from "@excalidraw/excalidraw/types";
+import type { ExcalidrawImperativeAPI, Gesture } from "@excalidraw/excalidraw/types";
+import type { ExcalidrawElement } from "@excalidraw/element/types";
 import { IAttachment } from "@/features/attachments/types/attachment.types";
 import ReactClearModal from "react-clear-modal";
 import clsx from "clsx";
@@ -22,8 +23,9 @@ import { IconEdit } from "@tabler/icons-react";
 import { lazy } from "react";
 import { Suspense } from "react";
 import { useTranslation } from "react-i18next";
-import { useHandleLibrary } from "@excalidraw/excalidraw";
+import { useHandleLibrary, LiveCollaborationTrigger } from "@excalidraw/excalidraw";
 import { localStorageLibraryAdapter } from "@/features/editor/components/excalidraw/excalidraw-utils.ts";
+import { useExcalidrawCollab } from "./use-excalidraw-collab";
 
 const Excalidraw = lazy(() =>
   import("@excalidraw/excalidraw").then((module) => ({
@@ -46,6 +48,16 @@ export default function ExcalidrawView(props: NodeViewProps) {
   const [opened, { open, close }] = useDisclosure(false);
   const computedColorScheme = useComputedColorScheme();
 
+  const pageId = editor.storage?.pageId;
+  const { broadcastScene, broadcastPointer, isCollaborating } = useExcalidrawCollab(excalidrawAPI, pageId, opened);
+
+  const handleChange = useCallback(
+    (elements: readonly ExcalidrawElement[]) => {
+      broadcastScene(elements);
+    },
+    [broadcastScene],
+  );
+
   const handleOpen = async () => {
     if (!editor.isEditable) {
       return;
@@ -98,7 +110,6 @@ export default function ExcalidrawView(props: NodeViewProps) {
     const fileName = "diagram.excalidraw.svg";
     const excalidrawSvgFile = await svgStringToFile(svgString, fileName);
 
-    // @ts-ignore
     const pageId = editor.storage?.pageId;
 
     let attachment: IAttachment = null;
@@ -158,6 +169,14 @@ export default function ExcalidrawView(props: NodeViewProps) {
                 scrollToContent: true,
               }}
               theme={computedColorScheme}
+              onChange={handleChange}
+              onPointerUpdate={broadcastPointer}
+              renderTopRightUI={() => (
+                <LiveCollaborationTrigger
+                  isCollaborating={isCollaborating}
+                  onSelect={() => {}}
+                />
+              )}
             />
           </Suspense>
         </div>

apps/client/src/features/editor/components/excalidraw/portal.tsx

@@ -0,0 +1,257 @@
+import { CaptureUpdateAction } from "@excalidraw/excalidraw";
+import { trackEvent } from "@excalidraw/excalidraw/analytics";
+import { encryptData } from "@excalidraw/excalidraw/data/encryption";
+import { newElementWith } from "@excalidraw/element";
+import throttle from "lodash.throttle";
+
+import type { UserIdleState } from "@excalidraw/common";
+import type { OrderedExcalidrawElement } from "@excalidraw/element/types";
+import type {
+  OnUserFollowedPayload,
+  SocketId,
+} from "@excalidraw/excalidraw/types";
+
+import { WS_EVENTS, FILE_UPLOAD_TIMEOUT, WS_SUBTYPES } from "../app_constants";
+import { isSyncableElement } from "../data";
+
+import type {
+  SocketUpdateData,
+  SocketUpdateDataSource,
+  SyncableExcalidrawElement,
+} from "../data";
+import type { TCollabClass } from "./Collab";
+import type { Socket } from "socket.io-client";
+
+class Portal {
+  collab: TCollabClass;
+  socket: Socket | null = null;
+  socketInitialized: boolean = false; // we don't want the socket to emit any updates until it is fully initialized
+  roomId: string | null = null;
+  roomKey: string | null = null;
+  broadcastedElementVersions: Map<string, number> = new Map();
+
+  constructor(collab: TCollabClass) {
+    this.collab = collab;
+  }
+
+  open(socket: Socket, id: string, key: string) {
+    this.socket = socket;
+    this.roomId = id;
+    this.roomKey = key;
+
+    // Initialize socket listeners
+    this.socket.on("init-room", () => {
+      if (this.socket) {
+        this.socket.emit("join-room", this.roomId);
+        trackEvent("share", "room joined");
+      }
+    });
+    this.socket.on("new-user", async (_socketId: string) => {
+      this.broadcastScene(
+        WS_SUBTYPES.INIT,
+        this.collab.getSceneElementsIncludingDeleted(),
+        /* syncAll */ true,
+      );
+    });
+    this.socket.on("room-user-change", (clients: SocketId[]) => {
+      this.collab.setCollaborators(clients);
+    });
+
+    return socket;
+  }
+
+  close() {
+    if (!this.socket) {
+      return;
+    }
+    this.queueFileUpload.flush();
+    this.socket.close();
+    this.socket = null;
+    this.roomId = null;
+    this.roomKey = null;
+    this.socketInitialized = false;
+    this.broadcastedElementVersions = new Map();
+  }
+
+  isOpen() {
+    return !!(
+      this.socketInitialized &&
+      this.socket &&
+      this.roomId &&
+      this.roomKey
+    );
+  }
+
+  async _broadcastSocketData(
+    data: SocketUpdateData,
+    volatile: boolean = false,
+    roomId?: string,
+  ) {
+    if (this.isOpen()) {
+      const json = JSON.stringify(data);
+      const encoded = new TextEncoder().encode(json);
+      const { encryptedBuffer, iv } = await encryptData(this.roomKey!, encoded);
+
+      this.socket?.emit(
+        volatile ? WS_EVENTS.SERVER_VOLATILE : WS_EVENTS.SERVER,
+        roomId ?? this.roomId,
+        encryptedBuffer,
+        iv,
+      );
+    }
+  }
+
+  queueFileUpload = throttle(async () => {
+    try {
+      await this.collab.fileManager.saveFiles({
+        elements: this.collab.excalidrawAPI.getSceneElementsIncludingDeleted(),
+        files: this.collab.excalidrawAPI.getFiles(),
+      });
+    } catch (error: any) {
+      if (error.name !== "AbortError") {
+        this.collab.excalidrawAPI.updateScene({
+          appState: {
+            errorMessage: error.message,
+          },
+        });
+      }
+    }
+
+    let isChanged = false;
+    const newElements = this.collab.excalidrawAPI
+      .getSceneElementsIncludingDeleted()
+      .map((element) => {
+        if (this.collab.fileManager.shouldUpdateImageElementStatus(element)) {
+          isChanged = true;
+          // this will signal collaborators to pull image data from server
+          // (using mutation instead of newElementWith otherwise it'd break
+          // in-progress dragging)
+          return newElementWith(element, { status: "saved" });
+        }
+        return element;
+      });
+
+    if (isChanged) {
+      this.collab.excalidrawAPI.updateScene({
+        elements: newElements,
+        captureUpdate: CaptureUpdateAction.NEVER,
+      });
+    }
+  }, FILE_UPLOAD_TIMEOUT);
+
+  broadcastScene = async (
+    updateType: WS_SUBTYPES.INIT | WS_SUBTYPES.UPDATE,
+    elements: readonly OrderedExcalidrawElement[],
+    syncAll: boolean,
+  ) => {
+    if (updateType === WS_SUBTYPES.INIT && !syncAll) {
+      throw new Error("syncAll must be true when sending SCENE.INIT");
+    }
+
+    // sync out only the elements we think we need to to save bandwidth.
+    // periodically we'll resync the whole thing to make sure no one diverges
+    // due to a dropped message (server goes down etc).
+    const syncableElements = elements.reduce((acc, element) => {
+      if (
+        (syncAll ||
+          !this.broadcastedElementVersions.has(element.id) ||
+          element.version > this.broadcastedElementVersions.get(element.id)!) &&
+        isSyncableElement(element)
+      ) {
+        acc.push(element);
+      }
+      return acc;
+    }, [] as SyncableExcalidrawElement[]);
+
+    const data: SocketUpdateDataSource[typeof updateType] = {
+      type: updateType,
+      payload: {
+        elements: syncableElements,
+      },
+    };
+
+    for (const syncableElement of syncableElements) {
+      this.broadcastedElementVersions.set(
+        syncableElement.id,
+        syncableElement.version,
+      );
+    }
+
+    this.queueFileUpload();
+
+    await this._broadcastSocketData(data as SocketUpdateData);
+  };
+
+  broadcastIdleChange = (userState: UserIdleState) => {
+    if (this.socket?.id) {
+      const data: SocketUpdateDataSource["IDLE_STATUS"] = {
+        type: WS_SUBTYPES.IDLE_STATUS,
+        payload: {
+          socketId: this.socket.id as SocketId,
+          userState,
+          username: this.collab.state.username,
+        },
+      };
+      return this._broadcastSocketData(
+        data as SocketUpdateData,
+        true, // volatile
+      );
+    }
+  };
+
+  broadcastMouseLocation = (payload: {
+    pointer: SocketUpdateDataSource["MOUSE_LOCATION"]["payload"]["pointer"];
+    button: SocketUpdateDataSource["MOUSE_LOCATION"]["payload"]["button"];
+  }) => {
+    if (this.socket?.id) {
+      const data: SocketUpdateDataSource["MOUSE_LOCATION"] = {
+        type: WS_SUBTYPES.MOUSE_LOCATION,
+        payload: {
+          socketId: this.socket.id as SocketId,
+          pointer: payload.pointer,
+          button: payload.button || "up",
+          selectedElementIds:
+          this.collab.excalidrawAPI.getAppState().selectedElementIds,
+          username: this.collab.state.username,
+        },
+      };
+
+      return this._broadcastSocketData(
+        data as SocketUpdateData,
+        true, // volatile
+      );
+    }
+  };
+
+  broadcastVisibleSceneBounds = (
+    payload: {
+      sceneBounds: SocketUpdateDataSource["USER_VISIBLE_SCENE_BOUNDS"]["payload"]["sceneBounds"];
+    },
+    roomId: string,
+  ) => {
+    if (this.socket?.id) {
+      const data: SocketUpdateDataSource["USER_VISIBLE_SCENE_BOUNDS"] = {
+        type: WS_SUBTYPES.USER_VISIBLE_SCENE_BOUNDS,
+        payload: {
+          socketId: this.socket.id as SocketId,
+          username: this.collab.state.username,
+          sceneBounds: payload.sceneBounds,
+        },
+      };
+
+      return this._broadcastSocketData(
+        data as SocketUpdateData,
+        true, // volatile
+        roomId,
+      );
+    }
+  };
+
+  broadcastUserFollowed = (payload: OnUserFollowedPayload) => {
+    if (this.socket?.id) {
+      this.socket.emit(WS_EVENTS.USER_FOLLOW_CHANGE, payload);
+    }
+  };
+}
+
+export default Portal;

apps/client/src/features/editor/components/excalidraw/use-excalidraw-collab.ts

@@ -0,0 +1,266 @@
+import { useEffect, useRef, useCallback, useMemo, useState } from "react";
+import { useAtom } from "jotai";
+import { socketAtom } from "@/features/websocket/atoms/socket-atom";
+import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
+import type {
+  ExcalidrawImperativeAPI,
+  Collaborator,
+  Gesture,
+} from "@excalidraw/excalidraw/types";
+import type { ExcalidrawElement } from "@excalidraw/element/types";
+import { reconcileElements, getSceneVersion } from "@excalidraw/excalidraw";
+import throttle from "lodash.throttle";
+
+// Message types for collaboration
+type SceneUpdateMessage = {
+  type: "SCENE_UPDATE";
+  payload: { elements: readonly ExcalidrawElement[] };
+};
+
+type PointerUpdateMessage = {
+  type: "POINTER_UPDATE";
+  payload: {
+    socketId: string;
+    pointer: { x: number; y: number };
+    button: "down" | "up";
+    username: string;
+    selectedElementIds: Record<string, boolean>;
+  };
+};
+
+type CollabMessage = SceneUpdateMessage | PointerUpdateMessage;
+
+export function useExcalidrawCollab(
+  excalidrawAPI: ExcalidrawImperativeAPI | null,
+  pageId: string | undefined,
+  isOpen: boolean,
+) {
+  const [socket] = useAtom(socketAtom);
+  const [currentUser] = useAtom(currentUserAtom);
+  const lastBroadcastedVersion = useRef(-1);
+  const isInitialized = useRef(false);
+  const collaboratorsRef = useRef<Map<string, Collaborator>>(new Map());
+  const [isCollaborating, setIsCollaborating] = useState(false);
+
+  // Track broadcasted element versions for bandwidth optimization
+  const broadcastedElementVersions = useRef<Map<string, number>>(new Map());
+
+  const roomId = pageId ? `excalidraw-${pageId}` : null;
+  const username = currentUser?.user?.name || "Anonymous";
+
+  // Broadcast pointer/cursor updates (volatile - can be dropped)
+  const broadcastPointer = useMemo(
+    () =>
+      throttle(
+        (payload: {
+          pointer: { x: number; y: number };
+          button: "down" | "up";
+          pointersMap: Gesture["pointers"];
+        }) => {
+          if (!socket || !roomId || !isInitialized.current) return;
+          if (payload.pointersMap.size >= 2) return; // Skip multi-touch
+
+          const data: PointerUpdateMessage = {
+            type: "POINTER_UPDATE",
+            payload: {
+              socketId: socket.id!,
+              pointer: payload.pointer,
+              button: payload.button,
+              username,
+              selectedElementIds:
+                excalidrawAPI?.getAppState().selectedElementIds || {},
+            },
+          };
+
+          const json = JSON.stringify(data);
+          socket.emit("ex-server-volatile-broadcast", [roomId, json, null]);
+        },
+        50,
+      ),
+    [socket, roomId, username, excalidrawAPI],
+  );
+
+  // Broadcast scene changes with bandwidth optimization
+  const broadcastScene = useCallback(
+    (elements: readonly ExcalidrawElement[], syncAll = false) => {
+      if (!socket || !roomId || !isInitialized.current) {
+        return;
+      }
+
+      const sceneVersion = getSceneVersion(elements);
+
+      if (sceneVersion <= lastBroadcastedVersion.current) {
+        return;
+      }
+
+      // Filter to only send elements that changed since last broadcast
+      const changedElements = elements.filter((element) => {
+        const lastVersion = broadcastedElementVersions.current.get(element.id);
+        return syncAll || lastVersion === undefined || element.version > lastVersion;
+      });
+
+      if (changedElements.length === 0) {
+        return;
+      }
+
+      const data: SceneUpdateMessage = {
+        type: "SCENE_UPDATE",
+        payload: { elements: changedElements },
+      };
+
+      // Update tracking map
+      for (const element of changedElements) {
+        broadcastedElementVersions.current.set(element.id, element.version);
+      }
+
+      const json = JSON.stringify(data);
+      socket.emit("ex-server-broadcast", [roomId, json, null]);
+      lastBroadcastedVersion.current = sceneVersion;
+    },
+    [socket, roomId],
+  );
+
+  // Throttled version for onChange handler
+  const throttledBroadcastScene = useMemo(
+    () => throttle((elements: readonly ExcalidrawElement[]) => broadcastScene(elements, false), 100),
+    [broadcastScene],
+  );
+
+  // Handle incoming broadcasts
+  const handleClientBroadcast = useCallback(
+    (jsonData: string, _iv: Uint8Array | null) => {
+      if (!excalidrawAPI || !socket) return;
+
+      try {
+        const data: CollabMessage = JSON.parse(jsonData);
+
+        if (data.type === "SCENE_UPDATE" && data.payload?.elements) {
+          const remoteElements = data.payload.elements;
+          const localElements =
+            excalidrawAPI.getSceneElementsIncludingDeleted();
+
+          const reconciledElements = reconcileElements(
+            localElements,
+            // @ts-ignore
+            remoteElements,
+            excalidrawAPI.getAppState(),
+          );
+
+          excalidrawAPI.updateScene({
+            elements: reconciledElements,
+          });
+
+          lastBroadcastedVersion.current = getSceneVersion(reconciledElements);
+        } else if (data.type === "POINTER_UPDATE") {
+          const { socketId, pointer, button, username, selectedElementIds } =
+            data.payload;
+
+          // Don't update our own cursor
+          if (socketId === socket.id) return;
+
+          // Update collaborator with pointer info
+          const collaborator = collaboratorsRef.current.get(socketId) || {};
+          collaboratorsRef.current.set(socketId, {
+            ...collaborator,
+            // @ts-ignore
+            pointer,
+            button,
+            username,
+            // @ts-ignore
+            selectedElementIds,
+            isCurrentUser: false,
+          });
+
+          excalidrawAPI.updateScene({
+            // @ts-ignore
+            collaborators: collaboratorsRef.current,
+          });
+        }
+      } catch (err) {
+        console.error("Failed to process broadcast:", err);
+      }
+    },
+    [excalidrawAPI, socket],
+  );
+
+  // Handle room user changes
+  const handleRoomUserChange = useCallback(
+    (socketIds: string[]) => {
+      if (!excalidrawAPI || !socket) return;
+
+      // Update collaborators map, preserving existing data
+      const newCollaborators = new Map<string, Collaborator>();
+      for (const id of socketIds) {
+        const existing = collaboratorsRef.current.get(id);
+        newCollaborators.set(id, {
+          ...existing,
+          isCurrentUser: id === socket.id,
+          username:
+            existing?.username || (id === socket.id ? username : "User"),
+        });
+      }
+
+      collaboratorsRef.current = newCollaborators;
+      // @ts-ignore
+      excalidrawAPI.updateScene({ collaborators: newCollaborators });
+
+      // We're collaborating if there are other users
+      setIsCollaborating(socketIds.length > 1);
+    },
+    [excalidrawAPI, socket, username],
+  );
+
+  // Join/leave room based on modal state
+  useEffect(() => {
+    if (!socket || !roomId || !isOpen) {
+      setIsCollaborating(false);
+      return;
+    }
+
+    console.log("Joining room:", roomId);
+    socket.emit("ex-join-room", roomId);
+    isInitialized.current = true;
+
+    // Set up listeners
+    socket.on("ex-client-broadcast", handleClientBroadcast);
+    socket.on("ex-room-user-change", handleRoomUserChange);
+    socket.on("ex-first-in-room", () => {
+      console.log("First in excalidraw room");
+    });
+    socket.on("ex-new-user", (socketId: string) => {
+      console.log("New user joined:", socketId);
+      if (excalidrawAPI) {
+        // Send full scene to new user (syncAll = true)
+        broadcastScene(excalidrawAPI.getSceneElements(), true);
+      }
+    });
+
+    return () => {
+      console.log("Leaving room:", roomId);
+      socket.emit("ex-leave-room", roomId);
+      socket.off("ex-client-broadcast", handleClientBroadcast);
+      socket.off("ex-room-user-change", handleRoomUserChange);
+      socket.off("ex-first-in-room");
+      socket.off("ex-new-user");
+      isInitialized.current = false;
+      lastBroadcastedVersion.current = -1;
+      broadcastedElementVersions.current = new Map();
+      collaboratorsRef.current = new Map();
+      setIsCollaborating(false);
+    };
+  }, [
+    socket,
+    roomId,
+    isOpen,
+    handleClientBroadcast,
+    handleRoomUserChange,
+    broadcastScene,
+    excalidrawAPI,
+  ]);
+
+  return {
+    broadcastScene: throttledBroadcastScene,
+    broadcastPointer,
+    isCollaborating,
+  };
+}

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

@@ -1,6 +1,11 @@
-import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
+import {
-import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
+  BubbleMenu as BaseBubbleMenu,
+  findParentNode,
+  posToDOMRect,
+  useEditorState,
+} from "@tiptap/react";
 import React, { useCallback } from "react";
+import { sticky } from "tippy.js";
 import { Node as PMNode } from "prosemirror-model";
 import {
   EditorMenuProps,
@@ -17,6 +22,16 @@ import { useTranslation } from "react-i18next";
 
 export function ImageMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
+  const shouldShow = useCallback(
+    ({ state }: ShouldShowProps) => {
+      if (!state) {
+        return false;
+      }
+
+      return editor.isActive("image");
+    },
+    [editor],
+  );
 
   const editorState = useEditorState({
     editor,
@@ -37,37 +52,17 @@ export function ImageMenu({ editor }: EditorMenuProps) {
     },
   });
 
-  const shouldShow = useCallback(
+  const getReferenceClientRect = useCallback(() => {
-    ({ state }: ShouldShowProps) => {
-      if (!state) {
-        return false;
-      }
-
-      return editor.isActive("image") && editor.getAttributes("image").src;
-    },
-    [editor],
-  );
-
-  const getReferencedVirtualElement = useCallback(() => {
-    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "image";
     const parent = findParentNode(predicate)(selection);
 
     if (parent) {
       const dom = editor.view.nodeDOM(parent?.pos) as HTMLElement;
-      const domRect = dom.getBoundingClientRect();
+      return dom.getBoundingClientRect();
-      return {
-        getBoundingClientRect: () => domRect,
-        getClientRects: () => [domRect],
-      };
     }
 
-    const domRect = posToDOMRect(editor.view, selection.from, selection.to);
+    return posToDOMRect(editor.view, selection.from, selection.to);
-    return {
-      getBoundingClientRect: () => domRect,
-      getClientRects: () => [domRect],
-    };
   }, [editor]);
 
   const alignImageLeft = useCallback(() => {
@@ -110,11 +105,15 @@ export function ImageMenu({ editor }: EditorMenuProps) {
       editor={editor}
       pluginKey={`image-menu`}
       updateDelay={0}
-      getReferencedVirtualElement={getReferencedVirtualElement}
+      tippyOptions={{
-      options={{
+        getReferenceClientRect,
-        placement: "top",
+        offset: [0, 8],
-        offset: 8,
+        zIndex: 99,
-        flip: false,
+        popperOptions: {
+          modifiers: [{ name: "flip", enabled: false }],
+        },
+        plugins: [sticky],
+        sticky: "popper",
       }}
       shouldShow={shouldShow}
     >

apps/client/src/features/editor/components/image/image-view.module.css

@@ -1,27 +0,0 @@
-.imageWrapper {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-radius: 8px;
-  overflow: hidden;
-  animation: pulse 1.2s ease-in-out infinite;
-
-  @mixin light {
-    background: linear-gradient(-90deg, var(--mantine-color-gray-3) 0%, var(--mantine-color-gray-1) 50%, var(--mantine-color-gray-3) 100%);
-    background-size: 400% 400%;
-  }
-
-  @mixin dark {
-    background: linear-gradient(-90deg, var(--mantine-color-dark-6) 0%, var(--mantine-color-dark-5) 50%, var(--mantine-color-dark-6) 100%);
-    background-size: 400% 400%;
-  }
-
-  @keyframes pulse {
-    0% {
-      background-position: 0% 0%;
-    }
-    100% {
-      background-position: -135% 0%;
-    }
-  }
-}

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

@@ -1,70 +1,30 @@
 import { NodeViewProps, NodeViewWrapper } from "@tiptap/react";
-import { Group, Image, Loader, Text } from "@mantine/core";
 import { useMemo } from "react";
+import { Image } from "@mantine/core";
 import { getFileUrl } from "@/lib/config.ts";
 import clsx from "clsx";
-import classes from "./image-view.module.css";
-import { useTranslation } from "react-i18next";
 
 export default function ImageView(props: NodeViewProps) {
-  const { t } = useTranslation();
+  const { node, selected } = props;
-  const { editor, node, selected } = props;
+  const { src, width, align, title } = node.attrs;
-  const { src, width, align, title, aspectRatio, placeholder } = node.attrs;
+
   const alignClass = useMemo(() => {
     if (align === "left") return "alignLeft";
     if (align === "right") return "alignRight";
     if (align === "center") return "alignCenter";
     return "alignCenter";
   }, [align]);
-  const previewSrc = useMemo(() => {
-    editor.storage.shared.imagePreviews =
-      editor.storage.shared.imagePreviews || {};
-
-    if (placeholder?.id) {
-      return editor.storage.shared.imagePreviews[placeholder.id];
-    }
-
-    return null;
-  }, [placeholder, editor]);
 
   return (
     <NodeViewWrapper data-drag-handle>
-      <div
+      <Image
-        className={clsx(
+        radius="md"
-          selected && "ProseMirror-selectednode",
+        fit="contain"
-          classes.imageWrapper,
+        w={width}
-          alignClass,
+        src={getFileUrl(src)}
-        )}
+        alt={title}
-        style={{
+        className={clsx(selected ? "ProseMirror-selectednode" : "", alignClass)}
-          aspectRatio: aspectRatio ? aspectRatio : src ? undefined : "16 / 9",
+      />
-          width,
-        }}
-      >
-        {src && (
-          <Image radius="md" fit="contain" src={getFileUrl(src)} alt={title} />
-        )}
-        {!src && previewSrc && (
-          <Group pos="relative" h="100%" w="100%">
-            <Image
-              radius="md"
-              fit="contain"
-              src={previewSrc}
-              alt={placeholder?.name}
-            />
-            <Loader size={20} pos="absolute" bottom={6} right={6} />
-          </Group>
-        )}
-        {!src && !previewSrc && (
-          <Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md">
-            <Loader size={20} style={{ flexShrink: 0 }} />
-            <Text component="span" size="sm" truncate="end">
-              {placeholder?.name
-                ? t("Uploading {{name}}", { name: placeholder.name })
-                : t("Uploading file")}
-            </Text>
-          </Group>
-        )}
-      </div>
     </NodeViewWrapper>
   );
 }

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

@@ -1,10 +1,9 @@
-import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
+import { BubbleMenu as BaseBubbleMenu, useEditorState } from "@tiptap/react";
 import React, { useCallback, useState } from "react";
 import { EditorMenuProps } from "@/features/editor/components/table/types/types.ts";
 import { LinkEditorPanel } from "@/features/editor/components/link/link-editor-panel.tsx";
 import { LinkPreviewPanel } from "@/features/editor/components/link/link-preview.tsx";
 import { Card } from "@mantine/core";
-import { useEditorState } from "@tiptap/react";
 
 export function LinkMenu({ editor, appendTo }: EditorMenuProps) {
   const [showEdit, setShowEdit] = useState(false);
@@ -60,15 +59,18 @@ export function LinkMenu({ editor, appendTo }: EditorMenuProps) {
   return (
     <BaseBubbleMenu
       editor={editor}
-      pluginKey={`link-menu`}
+      pluginKey={`link-menu}`}
       updateDelay={0}
-      options={{
+      tippyOptions={{
-        onHide: () => {
+        appendTo: () => {
+          return appendTo?.current;
+        },
+        onHidden: () => {
           setShowEdit(false);
         },
         placement: "bottom",
-        offset: 5,
+        offset: [0, 5],
-        // zIndex: 101,
+        zIndex: 101,
       }}
       shouldShow={shouldShow}
     >

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

@@ -106,7 +106,6 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
 
       setRenderItems(items);
       // update editor storage
-      //@ts-ignore
       props.editor.storage.mentionItems = items;
     }
   }, [suggestion, isLoading]);
@@ -164,7 +163,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
 
   const enterHandler = () => {
     if (!renderItems.length) return;
-    if (renderItems[selectedIndex]?.entityType !== "header") {
+    if (renderItems[selectedIndex].entityType !== "header") {
       selectItem(selectedIndex);
     }
   };
@@ -204,7 +203,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
       parentPageId: page.id || null,
       title: title
     };
-
+    
     let createdPage: IPage;
     try {
       createdPage = await createPageMutation.mutateAsync(payload);

apps/client/src/features/editor/components/mention/mention-suggestion.ts

@@ -1,11 +1,5 @@
 import { ReactRenderer, useEditor } from "@tiptap/react";
-import {
+import tippy from "tippy.js";
-  autoUpdate,
-  computePosition,
-  flip,
-  offset,
-  shift,
-} from "@floating-ui/dom";
 import MentionList from "@/features/editor/components/mention/mention-list.tsx";
 
 function getWhitespaceCount(query: string) {
@@ -15,27 +9,16 @@ function getWhitespaceCount(query: string) {
 
 const mentionRenderItems = () => {
   let component: ReactRenderer | null = null;
-  let activeClientRect: (() => DOMRect) | null = null;
+  let popup: any | null = null;
-  let updatePositionCleanup: (() => void) | null = null;
-
-  const destroy = () => {
-    updatePositionCleanup?.();
-    updatePositionCleanup = null;
-    component?.destroy();
-    if (component?.element?.parentNode) {
-      component.element.parentNode.removeChild(component.element);
-    }
-    component = null;
-  };
 
   return {
     onStart: (props: {
       editor: ReturnType<typeof useEditor>;
-      clientRect: () => DOMRect;
+      clientRect: DOMRect;
       query: string;
     }) => {
       // query must not start with a whitespace
-      if (props.query.charAt(0) === " ") {
+      if (props.query.charAt(0) === ' '){
         return;
       }
 
@@ -54,95 +37,75 @@ const mentionRenderItems = () => {
         return;
       }
 
-      activeClientRect = props.clientRect;
+      // @ts-ignore
-
+      popup = tippy("body", {
-      const { element } = component;
+        getReferenceClientRect: props.clientRect,
-      document.body.appendChild(element);
+        appendTo: () => document.body,
-
+        content: component.element,
-      updatePositionCleanup = autoUpdate(
+        showOnCreate: true,
-        {
+        interactive: true,
-          getBoundingClientRect: () =>
+        trigger: "manual",
-            activeClientRect ? activeClientRect() : new DOMRect(),
+        placement: "bottom-start",
-        },
+      });
-        element,
-        () => {
-          if (!component?.element) return;
-          computePosition(
-            {
-              getBoundingClientRect: () => {
-                return activeClientRect ? activeClientRect() : new DOMRect();
-              },
-            },
-            element,
-            {
-              placement: "bottom-start",
-              middleware: [offset(0), flip(), shift()],
-            },
-          ).then(({ x, y }) => {
-            Object.assign(element.style, {
-              left: `${x}px`,
-              top: `${y}px`,
-              position: "absolute",
-              zIndex: "9999",
-            });
-          });
-        },
-      );
     },
     onUpdate: (props: {
       editor: ReturnType<typeof useEditor>;
-      clientRect: () => DOMRect;
+      clientRect: DOMRect;
       query: string;
     }) => {
       // query must not start with a whitespace
-      if (props.query.charAt(0) === " ") {
+      if (props.query.charAt(0) === ' '){
-        destroy();
+        component?.destroy();
         return;
       }
 
       // only update component if popup is not destroyed
-      if (component) {
+      if (!popup?.[0].state.isDestroyed) {
-        component.updateProps(props);
+        component?.updateProps(props);
       }
 
       if (!props || !props.clientRect) {
         return;
       }
 
-      activeClientRect = props.clientRect;
-
       const whitespaceCount = getWhitespaceCount(props.query);
 
       // destroy component if space is greater 3 without a match
       if (
-        whitespaceCount > 4 &&
+        whitespaceCount > 3 &&
-        //@ts-ignore
+        props.editor.storage.mentionItems.length === 0
-        props.editor.storage.mentionItems.length === 1
       ) {
-        destroy();
+        popup?.[0]?.destroy();
-        return;
+        component?.destroy();
-      }
-      // fallback exit
-      if (whitespaceCount > 7) {
-        destroy();
         return;
       }
+
+      popup &&
+        !popup?.[0].state.isDestroyed &&
+        popup?.[0].setProps({
+          getReferenceClientRect: props.clientRect,
+        });
     },
     onKeyDown: (props: { event: KeyboardEvent }) => {
-      if (props.event.key === "Escape") {
+      if (props.event.key)
-        destroy();
+        if (
-        return true;
+          props.event.key === "Escape" ||
-      }
+          (props.event.key === "Enter" && !popup?.[0].state.isShown)
-
+        ) {
-      if (props.event.key === "Enter" && !component) {
+          popup?.[0].destroy();
-        destroy();
+          component?.destroy();
-        return false;
+          return false;
-      }
+        }
-
       return (component?.ref as any)?.onKeyDown(props);
     },
     onExit: () => {
-      destroy();
+      if (popup && !popup?.[0].state.isDestroyed) {
+        popup[0].destroy();
+      }
+
+      if (component) {
+        component.destroy();
+      }
     },
   };
 };

apps/client/src/features/editor/components/search-and-replace/search-and-replace-dialog.tsx

@@ -73,8 +73,6 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
     if (!editor) return;
 
     const { results, resultIndex } = editor.storage.searchAndReplace;
-    //TODO: check type error
-    //@ts-ignore
     const position: Range = results[resultIndex];
 
     if (!position) return;

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

@@ -161,7 +161,6 @@ const CommandGroups: SlashMenuGroupedItemsType = {
       command: ({ editor, range }) => {
         editor.chain().focus().deleteRange(range).run();
 
-        // @ts-ignore
         const pageId = editor.storage?.pageId;
         if (!pageId) return;
 
@@ -170,18 +169,13 @@ const CommandGroups: SlashMenuGroupedItemsType = {
         input.type = "file";
         input.accept = "image/*";
         input.multiple = true;
-        input.style.display = "none";
-        document.body.appendChild(input);
         input.onchange = async () => {
           if (input.files?.length) {
             for (const file of input.files) {
               const pos = editor.view.state.selection.from;
-
+              uploadImageAction(file, editor.view, pos, pageId);
-              uploadImageAction(file, editor, pos, pageId);
             }
           }
-
-          input.remove();
         };
         input.click();
       },
@@ -194,7 +188,6 @@ const CommandGroups: SlashMenuGroupedItemsType = {
       command: ({ editor, range }) => {
         editor.chain().focus().deleteRange(range).run();
 
-        // @ts-ignore
         const pageId = editor.storage?.pageId;
         if (!pageId) return;
 
@@ -202,19 +195,12 @@ const CommandGroups: SlashMenuGroupedItemsType = {
         const input = document.createElement("input");
         input.type = "file";
         input.accept = "video/*";
-        input.multiple = true;
-        input.style.display = "none";
-        document.body.appendChild(input);
         input.onchange = async () => {
           if (input.files?.length) {
-            for (const file of input.files) {
+            const file = input.files[0];
-              const pos = editor.view.state.selection.from;
+            const pos = editor.view.state.selection.from;
-
+            uploadVideoAction(file, editor.view, pos, pageId);
-              uploadVideoAction(file, editor, pos, pageId);
-            }
           }
-
-          input.remove();
         };
         input.click();
       },
@@ -227,7 +213,6 @@ const CommandGroups: SlashMenuGroupedItemsType = {
       command: ({ editor, range }) => {
         editor.chain().focus().deleteRange(range).run();
 
-        // @ts-ignore
         const pageId = editor.storage?.pageId;
         if (!pageId) return;
 
@@ -235,19 +220,12 @@ const CommandGroups: SlashMenuGroupedItemsType = {
         const input = document.createElement("input");
         input.type = "file";
         input.accept = "";
-        input.multiple = true;
-        input.style.display = "none";
-        document.body.appendChild(input);
         input.onchange = async () => {
           if (input.files?.length) {
-            for (const file of input.files) {
+            const file = input.files[0];
-              const pos = editor.view.state.selection.from;
+            const pos = editor.view.state.selection.from;
-
+            uploadAttachmentAction(file, editor.view, pos, pageId, true);
-              uploadAttachmentAction(file, editor, pos, pageId, true);
-            }
           }
-
-          input.remove();
         };
         input.click();
       },

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

@@ -1,35 +1,10 @@
 import { ReactRenderer, useEditor } from "@tiptap/react";
 import CommandList from "@/features/editor/components/slash-menu/command-list";
-import {
+import tippy from "tippy.js";
-  autoUpdate,
-  computePosition,
-  flip,
-  offset,
-  shift,
-} from "@floating-ui/dom";
 
 const renderItems = () => {
   let component: ReactRenderer | null = null;
-  let popup: HTMLElement | null = null;
+  let popup: any | null = null;
-  let cleanup: (() => void) | null = null;
-  let getReferenceClientRect: (() => DOMRect) | null = null;
-
-  const updatePosition = () => {
-    if (!popup || !getReferenceClientRect) return;
-
-    // @ts-ignore
-    const rect = getReferenceClientRect();
-
-    computePosition({ getBoundingClientRect: () => rect }, popup, {
-      placement: "bottom-start",
-      middleware: [offset(0), flip(), shift()],
-    }).then(({ x, y }) => {
-      if (popup) {
-        popup.style.left = `${x}px`;
-        popup.style.top = `${y}px`;
-      }
-    });
-  };
 
   return {
     onStart: (props: {
@@ -46,29 +21,15 @@ const renderItems = () => {
       }
 
       // @ts-ignore
-      getReferenceClientRect = props.clientRect;
+      popup = tippy("body", {
-
+        getReferenceClientRect: props.clientRect,
-      popup = document.createElement("div");
+        appendTo: () => document.body,
-      popup.style.zIndex = "9999";
+        content: component.element,
-      popup.style.position = "absolute";
+        showOnCreate: true,
-      popup.style.top = "0";
+        interactive: true,
-      popup.style.left = "0";
+        trigger: "manual",
-
+        placement: "bottom-start",
-      document.body.appendChild(popup);
+      });
-      popup.appendChild(component.element);
-
-      cleanup = autoUpdate(
-        // @ts-ignore
-        {
-          getBoundingClientRect: () => {
-            return getReferenceClientRect
-              ? getReferenceClientRect()
-              : new DOMRect();
-          },
-        },
-        popup,
-        updatePosition
-      );
     },
     onUpdate: (props: {
       editor: ReturnType<typeof useEditor>;
@@ -80,15 +41,14 @@ const renderItems = () => {
         return;
       }
 
-      // @ts-ignore
+      popup &&
-      getReferenceClientRect = props.clientRect;
+        popup[0].setProps({
-      updatePosition();
+          getReferenceClientRect: props.clientRect,
+        });
     },
     onKeyDown: (props: { event: KeyboardEvent }) => {
       if (props.event.key === "Escape") {
-        if (popup) {
+        popup?.[0].hide();
-          popup.style.display = "none";
-        }
 
         return true;
       }
@@ -97,19 +57,12 @@ const renderItems = () => {
       return component?.ref?.onKeyDown(props);
     },
     onExit: () => {
-      if (cleanup) {
+      if (popup && !popup[0].state.isDestroyed) {
-        cleanup();
+        popup[0].destroy();
-        cleanup = null;
-      }
-
-      if (popup) {
-        popup.remove();
-        popup = null;
       }
 
       if (component) {
         component.destroy();
-        component = null;
       }
     },
   };

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

@@ -1,11 +1,15 @@
-import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
+import {
-import { posToDOMRect, findParentNode } from "@tiptap/react";
+  BubbleMenu as BaseBubbleMenu,
+  posToDOMRect,
+  findParentNode,
+} from "@tiptap/react";
 import { Node as PMNode } from "@tiptap/pm/model";
 import React, { useCallback } from "react";
 import { ActionIcon, Tooltip } from "@mantine/core";
 import { IconTrash } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { Editor } from "@tiptap/core";
+import { sticky } from "tippy.js";
 
 interface SubpagesMenuProps {
   editor: Editor;
@@ -29,7 +33,7 @@ export const SubpagesMenu = React.memo(
 
         return editor.isActive("subpages");
       },
-      [editor]
+      [editor],
     );
 
     const getReferenceClientRect = useCallback(() => {
@@ -58,8 +62,18 @@ export const SubpagesMenu = React.memo(
     return (
       <BaseBubbleMenu
         editor={editor}
-        pluginKey={`subpages-menu`}
+        pluginKey={`subpages-menu}`}
         updateDelay={0}
+        tippyOptions={{
+          getReferenceClientRect,
+          offset: [0, 8],
+          zIndex: 99,
+          popperOptions: {
+            modifiers: [{ name: "flip", enabled: false }],
+          },
+          plugins: [sticky],
+          sticky: "popper",
+        }}
         shouldShow={shouldShow}
       >
         <Tooltip position="top" label={t("Delete")}>
@@ -75,7 +89,7 @@ export const SubpagesMenu = React.memo(
         </Tooltip>
       </BaseBubbleMenu>
     );
-  }
+  },
 );
 
 export default SubpagesMenu;

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

@@ -19,7 +19,6 @@ export default function SubpagesView(props: NodeViewProps) {
   const { spaceSlug, shareId } = useParams();
   const { t } = useTranslation();
 
-  //@ts-ignore
   const currentPageId = editor.storage.pageId;
 
   // Get subpages from shared tree if we're in a shared context

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

@@ -1,4 +1,6 @@
+import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react";
 import React, { useCallback } from "react";
+
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -15,7 +17,6 @@ import {
 import { useTranslation } from "react-i18next";
 import { TableBackgroundColor } from "./table-background-color";
 import { TableTextAlignment } from "./table-text-alignment";
-import { BubbleMenu } from "@tiptap/react/menus";
 
 export const TableCellMenu = React.memo(
   ({ editor, appendTo }: EditorMenuProps): JSX.Element => {
@@ -28,7 +29,7 @@ export const TableCellMenu = React.memo(
 
         return isCellSelection(state.selection);
       },
-      [editor]
+      [editor],
     );
 
     const mergeCells = useCallback(() => {
@@ -52,27 +53,23 @@ export const TableCellMenu = React.memo(
     }, [editor]);
 
     return (
-      <BubbleMenu
+      <BaseBubbleMenu
         editor={editor}
         pluginKey="table-cell-menu"
         updateDelay={0}
-        appendTo={() => {
+        tippyOptions={{
-          return appendTo?.current;
+          appendTo: () => {
-        }}
+            return appendTo?.current;
-        ref={(element) => {
-          element.style.zIndex = "99";
-        }}
-        options={{
-          offset: {
-            mainAxis: 15,
           },
+          offset: [0, 15],
+          zIndex: 99,
         }}
         shouldShow={shouldShow}
       >
         <ActionIcon.Group>
           <TableBackgroundColor editor={editor} />
           <TableTextAlignment editor={editor} />
-
+          
           <Tooltip position="top" label={t("Merge cells")}>
             <ActionIcon
               onClick={mergeCells}
@@ -128,9 +125,9 @@ export const TableCellMenu = React.memo(
             </ActionIcon>
           </Tooltip>
         </ActionIcon.Group>
-      </BubbleMenu>
+      </BaseBubbleMenu>
     );
-  }
+  },
 );
 
 export default TableCellMenu;

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

@@ -1,6 +1,11 @@
-import { posToDOMRect, findParentNode } from "@tiptap/react";
+import {
+  BubbleMenu as BaseBubbleMenu,
+  posToDOMRect,
+  findParentNode,
+} from "@tiptap/react";
 import { Node as PMNode } from "@tiptap/pm/model";
 import React, { useCallback } from "react";
+
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -12,12 +17,9 @@ import {
   IconColumnRemove,
   IconRowInsertBottom,
   IconRowInsertTop,
-  IconRowRemove,
+  IconRowRemove, IconTableColumn, IconTableRow,
-  IconTableColumn,
-  IconTableRow,
   IconTrashX,
-} from "@tabler/icons-react";
+} from '@tabler/icons-react';
-import { BubbleMenu } from "@tiptap/react/menus";
 import { isCellSelection } from "@docmost/editor-ext";
 import { useTranslation } from "react-i18next";
 
@@ -32,28 +34,20 @@ export const TableMenu = React.memo(
 
         return editor.isActive("table") && !isCellSelection(state.selection);
       },
-      [editor]
+      [editor],
     );
 
-    const getReferencedVirtualElement = useCallback(() => {
+    const getReferenceClientRect = useCallback(() => {
       const { selection } = editor.state;
       const predicate = (node: PMNode) => node.type.name === "table";
       const parent = findParentNode(predicate)(selection);
 
       if (parent) {
         const dom = editor.view.nodeDOM(parent?.pos) as HTMLElement;
-        const rect = dom.getBoundingClientRect();
+        return dom.getBoundingClientRect();
-        return {
-          getBoundingClientRect: () => rect,
-          getClientRects: () => [rect],
-        };
       }
 
-      const rect = posToDOMRect(editor.view, selection.from, selection.to);
+      return posToDOMRect(editor.view, selection.from, selection.to);
-      return {
-        getBoundingClientRect: () => rect,
-        getClientRects: () => [rect],
-      };
     }, [editor]);
 
     const toggleHeaderColumn = useCallback(() => {
@@ -93,33 +87,42 @@ export const TableMenu = React.memo(
     }, [editor]);
 
     return (
-      <BubbleMenu
+      <BaseBubbleMenu
         editor={editor}
         pluginKey="table-menu"
-        resizeDelay={0}
+        updateDelay={0}
-        getReferencedVirtualElement={getReferencedVirtualElement}
+        tippyOptions={{
-        ref={(element) => {
+          getReferenceClientRect: getReferenceClientRect,
-          element.style.zIndex = "99";
+          offset: [0, 15],
-        }}
+          zIndex: 99,
-        options={{
+          popperOptions: {
-          placement: "top",
+            modifiers: [
-          offset: {
+              {
-            mainAxis: 15,
+                name: "preventOverflow",
-          },
+                enabled: true,
-          flip: {
+                options: {
-            fallbackPlacements: ["top", "bottom"],
+                  altAxis: true,
-            padding: { top: 35 + 15, left: 8, right: 8, bottom: -Infinity },
+                  boundary: "clippingParents",
-            boundary: editor.options.element as HTMLElement,
+                  padding: 8,
-          },
+                },
-          shift: {
+              },
-            padding: 8 + 15,
+              {
-            crossAxis: true,
+                name: "flip",
+                enabled: true,
+                options: {
+                  boundary: editor.options.element,
+                  fallbackPlacements: ["top", "bottom"],
+                  padding: { top: 35, left: 8, right: 8, bottom: -Infinity },
+                },
+              },
+            ],
           },
         }}
         shouldShow={shouldShow}
       >
         <ActionIcon.Group>
-          <Tooltip position="top" label={t("Add left column")}>
+          <Tooltip position="top" label={t("Add left column")}
+          >
             <ActionIcon
               onClick={addColumnLeft}
               variant="default"
@@ -185,7 +188,8 @@ export const TableMenu = React.memo(
             </ActionIcon>
           </Tooltip>
 
-          <Tooltip position="top" label={t("Toggle header row")}>
+          <Tooltip position="top" label={t("Toggle header row")}
+          >
             <ActionIcon
               onClick={toggleHeaderRow}
               variant="default"
@@ -196,7 +200,8 @@ export const TableMenu = React.memo(
             </ActionIcon>
           </Tooltip>
 
-          <Tooltip position="top" label={t("Toggle header column")}>
+          <Tooltip position="top" label={t("Toggle header column")}
+          >
             <ActionIcon
               onClick={toggleHeaderColumn}
               variant="default"
@@ -219,9 +224,9 @@ export const TableMenu = React.memo(
             </ActionIcon>
           </Tooltip>
         </ActionIcon.Group>
-      </BubbleMenu>
+      </BaseBubbleMenu>
     );
-  }
+  },
 );
 
 export default TableMenu;

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

@@ -1,6 +1,11 @@
-import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
+import {
-import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
+  BubbleMenu as BaseBubbleMenu,
+  findParentNode,
+  posToDOMRect,
+  useEditorState,
+} from "@tiptap/react";
 import React, { useCallback } from "react";
+import { sticky } from "tippy.js";
 import { Node as PMNode } from "prosemirror-model";
 import {
   EditorMenuProps,
@@ -17,6 +22,16 @@ import { useTranslation } from "react-i18next";
 
 export function VideoMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
+  const shouldShow = useCallback(
+    ({ state }: ShouldShowProps) => {
+      if (!state) {
+        return false;
+      }
+
+      return editor.isActive("video");
+    },
+    [editor],
+  );
 
   const editorState = useEditorState({
     editor,
@@ -37,37 +52,17 @@ export function VideoMenu({ editor }: EditorMenuProps) {
     },
   });
 
-  const shouldShow = useCallback(
+  const getReferenceClientRect = useCallback(() => {
-    ({ state }: ShouldShowProps) => {
-      if (!state) {
-        return false;
-      }
-
-      return editor.isActive("video") && editor.getAttributes("video").src;
-    },
-    [editor],
-  );
-
-  const getReferencedVirtualElement = useCallback(() => {
-    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "video";
     const parent = findParentNode(predicate)(selection);
 
     if (parent) {
       const dom = editor.view.nodeDOM(parent?.pos) as HTMLElement;
-      const domRect = dom.getBoundingClientRect();
+      return dom.getBoundingClientRect();
-      return {
-        getBoundingClientRect: () => domRect,
-        getClientRects: () => [domRect],
-      };
     }
 
-    const domRect = posToDOMRect(editor.view, selection.from, selection.to);
+    return posToDOMRect(editor.view, selection.from, selection.to);
-    return {
-      getBoundingClientRect: () => domRect,
-      getClientRects: () => [domRect],
-    };
   }, [editor]);
 
   const alignVideoLeft = useCallback(() => {
@@ -110,11 +105,15 @@ export function VideoMenu({ editor }: EditorMenuProps) {
       editor={editor}
       pluginKey={`video-menu`}
       updateDelay={0}
-      getReferencedVirtualElement={getReferencedVirtualElement}
+      tippyOptions={{
-      options={{
+        getReferenceClientRect,
-        placement: "top",
+        offset: [0, 8],
-        offset: 8,
+        zIndex: 99,
-        flip: false,
+        popperOptions: {
+          modifiers: [{ name: "flip", enabled: false }],
+        },
+        plugins: [sticky],
+        sticky: "popper",
       }}
       shouldShow={shouldShow}
     >

apps/client/src/features/editor/components/video/video-view.module.css

@@ -1,33 +0,0 @@
-.videoWrapper {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-radius: 8px;
-  overflow: hidden;
-  animation: pulse 1.2s ease-in-out infinite;
-
-  @mixin light {
-    background: linear-gradient(-90deg, var(--mantine-color-gray-3) 0%, var(--mantine-color-gray-1) 50%, var(--mantine-color-gray-3) 100%);
-    background-size: 400% 400%;
-  }
-
-  @mixin dark {
-    background: linear-gradient(-90deg, var(--mantine-color-dark-6) 0%, var(--mantine-color-dark-5) 50%, var(--mantine-color-dark-6) 100%);
-    background-size: 400% 400%;
-  }
-
-  @keyframes pulse {
-    0% {
-      background-position: 0% 0%;
-    }
-    100% {
-      background-position: -135% 0%;
-    }
-  }
-}
-.video {
-  display: block;
-  width: 100%;
-  height: 100%;
-  border-radius: 8px;
-}

apps/client/src/features/editor/components/video/video-view.tsx

@@ -1,75 +1,29 @@
 import { NodeViewProps, NodeViewWrapper } from "@tiptap/react";
-import { Group, Loader, Text } from "@mantine/core";
 import { useMemo } from "react";
 import { getFileUrl } from "@/lib/config.ts";
 import clsx from "clsx";
-import classes from "./video-view.module.css";
-import { useTranslation } from "react-i18next";
 
 export default function VideoView(props: NodeViewProps) {
-  const { t } = useTranslation();
+  const { node, selected } = props;
-  const { editor, node, selected } = props;
+  const { src, width, align } = node.attrs;
-  const { src, width, align, aspectRatio, placeholder } = node.attrs;
+
   const alignClass = useMemo(() => {
     if (align === "left") return "alignLeft";
     if (align === "right") return "alignRight";
     if (align === "center") return "alignCenter";
     return "alignCenter";
   }, [align]);
-  const previewSrc = useMemo(() => {
-    editor.storage.shared.videoPreviews =
-      editor.storage.shared.videoPreviews || {};
-
-    if (placeholder?.id) {
-      return editor.storage.shared.videoPreviews[placeholder.id];
-    }
-
-    return null;
-  }, [placeholder, editor]);
 
   return (
     <NodeViewWrapper data-drag-handle>
-      <div
+      <video
-        className={clsx(
+        preload="metadata"
-          selected && "ProseMirror-selectednode",
+        width={width}
-          classes.videoWrapper,
+        controls
-          alignClass,
+        src={getFileUrl(src)}
-        )}
+        className={clsx(selected ? "ProseMirror-selectednode" : "", alignClass)}
-        style={{
+        style={{ display: "block" }}
-          aspectRatio: aspectRatio ? aspectRatio : src ? undefined : "16 / 9",
+      />
-          width,
-        }}
-      >
-        {src && (
-          <video
-            className={classes.video}
-            preload="metadata"
-            controls
-            src={getFileUrl(src)}
-          />
-        )}
-        {!src && previewSrc && (
-          <Group pos="relative" h="100%" w="100%">
-            <video
-              className={classes.video}
-              preload="metadata"
-              controls
-              src={previewSrc}
-            />
-            <Loader size={20} pos="absolute" top={6} right={6} />
-          </Group>
-        )}
-        {!src && !previewSrc && (
-          <Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md">
-            <Loader size={20} style={{ flexShrink: 0 }} />
-            <Text component="span" size="sm" truncate="end">
-              {placeholder?.name
-                ? t("Uploading {{name}}", { name: placeholder.name })
-                : t("Uploading file")}
-            </Text>
-          </Group>
-        )}
-      </div>
     </NodeViewWrapper>
   );
 }

apps/client/src/features/editor/extensions/extensions.ts

@@ -1,7 +1,11 @@
 import { StarterKit } from "@tiptap/starter-kit";
+import { Placeholder } from "@tiptap/extension-placeholder";
 import { TextAlign } from "@tiptap/extension-text-align";
-import { TaskList, TaskItem } from "@tiptap/extension-list";
+import { CharacterCount } from "@tiptap/extension-character-count";
-import { Placeholder, CharacterCount } from "@tiptap/extensions";
+import { TaskList } from "@tiptap/extension-task-list";
+import { ListKeymap } from "@tiptap/extension-list-keymap";
+import { TaskItem } from "@tiptap/extension-task-item";
+import { Underline } from "@tiptap/extension-underline";
 import { Superscript } from "@tiptap/extension-superscript";
 import SubScript from "@tiptap/extension-subscript";
 import { Typography } from "@tiptap/extension-typography";
@@ -11,7 +15,7 @@ import GlobalDragHandle from "tiptap-extension-global-drag-handle";
 import { Youtube } from "@tiptap/extension-youtube";
 import SlashCommand from "@/features/editor/extensions/slash-command";
 import { Collaboration, isChangeOrigin } from "@tiptap/extension-collaboration";
-import { CollaborationCaret } from "@tiptap/extension-collaboration-caret";
+import { CollaborationCursor } from "@tiptap/extension-collaboration-cursor";
 import { HocuspocusProvider } from "@hocuspocus/provider";
 import {
   Comment,
@@ -37,12 +41,11 @@ import {
   Embed,
   SearchAndReplace,
   Mention,
-  TableDndExtension,
   Subpages,
+  TableDndExtension,
   Heading,
   Highlight,
   UniqueID,
-  SharedStorage,
 } from "@docmost/editor-ext";
 import {
   randomElement,
@@ -94,9 +97,7 @@ lowlight.register("scala", scala);
 export const mainExtensions = [
   StarterKit.configure({
     heading: false,
-    undoRedo: false,
+    history: false,
-    link: false,
-    trailingNode: false,
     dropcursor: {
       width: 3,
       color: "#70CFF8",
@@ -108,7 +109,6 @@ export const mainExtensions = [
       },
     },
   }),
-  SharedStorage,
   Heading,
   UniqueID.configure({
     types: ["heading", "paragraph"],
@@ -134,6 +134,8 @@ export const mainExtensions = [
   TaskItem.configure({
     nested: true,
   }),
+  ListKeymap,
+  Underline,
   LinkExtension.configure({
     openOnClick: false,
   }),
@@ -168,9 +170,6 @@ export const mainExtensions = [
     },
   }).extend({
     addNodeView() {
-      // Force the react node view to render immediately using flush sync (https://github.com/ueberdosis/tiptap/blob/b4db352f839e1d82f9add6ee7fb45561336286d8/packages/react/src/ReactRenderer.tsx#L183-L191)
-      this.editor.isInitialized = true;
-
       return ReactNodeViewRenderer(MentionView);
     },
   }),
@@ -209,7 +208,6 @@ export const mainExtensions = [
   }),
   CustomCodeBlock.configure({
     view: CodeBlockView,
-    //@ts-ignore
     lowlight,
     HTMLAttributes: {
       spellcheck: false,
@@ -248,7 +246,7 @@ export const mainExtensions = [
         Escape: () => {
           const event = new CustomEvent("closeFindDialogFromEditor", {});
           document.dispatchEvent(event);
-          return false;
+          return true;
         },
       };
     },
@@ -260,9 +258,8 @@ type CollabExtensions = (provider: HocuspocusProvider, user: IUser) => any[];
 export const collabExtensions: CollabExtensions = (provider, user) => [
   Collaboration.configure({
     document: provider.document,
-    provider,
   }),
-  CollaborationCaret.configure({
+  CollaborationCursor.configure({
     provider,
     user: {
       name: user.name,

apps/client/src/features/editor/page-editor.tsx

@@ -1,22 +1,13 @@
 import "@/features/editor/styles/index.css";
-import React, {
+import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
 import { IndexeddbPersistence } from "y-indexeddb";
 import * as Y from "yjs";
 import {
   HocuspocusProvider,
-  onStatusParameters,
+  onAuthenticationFailedParameters,
   WebSocketStatus,
-  HocuspocusProviderWebsocket,
-  onSyncedParameters,
 } from "@hocuspocus/provider";
 import {
-  Editor,
   EditorContent,
   EditorProvider,
   useEditor,
@@ -78,140 +69,161 @@ export default function PageEditor({
   editable,
   content,
 }: PageEditorProps) {
+
+  
   const collaborationURL = useCollaborationUrl();
   const isComponentMounted = useRef(false);
-  const editorRef = useRef<Editor | null>(null);
+  const editorCreated = useRef(false);
 
   useEffect(() => {
     isComponentMounted.current = true;
   }, []);
-
+  
   const [currentUser] = useAtom(currentUserAtom);
   const [, setEditor] = useAtom(pageEditorAtom);
   const [, setAsideState] = useAtom(asideStateAtom);
   const [, setActiveCommentId] = useAtom(activeCommentIdAtom);
   const [showCommentPopup, setShowCommentPopup] = useAtom(showCommentPopupAtom);
-  const [isLocalSynced, setIsLocalSynced] = useState(false);
+  const ydocRef = useRef<Y.Doc | null>(null);
-  const [isRemoteSynced, setIsRemoteSynced] = useState(false);
+  if (!ydocRef.current) {
+    ydocRef.current = new Y.Doc();
+  }
+  const ydoc = ydocRef.current;
+  const [isLocalSynced, setLocalSynced] = useState(false);
+  const [isRemoteSynced, setRemoteSynced] = useState(false);
   const [yjsConnectionStatus, setYjsConnectionStatus] = useAtom(
     yjsConnectionStatusAtom,
   );
   const menuContainerRef = useRef(null);
+  const documentName = `page.${pageId}`;
   const { data: collabQuery, refetch: refetchCollabToken } = useCollabToken();
   const { isIdle, resetIdle } = useIdle(FIVE_MINUTES, { initialState: false });
   const documentState = useDocumentVisibility();
+  const [isCollabReady, setIsCollabReady] = useState(false);
   const { pageSlug } = useParams();
   const slugId = extractPageSlugId(pageSlug);
   const userPageEditMode =
     currentUser?.user?.settings?.preferences?.pageEditMode ?? PageEditMode.Edit;
-  const canScroll = useCallback(
+  
-    () => Boolean(isComponentMounted.current && editorRef.current),
+    const canScroll = useCallback(() => isComponentMounted.current && editorCreated.current, [isComponentMounted, editorCreated]);
-    [isComponentMounted],
-  );
   const { handleScrollTo } = useEditorScroll({ canScroll });
   // Providers only created once per pageId
   const providersRef = useRef<{
     local: IndexeddbPersistence;
     remote: HocuspocusProvider;
-    socket: HocuspocusProviderWebsocket;
   } | null>(null);
   const [providersReady, setProvidersReady] = useState(false);
 
+  const localProvider = providersRef.current?.local;
+  const remoteProvider = providersRef.current?.remote;
+
+  // Track when collaborative provider is ready and synced
+  const [collabReady, setCollabReady] = useState(false);
+  useEffect(() => {
+    if (
+      remoteProvider?.status === WebSocketStatus.Connected &&
+      isLocalSynced &&
+      isRemoteSynced
+    ) {
+      setCollabReady(true);
+    }
+  }, [remoteProvider?.status, isLocalSynced, isRemoteSynced]);
+
   useEffect(() => {
     if (!providersRef.current) {
-      const documentName = `page.${pageId}`;
-      const ydoc = new Y.Doc();
       const local = new IndexeddbPersistence(documentName, ydoc);
-      const socket = new HocuspocusProviderWebsocket({
+      local.on("synced", () => setLocalSynced(true));
-        url: collaborationURL,
-      });
-      const onLocalSyncedHandler = () => {
-        setIsLocalSynced(true);
-      };
-      const onStatusHandler = (event: onStatusParameters) => {
-        setYjsConnectionStatus(event.status);
-      };
-      const onSyncedHandler = (event: onSyncedParameters) => {
-        setIsRemoteSynced(event.state);
-      };
-      const onAuthenticationFailedHandler = () => {
-        const payload = jwtDecode(collabQuery?.token);
-        const now = Date.now().valueOf() / 1000;
-        const isTokenExpired = now >= payload.exp;
-        if (isTokenExpired) {
-          refetchCollabToken().then((result) => {
-            if (result.data?.token) {
-              socket.disconnect();
-              setTimeout(() => {
-                remote.configuration.token = result.data.token;
-                socket.connect();
-              }, 100);
-            }
-          });
-        }
-      };
       const remote = new HocuspocusProvider({
-        websocketProvider: socket,
         name: documentName,
+        url: collaborationURL,
         document: ydoc,
         token: collabQuery?.token,
-        onAuthenticationFailed: onAuthenticationFailedHandler,
+        connect: true,
-        onStatus: onStatusHandler,
+        preserveConnection: false,
-        onSynced: onSyncedHandler,
+        onAuthenticationFailed: (auth: onAuthenticationFailedParameters) => {
+          const payload = jwtDecode(collabQuery?.token);
+          const now = Date.now().valueOf() / 1000;
+          const isTokenExpired = now >= payload.exp;
+          if (isTokenExpired) {
+            refetchCollabToken().then((result) => {
+              if (result.data?.token) {
+                remote.disconnect();
+                setTimeout(() => {
+                  remote.configuration.token = result.data.token;
+                  remote.connect();
+                }, 100);
+              }
+            });
+          }
+        },
+        onStatus: (status) => {
+          if (status.status === "connected") {
+            setYjsConnectionStatus(status.status);
+          }
+        },
       });
-
+      remote.on("synced", () => setRemoteSynced(true));
-      local.on("synced", onLocalSyncedHandler);
+      remote.on("disconnect", () => {
-      providersRef.current = { socket, local, remote };
+        setYjsConnectionStatus(WebSocketStatus.Disconnected);
+      });
+      providersRef.current = { local, remote };
       setProvidersReady(true);
     } else {
       setProvidersReady(true);
     }
     // Only destroy on final unmount
     return () => {
-      providersRef.current?.socket.destroy();
       providersRef.current?.remote.destroy();
       providersRef.current?.local.destroy();
       providersRef.current = null;
     };
   }, [pageId]);
 
+  /*
+  useEffect(() => {
+    // Handle token updates by reconnecting with new token
+    if (providersRef.current?.remote && collabQuery?.token) {
+      const currentToken = providersRef.current.remote.configuration.token;
+      if (currentToken !== collabQuery.token) {
+        // Token has changed, need to reconnect with new token
+        providersRef.current.remote.disconnect();
+        providersRef.current.remote.configuration.token = collabQuery.token;
+        providersRef.current.remote.connect();
+      }
+    }
+  }, [collabQuery?.token]);
+   */
+
   // Only connect/disconnect on tab/idle, not destroy
   useEffect(() => {
     if (!providersReady || !providersRef.current) return;
-    const socket = providersRef.current.socket;
+    const remoteProvider = providersRef.current.remote;
-
     if (
       isIdle &&
       documentState === "hidden" &&
-      yjsConnectionStatus === WebSocketStatus.Connected
+      remoteProvider.status === WebSocketStatus.Connected
     ) {
-      socket.disconnect();
+      remoteProvider.disconnect();
+      setIsCollabReady(false);
       return;
     }
     if (
       documentState === "visible" &&
-      yjsConnectionStatus === WebSocketStatus.Disconnected
+      remoteProvider.status === WebSocketStatus.Disconnected
     ) {
       resetIdle();
-      socket.connect();
+      remoteProvider.connect();
+      setTimeout(() => setIsCollabReady(true), 500);
     }
   }, [isIdle, documentState, providersReady, resetIdle]);
 
-  // Attach here, to make sure the connection gets properly established
-  providersRef.current?.remote.attach();
-
   const extensions = useMemo(() => {
-    if (!providersReady || !providersRef.current || !currentUser?.user) {
+    if (!remoteProvider || !currentUser?.user) return mainExtensions;
-      return mainExtensions;
-    }
-
-    const remoteProvider = providersRef.current.remote;
-
     return [
       ...mainExtensions,
       ...collabExtensions(remoteProvider, currentUser?.user),
     ];
-  }, [providersReady, currentUser?.user]);
+  }, [remoteProvider, currentUser?.user]);
 
   const editor = useEditor(
     {
@@ -254,30 +266,18 @@ export default function PageEditor({
             }
           },
         },
-        handlePaste: (_view, event) => {
+        handlePaste: (view, event, slice) =>
-          if (!editorRef.current) return false;
+          handlePaste(view, event, pageId, currentUser?.user.id),
-
+        handleDrop: (view, event, _slice, moved) =>
-          return handlePaste(
+          handleFileDrop(view, event, moved, pageId),
-            editorRef.current,
-            event,
-            pageId,
-            currentUser?.user.id,
-          );
-        },
-        handleDrop: (_view, event, _slice, moved) => {
-          if (!editorRef.current) return false;
-
-          return handleFileDrop(editorRef.current, event, moved, pageId);
-        },
       },
       onCreate({ editor }) {
         if (editor) {
           // @ts-ignore
           setEditor(editor);
-          // @ts-ignore
           editor.storage.pageId = pageId;
           handleScrollTo(editor);
-          editorRef.current = editor;
+          editorCreated.current = true;
         }
       },
       onUpdate({ editor }) {
@@ -287,7 +287,7 @@ export default function PageEditor({
         debouncedUpdateContent(editorJson);
       },
     },
-    [pageId, editable, extensions],
+    [pageId, editable, remoteProvider],
   );
 
   const editorIsEditable = useEditorState({
@@ -343,17 +343,30 @@ export default function PageEditor({
     setAsideState({ tab: "", isAsideOpen: false });
   }, [pageId]);
 
+  useEffect(() => {
+    if (remoteProvider?.status === WebSocketStatus.Connecting) {
+      const timeout = setTimeout(() => {
+        setYjsConnectionStatus(WebSocketStatus.Disconnected);
+      }, 5000);
+      return () => clearTimeout(timeout);
+    }
+  }, [remoteProvider?.status]);
+
   const isSynced = isLocalSynced && isRemoteSynced;
 
   useEffect(() => {
-    const timeout = setTimeout(() => {
+    const collabReadyTimeout = setTimeout(() => {
-      if (yjsConnectionStatus === WebSocketStatus.Connecting || !isSynced) {
+      if (
-        setYjsConnectionStatus(WebSocketStatus.Disconnected);
+        !isCollabReady &&
+        isSynced &&
+        remoteProvider?.status === WebSocketStatus.Connected
+      ) {
+        setIsCollabReady(true);
       }
-    }, 7500);
+    }, 500);
+    return () => clearTimeout(collabReadyTimeout);
+  }, [isRemoteSynced, isLocalSynced, remoteProvider?.status]);
 
-    return () => clearTimeout(timeout);
-  }, [yjsConnectionStatus, isSynced]);
   useEffect(() => {
     // Only honor user default page edit mode preference and permissions
     if (editor) {
@@ -375,13 +388,12 @@ export default function PageEditor({
   useEffect(() => {
     if (
       !hasConnectedOnceRef.current &&
-      yjsConnectionStatus === WebSocketStatus.Connected &&
+      remoteProvider?.status === WebSocketStatus.Connected
-      isSynced
     ) {
       hasConnectedOnceRef.current = true;
       setShowStatic(false);
     }
-  }, [yjsConnectionStatus, isSynced]);
+  }, [remoteProvider?.status]);
 
   if (showStatic) {
     return (

apps/client/src/features/editor/readonly-page-editor.tsx

@@ -3,7 +3,7 @@ import React, { useCallback, useEffect, useMemo, useRef } from "react";
 import { EditorProvider } from "@tiptap/react";
 import { mainExtensions } from "@/features/editor/extensions/extensions";
 import { Document } from "@tiptap/extension-document";
-import { Heading, UniqueID } from "@docmost/editor-ext";
+import { Heading, generateNodeId, UniqueID } from "@docmost/editor-ext";
 import { Text } from "@tiptap/extension-text";
 import { Placeholder } from "@tiptap/extension-placeholder";
 import { useAtom } from "jotai";
@@ -81,7 +81,6 @@ export default function ReadonlyPageEditor({
         onCreate={({ editor }) => {
           if (editor) {
             if (pageId) {
-              // @ts-ignore
               editor.storage.pageId = pageId;
             }
             // @ts-ignore

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

@@ -1,5 +1,5 @@
 /* Give a remote user a caret */
-.collaboration-carets__caret {
+.collaboration-cursor__caret {
     border-left: 1px solid #0d0d0d;
     border-right: 1px solid #0d0d0d;
     margin-left: -1px;
@@ -10,7 +10,7 @@
 }
 
 /* Render the username above the caret */
-.collaboration-carets__label {
+.collaboration-cursor__label {
     border-radius: 3px 3px 3px 0;
     color: #0d0d0d;
     font-size: 0.75rem;

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

@@ -8,7 +8,7 @@
   }
 
   .mantine-AppShell-main {
-    padding: 0 !important;
+    padding-top: 0 !important;
     min-height: auto !important;
   }
 

apps/client/src/features/editor/title-editor.tsx

@@ -157,9 +157,7 @@ export function TitleEditor({
 
   useEffect(() => {
     setTimeout(() => {
-      // guard against Cannot access view['hasFocus'] error
+      titleEditor?.commands.focus("end");
-      if (!titleEditor?.isInitialized) return;
-      titleEditor?.commands?.focus("end");
     }, 500);
   }, [titleEditor]);
 

apps/client/src/features/group/components/group-list.tsx

@@ -1,25 +1,25 @@
 import { Table, Group, Text, Anchor } from "@mantine/core";
 import { useGetGroupsQuery } from "@/features/group/queries/group-query";
+import { useState } from "react";
 import { Link } from "react-router-dom";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import { IconGroupCircle } from "@/components/icons/icon-people-circle.tsx";
 import { useTranslation } from "react-i18next";
 import { formatMemberCount } from "@/lib";
 import { IGroup } from "@/features/group/types/group.types.ts";
 import Paginate from "@/components/common/paginate.tsx";
 import { queryClient } from "@/main.tsx";
+import { getSpaces } from "@/features/space/services/space-service.ts";
 import { getGroupMembers } from "@/features/group/services/group-service.ts";
-import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
 
 export default function GroupList() {
   const { t } = useTranslation();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const [page, setPage] = useState(1);
-  const { data, isLoading } = useGetGroupsQuery({ cursor });
+  const { data, isLoading } = useGetGroupsQuery({ page });
 
   const prefetchGroupMembers = (groupId: string) => {
     queryClient.prefetchQuery({
-      queryKey: ["groupMembers", groupId, {}],
+      queryKey: ["groupMembers", groupId, { page: 1 }],
-      queryFn: () => getGroupMembers(groupId, {}),
+      queryFn: () => getGroupMembers(groupId, { page: 1 }),
     });
   };
 
@@ -51,9 +51,9 @@ export default function GroupList() {
                     <Group gap="sm" wrap="nowrap">
                       <IconGroupCircle />
                       <div style={{ minWidth: 0, overflow: "hidden" }}>
-                        <AutoTooltipText fz="sm" fw={500} lineClamp={1}>
+                        <Text fz="sm" fw={500} lineClamp={1}>
                           {group.name}
-                        </AutoTooltipText>
+                        </Text>
                         <Text fz="xs" c="dimmed" lineClamp={2}>
                           {group.description}
                         </Text>
@@ -84,10 +84,10 @@ export default function GroupList() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
+          currentPage={page}
-          hasNextPage={data?.meta?.hasNextPage}
+          hasPrevPage={data?.meta.hasPrevPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
+          hasNextPage={data?.meta.hasNextPage}
-          onPrev={goPrev}
+          onPageChange={setPage}
         />
       )}
     </>

apps/client/src/features/group/components/group-members.tsx

@@ -4,7 +4,7 @@ import {
   useRemoveGroupMemberMutation,
 } from "@/features/group/queries/group-query";
 import { useParams } from "react-router-dom";
-import React from "react";
+import React, { useState } from "react";
 import { IconDots } from "@tabler/icons-react";
 import { modals } from "@mantine/modals";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
@@ -12,13 +12,12 @@ import useUserRole from "@/hooks/use-user-role.tsx";
 import { useTranslation } from "react-i18next";
 import { IUser } from "@/features/user/types/user.types.ts";
 import Paginate from "@/components/common/paginate.tsx";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 
 export default function GroupMembersList() {
   const { t } = useTranslation();
   const { groupId } = useParams();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const [page, setPage] = useState(1);
-  const { data, isLoading } = useGroupMembersQuery(groupId, { cursor });
+  const { data, isLoading } = useGroupMembersQuery(groupId, { page });
   const removeGroupMember = useRemoveGroupMemberMutation();
   const { isAdmin } = useUserRole();
 
@@ -108,10 +107,10 @@ export default function GroupMembersList() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
+          currentPage={page}
-          hasNextPage={data?.meta?.hasNextPage}
+          hasPrevPage={data?.meta.hasPrevPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
+          hasNextPage={data?.meta.hasNextPage}
-          onPrev={goPrev}
+          onPageChange={setPage}
         />
       )}
     </>

apps/client/src/features/page-history/atoms/history-atoms.ts

@@ -1,9 +1,4 @@
 import { atom } from "jotai";
 
 export const historyAtoms = atom<boolean>(false);
-export const activeHistoryIdAtom = atom<string>("");
+export const activeHistoryIdAtom = atom<string>('');
-export const activeHistoryPrevIdAtom = atom<string>("");
-export const highlightChangesAtom = atom<boolean>(true);
-
-export type DiffCounts = { added: number; deleted: number; total: number };
-export const diffCountsAtom = atom<DiffCounts | null>(null);

apps/client/src/features/page-history/components/css/history-mobile.module.css

@@ -1,69 +0,0 @@
-.container {
-  display: flex;
-  flex-direction: column;
-  height: calc(100vh - 60px);
-  position: relative;
-  overflow: hidden;
-}
-
-.selectorWrapper {
-  padding: var(--mantine-spacing-sm);
-  border-bottom: rem(1px) solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
-  flex-shrink: 0;
-}
-
-.selector {
-  width: 100%;
-  text-align: left;
-  background-color: light-dark(var(--mantine-color-white), var(--mantine-color-dark-6));
-  padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
-  cursor: pointer;
-
-  &:hover {
-    background-color: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-5));
-  }
-}
-
-.dropdown {
-  max-height: rem(300px);
-}
-
-.option {
-  padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
-
-  &[data-combobox-selected] {
-    background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
-  }
-
-  &:hover {
-    background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
-  }
-}
-
-.editorArea {
-  flex: 1;
-  min-height: 0;
-}
-
-.editorContent {
-  padding: var(--mantine-spacing-md);
-  padding-bottom: rem(60px);
-}
-
-.actionButtons {
-  padding: var(--mantine-spacing-sm) var(--mantine-spacing-md);
-  padding-bottom: rem(70px);
-  border-top: rem(1px) solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
-  background-color: light-dark(var(--mantine-color-white), var(--mantine-color-dark-7));
-  flex-shrink: 0;
-}
-
-.floatingBar {
-  position: fixed;
-  bottom: var(--mantine-spacing-md);
-  left: 50%;
-  transform: translateX(-50%);
-  z-index: 100;
-  background-color: light-dark(var(--mantine-color-white), var(--mantine-color-dark-6));
-  white-space: nowrap;
-}

apps/client/src/features/page-history/components/css/history.module.css

@@ -1,79 +0,0 @@
-.history {
-  display: block;
-  width: 100%;
-  padding: var(--mantine-spacing-md);
-  color: light-dark(var(--mantine-color-black), var(--mantine-color-dark-0));
-
-  @mixin hover {
-    background-color: light-dark(
-      var(--mantine-color-gray-2),
-      var(--mantine-color-dark-8)
-    );
-  }
-}
-
-.historyEditor {
-  :global(.ProseMirror) {
-    padding: 0 !important;
-  }
-
-  & :global(.history-diff-added) {
-    background: light-dark(#e1f3f2, #01654a) !important;
-    color: light-dark(#007b69, #cafff7) !important;
-    -webkit-box-decoration-break: clone;
-    box-decoration-break: clone;
-  }
-
-  & :global(.history-diff-deleted) {
-    text-decoration: line-through;
-    color: light-dark(var(--mantine-color-red-7), var(--mantine-color-red-4));
-    background: light-dark(var(--mantine-color-red-0), rgba(255, 0, 0, 0.1));
-    border-radius: rem(2px);
-    padding: 0 rem(2px);
-  }
-
-  & :global(.history-diff-node-added) {
-    outline: rem(2px) solid
-      light-dark(var(--mantine-color-teal-5), var(--mantine-color-teal-7));
-    outline-offset: rem(2px);
-    border-radius: rem(4px);
-  }
-
-  & :global(.history-diff-node-deleted) {
-    opacity: 0.5;
-    outline: rem(2px) dashed
-      light-dark(var(--mantine-color-red-4), var(--mantine-color-red-6));
-    outline-offset: rem(4px);
-    border-radius: rem(4px);
-  }
-}
-
-.active {
-  background-color: light-dark(
-    var(--mantine-color-gray-2),
-    var(--mantine-color-dark-8)
-  );
-}
-
-.sidebar {
-  max-height: rem(700px);
-  width: rem(250px);
-  padding: var(--mantine-spacing-sm);
-  display: flex;
-  flex-direction: column;
-  border-right: rem(1px) solid
-    light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
-}
-
-.sidebarFlex {
-  display: flex;
-}
-
-.sidebarMain {
-  flex: 1;
-}
-
-.sidebarRightSection {
-  flex: 1;
-  padding: rem(16px) rem(40px);
-}

apps/client/src/features/page-history/components/history-editor.tsx

@@ -1,203 +1,33 @@
-import "@/features/editor/styles/index.css";
+import '@/features/editor/styles/index.css';
-import { useEffect } from "react";
+import React, { useEffect } from 'react';
-import { EditorContent, useEditor } from "@tiptap/react";
+import { EditorContent, useEditor } from '@tiptap/react';
-import { mainExtensions } from "@/features/editor/extensions/extensions";
+import { mainExtensions } from '@/features/editor/extensions/extensions';
-import { Title } from "@mantine/core";
+import { Title } from '@mantine/core';
-import { Decoration, DecorationSet } from "@tiptap/pm/view";
-import historyClasses from "./css/history.module.css";
-import { recreateTransform } from "@docmost/editor-ext";
-import { DOMSerializer, Node } from "@tiptap/pm/model";
-import { ChangeSet, simplifyChanges } from "@tiptap/pm/changeset";
-import { useAtom } from "jotai";
-import {
-  diffCountsAtom,
-  highlightChangesAtom,
-} from "@/features/page-history/atoms/history-atoms";
 
 export interface HistoryEditorProps {
   title: string;
   content: any;
-  previousContent?: any;
 }
 
-export function HistoryEditor({
+export function HistoryEditor({ title, content }: HistoryEditorProps) {
-  title,
-  content,
-  previousContent,
-}: HistoryEditorProps) {
-  const [highlightChanges] = useAtom(highlightChangesAtom);
-  const [, setDiffCounts] = useAtom(diffCountsAtom);
-
   const editor = useEditor({
     extensions: mainExtensions,
     editable: false,
   });
 
   useEffect(() => {
-    if (!editor || !content) return;
+    if (editor && content) {
-
-    let decorationSet = DecorationSet.empty;
-    let addedCount = 0;
-    let deletedCount = 0;
-
-    if (previousContent) {
-      try {
-        const schema = editor.schema;
-        const oldContent = Node.fromJSON(schema, previousContent);
-        const newContent = Node.fromJSON(schema, content);
-
-        const tr = recreateTransform(oldContent, newContent, {
-          complexSteps: false,
-          wordDiffs: true,
-          simplifyDiff: true,
-        });
-
-        const changeSet = ChangeSet.create(oldContent).addSteps(
-          tr.doc,
-          tr.mapping.maps,
-          [],
-        );
-        const changes = simplifyChanges(changeSet.changes, newContent);
-
-        editor.commands.setContent(content);
-
-        const specialNodeTypes = new Set([
-          "image",
-          "attachment",
-          "video",
-          "excalidraw",
-          "drawio",
-          "mermaid",
-          "mathBlock",
-          "mathInline",
-          "table",
-          "details",
-          "callout",
-        ]);
-
-        const decorations: Decoration[] = [];
-        let changeIndex = 0;
-
-        for (const change of changes) {
-          if (change.toB > change.fromB) {
-            changeIndex++;
-            const currentIndex = changeIndex;
-            let foundSpecialNode: { node: Node; pos: number } | null = null;
-            newContent.nodesBetween(change.fromB, change.toB, (node, pos) => {
-              if (specialNodeTypes.has(node.type.name)) {
-                const nodeEnd = pos + node.nodeSize;
-                if (change.fromB <= pos && change.toB >= nodeEnd) {
-                  foundSpecialNode = { node, pos };
-                  return false;
-                }
-              }
-            });
-
-            if (foundSpecialNode) {
-              const nodeEnd =
-                foundSpecialNode.pos + foundSpecialNode.node.nodeSize;
-              decorations.push(
-                Decoration.node(foundSpecialNode.pos, nodeEnd, {
-                  class: "history-diff-node-added",
-                  "data-diff-index": String(currentIndex),
-                }),
-              );
-            } else {
-              decorations.push(
-                Decoration.inline(change.fromB, change.toB, {
-                  class: "history-diff-added",
-                  "data-diff-index": String(currentIndex),
-                }),
-              );
-            }
-            addedCount += 1;
-          }
-          if (change.toA > change.fromA) {
-            changeIndex++;
-            const currentIndex = changeIndex;
-            let foundDeletedNode: { node: Node; pos: number } | null = null;
-            oldContent.nodesBetween(change.fromA, change.toA, (node, pos) => {
-              if (specialNodeTypes.has(node.type.name)) {
-                const nodeEnd = pos + node.nodeSize;
-                if (change.fromA <= pos && change.toA >= nodeEnd) {
-                  foundDeletedNode = { node, pos };
-                  return false;
-                }
-              }
-            });
-
-            if (foundDeletedNode) {
-              decorations.push(
-                Decoration.widget(change.fromB, () => {
-                  const wrapper = document.createElement("div");
-                  wrapper.className = "history-diff-node-deleted";
-                  wrapper.setAttribute("data-diff-index", String(currentIndex));
-                  const serializer = DOMSerializer.fromSchema(schema);
-                  const dom = serializer.serializeNode(foundDeletedNode!.node);
-                  wrapper.appendChild(dom);
-                  return wrapper;
-                }),
-              );
-            } else {
-              const deletedText = oldContent.textBetween(
-                change.fromA,
-                change.toA,
-                "",
-              );
-              if (deletedText) {
-                decorations.push(
-                  Decoration.widget(change.fromB, () => {
-                    const span = document.createElement("span");
-                    span.className = "history-diff-deleted";
-                    span.setAttribute("data-diff-index", String(currentIndex));
-                    span.textContent = deletedText;
-                    return span;
-                  }),
-                );
-              }
-            }
-            deletedCount += 1;
-          }
-        }
-
-        decorationSet = DecorationSet.create(newContent, decorations);
-      } catch (e) {
-        console.error("History diff failed:", e);
-        editor.commands.setContent(content);
-      }
-    } else {
       editor.commands.setContent(content);
     }
-
+  }, [title, content, editor]);
-    const total = addedCount + deletedCount;
-    // @ts-ignore
-    setDiffCounts({ added: addedCount, deleted: deletedCount, total });
-
-    editor.setOptions({
-      editorProps: {
-        ...editor.options.editorProps,
-        decorations: () =>
-          highlightChanges ? decorationSet : DecorationSet.empty,
-      },
-    });
-  }, [
-    title,
-    content,
-    editor,
-    previousContent,
-    highlightChanges,
-    setDiffCounts,
-  ]);
 
   return (
-    <div>
+    <>
-      <Title order={1}>{title}</Title>
+      <div>
-      {editor && (
+        <Title order={1}>{title}</Title>
-        <EditorContent
+
-          editor={editor}
+        {editor && <EditorContent editor={editor} />}
-          className={historyClasses.historyEditor}
+      </div>
-        />
+    </>
-      )}
-    </div>
   );
 }

apps/client/src/features/page-history/components/history-item.tsx

@@ -1,42 +1,20 @@
 import { Text, Group, UnstyledButton } from "@mantine/core";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { formattedDate } from "@/lib/time";
-import classes from "./css/history.module.css";
+import classes from "./history.module.css";
 import clsx from "clsx";
-import { IPageHistory } from "@/features/page-history/types/page.types";
-import { memo, useCallback } from "react";
 
 interface HistoryItemProps {
-  historyItem: IPageHistory;
+  historyItem: any;
-  index: number;
+  onSelect: (id: string) => void;
-  onSelect: (id: string, index: number) => void;
-  onHover?: (id: string, index: number) => void;
-  onHoverEnd?: () => void;
   isActive: boolean;
 }
 
-const HistoryItem = memo(function HistoryItem({
+function HistoryItem({ historyItem, onSelect, isActive }: HistoryItemProps) {
-  historyItem,
-  index,
-  onSelect,
-  onHover,
-  onHoverEnd,
-  isActive,
-}: HistoryItemProps) {
-  const handleClick = useCallback(() => {
-    onSelect(historyItem.id, index);
-  }, [onSelect, historyItem.id, index]);
-
-  const handleMouseEnter = useCallback(() => {
-    onHover?.(historyItem.id, index);
-  }, [onHover, historyItem.id, index]);
-
   return (
     <UnstyledButton
       p="xs"
-      onClick={handleClick}
+      onClick={() => onSelect(historyItem.id)}
-      onMouseEnter={handleMouseEnter}
-      onMouseLeave={onHoverEnd}
       className={clsx(classes.history, { [classes.active]: isActive })}
     >
       <Group wrap="nowrap">
@@ -49,11 +27,11 @@ const HistoryItem = memo(function HistoryItem({
             <Group gap={4} wrap="nowrap">
               <CustomAvatar
                 size="sm"
-                avatarUrl={historyItem.lastUpdatedBy?.avatarUrl}
+                avatarUrl={historyItem.lastUpdatedBy.avatarUrl}
-                name={historyItem.lastUpdatedBy?.name}
+                name={historyItem.lastUpdatedBy.name}
               />
               <Text size="sm" c="dimmed" lineClamp={1}>
-                {historyItem.lastUpdatedBy?.name}
+                {historyItem.lastUpdatedBy.name}
               </Text>
             </Group>
           </div>
@@ -61,6 +39,6 @@ const HistoryItem = memo(function HistoryItem({
       </Group>
     </UnstyledButton>
   );
-});
+}
 
 export default HistoryItem;

apps/client/src/features/page-history/components/history-list.tsx

@@ -1,27 +1,29 @@
 import {
   usePageHistoryListQuery,
-  prefetchPageHistory,
+  usePageHistoryQuery,
 } from "@/features/page-history/queries/page-history-query";
 import HistoryItem from "@/features/page-history/components/history-item";
 import {
   activeHistoryIdAtom,
-  activeHistoryPrevIdAtom,
   historyAtoms,
 } from "@/features/page-history/atoms/history-atoms";
-import { useAtom, useSetAtom } from "jotai";
+import { useAtom } from "jotai";
-import { useCallback, useEffect, useMemo, useRef } from "react";
+import { useCallback, useEffect } from "react";
+import { Button, ScrollArea, Group, Divider, Text } from "@mantine/core";
 import {
-  Button,
+  pageEditorAtom,
-  ScrollArea,
+  titleEditorAtom,
-  Group,
+} from "@/features/editor/atoms/editor-atoms";
-  Divider,
+import { modals } from "@mantine/modals";
-  Loader,
+import { notifications } from "@mantine/notifications";
-  Center,
-} from "@mantine/core";
 import { useTranslation } from "react-i18next";
-import { useHistoryRestore } from "@/features/page-history/hooks";
+import { useSpaceAbility } from "@/features/space/permissions/use-space-ability.ts";
-
+import { useSpaceQuery } from "@/features/space/queries/space-query.ts";
-const PREFETCH_DELAY_MS = 150;
+import { useParams } from "react-router-dom";
+import {
+  SpaceCaslAction,
+  SpaceCaslSubject,
+} from "@/features/space/permissions/permissions.type.ts";
 
 interface Props {
   pageId: string;
@@ -30,89 +32,62 @@ interface Props {
 function HistoryList({ pageId }: Props) {
   const { t } = useTranslation();
   const [activeHistoryId, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
-  const setActiveHistoryPrevId = useSetAtom(activeHistoryPrevIdAtom);
-  const setHistoryModalOpen = useSetAtom(historyAtoms);
-
   const {
-    data: pageHistoryData,
+    data: pageHistoryList,
     isLoading,
     isError,
-    fetchNextPage,
-    hasNextPage,
-    isFetchingNextPage,
   } = usePageHistoryListQuery(pageId);
+  const { data: activeHistoryData } = usePageHistoryQuery(activeHistoryId);
 
-  const historyItems = useMemo(
+  const [mainEditor] = useAtom(pageEditorAtom);
-    () => pageHistoryData?.pages.flatMap((page) => page.items) ?? [],
+  const [mainEditorTitle] = useAtom(titleEditorAtom);
-    [pageHistoryData],
+  const [, setHistoryModalOpen] = useAtom(historyAtoms);
-  );
 
-  const loadMoreRef = useRef<HTMLDivElement>(null);
+  const { spaceSlug } = useParams();
-  const prefetchTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const { data: space } = useSpaceQuery(spaceSlug);
+  const spaceRules = space?.membership?.permissions;
+  const spaceAbility = useSpaceAbility(spaceRules);
 
-  const { canRestore, confirmRestore } = useHistoryRestore();
+  const confirmModal = () =>
+    modals.openConfirmModal({
+      title: t("Please confirm your action"),
+      children: (
+        <Text size="sm">
+          {t(
+            "Are you sure you want to restore this version? Any changes not versioned will be lost.",
+          )}
+        </Text>
+      ),
+      labels: { confirm: t("Confirm"), cancel: t("Cancel") },
+      onConfirm: handleRestore,
+    });
 
-  const clearPrefetchTimeout = useCallback(() => {
+  const handleRestore = useCallback(() => {
-    if (prefetchTimeoutRef.current) {
+    if (activeHistoryData) {
-      clearTimeout(prefetchTimeoutRef.current);
+      mainEditorTitle
-      prefetchTimeoutRef.current = null;
+        .chain()
+        .clearContent()
+        .setContent(activeHistoryData.title, true)
+        .run();
+      mainEditor
+        .chain()
+        .clearContent()
+        .setContent(activeHistoryData.content)
+        .run();
+      setHistoryModalOpen(false);
+      notifications.show({ message: t("Successfully restored") });
     }
-  }, []);
+  }, [activeHistoryData]);
-
-  const handleHover = useCallback(
-    (historyId: string, index: number) => {
-      clearPrefetchTimeout();
-      prefetchTimeoutRef.current = setTimeout(() => {
-        prefetchPageHistory(historyId);
-        const prevId = historyItems[index + 1]?.id;
-        if (prevId) {
-          prefetchPageHistory(prevId);
-        }
-      }, PREFETCH_DELAY_MS);
-    },
-    [clearPrefetchTimeout, historyItems],
-  );
 
   useEffect(() => {
-    return clearPrefetchTimeout;
+    if (
-  }, [clearPrefetchTimeout]);
+      pageHistoryList &&
-
+      pageHistoryList.items.length > 0 &&
-  const handleSelect = useCallback(
+      !activeHistoryId
-    (id: string, index: number) => {
+    ) {
-      setActiveHistoryId(id);
+      setActiveHistoryId(pageHistoryList.items[0].id);
-      setActiveHistoryPrevId(historyItems[index + 1]?.id ?? "");
-    },
-    [historyItems, setActiveHistoryId, setActiveHistoryPrevId],
-  );
-
-  useEffect(() => {
-    if (historyItems.length > 0 && !activeHistoryId) {
-      setActiveHistoryId(historyItems[0].id);
-      setActiveHistoryPrevId(historyItems[1]?.id ?? "");
     }
-  }, [
+  }, [pageHistoryList]);
-    historyItems,
-    activeHistoryId,
-    setActiveHistoryId,
-    setActiveHistoryPrevId,
-  ]);
-
-  useEffect(() => {
-    const sentinel = loadMoreRef.current;
-    if (!sentinel || !hasNextPage) return;
-
-    const observer = new IntersectionObserver(
-      (entries) => {
-        if (entries[0].isIntersecting && !isFetchingNextPage) {
-          fetchNextPage();
-        }
-      },
-      { threshold: 0.1 },
-    );
-
-    observer.observe(sentinel);
-    return () => observer.disconnect();
-  }, [fetchNextPage, hasNextPage, isFetchingNextPage]);
 
   if (isLoading) {
     return <></>;
@@ -122,36 +97,34 @@ function HistoryList({ pageId }: Props) {
     return <div>{t("Error loading page history.")}</div>;
   }
 
-  if (historyItems.length === 0) {
+  if (!pageHistoryList || pageHistoryList.items.length === 0) {
     return <>{t("No page history saved yet.")}</>;
   }
 
   return (
     <div>
       <ScrollArea h={620} w="100%" type="scroll" scrollbarSize={5}>
-        {historyItems.map((historyItem, index) => (
+        {pageHistoryList &&
-          <HistoryItem
+          pageHistoryList.items.map((historyItem, index) => (
-            key={historyItem.id}
+            <HistoryItem
-            historyItem={historyItem}
+              key={index}
-            index={index}
+              historyItem={historyItem}
-            onSelect={handleSelect}
+              onSelect={setActiveHistoryId}
-            onHover={handleHover}
+              isActive={historyItem.id === activeHistoryId}
-            onHoverEnd={clearPrefetchTimeout}
+            />
-            isActive={historyItem.id === activeHistoryId}
+          ))}
-          />
-        ))}
-        {hasNextPage && <div ref={loadMoreRef} style={{ height: 1 }} />}
-        {isFetchingNextPage && (
-          <Center py="sm">
-            <Loader size="sm" />
-          </Center>
-        )}
       </ScrollArea>
 
-      {canRestore && (
+      {spaceAbility.cannot(
+        SpaceCaslAction.Manage,
+        SpaceCaslSubject.Page,
+      ) ? null : (
         <>
           <Divider />
           <Group p="xs" wrap="nowrap">
+            <Button size="compact-md" onClick={confirmModal}>
+              {t("Restore")}
+            </Button>
             <Button
               variant="default"
               size="compact-md"
@@ -159,9 +132,6 @@ function HistoryList({ pageId }: Props) {
             >
               {t("Cancel")}
             </Button>
-            <Button size="compact-md" onClick={confirmRestore}>
-              {t("Restore")}
-            </Button>
           </Group>
         </>
       )}

apps/client/src/features/page-history/components/history-modal-body.tsx

@@ -1,45 +1,21 @@
-import {
+import { ScrollArea } from "@mantine/core";
-  ActionIcon,
-  Group,
-  Paper,
-  ScrollArea,
-  Switch,
-  Text,
-} from "@mantine/core";
 import HistoryList from "@/features/page-history/components/history-list";
-import classes from "./css/history.module.css";
+import classes from "./history.module.css";
-import { useAtom, useAtomValue } from "jotai";
+import { useAtom } from "jotai";
-import {
+import { activeHistoryIdAtom } from "@/features/page-history/atoms/history-atoms";
-  activeHistoryIdAtom,
-  activeHistoryPrevIdAtom,
-  diffCountsAtom,
-  highlightChangesAtom,
-} from "@/features/page-history/atoms/history-atoms";
 import HistoryView from "@/features/page-history/components/history-view";
-import { useRef } from "react";
+import { useEffect } from "react";
-import { IconChevronUp, IconChevronDown } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import {
-  useDiffNavigation,
-  useHistoryReset,
-} from "@/features/page-history/hooks";
 
 interface Props {
   pageId: string;
 }
 
 export default function HistoryModalBody({ pageId }: Props) {
-  const { t } = useTranslation();
+  const [activeHistoryId, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
-  const scrollViewportRef = useRef<HTMLDivElement>(null);
 
-  const activeHistoryId = useAtomValue(activeHistoryIdAtom);
+  useEffect(() => {
-  const activeHistoryPrevId = useAtomValue(activeHistoryPrevIdAtom);
+    setActiveHistoryId("");
-  const [highlightChanges, setHighlightChanges] = useAtom(highlightChangesAtom);
+  }, [pageId]);
-  const diffCounts = useAtomValue(diffCountsAtom);
-
-  useHistoryReset(pageId);
-  const { currentChangeIndex, handlePrevChange, handleNextChange } =
-    useDiffNavigation(scrollViewportRef);
 
   return (
     <div className={classes.sidebarFlex}>
@@ -49,63 +25,11 @@ export default function HistoryModalBody({ pageId }: Props) {
         </div>
       </nav>
 
-      <div style={{ position: "relative", flex: 1 }}>
+      <ScrollArea h="650" w="100%" scrollbarSize={5}>
-        <ScrollArea
+        <div className={classes.sidebarRightSection}>
-          h={650}
+          {activeHistoryId && <HistoryView historyId={activeHistoryId} />}
-          w="100%"
+        </div>
-          scrollbarSize={5}
+      </ScrollArea>
-          viewportRef={scrollViewportRef}
-        >
-          <div className={classes.sidebarRightSection}>
-            {activeHistoryId && <HistoryView />}
-          </div>
-        </ScrollArea>
-
-        {activeHistoryId && activeHistoryPrevId && (
-          <Paper
-            shadow="md"
-            radius="xl"
-            px="md"
-            py="xs"
-            style={{
-              position: "absolute",
-              bottom: 16,
-              left: "50%",
-              transform: "translateX(-50%)",
-            }}
-          >
-            <Group gap="md" wrap="nowrap">
-              <Switch
-                label={t("Highlight changes")}
-                checked={highlightChanges}
-                onChange={(e) => setHighlightChanges(e.currentTarget.checked)}
-                styles={{ label: { userSelect: "none", whiteSpace: "nowrap" } }}
-              />
-              {highlightChanges && diffCounts && diffCounts.total > 0 && (
-                <Group gap="xs" wrap="nowrap">
-                  <Text size="sm" c="dimmed" style={{ whiteSpace: "nowrap" }}>
-                    {currentChangeIndex} of {diffCounts.total}
-                  </Text>
-                  <ActionIcon
-                    variant="subtle"
-                    size="sm"
-                    onClick={handlePrevChange}
-                  >
-                    <IconChevronUp size={16} />
-                  </ActionIcon>
-                  <ActionIcon
-                    variant="subtle"
-                    size="sm"
-                    onClick={handleNextChange}
-                  >
-                    <IconChevronDown size={16} />
-                  </ActionIcon>
-                </Group>
-              )}
-            </Group>
-          </Paper>
-        )}
-      </div>
     </div>
   );
 }

apps/client/src/features/page-history/components/history-modal-mobile.tsx

@@ -1,208 +0,0 @@
-import {
-  ActionIcon,
-  Box,
-  Button,
-  Group,
-  Paper,
-  ScrollArea,
-  Select,
-  Switch,
-  Text,
-} from "@mantine/core";
-import { useAtom, useAtomValue, useSetAtom } from "jotai";
-import {
-  activeHistoryIdAtom,
-  activeHistoryPrevIdAtom,
-  diffCountsAtom,
-  highlightChangesAtom,
-  historyAtoms,
-} from "@/features/page-history/atoms/history-atoms";
-import HistoryView from "@/features/page-history/components/history-view";
-import { useCallback, useEffect, useMemo, useRef } from "react";
-import { IconCheck, IconChevronDown, IconChevronUp } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { usePageHistoryListQuery } from "@/features/page-history/queries/page-history-query";
-import { formattedDate } from "@/lib/time";
-import {
-  useDiffNavigation,
-  useHistoryReset,
-  useHistoryRestore,
-} from "@/features/page-history/hooks";
-import classes from "./css/history-mobile.module.css";
-
-interface Props {
-  pageId: string;
-  pageTitle?: string;
-}
-
-export default function HistoryModalMobile({ pageId, pageTitle }: Props) {
-  const { t } = useTranslation();
-
-  const [activeHistoryId, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
-  const setActiveHistoryPrevId = useSetAtom(activeHistoryPrevIdAtom);
-  const [highlightChanges, setHighlightChanges] = useAtom(highlightChangesAtom);
-  const diffCounts = useAtomValue(diffCountsAtom);
-  const setHistoryModalOpen = useSetAtom(historyAtoms);
-
-  const scrollViewportRef = useRef<HTMLDivElement>(null);
-  const dropdownViewportRef = useRef<HTMLDivElement>(null);
-
-  const {
-    data: pageHistoryData,
-    isLoading,
-    fetchNextPage,
-    hasNextPage,
-    isFetchingNextPage,
-  } = usePageHistoryListQuery(pageId);
-
-  const historyItems = useMemo(
-    () => pageHistoryData?.pages.flatMap((page) => page.items) ?? [],
-    [pageHistoryData],
-  );
-
-  const selectData = useMemo(
-    () =>
-      historyItems.map((item) => ({
-        value: item.id,
-        label: formattedDate(new Date(item.createdAt)),
-        userName: item.lastUpdatedBy?.name,
-      })),
-    [historyItems],
-  );
-
-  useHistoryReset(pageId);
-  const { canRestore, confirmRestore } = useHistoryRestore();
-  const { currentChangeIndex, handlePrevChange, handleNextChange } =
-    useDiffNavigation(scrollViewportRef);
-
-  useEffect(() => {
-    if (historyItems.length > 0 && !activeHistoryId) {
-      setActiveHistoryId(historyItems[0].id);
-      setActiveHistoryPrevId(historyItems[1]?.id ?? "");
-    }
-  }, [
-    historyItems,
-    activeHistoryId,
-    setActiveHistoryId,
-    setActiveHistoryPrevId,
-  ]);
-
-  const handleDropdownScroll = useCallback(() => {
-    const viewport = dropdownViewportRef.current;
-    if (!viewport || !hasNextPage || isFetchingNextPage) return;
-
-    const { scrollTop, scrollHeight, clientHeight } = viewport;
-    const isNearBottom = scrollTop + clientHeight >= scrollHeight - 50;
-
-    if (isNearBottom) {
-      fetchNextPage();
-    }
-  }, [fetchNextPage, hasNextPage, isFetchingNextPage]);
-
-  const handleSelectVersion = useCallback(
-    (value: string | null) => {
-      if (!value) return;
-      const index = historyItems.findIndex((item) => item.id === value);
-      if (index >= 0) {
-        setActiveHistoryId(value);
-        setActiveHistoryPrevId(historyItems[index + 1]?.id ?? "");
-      }
-    },
-    [historyItems, setActiveHistoryId, setActiveHistoryPrevId],
-  );
-
-  if (isLoading) {
-    return null;
-  }
-
-  return (
-    <Box className={classes.container}>
-      <Box className={classes.selectorWrapper}>
-        <Select
-          data={selectData}
-          value={activeHistoryId}
-          onChange={handleSelectVersion}
-          placeholder={t("Select version")}
-          checkIconPosition="right"
-          maxDropdownHeight={300}
-          renderOption={({ option, checked }) => (
-            <Group justify="space-between" wrap="nowrap" w="100%">
-              <div>
-                <Text size="sm">{option.label}</Text>
-                <Text size="xs" c="dimmed">
-                  {(option as { userName?: string }).userName}
-                </Text>
-              </div>
-              {checked && <IconCheck size={16} />}
-            </Group>
-          )}
-          comboboxProps={{ withinPortal: false }}
-          scrollAreaProps={{
-            viewportRef: dropdownViewportRef,
-            onScrollPositionChange: handleDropdownScroll,
-          }}
-        />
-      </Box>
-
-      <ScrollArea
-        className={classes.editorArea}
-        viewportRef={scrollViewportRef}
-        scrollbarSize={5}
-      >
-        <Box className={classes.editorContent}>
-          {activeHistoryId && <HistoryView />}
-        </Box>
-      </ScrollArea>
-
-      {canRestore && (
-        <Group className={classes.actionButtons} justify="flex-end" gap="sm">
-          <Button variant="default" onClick={() => setHistoryModalOpen(false)}>
-            {t("Cancel")}
-          </Button>
-          <Button onClick={confirmRestore}>{t("Restore")}</Button>
-        </Group>
-      )}
-
-      {activeHistoryId && (
-        <Paper
-          shadow="sm"
-          radius="xl"
-          px="md"
-          py="xs"
-          className={classes.floatingBar}
-        >
-          <Group gap="sm" wrap="nowrap">
-            <Switch
-              label={t("Highlight changes")}
-              checked={highlightChanges}
-              onChange={(e) => setHighlightChanges(e.currentTarget.checked)}
-              size="sm"
-              styles={{ label: { userSelect: "none", whiteSpace: "nowrap" } }}
-            />
-            {highlightChanges && diffCounts && diffCounts.total > 0 && (
-              <Group gap={4} wrap="nowrap">
-                <Text size="sm" c="dimmed" style={{ whiteSpace: "nowrap" }}>
-                  {currentChangeIndex} of {diffCounts.total}
-                </Text>
-                <ActionIcon
-                  variant="subtle"
-                  size="sm"
-                  onClick={handlePrevChange}
-                >
-                  <IconChevronUp size={16} />
-                </ActionIcon>
-                <ActionIcon
-                  variant="subtle"
-                  size="sm"
-                  onClick={handleNextChange}
-                >
-                  <IconChevronDown size={16} />
-                </ActionIcon>
-              </Group>
-            )}
-          </Group>
-        </Paper>
-      )}
-    </Box>
-  );
-}

apps/client/src/features/page-history/components/history-modal.tsx

@@ -2,26 +2,21 @@ import { Modal, Text } from "@mantine/core";
 import { useAtom } from "jotai";
 import { historyAtoms } from "@/features/page-history/atoms/history-atoms";
 import HistoryModalBody from "@/features/page-history/components/history-modal-body";
-import HistoryModalMobile from "@/features/page-history/components/history-modal-mobile";
 import { useTranslation } from "react-i18next";
-import { useMediaQuery } from "@mantine/hooks";
 
 interface Props {
   pageId: string;
-  pageTitle?: string;
 }
-
+export default function HistoryModal({ pageId }: Props) {
-export default function HistoryModal({ pageId, pageTitle }: Props) {
   const { t } = useTranslation();
   const [isModalOpen, setModalOpen] = useAtom(historyAtoms);
-  const isMobile = useMediaQuery("(max-width: 800px)");
 
-  if (isMobile) {
+  return (
-    return (
+    <>
       <Modal.Root
+        size={1200}
         opened={isModalOpen}
         onClose={() => setModalOpen(false)}
-        fullScreen
       >
         <Modal.Overlay />
         <Modal.Content style={{ overflow: "hidden" }}>
@@ -33,37 +28,11 @@ export default function HistoryModal({ pageId, pageTitle }: Props) {
             </Modal.Title>
             <Modal.CloseButton />
           </Modal.Header>
-          <Modal.Body
+          <Modal.Body>
-            p={0}
+            <HistoryModalBody pageId={pageId} />
-            style={{ height: "calc(100vh - 60px)", overflow: "hidden" }}
-          >
-            <HistoryModalMobile pageId={pageId} pageTitle={pageTitle} />
           </Modal.Body>
         </Modal.Content>
       </Modal.Root>
-    );
+    </>
-  }
-
-  return (
-    <Modal.Root
-      size={1400}
-      opened={isModalOpen}
-      onClose={() => setModalOpen(false)}
-    >
-      <Modal.Overlay />
-      <Modal.Content style={{ overflow: "hidden" }}>
-        <Modal.Header>
-          <Modal.Title>
-            <Text size="md" fw={500}>
-              {t("Page history")}
-            </Text>
-          </Modal.Title>
-          <Modal.CloseButton />
-        </Modal.Header>
-        <Modal.Body>
-          <HistoryModalBody pageId={pageId} />
-        </Modal.Body>
-      </Modal.Content>
-    </Modal.Root>
   );
 }

apps/client/src/features/page-history/components/history-view.tsx

@@ -1,44 +1,29 @@
 import { usePageHistoryQuery } from "@/features/page-history/queries/page-history-query";
 import { HistoryEditor } from "@/features/page-history/components/history-editor";
 import { useTranslation } from "react-i18next";
-import { useAtomValue } from "jotai";
-import {
-  activeHistoryIdAtom,
-  activeHistoryPrevIdAtom,
-} from "@/features/page-history/atoms/history-atoms";
 
-function HistoryView() {
+interface HistoryProps {
+  historyId: string;
+}
+
+function HistoryView({ historyId }: HistoryProps) {
   const { t } = useTranslation();
-  const historyId = useAtomValue(activeHistoryIdAtom);
+  const { data, isLoading, isError } = usePageHistoryQuery(historyId);
-  const prevHistoryId = useAtomValue(activeHistoryPrevIdAtom);
 
-  const {
+  if (isLoading) {
-    data,
-    isLoading: isLoadingCurrent,
-    isError: isErrorCurrent,
-  } = usePageHistoryQuery(historyId);
-  const {
-    data: prevData,
-    isLoading: isLoadingPrev,
-    isError: isErrorPrev,
-  } = usePageHistoryQuery(prevHistoryId);
-
-  if (isLoadingCurrent || isLoadingPrev) {
     return <></>;
   }
 
-  if (isErrorCurrent || !data) {
+  if (isError || !data) {
     return <div>{t("Error fetching page data.")}</div>;
   }
 
   return (
-    <div>
+    data && (
-      <HistoryEditor
+      <div>
-        content={data.content}
+        <HistoryEditor content={data.content} title={data.title} />
-        title={data.title}
+      </div>
-        previousContent={!isErrorPrev ? prevData?.content : undefined}
+    )
-      />
-    </div>
   );
 }
 

apps/client/src/features/page-history/components/history.module.css

@@ -0,0 +1,37 @@
+.history {
+    display: block;
+    width: 100%;
+    padding: var(--mantine-spacing-md);
+    color: light-dark(var(--mantine-color-black), var(--mantine-color-dark-0));
+
+    @mixin hover {
+        background-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-8));
+    }
+}
+
+.active {
+    background-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-8));
+}
+
+.sidebar {
+    max-height: rem(700px);
+    width: rem(250px);
+    padding: var(--mantine-spacing-sm);
+    display: flex;
+    flex-direction: column;
+    border-right: rem(1px) solid
+    light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
+}
+
+.sidebarFlex {
+    display: flex;
+}
+
+.sidebarMain {
+    flex: 1;
+}
+
+.sidebarRightSection {
+    flex: 1;
+    padding: rem(16px) rem(40px);
+}

apps/client/src/features/page-history/hooks/index.ts

@@ -1,3 +0,0 @@
-export { useDiffNavigation } from "./use-diff-navigation";
-export { useHistoryRestore } from "./use-history-restore";
-export { useHistoryReset } from "./use-history-reset";

apps/client/src/features/page-history/hooks/use-diff-navigation.ts

@@ -1,58 +0,0 @@
-import { useAtomValue } from "jotai";
-import { RefObject, useCallback, useEffect, useState } from "react";
-import { diffCountsAtom } from "@/features/page-history/atoms/history-atoms";
-
-/**
- * Manages navigation between diff changes in the history view.
- * Provides prev/next handlers and auto-scrolls to the current change.
- */
-export function useDiffNavigation(
-  scrollViewportRef: RefObject<HTMLDivElement>,
-) {
-  const diffCounts = useAtomValue(diffCountsAtom);
-  const [currentChangeIndex, setCurrentChangeIndex] = useState(0);
-
-  const scrollToChangeIndex = useCallback(
-    (index: number) => {
-      const viewport = scrollViewportRef.current;
-      if (!viewport || index < 1) return;
-
-      const element = viewport.querySelector(`[data-diff-index="${index}"]`);
-      if (element instanceof HTMLElement) {
-        const elementTop = element.offsetTop;
-        const viewportHeight = viewport.clientHeight;
-        const scrollTarget =
-          elementTop - viewportHeight / 2 + element.offsetHeight / 2;
-        viewport.scrollTo({ top: scrollTarget, behavior: "smooth" });
-      }
-    },
-    [scrollViewportRef],
-  );
-
-  useEffect(() => {
-    if (diffCounts && diffCounts.total > 0) {
-      setCurrentChangeIndex(1);
-      requestAnimationFrame(() => scrollToChangeIndex(1));
-    } else {
-      setCurrentChangeIndex(0);
-    }
-  }, [diffCounts, scrollToChangeIndex]);
-
-  const handlePrevChange = useCallback(() => {
-    if (!diffCounts || diffCounts.total === 0) return;
-    const newIndex =
-      currentChangeIndex <= 1 ? diffCounts.total : currentChangeIndex - 1;
-    setCurrentChangeIndex(newIndex);
-    scrollToChangeIndex(newIndex);
-  }, [diffCounts, currentChangeIndex, scrollToChangeIndex]);
-
-  const handleNextChange = useCallback(() => {
-    if (!diffCounts || diffCounts.total === 0) return;
-    const newIndex =
-      currentChangeIndex >= diffCounts.total ? 1 : currentChangeIndex + 1;
-    setCurrentChangeIndex(newIndex);
-    scrollToChangeIndex(newIndex);
-  }, [diffCounts, currentChangeIndex, scrollToChangeIndex]);
-
-  return { currentChangeIndex, handlePrevChange, handleNextChange };
-}

apps/client/src/features/page-history/hooks/use-history-reset.ts

@@ -1,24 +0,0 @@
-import { useAtom } from "jotai";
-import { useEffect } from "react";
-import {
-  activeHistoryIdAtom,
-  activeHistoryPrevIdAtom,
-  diffCountsAtom,
-} from "@/features/page-history/atoms/history-atoms";
-
-/**
- * Resets history state when pageId changes.
- * Clears active selection and diff counts.
- */
-export function useHistoryReset(pageId: string) {
-  const [, setActiveHistoryId] = useAtom(activeHistoryIdAtom);
-  const [, setActiveHistoryPrevId] = useAtom(activeHistoryPrevIdAtom);
-  const [, setDiffCounts] = useAtom(diffCountsAtom);
-
-  useEffect(() => {
-    setActiveHistoryId("");
-    setActiveHistoryPrevId("");
-    // @ts-ignore
-    setDiffCounts(null);
-  }, [pageId, setActiveHistoryId, setActiveHistoryPrevId, setDiffCounts]);
-}

apps/client/src/features/page-history/hooks/use-history-restore.tsx

@@ -1,78 +0,0 @@
-import { useAtom, useAtomValue, useSetAtom } from "jotai";
-import { useCallback } from "react";
-import { useTranslation } from "react-i18next";
-import { Text } from "@mantine/core";
-import { modals } from "@mantine/modals";
-import { notifications } from "@mantine/notifications";
-import { useParams } from "react-router-dom";
-import {
-  activeHistoryIdAtom,
-  historyAtoms,
-} from "@/features/page-history/atoms/history-atoms";
-import { usePageHistoryQuery } from "@/features/page-history/queries/page-history-query";
-import {
-  pageEditorAtom,
-  titleEditorAtom,
-} from "@/features/editor/atoms/editor-atoms";
-import { useSpaceAbility } from "@/features/space/permissions/use-space-ability";
-import { useSpaceQuery } from "@/features/space/queries/space-query";
-import {
-  SpaceCaslAction,
-  SpaceCaslSubject,
-} from "@/features/space/permissions/permissions.type";
-
-export function useHistoryRestore() {
-  const { t } = useTranslation();
-
-  const activeHistoryId = useAtomValue(activeHistoryIdAtom);
-  const { data: activeHistoryData } = usePageHistoryQuery(activeHistoryId);
-
-  const mainEditor = useAtomValue(pageEditorAtom);
-  const mainEditorTitle = useAtomValue(titleEditorAtom);
-  const setHistoryModalOpen = useSetAtom(historyAtoms);
-
-  const { spaceSlug } = useParams();
-  const { data: space } = useSpaceQuery(spaceSlug);
-  const spaceAbility = useSpaceAbility(space?.membership?.permissions);
-
-  const canRestore = spaceAbility.can(
-    SpaceCaslAction.Manage,
-    SpaceCaslSubject.Page,
-  );
-
-  const handleRestore = useCallback(() => {
-    if (!activeHistoryData) return;
-
-    mainEditorTitle
-      .chain()
-      .clearContent()
-      .setContent(activeHistoryData.title, { emitUpdate: true })
-      .run();
-
-    mainEditor
-      .chain()
-      .clearContent()
-      .setContent(activeHistoryData.content)
-      .run();
-
-    setHistoryModalOpen(false);
-    notifications.show({ message: t("Successfully restored") });
-  }, [activeHistoryData, mainEditor, mainEditorTitle, setHistoryModalOpen, t]);
-
-  const confirmRestore = useCallback(() => {
-    modals.openConfirmModal({
-      title: t("Please confirm your action"),
-      children: (
-        <Text size="sm">
-          {t(
-            "Are you sure you want to restore this version? Any changes not versioned will be lost.",
-          )}
-        </Text>
-      ),
-      labels: { confirm: t("Confirm"), cancel: t("Cancel") },
-      onConfirm: handleRestore,
-    });
-  }, [t, handleRestore]);
-
-  return { canRestore, confirmRestore };
-}

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

@@ -1,38 +1,19 @@
-import {
+import { useQuery, UseQueryResult } from "@tanstack/react-query";
-  InfiniteData,
-  useInfiniteQuery,
-  UseInfiniteQueryResult,
-  useQuery,
-  UseQueryResult,
-} from "@tanstack/react-query";
 import {
   getPageHistoryById,
   getPageHistoryList,
 } from "@/features/page-history/services/page-history-service";
 import { IPageHistory } from "@/features/page-history/types/page.types";
 import { IPagination } from "@/lib/types.ts";
-import { queryClient } from "@/main";
-
-const HISTORY_STALE_TIME = 60 * 60 * 1000;
-
-export function prefetchPageHistory(historyId: string) {
-  return queryClient.prefetchQuery({
-    queryKey: ["page-history", historyId],
-    queryFn: () => getPageHistoryById(historyId),
-    staleTime: HISTORY_STALE_TIME,
-  });
-}
 
 export function usePageHistoryListQuery(
   pageId: string,
-): UseInfiniteQueryResult<InfiniteData<IPagination<IPageHistory>, unknown>> {
+): UseQueryResult<IPagination<IPageHistory>, Error> {
-  return useInfiniteQuery({
+  return useQuery({
     queryKey: ["page-history-list", pageId],
-    queryFn: ({ pageParam }) => getPageHistoryList(pageId, pageParam),
+    queryFn: () => getPageHistoryList(pageId),
     enabled: !!pageId,
     gcTime: 0,
-    initialPageParam: undefined,
-    getNextPageParam: (lastPage) => lastPage.meta?.nextCursor ?? undefined,
   });
 }
 
@@ -43,6 +24,6 @@ export function usePageHistoryQuery(
     queryKey: ["page-history", historyId],
     queryFn: () => getPageHistoryById(historyId),
     enabled: !!historyId,
-    staleTime: HISTORY_STALE_TIME,
+    staleTime: 10 * 60 * 1000,
   });
 }

apps/client/src/features/page-history/services/page-history-service.ts

@@ -4,11 +4,9 @@ import { IPagination } from "@/lib/types.ts";
 
 export async function getPageHistoryList(
   pageId: string,
-  cursor?: string,
 ): Promise<IPagination<IPageHistory>> {
   const req = await api.post("/pages/history", {
     pageId,
-    cursor,
   });
   return req.data;
 }

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

@@ -7,17 +7,22 @@ import {
   IconHistory,
   IconLink,
   IconList,
-  IconMarkdown,
   IconMessage,
   IconPrinter,
+  IconSearch,
   IconTrash,
   IconWifiOff,
 } from "@tabler/icons-react";
-import React, { useEffect, useRef, useState } from "react";
+import React from "react";
 import useToggleAside from "@/hooks/use-toggle-aside.tsx";
-import { useAtom, useAtomValue } from "jotai";
+import { useAtom } from "jotai";
 import { historyAtoms } from "@/features/page-history/atoms/history-atoms.ts";
-import { useClipboard, useDisclosure, useHotkeys } from "@mantine/hooks";
+import {
+  getHotkeyHandler,
+  useClipboard,
+  useDisclosure,
+  useHotkeys,
+} from "@mantine/hooks";
 import { useParams } from "react-router-dom";
 import { usePageQuery } from "@/features/page/queries/page-query.ts";
 import { buildPageUrl } from "@/features/page/page.utils.ts";
@@ -29,12 +34,12 @@ import { useDeletePageModal } from "@/features/page/hooks/use-delete-page-modal.
 import { PageWidthToggle } from "@/features/user/components/page-width-pref.tsx";
 import { Trans, useTranslation } from "react-i18next";
 import ExportModal from "@/components/common/export-modal";
-import { htmlToMarkdown } from "@docmost/editor-ext";
 import {
   pageEditorAtom,
   yjsConnectionStatusAtom,
 } from "@/features/editor/atoms/editor-atoms.ts";
-import { formattedDate } from "@/lib/time.ts";
+import { searchAndReplaceStateAtom } from "@/features/editor/components/search-and-replace/atoms/search-and-replace-state-atom.ts";
+import { formattedDate, timeAgo } from "@/lib/time.ts";
 import { PageStateSegmentedControl } from "@/features/user/components/page-state-pref.tsx";
 import MovePageModal from "@/features/page/components/move-page-modal.tsx";
 import { useTimeAgo } from "@/hooks/use-time-ago.tsx";
@@ -46,6 +51,7 @@ interface PageHeaderMenuProps {
 export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
   const { t } = useTranslation();
   const toggleAside = useToggleAside();
+  const [yjsConnectionStatus] = useAtom(yjsConnectionStatusAtom);
 
   useHotkeys(
     [
@@ -62,7 +68,6 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
           const event = new CustomEvent("closeFindDialogFromEditor", {});
           document.dispatchEvent(event);
         },
-        { preventDefault: false },
       ],
     ],
     [],
@@ -70,7 +75,17 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
 
   return (
     <>
-      <ConnectionWarning />
+      {yjsConnectionStatus === "disconnected" && (
+        <Tooltip
+          label={t("Real-time editor connection lost. Retrying...")}
+          openDelay={250}
+          withArrow
+        >
+          <ActionIcon variant="default" c="red" style={{ border: "none" }}>
+            <IconWifiOff size={20} stroke={2} />
+          </ActionIcon>
+        </Tooltip>
+      )}
 
       {!readOnly && <PageStateSegmentedControl size="xs" />}
 
@@ -131,15 +146,6 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
     notifications.show({ message: t("Link copied") });
   };
 
-  const handleCopyAsMarkdown = () => {
-    if (!pageEditor) return;
-    const html = pageEditor.getHTML();
-    const markdown = htmlToMarkdown(html);
-    const title = page?.title ? `# ${page.title}\n\n` : "";
-    clipboard.copy(`${title}${markdown}`);
-    notifications.show({ message: t("Copied") });
-  };
-
   const handlePrint = () => {
     setTimeout(() => {
       window.print();
@@ -177,13 +183,6 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
           >
             {t("Copy link")}
           </Menu.Item>
-
-          <Menu.Item
-            leftSection={<IconMarkdown size={16} />}
-            onClick={handleCopyAsMarkdown}
-          >
-            {t("Copy as Markdown")}
-          </Menu.Item>
           <Menu.Divider />
 
           <Menu.Item leftSection={<IconArrowsHorizontal size={16} />}>
@@ -291,51 +290,3 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
     </>
   );
 }
-
-function ConnectionWarning() {
-  const { t } = useTranslation();
-  const yjsConnectionStatus = useAtomValue(yjsConnectionStatusAtom);
-  const [showWarning, setShowWarning] = useState(false);
-  const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  useEffect(() => {
-    const isDisconnected = ["disconnected", "connecting"].includes(
-      yjsConnectionStatus,
-    );
-
-    if (isDisconnected) {
-      if (!timeoutRef.current) {
-        timeoutRef.current = setTimeout(() => setShowWarning(true), 5000);
-      }
-    } else {
-      if (timeoutRef.current) {
-        clearTimeout(timeoutRef.current);
-        timeoutRef.current = null;
-      }
-      setShowWarning(false);
-    }
-  }, [yjsConnectionStatus]);
-
-  // Cleanup only on unmount
-  useEffect(() => {
-    return () => {
-      if (timeoutRef.current) {
-        clearTimeout(timeoutRef.current);
-      }
-    };
-  }, []);
-
-  if (!showWarning) return null;
-
-  return (
-    <Tooltip
-      label={t("Real-time editor connection lost. Retrying...")}
-      openDelay={250}
-      withArrow
-    >
-      <ActionIcon variant="default" c="red" style={{ border: "none" }}>
-        <IconWifiOff size={20} stroke={2} />
-      </ActionIcon>
-    </Tooltip>
-  );
-}

apps/client/src/features/page/components/page-import-modal.tsx

@@ -172,10 +172,6 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
             queryKey: ["root-sidebar-pages", fileTask.spaceId],
           });
 
-          await queryClient.invalidateQueries({
-            queryKey: ["recent-changes", fileTask.spaceId],
-          });
-
           setTimeout(() => {
             emit({
               operation: "refetchRootTreeNodeEvent",

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

@@ -163,6 +163,9 @@ export function useDeletePageMutation() {
 export function useMovePageMutation() {
   return useMutation<void, Error, IMovePage>({
     mutationFn: (data) => movePage(data),
+    onSuccess: () => {
+      invalidateOnMovePage();
+    },
   });
 }
 
@@ -250,10 +253,12 @@ export function useGetSidebarPagesQuery(
   return useInfiniteQuery({
     queryKey: ["sidebar-pages", data],
     enabled: !!data?.pageId || !!data?.spaceId,
-    queryFn: ({ pageParam }) => getSidebarPages({ ...data, cursor: pageParam }),
+    queryFn: ({ pageParam }) => getSidebarPages({ ...data, page: pageParam }),
-    initialPageParam: undefined,
+    initialPageParam: 1,
+    getPreviousPageParam: (firstPage) =>
+      firstPage.meta.hasPrevPage ? firstPage.meta.page - 1 : undefined,
     getNextPageParam: (lastPage) =>
-      lastPage.meta?.nextCursor ?? undefined,
+      lastPage.meta.hasNextPage ? lastPage.meta.page + 1 : undefined,
   });
 }
 
@@ -261,11 +266,13 @@ export function useGetRootSidebarPagesQuery(data: SidebarPagesParams) {
   return useInfiniteQuery({
     queryKey: ["root-sidebar-pages", data.spaceId],
     queryFn: async ({ pageParam }) => {
-      return getSidebarPages({ spaceId: data.spaceId, cursor: pageParam });
+      return getSidebarPages({ spaceId: data.spaceId, page: pageParam });
     },
-    initialPageParam: undefined,
+    initialPageParam: 1,
+    getPreviousPageParam: (firstPage) =>
+      firstPage.meta.hasPrevPage ? firstPage.meta.page - 1 : undefined,
     getNextPageParam: (lastPage) =>
-      lastPage.meta?.nextCursor ?? undefined,
+      lastPage.meta.hasNextPage ? lastPage.meta.page + 1 : undefined,
   });
 }
 
@@ -451,127 +458,17 @@ export function invalidateOnUpdatePage(
   });
 }
 
-export function updateCacheOnMovePage(
+export function invalidateOnMovePage() {
-  spaceId: string,
+  //for move invalidate all sidebars for now (how to do???)
-  pageId: string,
+  //invalidate all root sidebar pages
-  oldParentId: string | null,
+  queryClient.invalidateQueries({
-  newParentId: string | null,
+    queryKey: ["root-sidebar-pages"],
-  pageData: Partial<IPage>,
+  });
-) {
+  //invalidate all sub sidebar pages
-  // Remove page from old parent's cache
+  queryClient.invalidateQueries({
-  const oldQueryKey =
+    queryKey: ["sidebar-pages"],
-    oldParentId === null
+  });
-      ? ["root-sidebar-pages", spaceId]
+  // ---
-      : ["sidebar-pages", { pageId: oldParentId, spaceId }];
-
-  queryClient.setQueryData<InfiniteData<IPagination<IPage>>>(
-    oldQueryKey,
-    (old) => {
-      if (!old) return old;
-      return {
-        ...old,
-        pages: old.pages.map((page) => ({
-          ...page,
-          items: page.items.filter((item) => item.id !== pageId),
-        })),
-      };
-    },
-  );
-
-  // Update old parent's hasChildren flag if it has no more children
-  if (oldParentId !== null) {
-    const oldParentCache = queryClient.getQueryData<
-      InfiniteData<IPagination<IPage>>
-    >(["sidebar-pages", { pageId: oldParentId, spaceId }]);
-
-    const remainingChildren =
-      oldParentCache?.pages.flatMap((p) => p.items).length ?? 0;
-
-    if (remainingChildren === 0) {
-      // Update hasChildren in all caches where old parent appears
-      const allSideBarMatches = queryClient.getQueriesData({
-        predicate: (query) =>
-          query.queryKey[0] === "root-sidebar-pages" ||
-          query.queryKey[0] === "sidebar-pages",
-      });
-
-      allSideBarMatches.forEach(([key]) => {
-        queryClient.setQueryData<InfiniteData<IPagination<IPage>>>(
-          key,
-          (old) => {
-            if (!old) return old;
-            return {
-              ...old,
-              pages: old.pages.map((page) => ({
-                ...page,
-                items: page.items.map((item) =>
-                  item.id === oldParentId
-                    ? { ...item, hasChildren: false }
-                    : item,
-                ),
-              })),
-            };
-          },
-        );
-      });
-    }
-  }
-
-  // Add page to new parent's cache
-  const newQueryKey =
-    newParentId === null
-      ? ["root-sidebar-pages", spaceId]
-      : ["sidebar-pages", { pageId: newParentId, spaceId }];
-
-  queryClient.setQueryData<InfiniteData<IPagination<Partial<IPage>>>>(
-    newQueryKey,
-    (old) => {
-      if (!old) return old;
-
-      // Check if page already exists in new location
-      const exists = old.pages.some((page) =>
-        page.items.some((item) => item.id === pageId),
-      );
-      if (exists) return old;
-
-      return {
-        ...old,
-        pages: old.pages.map((page, index) => {
-          if (index === old.pages.length - 1) {
-            return {
-              ...page,
-              items: [...page.items, pageData],
-            };
-          }
-          return page;
-        }),
-      };
-    },
-  );
-
-  // Update new parent's hasChildren flag
-  if (newParentId !== null) {
-    const allSideBarMatches = queryClient.getQueriesData({
-      predicate: (query) =>
-        query.queryKey[0] === "root-sidebar-pages" ||
-        query.queryKey[0] === "sidebar-pages",
-    });
-
-    allSideBarMatches.forEach(([key]) => {
-      queryClient.setQueryData<InfiniteData<IPagination<IPage>>>(key, (old) => {
-        if (!old) return old;
-        return {
-          ...old,
-          pages: old.pages.map((page) => ({
-            ...page,
-            items: page.items.map((item) =>
-              item.id === newParentId ? { ...item, hasChildren: true } : item,
-            ),
-          })),
-        };
-      });
-    });
-  }
 }
 
 export function invalidateOnDeletePage(pageId: string) {

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

@@ -72,19 +72,22 @@ export async function getSidebarPages(
 export async function getAllSidebarPages(
   params: SidebarPagesParams,
 ): Promise<InfiniteData<IPagination<IPage>, unknown>> {
-  let cursor: string | undefined = undefined;
+  let page = 1;
+  let hasNextPage = false;
   const pages: IPagination<IPage>[] = [];
-  const pageParams: (string | undefined)[] = [];
+  const pageParams: number[] = [];
 
   do {
-    const req = await api.post("/pages/sidebar-pages", { ...params, cursor });
+    const req = await api.post("/pages/sidebar-pages", { ...params, page: page });
 
     const data: IPagination<IPage> = req.data;
     pages.push(data);
-    pageParams.push(cursor);
+    pageParams.push(page);
 
-    cursor = data.meta.nextCursor ?? undefined;
+    hasNextPage = data.meta.hasNextPage;
-  } while (cursor);
+
+    page += 1;
+  } while (hasNextPage);
 
   return {
     pageParams,
@@ -115,14 +118,7 @@ export async function exportPage(data: IExportPageParams): Promise<void> {
     .split("filename=")[1]
     .replace(/"/g, "");
 
-  let decodedFileName = fileName;
+  saveAs(req.data, decodeURIComponent(fileName));
-  try {
-    decodedFileName = decodeURIComponent(fileName);
-  } catch (err) {
-    // fallback to raw filename
-  }
-
-  saveAs(req.data, decodedFileName);
 }
 
 export async function importPage(file: File, spaceId: string) {

apps/client/src/features/page/trash/components/trash.tsx

@@ -30,15 +30,15 @@ import { useState } from "react";
 import TrashPageContentModal from "@/features/page/trash/components/trash-page-content-modal";
 import { UserInfo } from "@/components/common/user-info.tsx";
 import Paginate from "@/components/common/paginate.tsx";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
+import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search";
 
 export default function Trash() {
   const { t } = useTranslation();
   const { spaceSlug } = useParams();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const { page, setPage } = usePaginateAndSearch();
   const { data: space } = useGetSpaceBySlugQuery(spaceSlug);
   const { data: deletedPages, isLoading } = useDeletedPagesQuery(space?.id, {
-    cursor, limit: 50
+    page, limit: 50
   });
   const restorePageMutation = useRestorePageMutation();
   const deletePageMutation = useDeletePageMutation();
@@ -206,10 +206,10 @@ export default function Trash() {
 
         {deletedPages && deletedPages.items.length > 0 && (
           <Paginate
-            hasPrevPage={deletedPages.meta?.hasPrevPage}
+            currentPage={page}
-            hasNextPage={deletedPages.meta?.hasNextPage}
+            hasPrevPage={deletedPages.meta.hasPrevPage}
-            onNext={() => goNext(deletedPages.meta?.nextCursor)}
+            hasNextPage={deletedPages.meta.hasNextPage}
-            onPrev={goPrev}
+            onPageChange={setPage}
           />
         )}
       </Stack>

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

@@ -16,7 +16,6 @@ import {
   useRemovePageMutation,
   useMovePageMutation,
   useUpdatePageMutation,
-  updateCacheOnMovePage,
 } from "@/features/page/queries/page-query.ts";
 import { generateJitteredKeyBetween } from "fractional-indexing-jittered";
 import { SpaceTreeNode } from "@/features/page/tree/types.ts";
@@ -176,25 +175,9 @@ export function useTreeMutation<T>(spaceId: string) {
       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",
@@ -202,10 +185,8 @@ export function useTreeMutation<T>(spaceId: string) {
           payload: {
             id: draggedNodeId,
             parentId: args.parentId,
-            oldParentId,
             index: args.index,
             position: newPosition,
-            pageData,
           },
         });
       }, 50);

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

@@ -62,7 +62,7 @@ export interface ICopyPageToSpace {
 export interface SidebarPagesParams {
   spaceId?: string;
   pageId?: string;
-  cursor?: string;
+  page?: number; // pagination
 }
 
 export interface IPageInput {

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

@@ -18,6 +18,7 @@ import {
   IconFileDescription,
   IconSearch,
   IconCheck,
+  IconSparkles,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { useDebouncedValue } from "@mantine/hooks";
@@ -25,7 +26,7 @@ import { useGetSpacesQuery } from "@/features/space/queries/space-query";
 import { useLicense } from "@/ee/hooks/use-license";
 import classes from "./search-spotlight-filters.module.css";
 import { isCloud } from "@/lib/config.ts";
-import { useAtom } from "jotai";
+import { useAtom } from "jotai/index";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
 
 interface SearchSpotlightFiltersProps {
@@ -52,6 +53,7 @@ export function SearchSpotlightFilters({
   const [workspace] = useAtom(workspaceAtom);
 
   const { data: spacesData } = useGetSpacesQuery({
+    page: 1,
     limit: 100,
     query: debouncedSpaceQuery,
   });
@@ -263,9 +265,7 @@ export function SearchSpotlightFilters({
                 contentType !== option.value &&
                 handleFilterChange("contentType", option.value)
               }
-              disabled={
+              disabled={option.disabled || (isAiMode && option.value === "attachment")}
-                option.disabled || (isAiMode && option.value === "attachment")
-              }
             >
               <Group flex="1" gap="xs">
                 <div>
@@ -275,13 +275,11 @@ export function SearchSpotlightFilters({
                       {t("Enterprise")}
                     </Badge>
                   )}
-                  {!option.disabled &&
+                  {!option.disabled && isAiMode && option.value === "attachment" && (
-                    isAiMode &&
+                    <Text size="xs" mt={4}>
-                    option.value === "attachment" && (
+                      {t("Ask AI not available for attachments")}
-                      <Text size="xs" mt={4}>
+                    </Text>
-                        {t("Ask AI not available for attachments")}
+                  )}
-                      </Text>
-                    )}
                 </div>
                 {contentType === option.value && <IconCheck size={20} />}
               </Group>

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

@@ -10,8 +10,8 @@ import {
 export async function searchPage(
   params: IPageSearchParams,
 ): Promise<IPageSearch[]> {
-  const req = await api.post<{ items: IPageSearch[] }>("/search", params);
+  const req = await api.post<IPageSearch[]>("/search", params);
-  return req.data.items;
+  return req.data;
 }
 
 export async function searchSuggestions(
@@ -24,13 +24,13 @@ export async function searchSuggestions(
 export async function searchShare(
   params: IPageSearchParams,
 ): Promise<IPageSearch[]> {
-  const req = await api.post<{ items: IPageSearch[] }>("/search/share-search", params);
+  const req = await api.post<IPageSearch[]>("/search/share-search", params);
-  return req.data.items;
+  return req.data;
 }
 
 export async function searchAttachments(
   params: IPageSearchParams,
 ): Promise<IAttachmentSearch[]> {
-  const req = await api.post<{ items: IAttachmentSearch[] }>("/search-attachments", params);
+  const req = await api.post<IAttachmentSearch[]>("/search-attachments", params);
-  return req.data.items;
+  return req.data;
 }

apps/client/src/features/share/components/share-list.tsx

@@ -1,9 +1,8 @@
 import { Table, Group, Text, Anchor } from "@mantine/core";
-import React from "react";
+import React, { useState } from "react";
 import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import Paginate from "@/components/common/paginate.tsx";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import { useGetSharesQuery } from "@/features/share/queries/share-query.ts";
 import { ISharedItem } from "@/features/share/types/share.types.ts";
 import { format } from "date-fns";
@@ -15,8 +14,8 @@ import classes from "./share.module.css";
 
 export default function ShareList() {
   const { t } = useTranslation();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const [page, setPage] = useState(1);
-  const { data, isLoading } = useGetSharesQuery({ cursor });
+  const { data, isLoading } = useGetSharesQuery({ page });
 
   return (
     <>
@@ -87,10 +86,10 @@ export default function ShareList() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
+          currentPage={page}
-          hasNextPage={data?.meta?.hasNextPage}
+          hasPrevPage={data?.meta.hasPrevPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
+          hasNextPage={data?.meta.hasNextPage}
-          onPrev={goPrev}
+          onPageChange={setPage}
         />
       )}
     </>

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

@@ -33,7 +33,7 @@ export function useGetSharesQuery(
   params?: QueryParams,
 ): UseQueryResult<IPagination<ISharedItem>, Error> {
   return useQuery({
-    queryKey: ["share-list", params],
+    queryKey: ["share-list"],
     queryFn: () => getShares(params),
     placeholderData: keepPreviousData,
   });

apps/client/src/features/space/components/delete-space-modal.tsx

@@ -6,7 +6,6 @@ import { ISpace } from "../types/space.types";
 import { useNavigate } from "react-router-dom";
 import APP_ROUTE from "@/lib/app-route";
 import { Trans, useTranslation } from "react-i18next";
-import { useState } from "react";
 
 interface DeleteSpaceModalProps {
   space: ISpace;
@@ -15,7 +14,6 @@ interface DeleteSpaceModalProps {
 export default function DeleteSpaceModal({ space }: DeleteSpaceModalProps) {
   const { t } = useTranslation();
   const [opened, { open, close }] = useDisclosure(false);
-  const [isDeleting, setIsDeleting] = useState(false);
   const deleteSpaceMutation = useDeleteSpaceMutation();
   const navigate = useNavigate();
 
@@ -37,15 +35,12 @@ export default function DeleteSpaceModal({ space }: DeleteSpaceModalProps) {
       return;
     }
 
-    setIsDeleting(true);
     try {
       // pass slug too so we can clear the local cache
       await deleteSpaceMutation.mutateAsync({ id: space.id, slug: space.slug });
       navigate(APP_ROUTE.HOME);
     } catch (error) {
       console.error("Failed to delete space", error);
-    } finally {
-      setIsDeleting(false);
     }
   };
 
@@ -84,7 +79,7 @@ export default function DeleteSpaceModal({ space }: DeleteSpaceModalProps) {
           <Button onClick={close} variant="default">
             {t("Cancel")}
           </Button>
-          <Button onClick={handleDelete} color="red" loading={isDeleting}>
+          <Button onClick={handleDelete} color="red">
             {t("Confirm")}
           </Button>
         </Group>

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

@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
 import { SpaceSelect } from "./space-select";
 import { getSpaceUrl } from "@/lib/config";
 import { Button, Popover, Text } from "@mantine/core";
-import { IconChevronDown, IconChevronUp } from "@tabler/icons-react";
+import { IconChevronDown } from "@tabler/icons-react";
 import { useDisclosure } from "@mantine/hooks";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts";
@@ -21,7 +21,7 @@ export function SwitchSpace({
   spaceIcon,
 }: SwitchSpaceProps) {
   const navigate = useNavigate();
-  const [opened, { close, toggle }] = useDisclosure(false);
+  const [opened, { close, open, toggle }] = useDisclosure(false);
 
   const handleSelect = (value: string) => {
     if (value) {
@@ -44,9 +44,9 @@ export function SwitchSpace({
           variant="subtle"
           fullWidth
           justify="space-between"
-          rightSection={opened ? <IconChevronUp size={18} /> : <IconChevronDown size={18} />}
+          rightSection={<IconChevronDown size={18} />}
           color="gray"
-          onClick={toggle}
+          onClick={open}
         >
           <CustomAvatar
             name={spaceName}

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

@@ -15,7 +15,7 @@ import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts
 
 export default function SpaceGrid() {
   const { t } = useTranslation();
-  const { data, isLoading } = useGetSpacesQuery({ limit: 10 });
+  const { data, isLoading } = useGetSpacesQuery({ page: 1, limit: 10 });
 
   const cards = data?.items.slice(0, 9).map((space, index) => (
     <Card

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

@@ -1,6 +1,5 @@
 import { Group, Table, Text } from "@mantine/core";
 import React, { useState } from "react";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
 import SpaceSettingsModal from "@/features/space/components/settings-modal.tsx";
 import { useDisclosure } from "@mantine/hooks";
@@ -9,12 +8,11 @@ import { useTranslation } from "react-i18next";
 import Paginate from "@/components/common/paginate.tsx";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts";
-import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
 
 export default function SpaceList() {
   const { t } = useTranslation();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const [page, setPage] = useState(1);
-  const { data, isLoading } = useGetSpacesQuery({ cursor });
+  const { data, isLoading } = useGetSpacesQuery({ page });
   const [opened, { open, close }] = useDisclosure(false);
   const [selectedSpaceId, setSelectedSpaceId] = useState<string>(null);
 
@@ -51,9 +49,9 @@ export default function SpaceList() {
                       name={space.name}
                     />
                     <div style={{ minWidth: 0, overflow: "hidden" }}>
-                      <AutoTooltipText fz="sm" fw={500} lineClamp={1}>
+                      <Text fz="sm" fw={500} lineClamp={1}>
                         {space.name}
-                      </AutoTooltipText>
+                      </Text>
                       <Text fz="xs" c="dimmed" lineClamp={2}>
                         {space.description}
                       </Text>
@@ -73,10 +71,10 @@ export default function SpaceList() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
+          currentPage={page}
-          hasNextPage={data?.meta?.hasNextPage}
+          hasPrevPage={data?.meta.hasPrevPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
+          hasNextPage={data?.meta.hasNextPage}
-          onPrev={goPrev}
+          onPageChange={setPage}
         />
       )}
 

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

@@ -27,7 +27,6 @@ import { useTranslation } from "react-i18next";
 import Paginate from "@/components/common/paginate.tsx";
 import { SearchInput } from "@/components/common/search-input.tsx";
 import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search.tsx";
-import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
 
 type MemberType = "user" | "group";
 
@@ -41,9 +40,9 @@ export default function SpaceMembersList({
   readOnly,
 }: SpaceMembersProps) {
   const { t } = useTranslation();
-  const { search, cursor, goNext, goPrev, handleSearch } = usePaginateAndSearch();
+  const { search, page, setPage, handleSearch } = usePaginateAndSearch();
   const { data, isLoading } = useSpaceMembersQuery(spaceId, {
-    cursor,
+    page,
     limit: 100,
     query: search,
   });
@@ -139,10 +138,10 @@ export default function SpaceMembersList({
 
                       {member.type === "group" && <IconGroupCircle />}
 
-                      <div style={{ minWidth: 0, overflow: "hidden", maxWidth: 260 }}>
+                      <div>
-                        <AutoTooltipText fz="sm" fw={500}>
+                        <Text fz="sm" fw={500} lineClamp={1}>
                           {member?.name}
-                        </AutoTooltipText>
+                        </Text>
                         <Text fz="xs" c="dimmed">
                           {member.type == "user" && member?.email}
 
@@ -206,10 +205,10 @@ export default function SpaceMembersList({
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
+          currentPage={page}
-          hasNextPage={data?.meta?.hasNextPage}
+          hasPrevPage={data?.meta.hasPrevPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
+          hasNextPage={data?.meta.hasNextPage}
-          onPrev={goPrev}
+          onPageChange={setPage}
         />
       )}
     </>

apps/client/src/features/space/components/spaces-page/all-spaces-list.tsx

@@ -23,24 +23,23 @@ import SpaceSettingsModal from "@/features/space/components/settings-modal";
 import classes from "./all-spaces-list.module.css";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts";
-import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
 
 interface AllSpacesListProps {
   spaces: any[];
   onSearch: (query: string) => void;
+  page: number;
   hasPrevPage?: boolean;
   hasNextPage?: boolean;
-  onNext: () => void;
+  onPageChange: (page: number) => void;
-  onPrev: () => void;
 }
 
 export default function AllSpacesList({
   spaces,
   onSearch,
+  page,
   hasPrevPage,
   hasNextPage,
-  onNext,
+  onPageChange,
-  onPrev,
 }: AllSpacesListProps) {
   const { t } = useTranslation();
   const [settingsOpened, { open: openSettings, close: closeSettings }] =
@@ -97,10 +96,10 @@ export default function AllSpacesList({
                           variant="filled"
                           size="md"
                         />
-                        <div style={{ minWidth: 0, overflow: "hidden", maxWidth: 350 }}>
+                        <div>
-                          <AutoTooltipText fz="sm" fw={500} lineClamp={1}>
+                          <Text fz="sm" fw={500} lineClamp={1}>
                             {space.name}
-                          </AutoTooltipText>
+                          </Text>
                           {space.description && (
                             <Text fz="xs" c="dimmed" lineClamp={2}>
                               {space.description}
@@ -145,10 +144,10 @@ export default function AllSpacesList({
 
       {spaces.length > 0 && (
         <Paginate
+          currentPage={page}
           hasPrevPage={hasPrevPage}
           hasNextPage={hasNextPage}
-          onNext={onNext}
+          onPageChange={onPageChange}
-          onPrev={onPrev}
         />
       )}
 

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

@@ -69,12 +69,5 @@ export async function exportSpace(data: IExportSpaceParams): Promise<void> {
     .split("filename=")[1]
     .replace(/"/g, "");
 
-  let decodedFileName = fileName;
+  saveAs(req.data, decodeURIComponent(fileName));
-  try {
-    decodedFileName = decodeURIComponent(fileName);
-  } catch (err) {
-    // fallback to raw filename
-  }
-
-  saveAs(req.data, decodedFileName);
 }

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

@@ -45,10 +45,8 @@ export type MoveTreeNodeEvent = {
   payload: {
     id: string;
     parentId: string;
-    oldParentId: string | null;
     index: number;
     position: string;
-    pageData: Partial<IPage>;
   };
 };
 

apps/client/src/features/websocket/use-query-subscription.ts

@@ -8,7 +8,7 @@ import { IPagination } from "@/lib/types";
 import {
   invalidateOnCreatePage,
   invalidateOnDeletePage,
-  updateCacheOnMovePage,
+  invalidateOnMovePage,
   invalidateOnUpdatePage,
 } from "../page/queries/page-query";
 import { RQ_KEY } from "../comment/queries/comment-query";
@@ -41,13 +41,7 @@ export const useQuerySubscription = () => {
           invalidateOnCreatePage(data.payload.data);
           break;
         case "moveTreeNode":
-          updateCacheOnMovePage(
+          invalidateOnMovePage();
-            data.spaceId,
-            data.payload.id,
-            data.payload.oldParentId,
-            data.payload.parentId,
-            data.payload.pageData,
-          );
           break;
         case "deleteTreeNode":
           invalidateOnDeletePage(data.payload.node.id);

apps/client/src/features/workspace/components/members/components/workspace-invites-table.tsx

@@ -1,6 +1,6 @@
 import { Group, Table, Avatar, Text, Alert } from "@mantine/core";
 import { useWorkspaceInvitationsQuery } from "@/features/workspace/queries/workspace-query.ts";
-import React from "react";
+import React, { useState } from "react";
 import { getUserRoleLabel } from "@/features/workspace/types/user-role-data.ts";
 import InviteActionMenu from "@/features/workspace/components/members/components/invite-action-menu.tsx";
 import { IconInfoCircle } from "@tabler/icons-react";
@@ -8,13 +8,12 @@ import { timeAgo } from "@/lib/time.ts";
 import useUserRole from "@/hooks/use-user-role.tsx";
 import { useTranslation } from "react-i18next";
 import Paginate from "@/components/common/paginate.tsx";
-import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 
 export default function WorkspaceInvitesTable() {
   const { t } = useTranslation();
-  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const [page, setPage] = useState(1);
   const { data, isLoading } = useWorkspaceInvitationsQuery({
-    cursor,
+    page,
     limit: 100,
   });
   const { isAdmin } = useUserRole();
@@ -66,10 +65,10 @@ export default function WorkspaceInvitesTable() {
 
       {data?.items.length > 0 && (
         <Paginate
-          hasPrevPage={data?.meta?.hasPrevPage}
+          currentPage={page}
-          hasNextPage={data?.meta?.hasNextPage}
+          hasPrevPage={data?.meta.hasPrevPage}
-          onNext={() => goNext(data?.meta?.nextCursor)}
+          hasNextPage={data?.meta.hasNextPage}
-          onPrev={goPrev}
+          onPageChange={setPage}
         />
       )}
     </>