feat(ee): space control to hide comments from viewers role

* update

* update versions

* package updates

apps/client/package.json

@@ -50,9 +50,9 @@
     "katex": "0.16.40",
     "lowlight": "3.3.0",
     "mantine-form-zod-resolver": "1.3.0",
-    "mermaid": "11.15.0",
+    "mermaid": "11.16.1",
     "mitt": "3.0.1",
-    "nanoid": "3.3.8",
+    "nanoid": "3.3.17",
     "posthog-js": "1.391.2",
     "react": "19.2.7",
     "react-clear-modal": "^2.0.18",
@@ -61,7 +61,7 @@
     "react-error-boundary": "6.1.1",
     "react-helmet-async": "3.0.0",
     "react-i18next": "16.5.8",
-    "react-router-dom": "7.18.0",
+    "react-router-dom": "7.18.2",
     "semver": "7.7.4",
     "socket.io-client": "4.8.3",
     "zod": "4.3.6"
@@ -86,7 +86,7 @@
     "globals": "15.13.0",
     "jsdom": "25.0.0",
     "optics-ts": "2.4.1",
-    "postcss": "8.5.14",
+    "postcss": "8.5.25",
     "postcss-preset-mantine": "1.18.0",
     "postcss-simple-vars": "7.0.1",
     "prettier": "3.8.1",

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

@@ -508,6 +508,11 @@
   "Allow viewers to comment": "Allow viewers to comment",
   "Allow viewers to add comments on pages in this space.": "Allow viewers to add comments on pages in this space.",
   "Toggle viewer comments": "Toggle viewer comments",
+  "Hide comments from viewers": "Hide comments from viewers",
+  "Viewers cannot see or add comments on pages in this space.": "Viewers cannot see or add comments on pages in this space.",
+  "Toggle hide comments from viewers": "Toggle hide comments from viewers",
+  "Turn off 'Allow viewers to comment' first": "Turn off 'Allow viewers to comment' first",
+  "Turn off 'Hide comments from viewers' first": "Turn off 'Hide comments from viewers' first",
   "Public sharing is disabled at the workspace level": "Public sharing is disabled at the workspace level",
   "Prevent pages in this space from being shared publicly.": "Prevent pages in this space from being shared publicly.",
   "Page permissions": "Page permissions",

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

@@ -11,11 +11,13 @@ import { pageEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
 import AsideChatPanel from "@/ee/ai-chat/components/aside-chat-panel";
 import { PageDetailsAside } from "@/features/page-details/components/page-details-aside.tsx";
 import { ASIDE_PANEL_ID } from "@/hooks/use-toggle-aside.tsx";
+import { useCanViewComments } from "@/features/comment/hooks/use-can-view-comments.ts";
 
 export default function Aside() {
   const [{ tab, isAsideOpen }, setAsideState] = useAtom(asideStateAtom);
   const { t } = useTranslation();
   const pageEditor = useAtomValue(pageEditorAtom);
+  const canViewComments = useCanViewComments();
   const closeAside = () => setAsideState((s) => ({ ...s, isAsideOpen: false }));
 
   useEffect(() => {
@@ -23,12 +25,18 @@ export default function Aside() {
     document.getElementById(ASIDE_PANEL_ID)?.focus();
   }, [isAsideOpen, tab]);
 
+  useEffect(() => {
+    if (isAsideOpen && tab === "comments" && !canViewComments) {
+      setAsideState({ tab: "", isAsideOpen: false });
+    }
+  }, [isAsideOpen, tab, canViewComments, setAsideState]);
+
   let title: string;
   let component: ReactNode;
 
   switch (tab) {
     case "comments":
-      component = <CommentListWithTabs />;
+      component = canViewComments ? <CommentListWithTabs /> : null;
       title = "Comments";
       break;
     case "toc":

apps/client/src/components/ui/document-title.test.tsx

@@ -0,0 +1,45 @@
+import { describe, expect, it, beforeEach } from "vitest";
+import { render } from "@testing-library/react";
+import { HelmetProvider } from "react-helmet-async";
+import { DocumentTitle } from "./document-title.tsx";
+
+const renderTitle = (ui: React.ReactNode) =>
+  render(<HelmetProvider>{ui}</HelmetProvider>);
+
+describe("DocumentTitle", () => {
+  beforeEach(() => {
+    document.head.innerHTML = "<title>Docmost</title>";
+  });
+
+  it("appends the app name", () => {
+    renderTitle(<DocumentTitle title="Home" />);
+    expect(document.title).toBe("Home - Docmost");
+  });
+
+  it("omits the app name when asked", () => {
+    renderTitle(<DocumentTitle title="My page" withAppName={false} />);
+    expect(document.title).toBe("My page");
+  });
+
+  it("falls back to the app name without a title", () => {
+    renderTitle(<DocumentTitle />);
+    expect(document.title).toBe("Docmost");
+  });
+
+  it("never renders an empty title", () => {
+    renderTitle(<DocumentTitle title="Spaces" />);
+    const titles = Array.from(document.querySelectorAll("head > title"));
+    expect(titles.every((node) => node.textContent !== "")).toBe(true);
+  });
+
+  it("renders extra head children", () => {
+    renderTitle(
+      <DocumentTitle title="Shared">
+        <meta name="robots" content="noindex" />
+      </DocumentTitle>,
+    );
+    expect(
+      document.querySelector('head > meta[name="robots"]')?.getAttribute("content"),
+    ).toBe("noindex");
+  });
+});

apps/client/src/components/ui/document-title.tsx

@@ -0,0 +1,29 @@
+import React from "react";
+import { Helmet } from "react-helmet-async";
+import { getAppName } from "@/lib/config.ts";
+
+type DocumentTitleProps = {
+  title?: string;
+  withAppName?: boolean;
+  children?: React.ReactNode;
+};
+
+export function DocumentTitle({
+  title,
+  withAppName = true,
+  children,
+}: DocumentTitleProps) {
+  const appName = getAppName();
+
+  let documentTitle = appName;
+  if (title) {
+    documentTitle = withAppName ? `${title} - ${appName}` : title;
+  }
+
+  return (
+    <Helmet>
+      <title>{documentTitle}</title>
+      {children}
+    </Helmet>
+  );
+}

apps/client/src/components/ui/error-404.tsx

@@ -1,17 +1,15 @@
 import { Title, Text, Button, Container, Group } from "@mantine/core";
 import classes from "./error-404.module.css";
 import { Link } from "react-router-dom";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export function Error404() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("404 page not found")} />
-        <title>{t("404 page not found")} - Docmost</title>
-      </Helmet>
       <Container className={classes.root}>
         <Title className={classes.title}>{t("404 page not found")}</Title>
         <Text c="dimmed" size="lg" ta="center" className={classes.description}>

apps/client/src/ee/ai/pages/ai-settings.tsx

@@ -1,5 +1,3 @@
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import React from "react";
 import useUserRole from "@/hooks/use-user-role.tsx";
@@ -15,6 +13,7 @@ import { Feature } from "@/ee/features";
 import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
 import { isCloud } from "@/lib/config.ts";
 import { useLocation, useNavigate } from "react-router-dom";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function AiSettings() {
   const { t } = useTranslation();
@@ -40,9 +39,7 @@ export default function AiSettings() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title="AI settings" />
-        <title>AI settings - {getAppName()}</title>
-      </Helmet>
       <SettingsTitle title={t("AI settings")} />
 
       <Tabs color="dark" value={activeTab} onChange={handleTabChange}>

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

@@ -1,10 +1,9 @@
 import React, { useState } from "react";
 import { Anchor, Alert, Button, Group, Space, Text } from "@mantine/core";
 import { IconInfoCircle } from "@tabler/icons-react";
-import { Helmet } from "react-helmet-async";
 import { Trans, useTranslation } from "react-i18next";
 import SettingsTitle from "@/components/settings/settings-title";
-import { getAppName, getAppUrl } from "@/lib/config";
+import { getAppUrl } from "@/lib/config";
 import { ApiKeyTable } from "@/ee/api-key/components/api-key-table";
 import { CreateApiKeyModal } from "@/ee/api-key/components/create-api-key-modal";
 import { ApiKeyCreatedModal } from "@/ee/api-key/components/api-key-created-modal";
@@ -17,6 +16,7 @@ import { IApiKey } from "@/ee/api-key";
 import { useAtom } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
 import useUserRole from "@/hooks/use-user-role.tsx";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function UserApiKeys() {
   const { t } = useTranslation();
@@ -49,11 +49,7 @@ export default function UserApiKeys() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("API keys")} />
-        <title>
-          {t("API keys")} - {getAppName()}
-        </title>
-      </Helmet>
 
       <SettingsTitle title={t("API keys")} />
 

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

@@ -1,9 +1,7 @@
 import React, { useState } from "react";
 import { Anchor, Button, Divider, Group, Space, Text } from "@mantine/core";
-import { Helmet } from "react-helmet-async";
 import { Trans, useTranslation } from "react-i18next";
 import SettingsTitle from "@/components/settings/settings-title";
-import { getAppName } from "@/lib/config";
 import { ApiKeyTable } from "@/ee/api-key/components/api-key-table";
 import { CreateApiKeyModal } from "@/ee/api-key/components/create-api-key-modal";
 import { ApiKeyCreatedModal } from "@/ee/api-key/components/api-key-created-modal";
@@ -15,6 +13,7 @@ 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';
 import RestrictApiToAdmins from "@/ee/api-key/components/restrict-api-to-admins";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function WorkspaceApiKeys() {
   const { t } = useTranslation();
@@ -47,11 +46,7 @@ export default function WorkspaceApiKeys() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("API management")} />
-        <title>
-          {t("API management")} - {getAppName()}
-        </title>
-      </Helmet>
 
       <SettingsTitle title={t("API management")} />
 

apps/client/src/ee/audit/pages/audit-logs.tsx

@@ -10,11 +10,9 @@ import {
   Text,
   Tooltip,
 } from "@mantine/core";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { IconSettings } from "@tabler/icons-react";
 import SettingsTitle from "@/components/settings/settings-title";
-import { getAppName } from "@/lib/config";
 import Paginate from "@/components/common/paginate";
 import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import {
@@ -26,6 +24,7 @@ import { IAuditLogParams } from "@/ee/audit/types/audit.types";
 import { eventFilterOptions } from "@/ee/audit/lib/audit-event-labels";
 import AuditLogsTable from "@/ee/audit/components/audit-logs-table";
 import useUserRole from "@/hooks/use-user-role";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 type RetentionUnit = "days" | "months" | "years";
 
@@ -97,11 +96,7 @@ export default function AuditLogs() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Audit log")} />
-        <title>
-          {t("Audit log")} - {getAppName()}
-        </title>
-      </Helmet>
 
       <SettingsTitle title={t("Audit log")} />
 

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

@@ -1,5 +1,3 @@
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import BillingPlans from "@/ee/billing/components/billing-plans.tsx";
 import BillingTrial from "@/ee/billing/components/billing-trial.tsx";
@@ -9,6 +7,7 @@ import React from "react";
 import BillingDetails from "@/ee/billing/components/billing-details.tsx";
 import { useBillingQuery } from "@/ee/billing/queries/billing-query.ts";
 import useUserRole from "@/hooks/use-user-role.tsx";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function Billing() {
   const { data: billing, isError: isBillingError } = useBillingQuery();
@@ -20,9 +19,7 @@ export default function Billing() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title="Billing" />
-        <title>Billing - {getAppName()}</title>
-      </Helmet>
       <SettingsTitle title="Billing" />
 
       <BillingTrial />

apps/client/src/ee/features.ts

@@ -19,6 +19,7 @@ export const Feature = {
   SHARING_CONTROLS: 'sharing:controls',
   TEMPLATES: 'templates',
   VIEWER_COMMENTS: 'comment:viewer',
+  HIDE_COMMENTS: 'comment:hide',
   PERSONAL_SPACES: 'spaces:personal',
   DOCX_EXPORT: 'export:docx',
   BASES: 'bases',

apps/client/src/ee/licence/pages/license.tsx

@@ -1,5 +1,3 @@
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import React from "react";
 import useUserRole from "@/hooks/use-user-role.tsx";
@@ -9,6 +7,7 @@ import InstallationDetails from "@/ee/licence/components/installation-details.ts
 import OssDetails from "@/ee/licence/components/oss-details.tsx";
 import { useAtom } from "jotai/index";
 import { entitlementAtom } from "@/ee/entitlement/entitlement-atom";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function License() {
   const [entitlements] = useAtom(entitlementAtom);
@@ -21,9 +20,7 @@ export default function License() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title="License" />
-        <title>License - {getAppName()}</title>
-      </Helmet>
       <SettingsTitle title="License" />
 
       <ActivateLicenseForm />

apps/client/src/ee/page-verification/pages/verified-pages.tsx

@@ -1,17 +1,16 @@
 import { useState, useMemo } from "react";
 import { Group, MultiSelect, Select, Space, TextInput } from "@mantine/core";
 import { useDebouncedValue } from "@mantine/hooks";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { IconSearch } from "@tabler/icons-react";
 import SettingsTitle from "@/components/settings/settings-title";
-import { getAppName } from "@/lib/config";
 import Paginate from "@/components/common/paginate";
 import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import { useVerificationListQuery } from "@/ee/page-verification/queries/page-verification-query";
 import { IVerificationListParams } from "@/ee/page-verification/types/page-verification.types";
 import VerificationListTable from "@/ee/page-verification/components/verification-list-table";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function VerifiedPages() {
   const { t } = useTranslation();
@@ -68,11 +67,7 @@ export default function VerifiedPages() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Verified pages")} />
-        <title>
-          {t("Verified pages")} - {getAppName()}
-        </title>
-      </Helmet>
 
       <SettingsTitle title={t("Verified pages")} />
 

apps/client/src/ee/pages/cloud-login.tsx

@@ -1,18 +1,13 @@
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
 import { CloudLoginForm } from "@/ee/components/cloud-login-form.tsx";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function CloudLogin() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Login")} />
-        <title>
-          {t("Login")} - {getAppName()}
-        </title>
-      </Helmet>
 
       <CloudLoginForm />
     </>

apps/client/src/ee/pages/create-workspace.tsx

@@ -1,14 +1,11 @@
 import { SetupWorkspaceForm } from "@/features/auth/components/setup-workspace-form.tsx";
-import { Helmet } from "react-helmet-async";
 import React from "react";
-import { getAppName } from "@/lib/config.ts";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function CreateWorkspace() {
   return (
     <>
-      <Helmet>
+      <DocumentTitle title="Create Workspace" />
-        <title>Create Workspace - {getAppName()}</title>
-      </Helmet>
       <SetupWorkspaceForm />
     </>
   );

apps/client/src/ee/security/components/space-hide-comments-toggle.tsx

@@ -0,0 +1,62 @@
+import { Group, Text, Switch, Tooltip } from "@mantine/core";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { ISpace } from "@/features/space/types/space.types.ts";
+import { useUpdateSpaceMutation } from "@/features/space/queries/space-query.ts";
+import { useHasFeature } from "@/ee/hooks/use-feature.ts";
+import { Feature } from "@/ee/features.ts";
+import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label.ts";
+
+type SpaceHideCommentsToggleProps = {
+  space: ISpace;
+};
+
+export default function SpaceHideCommentsToggle({
+  space,
+}: SpaceHideCommentsToggleProps) {
+  const { t } = useTranslation();
+  const hasHideComments = useHasFeature(Feature.HIDE_COMMENTS);
+  const upgradeLabel = useUpgradeLabel();
+  const allowViewerCommentsEnabled =
+    space.settings?.comments?.allowViewerComments === true;
+  const isDisabled = !hasHideComments || allowViewerCommentsEnabled;
+  const tooltipLabel = !hasHideComments
+    ? upgradeLabel
+    : t("Turn off 'Allow viewers to comment' first");
+  const [checked, setChecked] = useState(
+    space.settings?.comments?.hideCommentsFromViewers === true,
+  );
+  const updateSpaceMutation = useUpdateSpaceMutation();
+
+  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.currentTarget.checked;
+    try {
+      await updateSpaceMutation.mutateAsync({
+        spaceId: space.id,
+        hideCommentsFromViewers: value,
+      });
+      setChecked(value);
+    } catch {
+      // error handled by mutation
+    }
+  };
+
+  return (
+    <Group justify="space-between" wrap="nowrap" gap="xl">
+      <div>
+        <Text size="md">{t("Hide comments from viewers")}</Text>
+        <Text size="sm" c="dimmed">
+          {t("Viewers cannot see or add comments on pages in this space.")}
+        </Text>
+      </div>
+      <Tooltip label={tooltipLabel} disabled={!isDisabled} refProp="rootRef">
+        <Switch
+          checked={checked}
+          onChange={handleChange}
+          disabled={isDisabled}
+          aria-label={t("Toggle hide comments from viewers")}
+        />
+      </Tooltip>
+    </Group>
+  );
+}

apps/client/src/ee/security/components/space-viewer-comments-toggle.tsx

@@ -17,7 +17,12 @@ export default function SpaceViewerCommentsToggle({
   const { t } = useTranslation();
   const hasViewerComments = useHasFeature(Feature.VIEWER_COMMENTS);
   const upgradeLabel = useUpgradeLabel();
-  const isDisabled = !hasViewerComments;
+  const hideCommentsEnabled =
+    space.settings?.comments?.hideCommentsFromViewers === true;
+  const isDisabled = !hasViewerComments || hideCommentsEnabled;
+  const tooltipLabel = !hasViewerComments
+    ? upgradeLabel
+    : t("Turn off 'Hide comments from viewers' first");
   const [checked, setChecked] = useState(
     space.settings?.comments?.allowViewerComments === true,
   );
@@ -45,7 +50,7 @@ export default function SpaceViewerCommentsToggle({
         </Text>
       </div>
       <Tooltip
-        label={upgradeLabel}
+        label={tooltipLabel}
         disabled={!isDisabled}
         refProp="rootRef"
       >

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

@@ -1,5 +1,4 @@
-import { Helmet } from "react-helmet-async";
+import { isCloud } from "@/lib/config.ts";
-import { getAppName, isCloud } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import {
   Alert,
@@ -37,6 +36,7 @@ import EnableScim from "@/ee/scim/components/enable-scim";
 import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
 import Paginate from "@/components/common/paginate";
 import { IScimToken } from "@/ee/scim/types/scim-token.types";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 const SCIM_TOKEN_LIMIT = 5;
 
@@ -64,9 +64,7 @@ export default function Security() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title="Security" />
-        <title>Security - {getAppName()}</title>
-      </Helmet>
       <SettingsTitle title={t("Security")} />
 
       <EnforceMfa />

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

@@ -22,8 +22,6 @@ import { useTranslation } from "react-i18next";
 import { useDisclosure, useWindowEvent } from "@mantine/hooks";
 import { notifications } from "@mantine/notifications";
 import { Link, useParams } from "react-router-dom";
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config";
 import { useEditor, EditorContent } from "@tiptap/react";
 import { templateExtensions } from "@/features/editor/extensions/extensions";
 import {
@@ -44,6 +42,7 @@ import CalloutMenu from "@/features/editor/components/callout/callout-menu.tsx";
 import ColumnsMenu from "@/features/editor/components/columns/columns-menu.tsx";
 
 import classes from "./template-editor.module.css";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function TemplateEditor() {
   const { t } = useTranslation();
@@ -247,11 +246,7 @@ export default function TemplateEditor() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Edit template")} />
-        <title>
-          {t("Edit template")} - {getAppName()}
-        </title>
-      </Helmet>
 
       {editorToolbarEnabled && editor && (
         <FixedToolbar editor={editor} templateMode />

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

@@ -13,11 +13,9 @@ import {
 } from "@mantine/core";
 import { modals } from "@mantine/modals";
 import { IconPlus } from "@tabler/icons-react";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { useDisclosure } from "@mantine/hooks";
-import { getAppName } from "@/lib/config";
 import {
   useGetTemplatesQuery,
   useDeleteTemplateMutation,
@@ -31,6 +29,7 @@ import useUserRole from "@/hooks/use-user-role";
 import CreateTemplateModal from "@/ee/template/components/create-template-modal";
 import { useAtomValue } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function TemplateList() {
   const { t } = useTranslation();
@@ -102,11 +101,7 @@ export default function TemplateList() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Templates")} />
-        <title>
-          {t("Templates")} - {getAppName()}
-        </title>
-      </Helmet>
 
       <Container size="900" pt="xl">
         <Group justify="space-between" mb="xl">

apps/client/src/features/comment/hooks/use-can-view-comments.ts

@@ -0,0 +1,15 @@
+import { useParams } from "react-router-dom";
+import { usePageQuery } from "@/features/page/queries/page-query.ts";
+import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
+import { extractPageSlugId } from "@/lib";
+
+export function useCanViewComments(): boolean {
+  const { pageSlug } = useParams();
+  const { data: page } = usePageQuery({ pageId: extractPageSlugId(pageSlug) });
+  const { data: space } = useGetSpaceBySlugQuery(page?.space?.slug);
+
+  const canEdit = !page?.deletedAt && (page?.permissions?.canEdit ?? false);
+  return (
+    canEdit || space?.settings?.comments?.hideCommentsFromViewers !== true
+  );
+}

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

@@ -389,14 +389,6 @@ const CommandGroups: SlashMenuGroupedItemsType = {
       command: ({ editor, range }: CommandProps) =>
         editor.chain().focus().deleteRange(range).setDetails().run(),
     },
-    {
-      title: "Tabs",
-      description: "Insert a multi-tab content block.",
-      searchTerms: ["tabs", "tabbed", "multi", "panel"],
-      icon: IconSitemap,
-      command: ({ editor, range }: CommandProps) =>
-        editor.chain().focus().deleteRange(range).insertTabs().run(),
-    },
     {
       title: "Callout",
       description: "Insert callout notice.",

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

@@ -1,167 +0,0 @@
-import { BubbleMenu } from "@tiptap/react/menus";
-import React, { useCallback } from "react";
-import { EditorMenuProps, ShouldShowProps } from "../table/types/types";
-import { isEditorReady, isTextSelected } from "@docmost/editor-ext";
-import { Node as PMNode } from "@tiptap/pm/model";
-import { findParentNode, posToDOMRect } from "@tiptap/core";
-import classes from "../common/toolbar-menu.module.css";
-import { ActionIcon, Tooltip } from "@mantine/core";
-import { useTranslation } from "react-i18next";
-import {
-  IconChevronLeft,
-  IconChevronRight,
-  IconColumnInsertLeft,
-  IconColumnInsertRight,
-  IconColumnRemove,
-  IconTrashX,
-} from "@tabler/icons-react";
-
-const TabsMenu = React.memo(({ editor }: EditorMenuProps) => {
-  const { t } = useTranslation();
-
-  const shouldShow = useCallback(
-    ({ state }: ShouldShowProps) => {
-      if (!state) {
-        return false;
-      }
-
-      if (isTextSelected(editor)) return false;
-
-      return editor.isActive("tabs");
-    },
-    [editor]
-  );
-
-  const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
-    const { selection } = editor.state;
-    const predicate = (node: PMNode) => node.type.name === "tabs";
-    const parent = findParentNode(predicate)(selection);
-
-    if (parent) {
-      const dom = editor.view.nodeDOM(parent?.pos) as HTMLElement;
-      const domRect = dom.getBoundingClientRect();
-      return {
-        getBoundingClientRect: () => domRect,
-        getClientRects: () => [domRect],
-      };
-    }
-
-    const domRect = posToDOMRect(editor.view, selection.from, selection.to);
-    return {
-      getBoundingClientRect: () => domRect,
-      getClientRects: () => [domRect],
-    };
-  }, [editor]);
-
-  const handleAddTabLeft = useCallback(() => {
-    editor.chain().focus().insertTab("left").run();
-  }, [editor]);
-
-  const handleAddTabRight = useCallback(() => {
-    editor.chain().focus().insertTab("right").run();
-  }, [editor]);
-
-  const handleMoveTabRight = useCallback(() => {
-    editor.chain().focus().moveTab("right").run();
-  }, [editor]);
-
-  const handleMoveTabLeft = useCallback(() => {
-    editor.chain().focus().moveTab("left").run();
-  }, [editor]);
-
-  const handleDeleteTab = useCallback(() => {
-    editor.chain().focus().deleteTab().run();
-  }, [editor]);
-
-  const handleDelete = useCallback(() => {
-    editor.chain().focus().deleteTabs().run();
-  }, [editor]);
-
-  return (
-    <BubbleMenu
-      style={{ zIndex: 99 }}
-      editor={editor}
-      pluginKey="tabs-menu"
-      resizeDelay={0}
-      getReferencedVirtualElement={getReferencedVirtualElement}
-      shouldShow={shouldShow}
-      options={{
-        placement: "top",
-        offset: false,
-        flip: false,
-      }}
-    >
-      <div className={classes.toolbar}>
-        <Tooltip position="top" label={t("Add left tab")} withinPortal={false}>
-          <ActionIcon
-            onClick={handleAddTabLeft}
-            variant="subtle"
-            size="lg"
-            aria-label={t("Add left tab")}
-          >
-            <IconColumnInsertLeft size={18} />
-          </ActionIcon>
-        </Tooltip>
-        <Tooltip position="top" label={t("Add right tab")} withinPortal={false}>
-          <ActionIcon
-            onClick={handleAddTabRight}
-            variant="subtle"
-            size="lg"
-            aria-label={t("Add right tab")}
-          >
-            <IconColumnInsertRight size={18} />
-          </ActionIcon>
-        </Tooltip>
-        <Tooltip position="top" label={t("Delete tab")} withinPortal={false}>
-          <ActionIcon
-            onClick={handleDeleteTab}
-            variant="subtle"
-            size="lg"
-            aria-label={t("Delete tab")}
-          >
-            <IconColumnRemove size={18} />
-          </ActionIcon>
-        </Tooltip>
-
-        <div className={classes.divider} />
-
-        <Tooltip position="top" label={t("Move tab left")} withinPortal={false}>
-          <ActionIcon
-            onClick={handleMoveTabLeft}
-            variant="subtle"
-            size="lg"
-            aria-label={t("Move tab left")}
-          >
-            <IconChevronLeft size={18} />
-          </ActionIcon>
-        </Tooltip>
-
-        <Tooltip position="top" label={t("Move tab right")} withinPortal={false}>
-          <ActionIcon
-            onClick={handleMoveTabRight}
-            variant="subtle"
-            size="lg"
-            aria-label={t("Move tab right")}
-          >
-            <IconChevronRight size={18} />
-          </ActionIcon>
-        </Tooltip>
-        <div className={classes.divider} />
-
-        <Tooltip position="top" label={t("Delete")} withinPortal={false}>
-          <ActionIcon
-            onClick={handleDelete}
-            variant="subtle"
-            size="lg"
-            aria-label={t("Delete")}
-          >
-            <IconTrashX size={18} />
-          </ActionIcon>
-        </Tooltip>
-      </div>
-    </BubbleMenu>
-  );
-});
-
-export default TabsMenu;

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

@@ -1,140 +0,0 @@
-import React, {
-  ChangeEvent,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-  type KeyboardEvent,
-} from "react";
-import { NodeViewContent, NodeViewWrapper, type NodeViewProps } from "@tiptap/react";
-import { Tabs, TextInput } from "@mantine/core";
-
-export default function TabsView(props: NodeViewProps) {
-  const { node, editor, getPos } = props;
-  const isEditable = editor.isEditable;
-  const allowFocusRef = useRef(false);
-
-  const tabs = useMemo(() => {
-    return Array.from({ length: node.childCount }, (_, index) => {
-      const labelNode = node.child(index)?.child(0);
-      const labelText = labelNode?.textContent;
-      const labelId = node.child(index)?.attrs?.id;
-
-      return {
-        label: labelText ?? "",
-        id: labelId ?? index,
-      };
-    });
-  }, [node]);
-
-  const activeTab = clampIndex(node.attrs.activeTab);
-  const [activeLabel, setActiveLabel] = useState(tabs[activeTab].label ?? "");
-
-  useEffect(() => {
-    setActiveLabel(tabs[activeTab].label);
-  }, [activeTab, tabs]);
-
-  const handleMouseDown = useCallback((event: React.MouseEvent) => {
-    const previous = document.activeElement as HTMLElement | null;
-    const input = event.currentTarget;
-
-    if (!previous?.contains(input)) {
-      allowFocusRef.current = true;
-      return;
-    }
-
-    allowFocusRef.current = true;
-  }, []);
-
-  const handleFocus = useCallback(
-    (event: React.FocusEvent<HTMLInputElement>) => {
-      if (!allowFocusRef.current || !isEditable) {
-        event.preventDefault();
-        event.target.blur();
-      }
-    },
-    [isEditable]
-  );
-
-  const handleBlur = useCallback(() => {
-    allowFocusRef.current = false;
-  }, []);
-
-  const commitLabel = useCallback(
-    (event: ChangeEvent<HTMLInputElement>) => {
-      const label = event.currentTarget.value;
-      setActiveLabel(label);
-
-      if (label === tabs[activeTab].label) return;
-      if (typeof getPos === "function") {
-        editor.commands.updateTabLabel?.(activeTab, label, getPos());
-      }
-    },
-    [activeTab, editor, getPos, tabs]
-  );
-
-  const handleLabelKeyDown = useCallback(
-    (event: KeyboardEvent<HTMLInputElement>) => {
-      event.stopPropagation();
-      if (event.key === "Escape") {
-        event.preventDefault();
-        event.currentTarget.blur();
-      }
-    },
-    []
-  );
-
-  return (
-    <NodeViewWrapper data-type="tabs">
-      <Tabs value={String(activeTab)}>
-        <Tabs.List style={{ marginBottom: 10 }}>
-          {tabs.map(({ label, id }, index) => (
-            <Tabs.Tab
-              key={id}
-              value={index.toString()}
-              onFocus={(event) => event.currentTarget.blur()}
-              onClick={(e) => {
-                e.preventDefault();
-                if (typeof getPos === "function") {
-                  editor.commands.setActiveTab?.(index, getPos());
-                }
-              }}
-            >
-              <TextInput
-                aria-label="Edit tab label"
-                onMouseDown={handleMouseDown}
-                onFocus={handleFocus}
-                onBlur={handleBlur}
-                onChange={commitLabel}
-                onKeyDown={handleLabelKeyDown}
-                variant="unstyled"
-                size="xs"
-                value={
-                  index === activeTab && allowFocusRef.current ? activeLabel : label
-                }
-                styles={{
-                  input: {
-                    minWidth: 80,
-                    padding: 0,
-                    cursor: "pointer",
-                  },
-                }}
-              />
-            </Tabs.Tab>
-          ))}
-        </Tabs.List>
-      </Tabs>
-
-      <div className="dm-tabs__content">
-        <NodeViewContent as="div" />
-      </div>
-    </NodeViewWrapper>
-  );
-}
-
-const clampIndex = (value: unknown, length = Number.MAX_SAFE_INTEGER) => {
-  const parsed = Number(value ?? 0);
-  if (!Number.isFinite(parsed) || length <= 0) return 0;
-  return Math.max(0, Math.min(Math.trunc(parsed), length - 1));
-};

apps/client/src/features/editor/extensions/drag-handle.ts

@@ -5,9 +5,8 @@ import {
   PluginKey,
   TextSelection,
 } from "@tiptap/pm/state";
-import { Fragment, Slice } from "@tiptap/pm/model";
+import { Fragment, Slice, Node } from "@tiptap/pm/model";
-import type { Node, ResolvedPos } from "@tiptap/pm/model";
+import { EditorView } from "@tiptap/pm/view";
-import type { EditorView } from "@tiptap/pm/view";
 
 export interface GlobalDragHandleOptions {
   /**
@@ -151,126 +150,9 @@ function isCustomNodeDOM(
   return false;
 }
 
-function getDirectTarget($pos: ResolvedPos, ancestorDepth: number) {
-  const ancestor = $pos.node(ancestorDepth);
-
-  if (ancestor.childCount === 0) return null;
-
-  if ($pos.depth > ancestorDepth) {
-    const childDepth = ancestorDepth + 1;
-    return {
-      pos: $pos.before(childDepth),
-      node: $pos.node(childDepth),
-    };
-  }
-
-  const index = $pos.index(ancestorDepth);
-  const childIndex = Math.min(index, ancestor.childCount - 1);
-  if (childIndex < 0) return null;
-
-  return {
-    pos: $pos.posAtIndex(childIndex, ancestorDepth),
-    node: ancestor.child(childIndex),
-  };
-}
-
-type DragSource = { from: number; to: number; node: Node };
-
-function dragSourceFromDOM(view: EditorView, dom: Element): DragSource | null {
-  let pos: number;
-  try {
-    pos = view.posAtDOM(dom, 0);
-  } catch {
-    return null;
-  }
-
-  const $pos = view.state.doc.resolve(pos);
-  if ($pos.depth === 0) return null;
-
-  const from = $pos.before($pos.depth);
-  const node = $pos.node($pos.depth);
-  return { from, to: from + node.nodeSize, node };
-}
-
-function resolveMoveSource(
-  view: EditorView,
-  hint: DragSource | null,
-): DragSource | null {
-  const { state } = view;
-
-  if (hint) {
-    const current = state.doc.nodeAt(hint.from);
-    if (current?.eq(hint.node)) return hint;
-  }
-
-  if (state.selection instanceof NodeSelection) {
-    return {
-      from: state.selection.from,
-      to: state.selection.from + state.selection.node.nodeSize,
-      node: state.selection.node,
-    };
-  }
-
-  return null;
-}
-
-function moveNodeWithinTabPanel(
-  view: EditorView,
-  dropPos: number,
-  source: DragSource,
-): boolean {
-  const { state } = view;
-  const { from: sourceFrom, to: sourceTo, node: sourceNode } = source;
-
-  const $drop = state.doc.resolve(dropPos);
-  const panelDepth = view.state.doc.resolve(dropPos).depth
-  if (panelDepth < 0) return false;
-
-  if (dropPos > sourceFrom && dropPos < sourceTo) return false;
-
-  let insertPos: number;
-  const target = getDirectTarget($drop, panelDepth);
-  if (!target) {
-    insertPos = $drop.start(panelDepth);
-  } else {
-    const targetStart = target.pos;
-    const targetEnd = targetStart + target.node.nodeSize;
-    const midpoint = (targetStart + targetEnd) / 2;
-    insertPos = dropPos >= midpoint ? targetEnd : targetStart;
-  }
-
-  // Already in place.
-  if (insertPos === sourceFrom || insertPos === sourceTo) return false;
-
-  const tr = state.tr;
-  tr.delete(sourceFrom, sourceTo);
-
-  const insertAt = tr.mapping.map(insertPos, -1);
-  const $insert = tr.doc.resolve(insertAt);
-  const index = $insert.index();
-
-  if (!$insert.parent.canReplace(index, index, Fragment.from(sourceNode))) {
-    return false;
-  }
-
-  tr.insert(insertAt, sourceNode);
-
-  const $placed = tr.doc.resolve(
-    Math.min(insertAt, tr.doc.content.size),
-  );
-  tr.setSelection(NodeSelection.near($placed));
-  tr.scrollIntoView();
-
-  view.dispatch(tr);
-  return true;
-}
-
-const NON_PROMOTABLE_PARENTS = new Set(["tabs", "tab", "tabPanel"]);
-
 function calcNodePos(pos: number, view: EditorView) {
   const $pos = view.state.doc.resolve(pos);
-  if ($pos.depth > 1 && !NON_PROMOTABLE_PARENTS.has($pos.node($pos.depth).type.name))
+  if ($pos.depth > 1) return $pos.before($pos.depth);
-    return $pos.before($pos.depth);
   return pos;
 }
 
@@ -278,8 +160,6 @@ export function DragHandlePlugin(
   options: GlobalDragHandleOptions & { pluginKey: string },
 ) {
   let listType = "";
-  let dragSource: DragSource | null = null;
-
   function handleDragStart(event: DragEvent, view: EditorView) {
     view.focus();
 
@@ -296,8 +176,6 @@ export function DragHandlePlugin(
 
     if (!(node instanceof Element)) return;
 
-    dragSource = dragSourceFromDOM(view, node);
-
     let draggedNodePos = nodePosAtDOM(node, view, options);
     if (draggedNodePos == null || draggedNodePos < 0) return;
     draggedNodePos = calcNodePos(draggedNodePos, view);
@@ -523,7 +401,6 @@ export function DragHandlePlugin(
           );
 
           const notDragging = node?.closest(".not-draggable");
-          const notDraggingMatch = node?.matches(".not-draggable-match")
           const excludedTagList = options.excludedTags
             .concat(["ol", "ul"])
             .join(", ");
@@ -531,8 +408,7 @@ export function DragHandlePlugin(
           if (
             !(node instanceof Element) ||
             node.matches(excludedTagList) ||
-            notDragging ||
+            notDragging
-            notDraggingMatch
           ) {
             hideDragHandle();
             return;
@@ -620,22 +496,6 @@ export function DragHandlePlugin(
           const isDroppedInsideList =
             resolvedPos.parent.type.name === "listItem";
 
-          const isDroppedInsideTabPanel =
-            resolvedPos.parent.type.name === "tabPanel";
-
-          if (isDroppedInsideTabPanel) {
-            const source = resolveMoveSource(view, dragSource);
-            const moved = source
-              ? moveNodeWithinTabPanel(view, dropPos.pos, source)
-              : false;
-   
-            // even when not moved swallow the drop so ProseMirror doesn't insert a copy.
-            event.preventDefault();
-            view.dragging = null;
-            dragSource = null;
-            return moved;
-          }
-
           // If the selected node is a list item and is not dropped inside a list, we need to wrap it inside <ol> tag otherwise ol list items will be transformed into ul list item when dropped
           if (
             view.state.selection instanceof NodeSelection &&
@@ -653,7 +513,6 @@ export function DragHandlePlugin(
         },
         dragend: (view) => {
           view.dom.classList.remove("dragging");
-          dragSource = null;
         },
       },
     },
@@ -667,7 +526,6 @@ const GlobalDragHandle = Extension.create({
     return {
       dragHandleWidth: 20,
       scrollThreshold: 100,
-      dragHandleSelector: undefined,
       excludedTags: [],
       customNodes: [],
       atomNodes: [],

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

@@ -3,7 +3,8 @@ import { StarterKit } from "@tiptap/starter-kit";
 import { Code } from "@tiptap/extension-code";
 import { TextAlign } from "@tiptap/extension-text-align";
 import { TaskList, TaskItem } from "@tiptap/extension-list";
-import { Placeholder, CharacterCount, UndoRedo } from "@tiptap/extensions";
+import { CharacterCount, UndoRedo } from "@tiptap/extensions";
+import { Placeholder } from "@/features/editor/extensions/placeholder";
 import { Superscript } from "@tiptap/extension-superscript";
 import SubScript from "@tiptap/extension-subscript";
 import { Typography } from "@tiptap/extension-typography";
@@ -62,10 +63,6 @@ import {
   TransclusionReference,
   TableView,
   BaseEmbed as BaseEmbedNode,
-  Tabs,
-  Tab,
-  TabLabel,
-  TabPanel,
 } from "@docmost/editor-ext";
 import {
   randomElement,
@@ -94,7 +91,6 @@ import ExcalidrawView from "@/features/editor/components/excalidraw/excalidraw-v
 import EmbedView from "@/features/editor/components/embed/embed-view.tsx";
 import PdfView from "@/features/editor/components/pdf/pdf-view.tsx";
 import SubpagesView from "@/features/editor/components/subpages/subpages-view.tsx";
-import TabsView from "@/features/editor/components/tabs/tabs-view.tsx";
 import TransclusionView from "@/features/editor/components/transclusion/transclusion-view.tsx";
 import TransclusionReferenceView from "@/features/editor/components/transclusion/transclusion-reference-view.tsx";
 import { BaseEmbedView } from "@/features/editor/components/base-embed/base-embed-view.tsx";
@@ -239,7 +235,7 @@ export const mainExtensions = [
   Typography,
   TrailingNode,
   GlobalDragHandle.configure({
-    customNodes: ["transclusionSource", "transclusionReference", "tabPanel"],
+    customNodes: ["transclusionSource", "transclusionReference"],
     atomNodes: ["base"],
   }),
   TextStyle,
@@ -294,12 +290,6 @@ export const mainExtensions = [
   Details,
   DetailsSummary,
   DetailsContent,
-  Tabs.configure({
-    view: TabsView,
-  }),
-  Tab,
-  TabLabel,
-  TabPanel,
   Youtube.configure({
     addPasteHandler: false,
     controls: true,

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

@@ -0,0 +1,64 @@
+import { isNodeEmpty } from "@tiptap/core";
+import { Plugin, PluginKey } from "@tiptap/pm/state";
+import { Decoration, DecorationSet } from "@tiptap/pm/view";
+import { Placeholder as TiptapPlaceholder } from "@tiptap/extensions";
+
+export const Placeholder = TiptapPlaceholder.extend({
+  addProseMirrorPlugins() {
+    const editor = this.editor;
+    const options = this.options;
+    const dataAttribute = `data-${options.dataAttribute || "placeholder"}`;
+
+    return [
+      new Plugin({
+        key: new PluginKey("docmostPlaceholder"),
+        props: {
+          decorations: (state) => {
+            if (options.showOnlyWhenEditable && !editor.isEditable) {
+              return null;
+            }
+
+            const { doc, selection } = state;
+            const { anchor } = selection;
+            const decorations: Decoration[] = [];
+            const isEmptyDoc = editor.isEmpty;
+
+            doc.descendants((node, pos) => {
+              if (!node.type.isTextblock) {
+                return options.includeChildren;
+              }
+
+              const hasAnchor = anchor >= pos && anchor <= pos + node.nodeSize;
+              const isEmpty = !node.isLeaf && isNodeEmpty(node);
+
+              if ((hasAnchor || !options.showOnlyCurrent) && isEmpty) {
+                const emptyNodeClass =
+                  typeof options.emptyNodeClass === "function"
+                    ? options.emptyNodeClass({ editor, node, pos, hasAnchor })
+                    : options.emptyNodeClass;
+                const classes = [emptyNodeClass];
+                if (isEmptyDoc) {
+                  classes.push(options.emptyEditorClass);
+                }
+
+                decorations.push(
+                  Decoration.node(pos, pos + node.nodeSize, {
+                    class: classes.join(" "),
+                    [dataAttribute]:
+                      typeof options.placeholder === "function"
+                        ? options.placeholder({ editor, node, pos, hasAnchor })
+                        : options.placeholder,
+                  }),
+                );
+              }
+
+              return options.includeChildren;
+            });
+
+            return DecorationSet.create(doc, decorations);
+          },
+        },
+      }),
+    ];
+  },
+});

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

@@ -82,7 +82,8 @@ import {
   getCollabSocket,
   releaseCollabSocket,
 } from "@/features/editor/collab-socket";
-import TabsMenu from "./components/tabs/tabs-menu";
+import clsx from "clsx";
+import { useCanViewComments } from "@/features/comment/hooks/use-can-view-comments.ts";
 
 interface PageEditorProps {
   pageId: string;
@@ -197,6 +198,7 @@ function CollabPageEditor({
   const { pageSlug } = useParams();
   const slugId = extractPageSlugId(pageSlug);
   const currentPageEditMode = useAtomValue(currentPageEditModeAtom);
+  const canViewComments = useCanViewComments();
   const canScroll = useCallback(
     () => Boolean(isComponentMounted.current && editorRef.current),
     [isComponentMounted],
@@ -373,6 +375,7 @@ function CollabPageEditor({
   };
 
   useEffect(() => {
+    if (!canViewComments) return;
     document.addEventListener("ACTIVE_COMMENT_EVENT", handleActiveCommentEvent);
     return () => {
       document.removeEventListener(
@@ -380,7 +383,7 @@ function CollabPageEditor({
         handleActiveCommentEvent,
       );
     };
-  }, []);
+  }, [canViewComments]);
 
   useEffect(() => {
     setActiveCommentId(null);
@@ -431,7 +434,13 @@ function CollabPageEditor({
   }
 
   return (
-    <div className="editor-container" style={{ position: "relative" }}>
+    <div
+      className={clsx(
+        "editor-container",
+        !canViewComments && "comments-hidden",
+      )}
+      style={{ position: "relative" }}
+    >
       <div ref={menuContainerRef}>
         <EditorContent editor={editor} />
 
@@ -454,7 +463,6 @@ function CollabPageEditor({
             <ExcalidrawMenu editor={editor} />
             <DrawioMenu editor={editor} />
             <ColumnsMenu editor={editor} />
-            <TabsMenu editor={editor} />
           </div>
         )}
         {editor && !editorIsEditable && (editable || canComment) && (
@@ -482,17 +490,21 @@ function StaticPageEditor({
   content: any;
   ariaLabel: string;
 }) {
+  const canViewComments = useCanViewComments();
+
   return (
-    <EditorProvider
+    <div className={clsx(!canViewComments && "comments-hidden")}>
-      editable={false}
+      <EditorProvider
-      immediatelyRender={true}
+        editable={false}
-      extensions={mainExtensions}
+        immediatelyRender={true}
-      content={content}
+        extensions={mainExtensions}
-      editorProps={{
+        content={content}
-        attributes: {
+        editorProps={{
-          "aria-label": ariaLabel,
+          attributes: {
-        },
+            "aria-label": ariaLabel,
-      }}
+          },
-    />
+        }}
+      />
+    </div>
   );
 }

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

@@ -315,3 +315,8 @@
     height: 100%;
   }
 }
+
+.comments-hidden .ProseMirror .comment-mark {
+  background: none;
+  border-bottom: none;
+}

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

@@ -17,5 +17,4 @@
 @import "./indent.css";
 @import "./columns.css";
 @import "./status.css";
-@import "./tabs.css";
 @import "./base-embed.css";

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

@@ -1,15 +0,0 @@
-.ProseMirror {
-  [data-type="tabs"] {
-    button {
-      outline: none;
-    }
-  }
-  
-  [data-type="tabLabel"] {
-    display: none;
-  }
-
-  [data-type="tabPanel"] {
-    outline: none;
-  }
-}

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

@@ -58,6 +58,7 @@ import {
   useWatchPageMutation,
   useUnwatchPageMutation,
 } from "@/features/page/queries/watcher-query";
+import { useCanViewComments } from "@/features/comment/hooks/use-can-view-comments.ts";
 
 interface PageHeaderMenuProps {
   readOnly?: boolean;
@@ -65,6 +66,7 @@ interface PageHeaderMenuProps {
 export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
   const { t } = useTranslation();
   const commentsTriggerProps = useAsideTriggerProps("comments");
+  const canViewComments = useCanViewComments();
   const tocTriggerProps = useAsideTriggerProps("toc");
   const { pageSlug } = useParams();
   const { data: page } = usePageQuery({
@@ -105,16 +107,18 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
 
       <PageShareModal readOnly={readOnly} />
 
-      <Tooltip label={t("Comments")} openDelay={250} withArrow>
+      {canViewComments && (
-        <ActionIcon
+        <Tooltip label={t("Comments")} openDelay={250} withArrow>
-          variant="subtle"
+          <ActionIcon
-          color="dark"
+            variant="subtle"
-          aria-label={t("Comments")}
+            color="dark"
-          {...commentsTriggerProps}
+            aria-label={t("Comments")}
-        >
+            {...commentsTriggerProps}
-          <IconMessage size={20} stroke={2} />
+          >
-        </ActionIcon>
+            <IconMessage size={20} stroke={2} />
-      </Tooltip>
+          </ActionIcon>
+        </Tooltip>
+      )}
 
       {!page?.isBase && (
         <Tooltip label={t("Table of contents")} openDelay={250} withArrow>

apps/client/src/features/space/components/space-security-settings.tsx

@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import { ISpace } from "@/features/space/types/space.types.ts";
 import SpacePublicSharingToggle from "@/ee/security/components/space-public-sharing-toggle.tsx";
 import SpaceViewerCommentsToggle from "@/ee/security/components/space-viewer-comments-toggle.tsx";
+import SpaceHideCommentsToggle from "@/ee/security/components/space-hide-comments-toggle.tsx";
 
 type SpaceSecuritySettingsProps = {
   space: ISpace;
@@ -29,6 +30,10 @@ export default function SpaceSecuritySettings({
       <Divider my="lg" />
 
       <SpaceViewerCommentsToggle space={space} />
+
+      <Divider my="lg" />
+
+      <SpaceHideCommentsToggle space={space} />
     </div>
   );
 }

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

@@ -11,6 +11,7 @@ export interface ISpaceSharingSettings {
 
 export interface ISpaceCommentsSettings {
   allowViewerComments?: boolean;
+  hideCommentsFromViewers?: boolean;
 }
 
 export interface ISpaceSettings {
@@ -36,6 +37,7 @@ export interface ISpace {
   // for updates
   disablePublicSharing?: boolean;
   allowViewerComments?: boolean;
+  hideCommentsFromViewers?: boolean;
 }
 
 interface IMembership {

apps/client/src/pages/auth/forgot-password.tsx

@@ -1,13 +1,10 @@
 import { ForgotPasswordForm } from "@/features/auth/components/forgot-password-form";
-import { getAppName } from "@/lib/config";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
-import { Helmet } from "react-helmet-async";
 
 export default function ForgotPassword() {
     return (
         <>
-            <Helmet>
+            <DocumentTitle title="Forgot Password" />
-                <title>Forgot Password - {getAppName()}</title>
-            </Helmet>
             <ForgotPasswordForm />
         </>
     );

apps/client/src/pages/auth/invite-signup.tsx

@@ -1,16 +1,13 @@
-import { Helmet } from "react-helmet-async";
 import { InviteSignUpForm } from "@/features/auth/components/invite-sign-up-form.tsx";
-import {getAppName} from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function InviteSignup() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Invitation Signup")} />
-        <title>{t("Invitation Signup")} - {getAppName()}</title>
-      </Helmet>
       <InviteSignUpForm />
     </>
   );

apps/client/src/pages/auth/login.tsx

@@ -1,18 +1,13 @@
 import { LoginForm } from "@/features/auth/components/login-form";
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function LoginPage() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Login")} />
-        <title>
-          {t("Login")} - {getAppName()}
-        </title>
-      </Helmet>
       <LoginForm />
     </>
   );

apps/client/src/pages/auth/password-reset.tsx

@@ -1,11 +1,10 @@
-import { Helmet } from "react-helmet-async";
 import { PasswordResetForm } from "@/features/auth/components/password-reset-form";
 import { Link, useSearchParams } from "react-router-dom";
 import { useVerifyUserTokenQuery } from "@/features/auth/queries/auth-query";
 import { Button, Container, Group, Text } from "@mantine/core";
 import APP_ROUTE from "@/lib/app-route";
-import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function PasswordReset() {
   const { t } = useTranslation();
@@ -23,11 +22,7 @@ export default function PasswordReset() {
   if (isError || !resetToken) {
     return (
       <>
-        <Helmet>
+        <DocumentTitle title={t("Password Reset")} />
-          <title>
-            {t("Password Reset")} - {getAppName()}
-          </title>
-        </Helmet>
         <Container my={40}>
           <Text size="lg" ta="center">
             {t("Invalid or expired password reset link")}
@@ -49,11 +44,7 @@ export default function PasswordReset() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Password Reset")} />
-        <title>
-          {t("Password Reset")} - {getAppName()}
-        </title>
-      </Helmet>
       <PasswordResetForm resetToken={resetToken} />
     </>
   );

apps/client/src/pages/auth/setup-workspace.tsx

@@ -1,11 +1,10 @@
 import { useWorkspacePublicDataQuery } from "@/features/workspace/queries/workspace-query.ts";
 import { SetupWorkspaceForm } from "@/features/auth/components/setup-workspace-form.tsx";
-import { Helmet } from "react-helmet-async";
 import React, { useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import APP_ROUTE from "@/lib/app-route.ts";
-import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function SetupWorkspace() {
   const { t } = useTranslation();
@@ -35,11 +34,7 @@ export default function SetupWorkspace() {
   ) {
     return (
       <>
-        <Helmet>
+        <DocumentTitle title={t("Setup Workspace")} />
-          <title>
-            {t("Setup Workspace")} - {getAppName()}
-          </title>
-        </Helmet>
         <SetupWorkspaceForm />
       </>
     );

apps/client/src/pages/dashboard/home.tsx

@@ -2,20 +2,15 @@ import { Container, Space } from "@mantine/core";
 import HomeTabs from "@/features/home/components/home-tabs";
 import HomeAiPrompt from "@/features/home/components/home-ai-prompt";
 import SpaceCarousel from "@/features/space/components/space-carousel.tsx";
-import { getAppName } from "@/lib/config.ts";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function Home() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Home")} />
-        <title>
-          {t("Home")} - {getAppName()}
-        </title>
-      </Helmet>
       <Container size={"900"} pt="xl">
         <HomeAiPrompt />
 

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

@@ -17,9 +17,7 @@ import {
 } from "@tabler/icons-react";
 import { Link, useParams } from "react-router-dom";
 import { useTranslation } from "react-i18next";
-import { Helmet } from "react-helmet-async";
 import { useDebouncedValue } from "@mantine/hooks";
-import { getAppName } from "@/lib/config";
 import { useLabelPagesQuery } from "@/features/label/queries/label-query.ts";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
 import { getLabelColor } from "@/features/label/utils/label-colors.ts";
@@ -29,6 +27,7 @@ import { normalizeLabelName } from "@/features/label/utils/normalize-label.ts";
 import { SpaceFilterMenu } from "@/features/space/components/space-filter-menu.tsx";
 import { EmptyState } from "@/components/ui/empty-state";
 import classes from "@/features/label/label.module.css";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function LabelPage() {
   const { t } = useTranslation();
@@ -82,11 +81,7 @@ export default function LabelPage() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={labelName} />
-        <title>
-          {labelName} - {getAppName()}
-        </title>
-      </Helmet>
 
       <Container size={820} py="xl">
         <Stack gap="lg">

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

@@ -3,7 +3,6 @@ import { usePageQuery } from "@/features/page/queries/page-query";
 import { FullEditor } from "@/features/editor/full-editor";
 import { TitleEditor } from "@/features/editor/title-editor";
 import HistoryModal from "@/features/page-history/components/history-modal";
-import { Helmet } from "react-helmet-async";
 import PageHeader from "@/features/page/components/header/page-header.tsx";
 import { extractPageSlugId } from "@/lib";
 import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
@@ -18,6 +17,7 @@ import { BaseView } from "@/ee/base/components/base-view";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
 import { getPageTitle } from "@/features/page/page.utils";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 const MemoizedFullEditor = React.memo(FullEditor);
 const MemoizedTitleEditor = React.memo(TitleEditor);
 const MemoizedPageHeader = React.memo(PageHeader);
@@ -110,9 +110,10 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) {
           paddingTop: "calc(var(--page-header-height) + 6px)",
         }}
       >
-        <Helmet>
+        <DocumentTitle
-          <title>{`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}</title>
+          title={`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}
-        </Helmet>
+          withAppName={false}
+        />
         <MemoizedPageHeader readOnly={!canEdit} />
         <div
           style={{
@@ -159,9 +160,10 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) {
   return (
     page && (
       <div>
-        <Helmet>
+        <DocumentTitle
-          <title>{`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}</title>
+          title={`${page?.icon || ""}  ${getPageTitle(page?.title, page?.isBase, t)}`}
-        </Helmet>
+          withAppName={false}
+        />
 
         <MemoizedPageHeader readOnly={!canEdit} />
 

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

@@ -5,21 +5,16 @@ import PageWidthPref from "@/features/user/components/page-width-pref.tsx";
 import PageEditPref from "@/features/user/components/page-state-pref";
 import FixedToolbarPref from "@/features/user/components/fixed-toolbar-pref";
 import NotificationPref from "@/features/user/components/notification-pref";
-import { getAppName } from "@/lib/config.ts";
 import { Divider } from "@mantine/core";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function AccountPreferences() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Preferences")} />
-        <title>
-          {t("Preferences")} - {getAppName()}
-        </title>
-      </Helmet>
       <SettingsTitle title={t("Preferences")} />
 
       <AccountTheme />

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

@@ -4,22 +4,17 @@ import ChangePassword from "@/features/user/components/change-password";
 import { Divider } from "@mantine/core";
 import AccountAvatar from "@/features/user/components/account-avatar";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
-import { getAppName } from "@/lib/config.ts";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { AccountMfaSection } from "@/features/user/components/account-mfa-section";
 import SessionList from "@/features/session/components/session-list";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function AccountSettings() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("My Profile")} />
-        <title>
-          {t("My Profile")} - {getAppName()}
-        </title>
-      </Helmet>
       <SettingsTitle title={t("My Profile")} />
 
       <AccountAvatar />

apps/client/src/pages/settings/group/group-info.tsx

@@ -1,20 +1,15 @@
 import SettingsTitle from "@/components/settings/settings-title.tsx";
 import GroupMembersList from "@/features/group/components/group-members";
 import GroupDetails from "@/features/group/components/group-details";
-import { getAppName } from "@/lib/config.ts";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function GroupInfo() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Manage Group")} />
-        <title>
-          {t("Manage Group")} - {getAppName()}
-        </title>
-      </Helmet>
       <SettingsTitle title={t("Manage Group")} />
       <GroupDetails />
       <GroupMembersList />

apps/client/src/pages/settings/group/groups.tsx

@@ -3,9 +3,8 @@ import SettingsTitle from "@/components/settings/settings-title.tsx";
 import { Group } from "@mantine/core";
 import CreateGroupModal from "@/features/group/components/create-group-modal";
 import useUserRole from "@/hooks/use-user-role.tsx";
-import {getAppName} from "@/lib/config.ts";
-import {Helmet} from "react-helmet-async";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function Groups() {
   const { t } = useTranslation();
@@ -13,9 +12,7 @@ export default function Groups() {
 
   return (
     <>
-        <Helmet>
+      <DocumentTitle title={t("Groups")} />
-            <title>{t("Groups")} - {getAppName()}</title>
-        </Helmet>
       <SettingsTitle title={t("Groups")} />
 
       <Group my="md" justify="flex-end">

apps/client/src/pages/settings/shares/shares.tsx

@@ -1,22 +1,17 @@
 import SettingsTitle from "@/components/settings/settings-title.tsx";
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
 import ShareList from "@/features/share/components/share-list.tsx";
 import { Alert, Text } from "@mantine/core";
 import { IconInfoCircle } from "@tabler/icons-react";
 import React from "react";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function Shares() {
   const { t } = useTranslation();
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Public sharing")} />
-        <title>
-          {t("Public sharing")} - {getAppName()}
-        </title>
-      </Helmet>
       <SettingsTitle title={t("Public sharing")} />
 
       <Alert variant="light" color="blue" icon={<IconInfoCircle />}>

apps/client/src/pages/settings/space/spaces.tsx

@@ -3,9 +3,8 @@ import SpaceList from "@/features/space/components/space-list.tsx";
 import useUserRole from "@/hooks/use-user-role.tsx";
 import { Group } from "@mantine/core";
 import CreateSpaceModal from "@/features/space/components/create-space-modal.tsx";
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function Spaces() {
   const { t } = useTranslation();
@@ -13,11 +12,7 @@ export default function Spaces() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Spaces")} />
-        <title>
-          {t("Spaces")} - {getAppName()}
-        </title>
-      </Helmet>
       <SettingsTitle title={t("Spaces")} />
 
       <Group my="md" justify="flex-end">

apps/client/src/pages/settings/workspace/workspace-members.tsx

@@ -6,11 +6,10 @@ import { useEffect, useState } from "react";
 import { useNavigate, useSearchParams } from "react-router-dom";
 import WorkspaceInvitesTable from "@/features/workspace/components/members/components/workspace-invites-table.tsx";
 import useUserRole from "@/hooks/use-user-role.tsx";
-import { getAppName } from "@/lib/config.ts";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { useAtom } from "jotai";
 import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function WorkspaceMembers() {
   const { t } = useTranslation();
@@ -38,11 +37,7 @@ export default function WorkspaceMembers() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Members")} />
-        <title>
-          {t("Members")} - {getAppName()}
-        </title>
-      </Helmet>
       <SettingsTitle title={t("Members")} />
 
       {/* <WorkspaceInviteSection /> */}

apps/client/src/pages/settings/workspace/workspace-settings.tsx

@@ -2,21 +2,19 @@ import SettingsTitle from "@/components/settings/settings-title.tsx";
 import WorkspaceNameForm from "@/features/workspace/components/settings/components/workspace-name-form";
 import WorkspaceIcon from "@/features/workspace/components/settings/components/workspace-icon.tsx";
 import { useTranslation } from "react-i18next";
-import { getAppName, isCloud } from "@/lib/config.ts";
+import { isCloud } from "@/lib/config.ts";
-import { Helmet } from "react-helmet-async";
 import ManageHostname from "@/ee/components/manage-hostname.tsx";
 import { Divider } from "@mantine/core";
 import AllowMemberTemplates from "@/ee/security/components/allow-member-templates.tsx";
 import WorkspaceDefaultPageEditMode from "@/features/workspace/components/settings/components/workspace-default-page-edit-mode.tsx";
 import PersonalSpacesSetting from "@/ee/personal-space/components/personal-spaces-setting.tsx";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function WorkspaceSettings() {
   const { t } = useTranslation();
   return (
     <>
-      <Helmet>
+      <DocumentTitle title="Workspace Settings" />
-        <title>Workspace Settings - {getAppName()}</title>
-      </Helmet>
       <SettingsTitle title={t("General")} />
       <WorkspaceIcon />
       <WorkspaceNameForm />

apps/client/src/pages/share/shared-page.tsx

@@ -1,5 +1,4 @@
 import { useNavigate, useParams } from "react-router-dom";
-import { Helmet } from "react-helmet-async";
 import { useTranslation } from "react-i18next";
 import { useSharePageQuery } from "@/features/share/queries/share-query.ts";
 import { Container } from "@mantine/core";
@@ -14,6 +13,7 @@ import {
   sharedTreeDataAtom,
 } from "@/features/share/atoms/shared-page-atom.ts";
 import { isPageInTree } from "@/features/share/utils.ts";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function SharedPage() {
   const { t } = useTranslation();
@@ -56,12 +56,14 @@ export default function SharedPage() {
 
   return (
     <div>
-      <Helmet>
+      <DocumentTitle
-        <title>{`${data?.page?.title || t("untitled")}`}</title>
+        title={data?.page?.title || t("untitled")}
+        withAppName={false}
+      >
         {!data?.share.searchIndexing && (
           <meta name="robots" content="noindex" />
         )}
-      </Helmet>
+      </DocumentTitle>
 
       <Container fluid={fullWidth} size={fullWidth ? undefined : 900} p={0}>
         <ReadonlyPageEditor

apps/client/src/pages/space/space-home.tsx

@@ -2,8 +2,7 @@ import {Container} from "@mantine/core";
 import SpaceHomeTabs from "@/features/space/components/space-home-tabs.tsx";
 import {useParams} from "react-router-dom";
 import {useGetSpaceBySlugQuery} from "@/features/space/queries/space-query.ts";
-import {getAppName} from "@/lib/config.ts";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
-import {Helmet} from "react-helmet-async";
 
 export default function SpaceHome() {
     const {spaceSlug} = useParams();
@@ -11,9 +10,7 @@ export default function SpaceHome() {
 
     return (
         <>
-            <Helmet>
+            <DocumentTitle title={space?.name || 'Overview'} />
-                <title>{space?.name || 'Overview'} - {getAppName()}</title>
-            </Helmet>
             <Container size={"900"} pt="xl">
                 {space && <SpaceHomeTabs/>}
             </Container>

apps/client/src/pages/spaces/spaces.tsx

@@ -1,13 +1,12 @@
 import { Container, Title, Text, Group, Box } from "@mantine/core";
 import { useTranslation } from "react-i18next";
-import { Helmet } from "react-helmet-async";
-import { getAppName } from "@/lib/config";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query";
 import CreateSpaceModal from "@/features/space/components/create-space-modal";
 import { AllSpacesList } from "@/features/space/components/spaces-page";
 import FavoriteSpacesGrid from "@/features/space/components/spaces-page/favorite-spaces-grid";
 import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search";
 import useUserRole from "@/hooks/use-user-role";
+import { DocumentTitle } from "@/components/ui/document-title.tsx";
 
 export default function Spaces() {
   const { t } = useTranslation();
@@ -22,11 +21,7 @@ export default function Spaces() {
 
   return (
     <>
-      <Helmet>
+      <DocumentTitle title={t("Spaces")} />
-        <title>
-          {t("Spaces")} - {getAppName()}
-        </title>
-      </Helmet>
 
       <Container size={"800"} pt="xl">
         <Group justify="space-between" mb="xl">

apps/server/package.json

@@ -40,30 +40,30 @@
     "@clickhouse/client": "1.18.2",
     "@docmost/base-formula": "workspace:*",
     "@docmost/pdf-inspector": "1.9.6",
-    "@fastify/cookie": "^11.0.2",
+    "@fastify/cookie": "11.0.2",
-    "@fastify/multipart": "^10.0.0",
+    "@fastify/multipart": "10.0.0",
-    "@fastify/static": "^9.1.3",
+    "@fastify/static": "10.1.2",
-    "@keyv/redis": "^5.1.6",
+    "@keyv/redis": "5.1.6",
     "@langchain/core": "1.1.46",
     "@langchain/textsplitters": "1.0.1",
-    "@modelcontextprotocol/sdk": "1.29.0",
+    "@modelcontextprotocol/sdk": "1.30.0",
-    "@nest-lab/throttler-storage-redis": "^1.2.0",
+    "@nest-lab/throttler-storage-redis": "1.2.0",
     "@nestjs-labs/nestjs-ioredis": "11.0.4",
     "@nestjs/bullmq": "11.0.4",
     "@nestjs/cache-manager": "3.1.3",
-    "@nestjs/common": "11.1.27",
+    "@nestjs/common": "11.1.28",
     "@nestjs/config": "4.0.4",
     "@nestjs/core": "11.1.27",
     "@nestjs/event-emitter": "3.1.0",
     "@nestjs/jwt": "11.0.2",
     "@nestjs/mapped-types": "2.1.1",
     "@nestjs/passport": "11.0.5",
-    "@nestjs/platform-fastify": "11.1.27",
+    "@nestjs/platform-fastify": "11.1.28",
-    "@nestjs/platform-socket.io": "11.1.27",
+    "@nestjs/platform-socket.io": "11.1.28",
     "@nestjs/schedule": "6.1.3",
     "@nestjs/terminus": "11.1.1",
     "@nestjs/throttler": "6.5.0",
-    "@nestjs/websockets": "11.1.27",
+    "@nestjs/websockets": "11.1.28",
     "@node-saml/passport-saml": "5.1.0",
     "@socket.io/redis-adapter": "8.3.0",
     "ai": "6.0.134",
@@ -90,8 +90,8 @@
     "ldapts": "8.1.7",
     "mammoth": "1.12.0",
     "mime-types": "3.0.2",
-    "msgpackr": "^1.11.9",
+    "msgpackr": "1.11.9",
-    "nanoid": "5.1.7",
+    "nanoid": "5.1.16",
     "nestjs-cls": "6.2.0",
     "nestjs-kysely": "3.1.2",
     "nestjs-pino": "4.6.1",
@@ -102,7 +102,7 @@
     "passport-google-oauth20": "2.0.0",
     "passport-jwt": "4.0.1",
     "pg-tsquery": "8.4.2",
-    "pgvector": "^0.2.1",
+    "pgvector": "0.2.1",
     "pino-http": "11.0.0",
     "pino-pretty": "13.1.3",
     "postgres": "3.4.8",
@@ -118,7 +118,7 @@
     "tlds": "1.261.0",
     "tmp-promise": "3.0.3",
     "typesense": "3.0.5",
-    "undici": "7.28.0",
+    "undici": "7.29.0",
     "ws": "8.21.0",
     "yauzl": "3.4.0",
     "zod": "4.3.6"

apps/server/src/collaboration/collaboration.util.ts

@@ -45,10 +45,6 @@ import {
   TransclusionSource,
   TransclusionReference,
   BaseEmbed,
-  Tabs,
-  Tab,
-  TabLabel,
-  TabPanel,
 } from '@docmost/editor-ext';
 import { generateText, getSchema, JSONContent } from '@tiptap/core';
 import { generateHTML, generateJSON } from '../common/helpers/prosemirror/html';
@@ -91,10 +87,6 @@ export const tiptapExtensions = [
   Details,
   DetailsContent,
   DetailsSummary,
-  Tabs,
-  Tab,
-  TabLabel,
-  TabPanel,
   CustomTable,
   TableCell,
   TableRow,

apps/server/src/common/features.ts

@@ -18,6 +18,7 @@ export const Feature = {
   RETENTION: 'retention',
   SHARING_CONTROLS: 'sharing:controls',
   VIEWER_COMMENTS: 'comment:viewer',
+  HIDE_COMMENTS: 'comment:hide',
   TEMPLATES: 'templates',
   PDF_EXPORT: 'export:pdf',
   PERSONAL_SPACES: 'spaces:personal',

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

@@ -89,20 +89,29 @@ export class CommentController {
     @Body()
     pagination: PaginationOptions,
     @AuthUser() user: User,
+    @AuthWorkspace() workspace: Workspace,
   ) {
     const page = await this.pageRepo.findById(input.pageId);
     if (!page) {
       throw new NotFoundException('Page not found');
     }
 
-    await this.pageAccessService.validateCanView(page, user);
+    await this.pageAccessService.validateCanViewComments(
+      page,
+      user,
+      workspace.id,
+    );
 
     return this.commentService.findByPageId(page.id, pagination);
   }
 
   @HttpCode(HttpStatus.OK)
   @Post('info')
-  async findOne(@Body() input: CommentIdDto, @AuthUser() user: User) {
+  async findOne(
+    @Body() input: CommentIdDto,
+    @AuthUser() user: User,
+    @AuthWorkspace() workspace: Workspace,
+  ) {
     const comment = await this.commentRepo.findById(input.commentId);
     if (!comment) {
       throw new NotFoundException('Comment not found');
@@ -113,7 +122,11 @@ export class CommentController {
       throw new NotFoundException('Page not found');
     }
 
-    await this.pageAccessService.validateCanView(page, user);
+    await this.pageAccessService.validateCanViewComments(
+      page,
+      user,
+      workspace.id,
+    );
 
     return comment;
   }

apps/server/src/core/notification/services/comment.notification.ts

@@ -14,6 +14,7 @@ import { CommentMentionEmail } from '@docmost/transactional/emails/comment-menti
 import { CommentCreateEmail } from '@docmost/transactional/emails/comment-created-email';
 import { CommentResolvedEmail } from '@docmost/transactional/emails/comment-resolved-email';
 import { getPageTitle } from '../../../common/helpers';
+import { PageAccessService } from '../../page/page-access/page-access.service';
 
 @Injectable()
 export class CommentNotificationService {
@@ -25,6 +26,7 @@ export class CommentNotificationService {
     private readonly spaceMemberRepo: SpaceMemberRepo,
     private readonly pagePermissionRepo: PagePermissionRepo,
     private readonly watcherRepo: WatcherRepo,
+    private readonly pageAccessService: PageAccessService,
   ) {}
 
   async processComment(data: ICommentNotificationJob, appUrl: string) {
@@ -48,7 +50,7 @@ export class CommentNotificationService {
     );
     if (!context) return;
 
-    const { actor, pageTitle, pageUrl } = context;
+    const { actor, pageTitle, pageUrl, spaceSettings } = context;
     const notifiedUserIds = new Set<string>();
     notifiedUserIds.add(actorId);
 
@@ -72,7 +74,16 @@ export class CommentNotificationService {
         pageId,
         [...usersWithSpaceAccess],
       );
-    const usersWithAccess = new Set(usersWithPageAccess);
+    let accessibleUserIds = usersWithPageAccess;
+    if (spaceSettings?.comments?.hideCommentsFromViewers === true) {
+      accessibleUserIds =
+        await this.pageAccessService.filterUserIdsWithPageEditAccess(
+          spaceId,
+          pageId,
+          accessibleUserIds,
+        );
+    }
+    const usersWithAccess = new Set(accessibleUserIds);
 
     for (const userId of mentionedUserIds) {
       if (!usersWithAccess.has(userId)) continue;
@@ -145,7 +156,7 @@ export class CommentNotificationService {
     );
     if (!context) return;
 
-    const { actor, pageTitle, pageUrl } = context;
+    const { actor, pageTitle, pageUrl, spaceSettings } = context;
 
     const roles = await this.spaceMemberRepo.getUserSpaceRoles(
       commentCreatorId,
@@ -166,6 +177,16 @@ export class CommentNotificationService {
       );
     if (hasPageAccess.length === 0) return;
 
+    if (spaceSettings?.comments?.hideCommentsFromViewers === true) {
+      const editCapable =
+        await this.pageAccessService.filterUserIdsWithPageEditAccess(
+          spaceId,
+          pageId,
+          [commentCreatorId],
+        );
+      if (editCapable.length === 0) return;
+    }
+
     const notification = await this.notificationService.create({
       userId: commentCreatorId,
       workspaceId,
@@ -225,7 +246,7 @@ export class CommentNotificationService {
         .executeTakeFirst(),
       this.db
         .selectFrom('spaces')
-        .select(['id', 'slug'])
+        .select(['id', 'slug', 'settings'])
         .where('id', '=', spaceId)
         .executeTakeFirst(),
     ]);
@@ -236,6 +257,11 @@ export class CommentNotificationService {
 
     const pageUrl = `${appUrl}/s/${space.slug}/p/${page.slugId}`;
 
-    return { actor, pageTitle: getPageTitle(page.title), pageUrl };
+    return {
+      actor,
+      pageTitle: getPageTitle(page.title),
+      pageUrl,
+      spaceSettings: (space.settings ?? null) as Record<string, any> | null,
+    };
   }
 }

apps/server/src/core/page/page-access/page-access.service.ts

@@ -7,6 +7,7 @@ import {
   SpaceCaslSubject,
 } from '../../casl/interfaces/space-ability.type';
 import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
+import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
 
 @Injectable()
 export class PageAccessService {
@@ -14,6 +15,7 @@ export class PageAccessService {
     private readonly pagePermissionRepo: PagePermissionRepo,
     private readonly spaceAbility: SpaceAbilityFactory,
     private readonly spaceRepo: SpaceRepo,
+    private readonly spaceMemberRepo: SpaceMemberRepo,
   ) {}
 
   /**
@@ -118,8 +120,68 @@ export class PageAccessService {
 
     const space = await this.spaceRepo.findById(page.spaceId, workspaceId);
     const settings = space?.settings as Record<string, any> | null;
-    if (!settings?.comments?.allowViewerComments) {
+    if (
+      !settings?.comments?.allowViewerComments ||
+      settings?.comments?.hideCommentsFromViewers
+    ) {
       throw new ForbiddenException();
     }
   }
+
+  async validateCanViewComments(
+    page: Page,
+    user: User,
+    workspaceId: string,
+  ): Promise<void> {
+    const { canEdit } = await this.validateCanViewWithPermissions(page, user);
+    if (canEdit) {
+      return;
+    }
+
+    const space = await this.spaceRepo.findById(page.spaceId, workspaceId);
+    const settings = space?.settings as Record<string, any> | null;
+    if (settings?.comments?.hideCommentsFromViewers) {
+      throw new ForbiddenException();
+    }
+  }
+
+  /**
+   * Callers must pass userIds that already have space access (WS room members / pre-filtered notification recipients).
+   */
+  async filterUserIdsWithPageEditAccess(
+    spaceId: string,
+    pageId: string,
+    userIds: string[],
+  ): Promise<string[]> {
+    if (userIds.length === 0) {
+      return [];
+    }
+
+    const spaceHasRestrictedPages =
+      await this.pagePermissionRepo.hasRestrictedPagesInSpace(spaceId);
+    const hasRestriction =
+      spaceHasRestrictedPages &&
+      (await this.pagePermissionRepo.hasRestrictedAncestor(pageId));
+
+    if (!hasRestriction) {
+      const editCapableIds =
+        await this.spaceMemberRepo.getUserIdsWithSpaceEditAccess(
+          userIds,
+          spaceId,
+        );
+      return userIds.filter((id) => editCapableIds.has(id));
+    }
+
+    const results = await Promise.all(
+      userIds.map(async (userId) => {
+        const { canEdit } = await this.pagePermissionRepo.canUserEditPage(
+          userId,
+          pageId,
+        );
+        return canEdit ? userId : null;
+      }),
+    );
+
+    return results.filter((id): id is string => id !== null);
+  }
 }

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

@@ -810,6 +810,10 @@ export class PageService {
       throw new BadRequestException('Invalid move position');
     }
 
+    if (dto.parentPageId && dto.parentPageId === dto.pageId) {
+      throw new BadRequestException('A page cannot be its own parent');
+    }
+
     let parentPageId = null;
     if (movedPage.parentPageId === dto.parentPageId) {
       parentPageId = undefined;

apps/server/src/core/space/dto/update-space.dto.ts

@@ -15,4 +15,8 @@ export class UpdateSpaceDto extends PartialType(CreateSpaceDto) {
   @IsOptional()
   @IsBoolean()
   allowViewerComments: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  hideCommentsFromViewers: boolean;
 }

apps/server/src/core/space/services/space.service.ts

@@ -30,6 +30,35 @@ import {
   IAuditService,
 } from '../../../integrations/audit/audit.service';
 
+export function validateExclusiveCommentSettings(
+  dto: Partial<
+    Pick<UpdateSpaceDto, 'allowViewerComments' | 'hideCommentsFromViewers'>
+  >,
+  settingsBefore: Record<string, any>,
+): void {
+  if (
+    dto.allowViewerComments === undefined &&
+    dto.hideCommentsFromViewers === undefined
+  ) {
+    return;
+  }
+
+  const allowViewerComments =
+    dto.allowViewerComments ??
+    settingsBefore.comments?.allowViewerComments ??
+    false;
+  const hideCommentsFromViewers =
+    dto.hideCommentsFromViewers ??
+    settingsBefore.comments?.hideCommentsFromViewers ??
+    false;
+
+  if (allowViewerComments && hideCommentsFromViewers) {
+    throw new BadRequestException(
+      "'Allow viewers to comment' and 'Hide comments from viewers' cannot both be enabled",
+    );
+  }
+}
+
 @Injectable()
 export class SpaceService {
   constructor(
@@ -141,7 +170,8 @@ export class SpaceService {
 
     if (
       typeof updateSpaceDto.disablePublicSharing !== 'undefined' ||
-      typeof updateSpaceDto.allowViewerComments !== 'undefined'
+      typeof updateSpaceDto.allowViewerComments !== 'undefined' ||
+      typeof updateSpaceDto.hideCommentsFromViewers !== 'undefined'
     ) {
       const workspace = await this.workspaceRepo.findById(workspaceId, {
         withLicenseKey: true,
@@ -168,6 +198,17 @@ export class SpaceService {
       ) {
         throw new ForbiddenException('This feature requires a valid license');
       }
+
+      if (
+        updateSpaceDto.hideCommentsFromViewers === true &&
+        !this.licenseCheckService.hasFeature(
+          workspace.licenseKey,
+          Feature.HIDE_COMMENTS,
+          workspace.plan,
+        )
+      ) {
+        throw new ForbiddenException('This feature requires a valid license');
+      }
     }
 
     const spaceBefore = await this.spaceRepo.findById(
@@ -176,6 +217,8 @@ export class SpaceService {
     );
     const settingsBefore = (spaceBefore?.settings ?? {}) as Record<string, any>;
 
+    validateExclusiveCommentSettings(updateSpaceDto, settingsBefore);
+
     const before: Record<string, any> = {};
     const after: Record<string, any> = {};
 
@@ -218,6 +261,23 @@ export class SpaceService {
         );
       }
 
+      if (typeof updateSpaceDto.hideCommentsFromViewers !== 'undefined') {
+        const prev = settingsBefore?.comments?.hideCommentsFromViewers ?? false;
+        if (prev !== updateSpaceDto.hideCommentsFromViewers) {
+          before.hideCommentsFromViewers = prev;
+          after.hideCommentsFromViewers =
+            updateSpaceDto.hideCommentsFromViewers;
+        }
+
+        await this.spaceRepo.updateCommentSettings(
+          updateSpaceDto.spaceId,
+          workspaceId,
+          'hideCommentsFromViewers',
+          updateSpaceDto.hideCommentsFromViewers,
+          trx,
+        );
+      }
+
       updatedSpace = await this.spaceRepo.updateSpace(
         {
           name: updateSpaceDto.name,

apps/server/src/database/repos/space/space-member.repo.ts

@@ -20,6 +20,7 @@ import {
   CacheKey,
   PERMISSION_CACHE_TTL_MS,
 } from '../../../common/helpers/cache-keys';
+import { SpaceRole } from '../../../common/helpers/types/permission';
 
 @Injectable()
 export class SpaceMemberRepo {
@@ -278,6 +279,32 @@ export class SpaceMemberRepo {
     return new Set(rows.map((r) => r.userId));
   }
 
+  async getUserIdsWithSpaceEditAccess(
+    userIds: string[],
+    spaceId: string,
+  ): Promise<Set<string>> {
+    if (userIds.length === 0) return new Set();
+
+    const rows = await this.db
+      .selectFrom('spaceMembers')
+      .select('userId')
+      .where('userId', 'in', userIds)
+      .where('spaceId', '=', spaceId)
+      .where('spaceMembers.role', 'in', [SpaceRole.ADMIN, SpaceRole.WRITER])
+      .unionAll(
+        this.db
+          .selectFrom('spaceMembers')
+          .innerJoin('groupUsers', 'groupUsers.groupId', 'spaceMembers.groupId')
+          .select('groupUsers.userId')
+          .where('groupUsers.userId', 'in', userIds)
+          .where('spaceMembers.spaceId', '=', spaceId)
+          .where('spaceMembers.role', 'in', [SpaceRole.ADMIN, SpaceRole.WRITER]),
+      )
+      .execute();
+
+    return new Set(rows.map((r) => r.userId));
+  }
+
   async getSpaceIdsByGroupId(groupId: string): Promise<string[]> {
     const rows = await this.db
       .selectFrom('spaceMembers')

apps/server/src/database/repos/space/space.repo.ts

@@ -149,6 +149,17 @@ export class SpaceRepo {
       .executeTakeFirst();
   }
 
+  async getSpaceSettings(
+    spaceId: string,
+  ): Promise<Record<string, any> | null> {
+    const row = await this.db
+      .selectFrom('spaces')
+      .select('settings')
+      .where('id', '=', spaceId)
+      .executeTakeFirst();
+    return (row?.settings as Record<string, any> | undefined) ?? null;
+  }
+
   async insertSpace(
     insertableSpace: InsertableSpace,
     trx?: KyselyTransaction,

apps/server/src/ws/ws.service.ts

@@ -3,6 +3,8 @@ import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { Cache } from 'cache-manager';
 import { Server, Socket } from 'socket.io';
 import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
+import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
+import { PageAccessService } from '../core/page/page-access/page-access.service';
 import {
   TREE_EVENTS,
   WS_SPACE_RESTRICTION_CACHE_PREFIX,
@@ -17,6 +19,8 @@ export class WsService {
 
   constructor(
     private readonly pagePermissionRepo: PagePermissionRepo,
+    private readonly spaceRepo: SpaceRepo,
+    private readonly pageAccessService: PageAccessService,
     @Inject(CACHE_MANAGER) private readonly cacheManager: Cache,
   ) {}
 
@@ -67,9 +71,24 @@ export class WsService {
     spaceId: string,
     pageId: string,
     data: any,
+    opts?: { bypassVisibilityCheck?: boolean },
   ): Promise<void> {
     const room = getSpaceRoomName(spaceId);
 
+    if (
+      !opts?.bypassVisibilityCheck &&
+      (await this.spaceHidesCommentsFromViewers(spaceId))
+    ) {
+      await this.broadcastToUsersMatching(room, null, data, (candidateIds) =>
+        this.pageAccessService.filterUserIdsWithPageEditAccess(
+          spaceId,
+          pageId,
+          candidateIds,
+        ),
+      );
+      return;
+    }
+
     const hasRestrictions = await this.spaceHasRestrictions(spaceId);
     if (!hasRestrictions) {
       this.server.to(room).emit('message', data);
@@ -118,6 +137,17 @@ export class WsService {
     excludeSocketId: string | null,
     pageId: string,
     data: any,
+  ): Promise<void> {
+    await this.broadcastToUsersMatching(room, excludeSocketId, data, (ids) =>
+      this.pagePermissionRepo.getUserIdsWithPageAccess(pageId, ids),
+    );
+  }
+
+  private async broadcastToUsersMatching(
+    room: string,
+    excludeSocketId: string | null,
+    data: any,
+    filterUserIds: (candidateUserIds: string[]) => Promise<string[]>,
   ): Promise<void> {
     const sockets = await this.server.in(room).fetchSockets();
 
@@ -144,15 +174,9 @@ export class WsService {
     const candidateUserIds = Array.from(userSocketMap.keys());
     if (candidateUserIds.length === 0) return;
 
-    const authorizedUserIds =
+    const allowedSet = new Set(await filterUserIds(candidateUserIds));
-      await this.pagePermissionRepo.getUserIdsWithPageAccess(
-        pageId,
-        candidateUserIds,
-      );
-
-    const authorizedSet = new Set(authorizedUserIds);
     for (const [userId, userSockets] of userSocketMap) {
-      if (authorizedSet.has(userId)) {
+      if (allowedSet.has(userId)) {
         for (const socket of userSockets) {
           socket.emit('message', data);
         }
@@ -176,6 +200,13 @@ export class WsService {
     return hasRestrictions;
   }
 
+  private async spaceHidesCommentsFromViewers(
+    spaceId: string,
+  ): Promise<boolean> {
+    const settings = await this.spaceRepo.getSpaceSettings(spaceId);
+    return settings?.comments?.hideCommentsFromViewers === true;
+  }
+
   private extractPageId(data: any): string | null {
     switch (data.operation) {
       case 'addTreeNode':

package.json

@@ -23,11 +23,11 @@
     "@casl/ability": "6.8.0",
     "@docmost/editor-ext": "workspace:*",
     "@floating-ui/dom": "1.7.3",
-    "@hocuspocus/common": "4.4.0",
+    "@hocuspocus/common": "4.5.0",
-    "@hocuspocus/provider": "4.4.0",
+    "@hocuspocus/provider": "4.5.0",
-    "@hocuspocus/provider-react": "4.4.0",
+    "@hocuspocus/provider-react": "4.5.0",
-    "@hocuspocus/server": "4.4.0",
+    "@hocuspocus/server": "4.5.0",
-    "@hocuspocus/transformer": "4.4.0",
+    "@hocuspocus/transformer": "4.5.0",
     "@joplin/turndown": "4.0.82",
     "@joplin/turndown-plugin-gfm": "1.0.64",
     "@sindresorhus/slugify": "3.0.0",
@@ -65,7 +65,7 @@
     "date-fns": "4.1.0",
     "diff": "8.0.3",
     "docx": "9.7.1",
-    "dompurify": "3.4.11",
+    "dompurify": "3.4.13",
     "fractional-indexing-jittered": "1.0.0",
     "highlight.js": "11.11.1",
     "image-dimensions": "2.5.0",
@@ -81,12 +81,12 @@
     "yjs": "^13.6.30"
   },
   "devDependencies": {
-    "@nx/js": "22.6.1",
+    "@nx/js": "23.1.1",
     "@types/bytes": "3.1.5",
     "@types/qrcode": "1.5.6",
     "@types/turndown": "5.0.6",
-    "concurrently": "9.2.3",
+    "concurrently": "10.0.4",
-    "nx": "22.6.1",
+    "nx": "23.1.1",
     "tsx": "^4.21.0"
   },
   "workspaces": {

packages/editor-ext/src/index.ts

@@ -30,7 +30,6 @@ export * from "./lib/shared-storage";
 export * from "./lib/recreate-transform";
 export * from "./lib/columns";
 export * from "./lib/status";
-export * from "./lib/tabs";
 export * from "./lib/pdf";
 export * from "./lib/page-break";
 export * from "./lib/resizable-nodeview";

packages/editor-ext/src/lib/markdown/utils/marked.utils.ts

@@ -2,7 +2,6 @@ import { marked } from "marked";
 import { calloutExtension } from "./callout.marked";
 import { mathBlockExtension } from "./math-block.marked";
 import { mathInlineExtension } from "./math-inline.marked";
-import { tabsExtension } from "./tabs.marked";
 
 marked.use({
   renderer: {
@@ -35,12 +34,7 @@ marked.use({
 });
 
 marked.use({
-  extensions: [
+  extensions: [calloutExtension, mathBlockExtension, mathInlineExtension],
-    calloutExtension,
-    mathBlockExtension,
-    mathInlineExtension,
-    tabsExtension,
-  ],
 });
 
 marked.setOptions({ breaks: true });

packages/editor-ext/src/lib/markdown/utils/tabs.marked.ts

@@ -1,152 +0,0 @@
-import { marked, type Token } from 'marked';
-
-interface MarkdownTab {
-  label: string;
-  text: string;
-  forceActive: boolean;
-}
-
-interface TabbedToken {
-  type: 'tabbed';
-  raw: string;
-  tabs: MarkdownTab[];
-  activeTabIndex: number;
-}
-
-const HEADER_RE =
-  /^===([!+])?\s*["'“”‘’]((?:\\["\\]|[^\\"'“”‘’\n])+?)["'“”‘’]\s*$/gm;
-
-export const tabsExtension = {
-  name: 'tabbed',
-  level: 'block',
-  start(src: string) {
-    return src.search(/^===(?:[!+])?\s*["'“”‘’]/m);
-  },
-  tokenizer(src: string): TabbedToken | undefined {
-    if (src.indexOf('===') === -1) return;
-
-    const headers: Array<{
-      index: number;
-      raw: string;
-      marker: string;
-      label: string;
-    }> = [];
-
-    HEADER_RE.lastIndex = 0;
-
-    for (let m = HEADER_RE.exec(src); m !== null; m = HEADER_RE.exec(src)) {
-      headers.push({
-        index: m.index,
-        raw: m[0],
-        marker: m[1] ?? '',
-        label: unescapeTabLabel(m[2].trim()),
-      });
-    }
-
-    if (headers.length < 1 || headers[0].index !== 0) return;
-
-    const tabs: MarkdownTab[] = [];
-    let consumed = 0;
-    let breakOutOfTabSet = false;
-
-    for (let i = 0; i < headers.length; i++) {
-      const h = headers[i];
-
-      if (i > 0 && h.marker === '!') break;
-
-      const headerEnd = h.index + h.raw.length;
-      const bodyStart =
-        src.charCodeAt(headerEnd) === 10 ? headerEnd + 1 : headerEnd;
-
-      const next = headers[i + 1];
-      const bodyLimit = next ? next.index : src.length;
-      let bodyEnd = bodyLimit;
-      let lineStart = bodyStart;
-      
-      while (lineStart < bodyLimit) {
-        const newlineIndex = src.indexOf('\n', lineStart);
-        const lineEnd =
-          newlineIndex === -1 || newlineIndex > bodyLimit
-            ? bodyLimit
-            : newlineIndex;
-
-        const line = src.slice(lineStart, lineEnd);
-        const isBlank = line.trim() === '';
-        const isIndented = /^( {2,4}|\t)/.test(line);
-
-        if (!isBlank && !isIndented) {
-          bodyEnd = lineStart;
-          breakOutOfTabSet = true;
-          break;
-        }
-
-        lineStart = lineEnd < bodyLimit ? lineEnd + 1 : bodyLimit;
-      }
-
-      let body = src.slice(bodyStart, bodyEnd).replace(/\n+$/, '');
-
-      if (body.length > 0) {
-        body = body
-          .split('\n')
-          .map((line) => line.replace(/^(?:\t| {2,4})/, ''))
-          .join('\n');
-      }
-
-      tabs.push({
-        label: h.label,
-        text: body,
-        forceActive: h.marker === '+',
-      });
-
-      consumed = bodyEnd;
-
-      if (breakOutOfTabSet) break;
-    }
-
-    if (tabs.length < 1) return;
-
-    const forcedActiveIndex = tabs.findIndex((t) => t.forceActive);
-
-    return {
-      type: 'tabbed',
-      raw: src.slice(0, consumed),
-      tabs,
-      activeTabIndex: Math.max(forcedActiveIndex, 0),
-    };
-  },
-  renderer(token: Token) {
-    const tabbedToken = token as TabbedToken;
-
-    const activeTabIndex = Math.max(
-      0,
-      Math.min(tabbedToken.activeTabIndex ?? 0, tabbedToken.tabs.length - 1),
-    );
-
-    const sections = tabbedToken.tabs.map((tab, index) => {
-      const label = escapeHtml(tab.label);
-      const panel = marked.parse(tab.text || '').toString();
-      const isActive = index === activeTabIndex;
-
-      const activeAttrs = isActive
-        ? 'data-tab-active="true"'
-        : 'data-tab-active="false"';
-
-      return `<div data-type="tab" aria-hidden="true" ${activeAttrs}><div data-type="tabLabel">${label}</div><div data-type="tabPanel" >${panel}</div></div>`;
-    });
-
-    return `<div data-type="tabs" data-active-tab="${activeTabIndex}">${sections.join('')}</div>`;
-  },
-};
-
-function unescapeTabLabel(value: string): string {
-  return value.replace(/\\(["\\])/g, '$1');
-}
-
-function escapeHtml(value: string): string {
-  return value
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;');
-}

packages/editor-ext/src/lib/markdown/utils/turndown.utils.ts

@@ -24,7 +24,6 @@ export function htmlToMarkdown(html: string): string {
     TurndownPluginGfm.tables,
     TurndownPluginGfm.strikethrough,
     TurndownPluginGfm.highlightedCodeBlock,
-    tabs,
     taskList,
     callout,
     preserveDetail,
@@ -39,64 +38,6 @@ export function htmlToMarkdown(html: string): string {
   return turndownService.turndown(html).replaceAll('<br>', ' ');
 }
 
-const hasPreviousTabs = (node: HTMLElement) => {
-  // we want to make this as cheap as reasonable since it
-  // would be preferable to return a false positive
-  // than to make the editor noticably slower
-  let el = node.previousElementSibling;
-  let checks = 0;
-
-  while (el) {
-    if (el.getAttribute('data-type') === 'tabs') return true;
-    el = el.previousElementSibling;
-    checks += 1;
-
-    if (checks === 100) return true;
-  }
-
-  return false;
-};
-
-function tabs(turndownService: _TurndownService) {
-  turndownService.addRule('tabs', {
-    filter: (node: HTMLInputElement) =>
-      node.nodeName === 'DIV' && node.getAttribute('data-type') === 'tabs',
-    replacement: (content: string, node: HTMLInputElement) => {
-      const tabNodes = Array.from(
-        node.querySelectorAll(':scope > div[data-type="tab"]'),
-      );
-      if (tabNodes.length === 0) return content;
-
-      const isNestedTabsNode =
-        node.parentElement?.closest('div[data-type="tabs"]') !== null;
-
-      const tabBlocks = tabNodes.map((tabNode, index) => {
-        const labelNode = tabNode.querySelector(
-          ':scope > div[data-type="tabLabel"]',
-        );
-        const panelNode = tabNode.querySelector(
-          ':scope > div[data-type="tabPanel"]',
-        );
-
-        const label = sanitizeTabLabel(labelNode?.textContent || 'Tab');
-        const panelMarkdown = panelNode
-          ? turndownService.turndown(panelNode.innerHTML).trim()
-          : '';
-
-        const isFirstTabInSet = index === 0;
-        const marker =
-          isFirstTabInSet && !isNestedTabsNode && hasPreviousTabs(node)
-            ? '!'
-            : '';
-
-        return `===${marker} "${label}"\n${indentMarkdownBlock(panelMarkdown)}`;
-      });
-
-      return `\n\n${tabBlocks.join('\n\n')}\n\n`;
-    },
-  });
-}
-
 function listParagraph(turndownService: _TurndownService) {
   turndownService.addRule('paragraph', {
     filter: ['p'],
@@ -112,9 +53,7 @@ function listParagraph(turndownService: _TurndownService) {
 function orderedListItem(turndownService: _TurndownService) {
   turndownService.addRule('orderedListItem', {
     filter: function (node: HTMLInputElement) {
-      return (
+      return node.nodeName === 'LI' && node.getAttribute('data-type') !== 'taskItem';
-        node.nodeName === 'LI' && node.getAttribute('data-type') !== 'taskItem'
-      );
     },
     replacement: (content: string, node: HTMLInputElement, options: any) => {
       const parent = node.parentNode as HTMLElement;
@@ -175,7 +114,9 @@ function taskList(turndownService: _TurndownService) {
       const prefix = `- ${isChecked ? '[x]' : '[ ]'} `;
 
       return (
-        prefix + text + (node.nextSibling && !/\n$/.test(text) ? '\n' : '')
+        prefix +
+        text +
+        (node.nextSibling && !/\n$/.test(text) ? '\n' : '')
       );
     },
   });
@@ -270,25 +211,10 @@ function video(turndownService: _TurndownService) {
     replacement: function (_content: string, node: HTMLInputElement) {
       const src = node.getAttribute('src') || '';
       const ariaLabel = node.getAttribute('aria-label');
-      const name = sanitizeMdLinkText(ariaLabel || getBasename(src) || src);
+      const name = sanitizeMdLinkText(
+        ariaLabel || getBasename(src) || src,
+      );
       return '[' + name + '](' + src + ')';
     },
   });
 }
-
-function sanitizeTabLabel(value: string): string {
-  return value
-    .replace(/[\r\n]+/g, ' ')
-    .replace(/\\/g, '\\\\')
-    .replace(/"/g, '\\"')
-    .trim();
-}
-
-function indentMarkdownBlock(content: string): string {
-  if (!content) return '\t';
-
-  return content
-    .split('\n')
-    .map((line) => (line.trim() ? `\t${line}` : ''))
-    .join('\n');
-}

packages/editor-ext/src/lib/tabs/index.ts

@@ -1,8 +0,0 @@
-export { Tabs } from "./tabs";
-export { Tab } from "./tab";
-export { TabLabel } from "./tab-label";
-export { TabPanel } from "./tab-panel";
-export type { TabsOptions } from "./tabs";
-export type { TabOptions } from "./tab";
-export type { TabLabelOptions } from "./tab-label";
-export type { TabPanelOptions } from "./tab-panel";

packages/editor-ext/src/lib/tabs/tab-label.ts

@@ -1,42 +0,0 @@
-import { mergeAttributes, Node } from "@tiptap/core";
-
-export interface TabLabelOptions {
-  HTMLAttributes: Record<string, unknown>;
-}
-
-export const TabLabel = Node.create<TabLabelOptions>({
-  name: "tabLabel",
-  content: "inline*",
-  defining: true,
-  selectable: false,
-
-  addOptions() {
-    return {
-      HTMLAttributes: {},
-    };
-  },
-
-  parseHTML() {
-    return [
-      {
-        tag: `div[data-type="${this.name}"]`,
-      },
-    ];
-  },
-
-  renderHTML({ HTMLAttributes }) {
-    return [
-      "div",
-      mergeAttributes(
-        {
-          "data-type": this.name,
-          "aria-hidden": "true",
-          class: "not-draggable-match"
-        },
-        this.options.HTMLAttributes,
-        HTMLAttributes,
-      ),
-      0,
-    ];
-  },
-});

packages/editor-ext/src/lib/tabs/tab-panel.ts

@@ -1,37 +0,0 @@
-import { mergeAttributes, Node } from "@tiptap/core";
-
-export interface TabPanelOptions {
-  HTMLAttributes: Record<string, unknown>;
-}
-
-export const TabPanel = Node.create<TabPanelOptions>({
-  name: "tabPanel",
-  content: "block+",
-  defining: true,
-
-  addOptions() {
-    return {
-      HTMLAttributes: {},
-    };
-  },
-
-  parseHTML() {
-    return [
-      {
-        tag: `div[data-type="${this.name}"]`,
-      },
-    ];
-  },
-
-  renderHTML({ HTMLAttributes }) {
-    return [
-      "div",
-      mergeAttributes(
-        { "data-type": this.name, role: "tabpanel", class: "not-draggable-match" },
-        this.options.HTMLAttributes,
-        HTMLAttributes,
-      ),
-      0,
-    ];
-  },
-});

packages/editor-ext/src/lib/tabs/tab.ts

@@ -1,72 +0,0 @@
-import { mergeAttributes, Node } from '@tiptap/core';
-import { generateNodeId } from "../utils";
-
-export interface TabOptions {
-  HTMLAttributes: Record<string, unknown>;
-}
-
-export const Tab = Node.create<TabOptions>({
-  name: 'tab',
-  content: 'tabLabel tabPanel',
-  defining: true,
-  isolating: true,
-
-  addOptions() {
-    return {
-      HTMLAttributes: {},
-    };
-  },
-
-  addAttributes() {
-    return {
-      id: {
-        default: '',
-        parseHTML: (element: HTMLElement) =>
-          element.getAttribute('data-tab-id') ?? generateNodeId(),
-        renderHTML: (attributes: { id?: string }) => ({
-          'data-tab-id': attributes.id ?? '',
-        }),
-      },
-      active: {
-        default: true,
-        parseHTML: (element: HTMLElement) => {
-          const rawValue = element.getAttribute('data-tab-active');
-          if (rawValue === null) {
-            return !element.hasAttribute('hidden');
-          }
-
-          return rawValue === 'true';
-        },
-        renderHTML: (attributes: { active?: boolean }) => {
-          const isActive = attributes.active !== false;
-
-          return {
-            'data-tab-active': isActive ? 'true' : 'false',
-            'aria-hidden': isActive ? 'false' : 'true',
-            ...(isActive ? {} : { hidden: 'hidden' }),
-          };
-        },
-      },
-    };
-  },
-
-  parseHTML() {
-    return [
-      {
-        tag: `div[data-type="${this.name}"]`,
-      },
-    ];
-  },
-
-  renderHTML({ HTMLAttributes }) {
-    return [
-      'div',
-      mergeAttributes(
-        { 'data-type': this.name },
-        this.options.HTMLAttributes,
-        HTMLAttributes,
-      ),
-      0,
-    ];
-  },
-});

packages/editor-ext/src/lib/tabs/tabs.ts

@@ -1,463 +0,0 @@
-import { InputRule, Node, Range, mergeAttributes } from '@tiptap/core';
-import { Fragment, type Node as PMNode } from '@tiptap/pm/model';
-import {
-  TextSelection,
-  type Transaction,
-  type EditorState,
-} from '@tiptap/pm/state';
-import { ReactNodeViewRenderer, type ReactNodeViewProps } from '@tiptap/react';
-import type { ComponentType } from 'react';
-import { generateNodeId } from '../utils';
-import { findParentNode } from '../table/utils';
-
-export interface TabsOptions {
-  HTMLAttributes: Record<string, unknown>;
-  view: ComponentType<ReactNodeViewProps<HTMLElement>> | null;
-}
-
-const TAB_INPUT_REGEX =
-  /^\s*===\s*["'“”‘’]((?:\\["\\]|[^\\"'“”‘’\n])+?)["'“”‘’]\s+$/;
-
-declare module '@tiptap/core' {
-  interface Commands<ReturnType> {
-    tabs: {
-      insertTabs: (tabName?: string, range?: Range) => ReturnType;
-      insertTab: (pos: 'right' | 'left') => ReturnType;
-      moveTab: (pos: 'right' | 'left') => ReturnType;
-      setActiveTab: (index: number, tabsPos: number) => ReturnType;
-      deleteTabs: () => ReturnType;
-      updateTabLabel: (
-        index: number,
-        label: string,
-        tabsPos: number,
-      ) => ReturnType;
-    };
-  }
-}
-
-export const Tabs = Node.create<TabsOptions>({
-  name: 'tabs',
-  group: 'block',
-  content: 'tab+',
-  defining: true,
-  isolating: true,
-
-  addOptions() {
-    return { HTMLAttributes: {}, view: null };
-  },
-
-  addAttributes() {
-    return {
-      activeTab: {
-        default: 0,
-        parseHTML: (element) =>
-          Number(element.getAttribute('data-active-tab')) || 0,
-        renderHTML: (attributes) => ({
-          'data-active-tab': clampIndex(attributes.activeTab),
-        }),
-      },
-    };
-  },
-
-  parseHTML() {
-    return [{ tag: `div[data-type="${this.name}"]` }];
-  },
-
-  renderHTML({ HTMLAttributes }) {
-    return [
-      'div',
-      mergeAttributes(
-        { 'data-type': this.name },
-        this.options.HTMLAttributes,
-        HTMLAttributes,
-      ),
-      0,
-    ];
-  },
-
-  addNodeView() {
-    if (!this.options.view) return undefined;
-    this.editor.isInitialized = true;
-    return ReactNodeViewRenderer(this.options.view);
-  },
-
-  addInputRules() {
-    return [
-      new InputRule({
-        find: TAB_INPUT_REGEX,
-        handler: ({ range, match }) => {
-          const rawLabel = typeof match[1] === 'string' ? match[1] : 'Tab 1';
-          const label = rawLabel.replace(/\\(["\\])/g, '$1').trim();
-
-          this.editor.commands.insertTabs(label, range);
-        },
-      }),
-    ];
-  },
-
-  addCommands() {
-    const createTab = (
-      schema: EditorState['schema'],
-      label: string,
-      active: boolean,
-    ) => {
-      const { tab, tabLabel, tabPanel, paragraph } = schema.nodes;
-      if (!tab || !tabLabel || !tabPanel || !paragraph) return null;
-
-      return tab.create({ id: generateNodeId(), active }, [
-        tabLabel.create(null, schema.text(label || ' ')),
-        tabPanel.create(null, paragraph.create()),
-      ]);
-    };
-
-    const getTabPos = (doc: PMNode, tabsPos: number, tabIndex: number) => {
-      const pos = doc.resolve(tabsPos + 1);
-      return pos.posAtIndex(tabIndex, pos.depth);
-    };
-
-    const applyActiveTabState = (
-      tr: Transaction,
-      tabsPos: number,
-      previousIndex: number,
-      nextIndex: number,
-    ) => {
-      const tabsNode = tr.doc.nodeAt(tabsPos);
-      if (tabsNode?.type.name !== 'tabs' || tabsNode.childCount <= 0) {
-        return null;
-      }
-
-      const prev = clampIndex(previousIndex, tabsNode.childCount);
-      const next = clampIndex(nextIndex, tabsNode.childCount);
-
-      tr.setNodeMarkup(tabsPos, undefined, {
-        ...tabsNode.attrs,
-        activeTab: next,
-      });
-
-      const prevTabPos = getTabPos(tr.doc, tabsPos, prev);
-      const nextTabPos = getTabPos(tr.doc, tabsPos, next);
-
-      if (prev !== next) {
-        const prevTabNode = tr.doc.nodeAt(prevTabPos);
-        if (prevTabNode) {
-          tr.setNodeMarkup(prevTabPos, undefined, {
-            ...prevTabNode.attrs,
-            active: false,
-          });
-        }
-      }
-
-      const nextTabNode = tr.doc.nodeAt(nextTabPos);
-      if (nextTabNode) {
-        tr.setNodeMarkup(nextTabPos, undefined, {
-          ...nextTabNode.attrs,
-          active: true,
-        });
-      }
-
-      return nextTabPos;
-    };
-
-    const selectTabPanel = (
-      tr: Transaction,
-      tabsPos: number,
-      tabPos: number,
-    ) => {
-      const tabsNode = tr.doc.nodeAt(tabsPos);
-      if (tabsNode?.type.name !== 'tabs' || tabsNode.childCount <= 0) {
-        return null;
-      }
-
-      const tabNode = tr.doc.nodeAt(tabPos);
-      const labelSize = tabNode?.child(0).nodeSize ?? 0;
-      const panelContentPos = tabPos + 1 + labelSize + 1;
-
-      tr.setSelection(TextSelection.near(tr.doc.resolve(panelContentPos), 1));
-    };
-
-    return {
-      insertTabs:
-        (tabName?: string, range?: Range) =>
-        ({ tr, state, dispatch }) => {
-          const firstTab = createTab(state.schema, tabName ?? 'Tab 1', true);
-          if (!firstTab) return false;
-
-          const tabsNode = this.type.create(
-            {
-              activeTab: 0,
-            },
-            Fragment.fromArray([firstTab]),
-          );
-
-          const insertionPos = tr.selection.from;
-
-          if (range) {
-            tr.replaceRangeWith(
-              range.from,
-              range.to,
-              tabsNode,
-            ).scrollIntoView();
-          } else {
-            tr.replaceSelectionWith(tabsNode).scrollIntoView();
-          }
-
-          const firstTabPos = getTabPos(tr.doc, insertionPos, 0);
-          const firstTabNode = tr.doc.nodeAt(firstTabPos);
-          if (!firstTabNode) return false;
-
-          if (!range) {
-            const labelSize = firstTabNode.child(0)?.nodeSize ?? 0;
-            const panelContentPos = firstTabPos + 2 + labelSize + 2;
-
-            tr.setSelection(
-              TextSelection.near(tr.doc.resolve(panelContentPos), 1),
-            );
-          }
-
-          if (dispatch) dispatch(tr);
-          return true;
-        },
-
-      insertTab:
-        (pos: 'left' | 'right') =>
-        ({ state, tr, dispatch }) => {
-          const { $from } = state.selection;
-          const tabs = findParentNode(
-            (node) => node.type.name === this.name,
-            $from,
-          );
-          if (!tabs || tabs.node.childCount <= 0) return false;
-
-          const currentTabIndex = clampIndex(
-            tabs.node.attrs.activeTab,
-            tabs.node.childCount,
-          );
-
-          const insertIndex =
-            pos === 'right' ? currentTabIndex + 1 : currentTabIndex;
-
-          const newTab = createTab(state.schema, 'Tab', false);
-          if (!newTab) return false;
-
-          const insertPos = getTabPos(state.doc, tabs.pos, insertIndex);
-          tr.insert(insertPos, newTab);
-
-          const insertedTabPos = getTabPos(tr.doc, tabs.pos, insertIndex);
-          tr.setNodeMarkup(insertedTabPos, undefined, {
-            ...newTab.attrs,
-            active: true,
-          });
-
-          const previousActiveIndex =
-            pos === 'left' ? currentTabIndex + 1 : currentTabIndex;
-
-          const activeTabPos = applyActiveTabState(
-            tr,
-            tabs.pos,
-            previousActiveIndex,
-            insertIndex,
-          );
-          if (activeTabPos == null) return false;
-
-          selectTabPanel(tr, tabs.pos, insertedTabPos);
-          if (dispatch) dispatch(tr);
-          return true;
-        },
-
-      moveTab:
-        (pos: 'left' | 'right') =>
-        ({ state, tr, dispatch }) => {
-          const { $from } = state.selection;
-          const tabs = findParentNode(
-            (node) => node.type.name === this.name,
-            $from,
-          );
-          if (!tabs || tabs.node.childCount <= 1) return false;
-
-          const currentTabIndex = clampIndex(
-            tabs.node.attrs.activeTab,
-            tabs.node.childCount,
-          );
-
-          const targetIndex =
-            pos === 'left' ? currentTabIndex - 1 : currentTabIndex + 1;
-
-          if (targetIndex < 0 || targetIndex >= tabs.node.childCount)
-            return false;
-
-          const currentTabPos = getTabPos(state.doc, tabs.pos, currentTabIndex);
-          const currentTabNode = state.doc.nodeAt(currentTabPos);
-          if (!currentTabNode) return false;
-
-          const mappedCurrentTabPos = tr.mapping.map(currentTabPos);
-          tr.delete(
-            mappedCurrentTabPos,
-            mappedCurrentTabPos + currentTabNode.nodeSize,
-          );
-
-          const insertPos = getTabPos(tr.doc, tabs.pos, targetIndex);
-          tr.insert(insertPos, currentTabNode);
-
-          const movedTabPos = applyActiveTabState(
-            tr,
-            tabs.pos,
-            targetIndex,
-            targetIndex,
-          );
-          selectTabPanel(tr, tabs.pos, movedTabPos);
-
-          if (dispatch) dispatch(tr.scrollIntoView());
-          return true;
-        },
-
-      setActiveTab:
-        (index, tabsPos) =>
-        ({ state, tr, dispatch }) => {
-          const tabsNode = state.doc.nodeAt(tabsPos);
-          if (tabsNode?.childCount <= 0) return false;
-
-          const nextIndex = clampIndex(index, tabsNode.childCount);
-          const prevIndex = clampIndex(
-            tabsNode.attrs.activeTab,
-            tabsNode.childCount,
-          );
-
-          const activeTabPos = applyActiveTabState(
-            tr,
-            tabsPos,
-            prevIndex,
-            nextIndex,
-          );
-          if (activeTabPos == null) return false;
-
-          selectTabPanel(tr, tabsPos, activeTabPos);
-          if (dispatch) dispatch(tr.scrollIntoView());
-          return true;
-        },
-
-      updateTabLabel:
-        (index, label, tabsPos) =>
-        ({ state, tr, dispatch }) => {
-          const tabsNode = state.doc.nodeAt(tabsPos);
-          if (!tabsNode) return false;
-
-          const labelIndex = clampIndex(index, tabsNode.childCount);
-          const $tabs = state.doc.resolve(tabsPos + 1);
-          const tabPos = $tabs.posAtIndex(labelIndex, $tabs.depth);
-
-          const labelNode = state.doc.nodeAt(tabPos + 1);
-          const labelContentPos = tabPos + 2;
-
-          tr.replaceWith(
-            labelContentPos,
-            labelContentPos + labelNode.content.size,
-            state.schema.text(label || ' '),
-          );
-
-          if (dispatch) dispatch(tr);
-          return true;
-        },
-
-      deleteTab:
-        () =>
-        ({ state, tr, dispatch }) => {
-          const { $from } = state.selection;
-          const tabs = findParentNode(
-            (node) => node.type.name === this.name,
-            $from,
-          );
-          if (!tabs) return false;
-
-          if (tabs.node.childCount < 2) {
-            this.editor.commands.deleteTabs();
-            return true;
-          }
-
-          const currentTabIndex = clampIndex(
-            tabs.node.attrs.activeTab,
-            tabs.node.childCount,
-          );
-
-          const currentTabPos = getTabPos(state.doc, tabs.pos, currentTabIndex);
-          const currentTabNode = state.doc.nodeAt(currentTabPos);
-          if (!currentTabNode) return false;
-
-          const nextTabIndex =
-            currentTabIndex < tabs.node.childCount - 1
-              ? currentTabIndex
-              : currentTabIndex - 1;
-
-          tr.delete(currentTabPos, currentTabPos + currentTabNode.nodeSize);
-
-          const activeTabPos = applyActiveTabState(
-            tr,
-            tabs.pos,
-            nextTabIndex,
-            nextTabIndex,
-          );
-          if (activeTabPos == null) return false;
-
-          selectTabPanel(tr, tabs.pos, activeTabPos);
-
-          if (dispatch) dispatch(tr);
-          return true;
-        },
-
-      deleteTabs:
-        () =>
-        ({ state, tr, dispatch }) => {
-          const { $from } = state.selection;
-          const tabs = findParentNode(
-            (node) => node.type.name === this.name,
-            $from,
-          );
-          if (tabs?.node.childCount <= 0) return false;
-
-          tr.delete(tabs.pos, tabs.pos + tabs.node.nodeSize);
-
-          if (dispatch) dispatch(tr);
-          return true;
-        },
-    };
-  },
-
-  addKeyboardShortcuts() {
-    return {
-      Enter: ({ editor }) => {
-        const { state } = editor;
-        const { $from, empty } = state.selection;
-
-        if (!empty) return false;
-        if ($from.parent.content.size > 0) return false;
-
-        const tabsNode = findParentNode(
-          (node) => node.type.name === this.name,
-          $from,
-        );
-
-        if (!tabsNode) return false;
-        return editor
-          .chain()
-          .command(({ tr, state }) => {
-            const posAfter = $from.after(tabsNode.depth);
-            tr.delete($from.before(), $from.after());
-
-            const targetPos = tr.mapping.map(posAfter);
-            const paragraph = state.schema.nodes.paragraph.create();
-
-            tr.insert(targetPos, paragraph);
-            tr.setSelection(TextSelection.create(tr.doc, targetPos + 1));
-            return true;
-          })
-          .scrollIntoView()
-          .run();
-      },
-    };
-  },
-});
-
-const clampIndex = (value: unknown, length = Number.MAX_SAFE_INTEGER) => {
-  const parsed = Number(value ?? 0);
-  if (!Number.isFinite(parsed) || length <= 0) return 0;
-  return Math.max(0, Math.min(Math.trunc(parsed), length - 1));
-};

pnpm-workspace.yaml

@@ -5,54 +5,28 @@ patchedDependencies:
   scimmy@1.3.5: patches/scimmy@1.3.5.patch
 overrides:
   prosemirror-changeset: 2.4.0
-  y-prosemirror: 1.3.7
   glob: 13.0.6
   ws: 8.21.0
-  dompurify: 3.4.11
+  dompurify: 3.4.13
+  mermaid: 11.16.1
+  undici: 7.29.0
   tmp: 0.2.7
-  hono: 4.12.25
+  nanoid@^3: 3.3.17
-  mermaid: 11.15.0
-  nanoid@^3: 3.3.8
-  socket.io-parser: 4.2.6
-  serialize-javascript: 7.0.3
   lodash-es: 4.18.1
-  lodash: 4.18.1
-  '@hono/node-server': 1.19.13
-  undici: 7.28.0
-  ajv@^6: 6.14.0
-  ajv@^8: 8.18.0
-  underscore: 1.13.8
-  immutable: 4.3.8
   express-rate-limit: 8.2.2
-  minimatch@^3: 3.1.5
-  minimatch@^5: 5.1.8
   flatted: 3.4.2
-  picomatch@<2.3.2: 2.3.2
+  find-my-way: 9.7.0
-  picomatch@>=4.0.0 <4.0.4: 4.0.4
-  fastify: 5.8.5
-  yaml@>=1.0.0 <1.10.3: 1.10.3
   yaml@>=2.0.0 <2.8.3: 2.8.3
-  path-to-regexp@^8: 8.4.0
+  brace-expansion@^5: 5.0.9
-  brace-expansion@^5: 5.0.6
-  '@xmldom/xmldom': 0.8.13
-  handlebars: 4.7.9
   axios: 1.18.1
-  langsmith: 0.7.0
+  ip-address: 10.3.1
-  follow-redirects: 1.16.0
+  fast-uri: 3.1.5
-  protobufjs: 7.5.8
-  ip-address: 10.1.1
-  fast-uri: 3.1.3
   form-data@>=4.0.0 <4.0.6: 4.0.6
-  nanoid@>=4.0.0 <5.0.9: 5.1.16
+  nanoid@>=4.0.0 <5.1.16: 5.1.16
-  qs: 6.15.3
   esbuild@>=0.27.3 <0.28.1: 0.28.1
-  '@babel/core@<=7.29.0': 7.29.7
   '@opentelemetry/core@>=2.0.0 <2.8.0': 2.9.0
-  '@babel/plugin-transform-modules-systemjs@<=7.29.3': 7.29.7
+  js-yaml@>=3.0.0 <3.15.1: 3.15.1
-  brace-expansion@<1.1.13: 1.1.15
+  js-yaml@>=4.0.0 <4.3.1: 4.3.1
-  brace-expansion@>=2.0.0 <2.0.3: 2.0.3
-  js-yaml@>=3.0.0 <3.15.0: 3.15.0
-  js-yaml@>=4.0.0 <=4.1.1: 4.3.0
 shamefullyHoist: true
 minimumReleaseAge: 4320
 allowBuilds: