minor search filter fixes

Selecting a creator with an empty query now lists their pages (or
attachments in attachment mode) newest-first, with the same space and
page permission filtering as typed search.

Dockerfile

@@ -1,7 +1,7 @@
 FROM node:26-slim AS base
 LABEL org.opencontainers.image.source="https://github.com/docmost/docmost"
 
-RUN npm install -g pnpm@11.23.0
+RUN npm install -g pnpm@11.15.1
 
 FROM base AS builder
 

apps/client/package.json

@@ -64,7 +64,6 @@
     "react-router-dom": "7.18.2",
     "semver": "7.7.4",
     "socket.io-client": "4.8.3",
-    "yet-another-react-lightbox": "^3.32.2",
     "zod": "4.3.6"
   },
   "devDependencies": {

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

@@ -294,7 +294,6 @@
   "Export space": "Export space",
   "Export {{type}}": "Export {{type}}",
   "File exceeds the {{limit}} attachment limit": "File exceeds the {{limit}} attachment limit",
-  "Media": "Media",
   "Align left": "Align left",
   "Align right": "Align right",
   "Align center": "Align center",

apps/client/src/App.tsx

@@ -1,92 +1,60 @@
-import { lazy, Suspense, useEffect } from "react";
 import { Navigate, Route, Routes } from "react-router-dom";
-import Layout from "@/components/layouts/global/layout.tsx";
+import SetupWorkspace from "@/pages/auth/setup-workspace.tsx";
+import LoginPage from "@/pages/auth/login";
+import Home from "@/pages/dashboard/home";
+import Page from "@/pages/page/page";
+import AccountSettings from "@/pages/settings/account/account-settings";
+import WorkspaceMembers from "@/pages/settings/workspace/workspace-members";
+import WorkspaceSettings from "@/pages/settings/workspace/workspace-settings";
+import Groups from "@/pages/settings/group/groups";
+import GroupInfo from "./pages/settings/group/group-info";
+import Spaces from "@/pages/settings/space/spaces.tsx";
 import { Error404 } from "@/components/ui/error-404.tsx";
+import AccountPreferences from "@/pages/settings/account/account-preferences.tsx";
+import SpaceHome from "@/pages/space/space-home.tsx";
+import PageRedirect from "@/pages/page/page-redirect.tsx";
+import Layout from "@/components/layouts/global/layout.tsx";
+import InviteSignup from "@/pages/auth/invite-signup.tsx";
+import ForgotPassword from "@/pages/auth/forgot-password.tsx";
+import PasswordReset from "./pages/auth/password-reset";
+import Billing from "@/ee/billing/pages/billing.tsx";
+import CloudLogin from "@/ee/pages/cloud-login.tsx";
+import CreateWorkspace from "@/ee/pages/create-workspace.tsx";
 import { isCloud } from "@/lib/config.ts";
 import { useTranslation } from "react-i18next";
+import Security from "@/ee/security/pages/security.tsx";
+import License from "@/ee/licence/pages/license.tsx";
 import { useRedirectToCloudSelect } from "@/ee/hooks/use-redirect-to-cloud-select.tsx";
+import SharedPage from "@/pages/share/shared-page.tsx";
+import PdfRenderPage from "@/ee/pdf-export/pdf-render-page.tsx";
+import Shares from "@/pages/settings/shares/shares.tsx";
+import ShareLayout from "@/features/share/components/share-layout.tsx";
+import ShareRedirect from "@/pages/share/share-redirect.tsx";
 import { useTrackOrigin } from "@/hooks/use-track-origin";
-
-const SetupWorkspace = lazy(() => import("@/pages/auth/setup-workspace.tsx"));
-const LoginPage = lazy(() => import("@/pages/auth/login"));
-const Home = lazy(() => import("@/pages/dashboard/home"));
-const Page = lazy(() => import("@/pages/page/page"));
-const AccountSettings = lazy(
-  () => import("@/pages/settings/account/account-settings"),
-);
-const WorkspaceMembers = lazy(
-  () => import("@/pages/settings/workspace/workspace-members"),
-);
-const WorkspaceSettings = lazy(
-  () => import("@/pages/settings/workspace/workspace-settings"),
-);
-const Groups = lazy(() => import("@/pages/settings/group/groups"));
-const GroupInfo = lazy(() => import("./pages/settings/group/group-info"));
-const Spaces = lazy(() => import("@/pages/settings/space/spaces.tsx"));
-const AccountPreferences = lazy(
-  () => import("@/pages/settings/account/account-preferences.tsx"),
-);
-const SpaceHome = lazy(() => import("@/pages/space/space-home.tsx"));
-const PageRedirect = lazy(() => import("@/pages/page/page-redirect.tsx"));
-const InviteSignup = lazy(() => import("@/pages/auth/invite-signup.tsx"));
-const ForgotPassword = lazy(() => import("@/pages/auth/forgot-password.tsx"));
-const PasswordReset = lazy(() => import("./pages/auth/password-reset"));
-const Billing = lazy(() => import("@/ee/billing/pages/billing.tsx"));
-const CloudLogin = lazy(() => import("@/ee/pages/cloud-login.tsx"));
-const CreateWorkspace = lazy(() => import("@/ee/pages/create-workspace.tsx"));
-const Security = lazy(() => import("@/ee/security/pages/security.tsx"));
-const License = lazy(() => import("@/ee/licence/pages/license.tsx"));
-const SharedPage = lazy(() => import("@/pages/share/shared-page.tsx"));
-const PdfRenderPage = lazy(() => import("@/ee/pdf-export/pdf-render-page.tsx"));
-const Shares = lazy(() => import("@/pages/settings/shares/shares.tsx"));
-const ShareLayout = lazy(
-  () => import("@/features/share/components/share-layout.tsx"),
-);
-const ShareRedirect = lazy(() => import("@/pages/share/share-redirect.tsx"));
-const SpacesPage = lazy(() => import("@/pages/spaces/spaces.tsx"));
-const MfaChallengePage = lazy(() =>
-  import("@/ee/mfa/pages/mfa-challenge-page").then((m) => ({
-    default: m.MfaChallengePage,
-  })),
-);
-const MfaSetupRequiredPage = lazy(() =>
-  import("@/ee/mfa/pages/mfa-setup-required-page").then((m) => ({
-    default: m.MfaSetupRequiredPage,
-  })),
-);
-const SpaceTrash = lazy(() => import("@/pages/space/space-trash.tsx"));
-const UserApiKeys = lazy(() => import("@/ee/api-key/pages/user-api-keys"));
-const WorkspaceApiKeys = lazy(
-  () => import("@/ee/api-key/pages/workspace-api-keys"),
-);
-const AiSettings = lazy(() => import("@/ee/ai/pages/ai-settings.tsx"));
-const BasePage = lazy(() => import("@/ee/base/pages/base-page.tsx"));
-const AuditLogs = lazy(() => import("@/ee/audit/pages/audit-logs.tsx"));
-const VerifiedPages = lazy(
-  () => import("@/ee/page-verification/pages/verified-pages.tsx"),
-);
-const TemplateList = lazy(() => import("@/ee/template/pages/template-list"));
-const TemplateEditor = lazy(
-  () => import("@/ee/template/pages/template-editor"),
-);
-const FavoritesPage = lazy(() => import("@/pages/favorites/favorites-page"));
-const AiChat = lazy(() => import("@/ee/ai-chat/pages/ai-chat.tsx"));
-const VerifyEmail = lazy(() => import("@/ee/pages/verify-email.tsx"));
-const LabelPage = lazy(() => import("@/pages/label/label-page"));
+import SpacesPage from "@/pages/spaces/spaces.tsx";
+import { MfaChallengePage } from "@/ee/mfa/pages/mfa-challenge-page";
+import { MfaSetupRequiredPage } from "@/ee/mfa/pages/mfa-setup-required-page";
+import SpaceTrash from "@/pages/space/space-trash.tsx";
+import UserApiKeys from "@/ee/api-key/pages/user-api-keys";
+import WorkspaceApiKeys from "@/ee/api-key/pages/workspace-api-keys";
+import AiSettings from "@/ee/ai/pages/ai-settings.tsx";
+import BasePage from "@/ee/base/pages/base-page.tsx";
+import AuditLogs from "@/ee/audit/pages/audit-logs.tsx";
+import VerifiedPages from "@/ee/page-verification/pages/verified-pages.tsx";
+import TemplateList from "@/ee/template/pages/template-list";
+import TemplateEditor from "@/ee/template/pages/template-editor";
+import FavoritesPage from "@/pages/favorites/favorites-page";
+import AiChat from "@/ee/ai-chat/pages/ai-chat.tsx";
+import VerifyEmail from "@/ee/pages/verify-email.tsx";
+import LabelPage from "@/pages/label/label-page";
 
 export default function App() {
   const { t } = useTranslation();
   useRedirectToCloudSelect();
   useTrackOrigin();
 
-  useEffect(() => {
-    // warm the editor chunk so opening a page doesn't wait on the network
-    const timer = setTimeout(() => import("@/pages/page/page"), 3000);
-    return () => clearTimeout(timer);
-  }, []);
-
   return (
-    <Suspense fallback={null}>
+    <>
       <Routes>
         <Route index element={<Navigate to="/home" />} />
         <Route path={"/login"} element={<LoginPage />} />
@@ -167,6 +135,6 @@ export default function App() {
 
         <Route path="*" element={<Error404 />} />
       </Routes>
-    </Suspense>
+    </>
   );
 }

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

@@ -1,30 +1,17 @@
 import { ActionIcon, Box, Group, ScrollArea, Title, Tooltip } from "@mantine/core";
 import { IconX } from "@tabler/icons-react";
+import CommentListWithTabs from "@/features/comment/components/comment-list-with-tabs.tsx";
 import { useAtom } from "jotai";
 import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
-import React, { lazy, ReactNode, Suspense, useEffect } from "react";
+import React, { ReactNode, useEffect } from "react";
 import { useTranslation } from "react-i18next";
+import { TableOfContents } from "@/features/editor/components/table-of-contents/table-of-contents.tsx";
 import { useAtomValue } from "jotai";
 import { pageEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
+import AsideChatPanel from "@/ee/ai-chat/components/aside-chat-panel";
+import { PageDetailsAside } from "@/features/page-details/components/page-details-aside.tsx";
 import { ASIDE_PANEL_ID } from "@/hooks/use-toggle-aside.tsx";
 
-const CommentListWithTabs = lazy(
-  () => import("@/features/comment/components/comment-list-with-tabs.tsx"),
-);
-const TableOfContents = lazy(() =>
-  import(
-    "@/features/editor/components/table-of-contents/table-of-contents.tsx"
-  ).then((m) => ({ default: m.TableOfContents })),
-);
-const AsideChatPanel = lazy(
-  () => import("@/ee/ai-chat/components/aside-chat-panel"),
-);
-const PageDetailsAside = lazy(() =>
-  import("@/features/page-details/components/page-details-aside.tsx").then(
-    (m) => ({ default: m.PageDetailsAside }),
-  ),
-);
-
 export default function Aside() {
   const [{ tab, isAsideOpen }, setAsideState] = useAtom(asideStateAtom);
   const { t } = useTranslation();
@@ -81,19 +68,17 @@ export default function Aside() {
             </Group>
           )}
 
-          <Suspense fallback={null}>
-            {tab === "comments" || tab === "chat" ? (
-              component
-            ) : (
-              <ScrollArea
-                style={{ height: "85vh" }}
-                scrollbarSize={5}
-                type="scroll"
-              >
-                <div style={{ paddingBottom: "200px" }}>{component}</div>
-              </ScrollArea>
-            )}
-          </Suspense>
+          {tab === "comments" || tab === "chat" ? (
+            component
+          ) : (
+            <ScrollArea
+              style={{ height: "85vh" }}
+              scrollbarSize={5}
+              type="scroll"
+            >
+              <div style={{ paddingBottom: "200px" }}>{component}</div>
+            </ScrollArea>
+          )}
         </>
       )}
     </Box>

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

@@ -11,10 +11,7 @@ import {
   sidebarWidthAtom,
 } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import { SpaceSidebar } from "@/features/space/components/sidebar/space-sidebar.tsx";
-
-const AiChatSidebar = React.lazy(
-  () => import("@/ee/ai-chat/components/ai-chat-sidebar.tsx"),
-);
+import AiChatSidebar from "@/ee/ai-chat/components/ai-chat-sidebar.tsx";
 import { AppHeader } from "@/components/layouts/global/app-header.tsx";
 import Aside from "@/components/layouts/global/aside.tsx";
 import classes from "./app-shell.module.css";
@@ -129,11 +126,7 @@ export default function GlobalAppShell({
         )}
         {isSpaceRoute && <SpaceSidebar />}
         {isSettingsRoute && <SettingsSidebar />}
-        {isAiRoute && (
-          <React.Suspense fallback={null}>
-            <AiChatSidebar />
-          </React.Suspense>
-        )}
+        {isAiRoute && <AiChatSidebar />}
         {showGlobalSidebar && <GlobalSidebar />}
       </AppShell.Navbar>
       <AppShell.Main id={MAIN_CONTENT_ID} tabIndex={-1}>

apps/client/src/ee/base/components/views/view-filter-config.tsx

@@ -9,7 +9,6 @@ import {
   Text,
   UnstyledButton,
   Button,
-  MultiSelect,
 } from "@mantine/core";
 import { IconPlus, IconTrash } from "@tabler/icons-react";
 import {
@@ -53,9 +52,6 @@ const NO_VALUE_OPERATORS: FilterOperator[] = ["isEmpty", "isNotEmpty"];
 // stored value so a stale shape isn't sent to the engine.
 function valueClass(op: FilterOperator, inputKind: string): string {
   if (NO_VALUE_OPERATORS.includes(op)) return "none";
-  if (inputKind === "choices") {
-    return op === "any" || op === "none" ? "choicesMulti" : "choicesSingle";
-  }
   if (inputKind === "person") {
     return op === "any" || op === "none" ? "personMulti" : "personSingle";
   }
@@ -74,10 +70,6 @@ function getOperatorsForType(type: string): FilterOperator[] {
     DEFAULT_FILTER_OPERATORS) as FilterOperator[];
 }
 
-function isMultiChoice(op: FilterCondition["op"]): boolean {
-  return op === "any" || op === "none";
-}
-
 function FilterValueInput({
   condition,
   property,
@@ -129,32 +121,6 @@ function FilterValueInput({
     const typeOptions = property.typeOptions as SelectTypeOptions | undefined;
     const choices = typeOptions?.choices ?? [];
     const choiceOptions = choices.map((c) => ({ value: c.id, label: c.name }));
-
-    if (isMultiChoice(condition.op)) {
-      const { value } = condition;
-      const selected = (
-        Array.isArray(value) ? value : value ? [value] : []
-      ).filter((id) => choices.some((c) => c.id === id));
-
-      return (
-        <MultiSelect
-          size="xs"
-          data={choiceOptions}
-          comboboxProps={{ withinPortal: false }}
-          value={selected}
-          onChange={(values) => onChange(values)}
-          w={160}
-          styles={{
-            pillsList: {
-              maxHeight: 70,
-              overflowY: "auto",
-            },
-          }}
-          maxDropdownHeight={220}
-        />
-      );
-    }
-
     return (
       <Select
         size="xs"
@@ -233,18 +199,11 @@ export function ViewFilterConfigPopover({
     label: p.name,
   }));
 
-  const [unSaved, setUnSaved] = useState(false)
   const [draft, setDraft] = useState<FilterCondition | null>(null);
-  const [draftConditions, setDraftConditions] =
-    useState<FilterCondition[]>(conditions);
 
   useEffect(() => {
-    if (opened) {
-      setDraftConditions(conditions);
-      setDraft(null);
-      setUnSaved(false)
-    }
-  }, [opened, conditions]);
+    if (!opened) setDraft(null);
+  }, [opened]);
 
   const handleStartDraft = useCallback(() => {
     const firstProperty = properties[0];
@@ -257,21 +216,14 @@ export function ViewFilterConfigPopover({
   }, [properties]);
 
   const handleSaveDraft = useCallback(() => {
-    const nextConditions = draft
-      ? [...draftConditions, draft]
-      : draftConditions;
-
-    onChange(nextConditions);
+    if (!draft) return;
+    onChange([...conditions, draft]);
     setDraft(null);
-    setUnSaved(false)
-
-  }, [draft, draftConditions, onChange]);
+  }, [draft, conditions, onChange]);
 
   const handleCancelDraft = useCallback(() => {
-    setDraftConditions(conditions)
     setDraft(null);
-    setUnSaved(false)
-  }, [conditions]);
+  }, []);
 
   const handleDraftPropertyChange = useCallback(
     (propertyId: string | null) => {
@@ -320,19 +272,17 @@ export function ViewFilterConfigPopover({
 
   const handleRemove = useCallback(
     (index: number) => {
-      setUnSaved(true);
-      setDraftConditions((current) => current.filter((_, i) => i !== index));
+      onChange(conditions.filter((_, i) => i !== index));
     },
-    [],
+    [conditions, onChange],
   );
 
   const handlePropertyChange = useCallback(
     (index: number, propertyId: string | null) => {
       if (!propertyId) return;
       const newProperty = properties.find((p) => p.id === propertyId);
-      setUnSaved(true)
-      setDraftConditions((current) =>
-        current.map((f, i) => {
+      onChange(
+        conditions.map((f, i) => {
           if (i !== index) return f;
           if (newProperty) {
             const validOperators = getOperatorsForType(newProperty.type);
@@ -352,16 +302,15 @@ export function ViewFilterConfigPopover({
         }),
       );
     },
-    [properties],
+    [conditions, properties, onChange],
   );
 
   const handleOperatorChange = useCallback(
     (index: number, operator: string | null) => {
       if (!operator) return;
       const op = operator as FilterOperator;
-      setUnSaved(true)
-      setDraftConditions((current) =>
-        current.map((f, i) => {
+      onChange(
+        conditions.map((f, i) => {
           if (i !== index) return f;
           const kind = inputKindForProperty(
             properties.find((p) => p.id === f.propertyId),
@@ -371,17 +320,16 @@ export function ViewFilterConfigPopover({
         }),
       );
     },
-    [properties],
+    [conditions, properties, onChange],
   );
 
   const handleValueChange = useCallback(
     (index: number, value: unknown) => {
-      setUnSaved(true)
-      setDraftConditions((current) =>
-        current.map((f, i) => (i === index ? { ...f, value } : f)),
+      onChange(
+        conditions.map((f, i) => (i === index ? { ...f, value } : f)),
       );
     },
-    [],
+    [conditions, onChange],
   );
 
   return (
@@ -414,13 +362,13 @@ export function ViewFilterConfigPopover({
             {t("Filter by")}
           </Text>
 
-          {draftConditions.length === 0 && !draft && (
+          {conditions.length === 0 && !draft && (
             <Text size="xs" c="dimmed">
               {t("No filters applied")}
             </Text>
           )}
 
-          {draftConditions.map((condition, index) => {
+          {conditions.map((condition, index) => {
             const needsValue = !NO_VALUE_OPERATORS.includes(condition.op);
             const property = properties.find(
               (p) => p.id === condition.propertyId,
@@ -523,6 +471,14 @@ export function ViewFilterConfigPopover({
                     />
                   )}
                 </Group>
+                <Group justify="flex-end" gap="xs">
+                  <Button variant="default" size="xs" onClick={handleCancelDraft}>
+                    {t("Cancel")}
+                  </Button>
+                  <Button size="xs" onClick={handleSaveDraft}>
+                    {t("Save")}
+                  </Button>
+                </Group>
               </Stack>
             );
           })()}
@@ -536,20 +492,6 @@ export function ViewFilterConfigPopover({
               {t("Add filter")}
             </UnstyledButton>
           )}
-          <Group justify="flex-end" gap="xs">
-            <Button
-              variant="default"
-              size="xs"
-              onClick={handleCancelDraft}
-              disabled={!draft && !unSaved}
-            >
-              {t("Cancel")}
-            </Button>
-
-            <Button size="xs" onClick={handleSaveDraft} disabled={!draft && !unSaved}>
-              {t("Save")}
-            </Button>
-          </Group>
         </Stack>
       </Popover.Dropdown>
     </Popover>

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

@@ -16,14 +16,6 @@ export const showAiMenuAtom = atom(false);
 
 export const showLinkMenuAtom = atom(false);
 
-export type LightboxRequest = {
-  src: string;
-  type: "image" | "video";
-} | null;
-
-const initialLightboxRequest: LightboxRequest = null;
-export const lightboxRequestAtom = atom(initialLightboxRequest);
-
 // Current page's edit mode — initialized from the user's saved preference on
 // first load, can be toggled locally without persisting to the server.
 export const currentPageEditModeAtom = atom<PageEditMode>(PageEditMode.Edit);

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

@@ -23,21 +23,11 @@ import {
 } from "@/features/comment/atoms/comment-atom";
 import { useAtom, useAtomValue } from "jotai";
 import { v7 as uuid7 } from "uuid";
-import {
-  isCellSelection,
-  isEditorReady,
-  isTextSelected,
-} from "@docmost/editor-ext";
+import { isCellSelection, isEditorReady, isTextSelected } from "@docmost/editor-ext";
 import { LinkSelector } from "@/features/editor/components/bubble-menu/link-selector.tsx";
 import { useTranslation } from "react-i18next";
-import {
-  showAiMenuAtom,
-  showLinkMenuAtom,
-} from "@/features/editor/atoms/editor-atoms";
-import {
-  userAtom,
-  workspaceAtom,
-} from "@/features/user/atoms/current-user-atom";
+import { showAiMenuAtom, showLinkMenuAtom } from "@/features/editor/atoms/editor-atoms";
+import { userAtom, workspaceAtom } from "@/features/user/atoms/current-user-atom";
 
 export interface BubbleMenuItem {
   name: string;
@@ -227,12 +217,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
 
             <ActionIcon.Group>
               {items.map((item, index) => (
-                <Tooltip
-                  key={index}
-                  label={t(item.name)}
-                  withArrow
-                  withinPortal={false}
-                >
+                <Tooltip key={index} label={t(item.name)} withArrow>
                   <ActionIcon
                     key={index}
                     variant="default"
@@ -241,9 +226,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
                     aria-label={t(item.name)}
                     className={clsx({ [classes.active]: item.isActive() })}
                     style={{ border: "none" }}
-                    onClick={() =>
-                      isEditorReady(props.editor) && item.command()
-                    }
+                    onClick={() => isEditorReady(props.editor) && item.command()}
                   >
                     <item.icon style={{ width: rem(16) }} stroke={2} />
                   </ActionIcon>
@@ -273,9 +256,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
               radius="6px"
               aria-label={t(commentItem.name)}
               style={{ border: "none" }}
-              onClick={() =>
-                isEditorReady(props.editor) && commentItem.command()
-              }
+              onClick={() => isEditorReady(props.editor) && commentItem.command()}
             >
               <IconMessage size={16} stroke={2} />
             </ActionIcon>

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

@@ -129,7 +129,8 @@ function handleColorKeyNav(
   grid: "text" | "highlight",
 ) {
   const cols = COLOR_GRID_COLS;
-  const total = grid === "text" ? TEXT_COLORS.length : HIGHLIGHT_COLORS.length;
+  const total =
+    grid === "text" ? TEXT_COLORS.length : HIGHLIGHT_COLORS.length;
   const col = index % cols;
 
   if (e.key === "ArrowRight") {
@@ -162,7 +163,8 @@ function handleColorKeyNav(
     if (prev >= 0) {
       focusSwatch(grid, prev);
     } else if (grid === "highlight") {
-      const lastRowStart = Math.floor((TEXT_COLORS.length - 1) / cols) * cols;
+      const lastRowStart =
+        Math.floor((TEXT_COLORS.length - 1) / cols) * cols;
       focusSwatch("text", Math.min(lastRowStart + col, TEXT_COLORS.length - 1));
     }
     return;
@@ -220,7 +222,7 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
       withArrow
     >
       <Popover.Target>
-        <Tooltip label={t("Text color")} withArrow withinPortal={false}>
+        <Tooltip label={t("Text color")} withArrow>
           <Button
             variant="default"
             radius="0"
@@ -245,26 +247,26 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
 
       <Popover.Dropdown onMouseDown={(e) => e.preventDefault()}>
         <Stack gap="md" p="2px">
-          <Box>
-            <Text size="sm" fw={600} mb="xs">
-              {t("Text color")}
-            </Text>
-            <SimpleGrid cols={5} spacing="xs">
-              {TEXT_COLORS.map(({ name, color }, index) => {
-                const applyTextColor = () => {
-                  if (!isEditorReady(editor)) return;
-                  if (name === "Default") {
-                    editor.commands.unsetColor();
-                  } else {
-                    editor
-                      .chain()
-                      .focus()
-                      .setColor(color || "")
-                      .run();
-                  }
-                  setIsOpen(false);
-                };
-                return (
+            <Box>
+              <Text size="sm" fw={600} mb="xs">
+                {t("Text color")}
+              </Text>
+              <SimpleGrid cols={5} spacing="xs">
+                {TEXT_COLORS.map(({ name, color }, index) => {
+                  const applyTextColor = () => {
+                    if (!isEditorReady(editor)) return;
+                    if (name === "Default") {
+                      editor.commands.unsetColor();
+                    } else {
+                      editor
+                        .chain()
+                        .focus()
+                        .setColor(color || "")
+                        .run();
+                    }
+                    setIsOpen(false);
+                  };
+                  return (
                   <Tooltip key={index} label={t(name)} withArrow>
                     <Box
                       role="button"
@@ -304,34 +306,34 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                       A
                     </Box>
                   </Tooltip>
-                );
-              })}
-            </SimpleGrid>
-          </Box>
+                  );
+                })}
+              </SimpleGrid>
+            </Box>
 
-          <Box>
-            <Text size="sm" fw={600} mb="xs">
-              {t("Highlight color")}
-            </Text>
-            <SimpleGrid cols={5} spacing="xs">
-              {HIGHLIGHT_COLORS.map(({ name, color }, index) => {
-                const applyHighlight = () => {
-                  if (!isEditorReady(editor)) return;
-                  if (name === "Default") {
-                    editor.commands.unsetHighlight();
-                  } else {
-                    editor
-                      .chain()
-                      .focus()
-                      .toggleMark("highlight", {
-                        color: color || "",
-                        colorName: name.toLowerCase() || "",
-                      })
-                      .run();
-                  }
-                  setIsOpen(false);
-                };
-                return (
+            <Box>
+              <Text size="sm" fw={600} mb="xs">
+                {t("Highlight color")}
+              </Text>
+              <SimpleGrid cols={5} spacing="xs">
+                {HIGHLIGHT_COLORS.map(({ name, color }, index) => {
+                  const applyHighlight = () => {
+                    if (!isEditorReady(editor)) return;
+                    if (name === "Default") {
+                      editor.commands.unsetHighlight();
+                    } else {
+                      editor
+                        .chain()
+                        .focus()
+                        .toggleMark("highlight", {
+                          color: color || "",
+                          colorName: name.toLowerCase() || "",
+                        })
+                        .run();
+                    }
+                    setIsOpen(false);
+                  };
+                  return (
                   <Tooltip key={index} label={t(name)} withArrow>
                     <Box
                       role="button"
@@ -376,36 +378,37 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                       )}
                     </Box>
                   </Tooltip>
-                );
-              })}
-            </SimpleGrid>
-          </Box>
+                  );
+                })}
+              </SimpleGrid>
+            </Box>
 
-          <Button
-            variant="default"
-            fullWidth
-            data-color-grid="remove"
-            className={classes.removeColor}
-            onClick={() => {
-              if (isEditorReady(editor)) {
-                editor.commands.unsetColor();
-                editor.commands.unsetHighlight();
-              }
-              setIsOpen(false);
-            }}
-            onKeyDown={(e) => {
-              if (e.key === "ArrowUp") {
-                e.preventDefault();
-                const lastRowStart =
-                  Math.floor((HIGHLIGHT_COLORS.length - 1) / COLOR_GRID_COLS) *
-                  COLOR_GRID_COLS;
-                focusSwatch("highlight", lastRowStart);
-              }
-            }}
-          >
-            {t("Remove color")}
-          </Button>
-        </Stack>
+            <Button
+              variant="default"
+              fullWidth
+              data-color-grid="remove"
+              className={classes.removeColor}
+              onClick={() => {
+                if (isEditorReady(editor)) {
+                  editor.commands.unsetColor();
+                  editor.commands.unsetHighlight();
+                }
+                setIsOpen(false);
+              }}
+              onKeyDown={(e) => {
+                if (e.key === "ArrowUp") {
+                  e.preventDefault();
+                  const lastRowStart =
+                    Math.floor(
+                      (HIGHLIGHT_COLORS.length - 1) / COLOR_GRID_COLS,
+                    ) * COLOR_GRID_COLS;
+                  focusSwatch("highlight", lastRowStart);
+                }
+              }}
+            >
+              {t("Remove color")}
+            </Button>
+          </Stack>
       </Popover.Dropdown>
     </Popover>
   );

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

@@ -10,7 +10,7 @@ export const LinkSelector: FC = () => {
   const setShowLinkMenu = useSetAtom(showLinkMenuAtom);
 
   return (
-    <Tooltip label={t("Add link")} withArrow withinPortal={false}>
+    <Tooltip label={t("Add link")} withArrow>
       <ActionIcon
         variant="default"
         size="lg"

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

@@ -91,12 +91,7 @@ export const TextAlignmentSelector: FC<TextAlignmentProps> = ({
       onChange={setIsOpen}
     >
       <Menu.Target>
-        <Tooltip
-          label={t("Text align")}
-          withArrow
-          disabled={isOpen}
-          withinPortal={false}
-        >
+        <Tooltip label={t("Text align")} withArrow disabled={isOpen}>
           <Button
             variant="default"
             style={{ border: "none", height: "34px" }}

apps/client/src/features/editor/components/common/lightbox-view.tsx

@@ -1,176 +0,0 @@
-import type { Editor } from "@tiptap/react";
-import type { Node as PMNode } from "@tiptap/pm/model";
-import Lightbox, { type Slide } from "yet-another-react-lightbox";
-import type { LightboxRequest } from "@/features/editor/atoms/editor-atoms";
-import { getFileUrl } from "@/lib/config.ts";
-import "yet-another-react-lightbox/styles.css";
-import "yet-another-react-lightbox/plugins/captions.css";
-import Captions from "yet-another-react-lightbox/plugins/captions";
-import Download from "yet-another-react-lightbox/plugins/download";
-import Fullscreen from "yet-another-react-lightbox/plugins/fullscreen";
-import Video from "yet-another-react-lightbox/plugins/video";
-import Zoom from "yet-another-react-lightbox/plugins/zoom";
-import { useEffect, useMemo, useState } from "react";
-import i18n from "@/i18n.ts";
-import { useTranslation } from "react-i18next";
-
-type LightboxViewProps = {
-  editor: Editor;
-  open: boolean;
-  src: string;
-  type: "image" | "video";
-  onClose: () => void;
-};
-
-function getVideoMimeType(src: string) {
-  const extension = src.split(/[?#]/, 1)[0].split(".").pop()?.toLowerCase();
-
-  switch (extension) {
-    case "webm":
-      return "video/webm";
-    case "ogv":
-      return "video/ogg";
-    case "mov":
-      return "video/quicktime";
-    case "m4v":
-      return "video/x-m4v";
-    default:
-      return "video/mp4";
-  }
-}
-
-function getFilename(src: string) {
-  const filename = src.split(/[?#]/, 1)[0].split("/").pop();
-  if (!filename) return i18n.t("Media");
-
-  try {
-    return decodeURIComponent(filename);
-  } catch {
-    return filename;
-  }
-}
-
-function getMedia(rawSrc: string, type?: string, alt?: string): Slide {
-  const src = getFileUrl(rawSrc);
-  const filename = getFilename(rawSrc);
-  const caption = alt || filename;
-
-  if (type === "video") {
-    return {
-      type: "video",
-      sources: [{ src, type: getVideoMimeType(rawSrc) }],
-      title: caption,
-      download: { url: src, filename },
-    };
-  } else {
-    return {
-      type: "image",
-      src,
-      alt: alt || undefined,
-      title: caption,
-      download: { url: src, filename },
-    };
-  }
-}
-
-const LIGHTBOX_NODE_TYPES: Record<string, "image" | "video"> = {
-  image: "image",
-  video: "video",
-  drawio: "image",
-  excalidraw: "image",
-};
-
-// video is excluded: clicks there operate the native controls
-const CLICK_TO_EXPAND_NODE_TYPES = new Set(["image", "drawio", "excalidraw"]);
-
-export function getLightboxClickRequest(node: PMNode): LightboxRequest {
-  if (!CLICK_TO_EXPAND_NODE_TYPES.has(node.type.name)) return null;
-
-  const src = typeof node.attrs.src === "string" ? node.attrs.src : "";
-  if (!src) return null;
-
-  return { src: getFileUrl(src), type: "image" };
-}
-
-function getPageMedia(editor: Editor): Slide[] {
-  const media: Slide[] = [];
-
-  editor.state.doc.descendants((node) => {
-    const type = LIGHTBOX_NODE_TYPES[node.type.name];
-    if (!type) return;
-
-    const rawSrc = typeof node.attrs.src === "string" ? node.attrs.src : "";
-    if (!rawSrc) return;
-
-    media.push(getMedia(rawSrc, type, node.attrs.alt));
-  });
-
-  return media;
-}
-
-export default function LightboxView({
-  editor,
-  open,
-  src,
-  type,
-  onClose,
-}: LightboxViewProps) {
-  const { i18n: i18nInstance } = useTranslation();
-
-  const selectedSlide = useMemo(
-    () => getMedia(src, type),
-    [src, type, i18nInstance.language]
-  );
-
-  const [pageSlides, setPageSlides] = useState<Slide[]>([]);
-  const [loadedMediaKey, setLoadedMediaKey] = useState<string | null>(null);
-
-  useEffect(() => {
-    if (!open) return;
-
-    setLoadedMediaKey(null);
-
-    const frame = requestAnimationFrame(() => {
-      const slides = getPageMedia(editor);
-
-      setPageSlides(slides);
-      setLoadedMediaKey(`${type}:${src}`);
-    });
-
-    return () => cancelAnimationFrame(frame);
-  }, [editor, open, type, src]);
-
-  const slides = loadedMediaKey === `${type}:${src}` ? pageSlides : [selectedSlide];
-
-  const index = useMemo(() => {
-    if (!(pageSlides.length > 0)) {
-      return 0;
-    }
-
-    const idx = slides.findIndex((slide) =>
-      type === "video"
-        ? "sources" in slide && slide.sources.some((s) => s.src === src)
-        : "src" in slide && slide.src === src
-    );
-    return idx >= 0 ? idx : 0;
-  }, [slides, src, type]);
-
-  return (
-    <Lightbox
-      open={open}
-      close={onClose}
-      index={index}
-      slides={slides}
-      plugins={[Captions, Download, Fullscreen, Video, Zoom]}
-      styles={{ container: { backgroundColor: "rgba(0, 0, 0, 0.8)" } }}
-      captions={{ descriptionTextAlign: "center" }}
-      video={{ controls: true, playsInline: true }}
-      zoom={{
-        scrollToZoom: true,
-        maxZoomPixelRatio: 4,
-        maxZoom: 4,
-        supports: ["video"],
-      }}
-    />
-  );
-}

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

@@ -1,7 +1,6 @@
 import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { useSetAtom } from "jotai";
 import { Node as PMNode } from "@tiptap/pm/model";
 import { isEditorReady } from "@docmost/editor-ext";
 import {
@@ -25,7 +24,6 @@ import {
   IconDownload,
   IconEdit,
   IconTrash,
-  IconZoomIn,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { getDrawioUrl, getFileUrl } from "@/lib/config.ts";
@@ -41,12 +39,10 @@ import { decodeBase64ToSvgString, svgStringToFile } from "@/lib/utils";
 import { IAttachment } from "@/features/attachments/types/attachment.types";
 import { modals } from "@mantine/modals";
 import { useAltTextControl } from "@/features/editor/components/common/use-alt-text-control.tsx";
-import { lightboxRequestAtom } from "@/features/editor/atoms/editor-atoms";
 import classes from "../common/toolbar-menu.module.css";
 
 export function DrawioMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
-  const setLightboxRequest = useSetAtom(lightboxRequestAtom);
   const [opened, { open, close }] = useDisclosure(false);
   const [initialXML, setInitialXML] = useState<string>("");
   const drawioRef = useRef<DrawIoEmbedRef>(null);
@@ -332,23 +328,6 @@ export function DrawioMenu({ editor }: EditorMenuProps) {
 
           <div className={classes.divider} />
 
-          <Tooltip position="top" label={t("Expand")} withinPortal={false}>
-            <ActionIcon
-              onClick={() =>
-                editorState?.src &&
-                setLightboxRequest({
-                  src: getFileUrl(editorState.src),
-                  type: "image",
-                })
-              }
-              size="lg"
-              aria-label={t("Expand")}
-              variant="subtle"
-            >
-              <IconZoomIn size={18} />
-            </ActionIcon>
-          </Tooltip>
-
           <Tooltip position="top" label={t("Edit")} withinPortal={false}>
             <ActionIcon
               onClick={handleOpen}

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

@@ -1,7 +1,6 @@
 import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { lazy, Suspense, useCallback, useEffect, useRef, useState } from "react";
-import { useSetAtom } from "jotai";
 import { Node as PMNode } from "@tiptap/pm/model";
 import { isEditorReady } from "@docmost/editor-ext";
 import {
@@ -26,7 +25,6 @@ import {
   IconDownload,
   IconEdit,
   IconTrash,
-  IconZoomIn,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { getFileUrl } from "@/lib/config.ts";
@@ -39,7 +37,6 @@ import ReactClearModal from "react-clear-modal";
 import { useHandleLibrary } from "@excalidraw/excalidraw";
 import { localStorageLibraryAdapter } from "@/features/editor/components/excalidraw/excalidraw-utils.ts";
 import { useAltTextControl } from "@/features/editor/components/common/use-alt-text-control.tsx";
-import { lightboxRequestAtom } from "@/features/editor/atoms/editor-atoms";
 import classes from "../common/toolbar-menu.module.css";
 
 const ExcalidrawComponent = lazy(() =>
@@ -50,7 +47,6 @@ const ExcalidrawComponent = lazy(() =>
 
 export function ExcalidrawMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
-  const setLightboxRequest = useSetAtom(lightboxRequestAtom);
   const [opened, { open, close }] = useDisclosure(false);
   const [excalidrawAPI, setExcalidrawAPI] =
     useState<ExcalidrawImperativeAPI>(null);
@@ -363,23 +359,6 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) {
 
           <div className={classes.divider} />
 
-          <Tooltip position="top" label={t("Expand")} withinPortal={false}>
-            <ActionIcon
-              onClick={() =>
-                editorState?.src &&
-                setLightboxRequest({
-                  src: getFileUrl(editorState.src),
-                  type: "image",
-                })
-              }
-              size="lg"
-              aria-label={t("Expand")}
-              variant="subtle"
-            >
-              <IconZoomIn size={18} />
-            </ActionIcon>
-          </Tooltip>
-
           <Tooltip position="top" label={t("Edit")} withinPortal={false}>
             <ActionIcon
               onClick={handleOpen}

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

@@ -1,7 +1,6 @@
 import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import React, { useCallback, useRef } from "react";
-import { useSetAtom } from "jotai";
 import { Node as PMNode } from "@tiptap/pm/model";
 import { isEditorReady } from "@docmost/editor-ext";
 import {
@@ -17,19 +16,16 @@ import {
   IconDownload,
   IconRefresh,
   IconTrash,
-  IconZoomIn,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { getFileUrl } from "@/lib/config.ts";
 import { uploadImageAction } from "@/features/editor/components/image/upload-image-action.tsx";
 import { useAltTextControl } from "@/features/editor/components/common/use-alt-text-control.tsx";
-import { lightboxRequestAtom } from "@/features/editor/atoms/editor-atoms";
 import classes from "../common/toolbar-menu.module.css";
 
 export function ImageMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
   const fileInputRef = useRef<HTMLInputElement>(null);
-  const setLightboxRequest = useSetAtom(lightboxRequestAtom);
 
   const editorState = useEditorState({
     editor,
@@ -211,23 +207,6 @@ export function ImageMenu({ editor }: EditorMenuProps) {
 
         <div className={classes.divider} />
 
-        <Tooltip position="top" label={t("Expand")} withinPortal={false}>
-          <ActionIcon
-            onClick={() =>
-              editorState?.src &&
-              setLightboxRequest({
-                src: getFileUrl(editorState.src),
-                type: "image",
-              })
-            }
-            size="lg"
-            aria-label={t("Expand")}
-            variant="subtle"
-          >
-            <IconZoomIn size={18} />
-          </ActionIcon>
-        </Tooltip>
-
         <Tooltip position="top" label={t("Download")} withinPortal={false}>
           <ActionIcon
             onClick={handleDownload}

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

@@ -13,21 +13,14 @@ import {
 import { useTranslation } from "react-i18next";
 import { sortPositionKeys } from "@/features/page/tree/utils/utils";
 import { useSharedPageSubpages } from "@/features/share/hooks/use-shared-page-subpages";
-import { extractPageSlugId } from "@/lib";
 
 export default function SubpagesView(props: NodeViewProps) {
   const { editor } = props;
-  const { spaceSlug, shareId, pageSlug } = useParams();
+  const { spaceSlug, shareId } = useParams();
   const { t } = useTranslation();
 
-  // @ts-ignore
-  const storagePageId = editor.storage.pageId;
-  const routePageId = extractPageSlugId(pageSlug);
-  let currentPageId = storagePageId;
-
-  if (shareId){
-    currentPageId = routePageId;
-  }
+  //@ts-ignore
+  const currentPageId = editor.storage.pageId;
 
   // Get subpages from shared tree if we're in a shared context
   const sharedSubpages = useSharedPageSubpages(currentPageId);

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

@@ -1,7 +1,6 @@
 import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback } from "react";
-import { useSetAtom } from "jotai";
 import { Node as PMNode } from "@tiptap/pm/model";
 import { isEditorReady } from "@docmost/editor-ext";
 import {
@@ -16,17 +15,14 @@ import {
   IconLayoutAlignRight,
   IconDownload,
   IconTrash,
-  IconZoomIn,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { getFileUrl } from "@/lib/config.ts";
 import { useAltTextControl } from "@/features/editor/components/common/use-alt-text-control.tsx";
-import { lightboxRequestAtom } from "@/features/editor/atoms/editor-atoms";
 import classes from "../common/toolbar-menu.module.css";
 
 export function VideoMenu({ editor }: EditorMenuProps) {
   const { t } = useTranslation();
-  const setLightboxRequest = useSetAtom(lightboxRequestAtom);
 
   const editorState = useEditorState({
     editor,
@@ -187,23 +183,6 @@ export function VideoMenu({ editor }: EditorMenuProps) {
 
         <div className={classes.divider} />
 
-        <Tooltip position="top" label={t("Expand")} withinPortal={false}>
-          <ActionIcon
-            onClick={() =>
-              editorState?.src &&
-              setLightboxRequest({
-                src: getFileUrl(editorState.src),
-                type: "video",
-              })
-            }
-            size="lg"
-            aria-label={t("Expand")}
-            variant="subtle"
-          >
-            <IconZoomIn size={18} />
-          </ActionIcon>
-        </Tooltip>
-
         <Tooltip position="top" label={t("Download")} withinPortal={false}>
           <ActionIcon
             onClick={handleDownload}

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

@@ -33,7 +33,6 @@ import { useAtom, useAtomValue } from "jotai";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
 import {
   currentPageEditModeAtom,
-  lightboxRequestAtom,
   pageEditorAtom,
   yjsConnectionStatusAtom,
   yjsSyncedAtom,
@@ -54,9 +53,6 @@ import CalloutMenu from "@/features/editor/components/callout/callout-menu.tsx";
 import VideoMenu from "@/features/editor/components/video/video-menu.tsx";
 import PdfMenu from "@/features/editor/components/pdf/pdf-menu.tsx";
 import SubpagesMenu from "@/features/editor/components/subpages/subpages-menu.tsx";
-import LightboxView, {
-  getLightboxClickRequest,
-} from "@/features/editor/components/common/lightbox-view";
 import {
   handleFileDrop,
   handlePaste,
@@ -188,7 +184,6 @@ function CollabPageEditor({
   const [, setActiveCommentId] = useAtom(activeCommentIdAtom);
   const [showCommentPopup, setShowCommentPopup] = useAtom(showCommentPopupAtom);
   const [showReadOnlyCommentPopup] = useAtom(showReadOnlyCommentPopupAtom);
-  const [lightboxRequest, setLightboxRequest] = useAtom(lightboxRequestAtom);
   const [isLocalSynced, setIsLocalSynced] = useState(false);
   const [isRemoteSynced, setIsRemoteSynced] = useState(false);
   const [yjsConnectionStatus, setYjsConnectionStatus] = useAtom(
@@ -250,17 +245,6 @@ function CollabPageEditor({
     return [...mainExtensions, ...collabExtensions(provider, currentUser.user)];
   }, [provider, currentUser?.user]);
 
-  const debouncedUpdateContent = useDebouncedCallback((newContent: any) => {
-    const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
-
-    if (pageData) {
-      queryClient.setQueryData(["pages", slugId], {
-        ...pageData,
-        content: newContent,
-      });
-    }
-  }, 3000);
-
   const editor = useEditor(
     {
       extensions,
@@ -321,22 +305,6 @@ function CollabPageEditor({
 
           return handleFileDrop(editorRef.current, event, moved, pageId);
         },
-        handleClickOn: (view, _pos, node) => {
-          if (view.editable) return false;
-
-          const request = getLightboxClickRequest(node);
-          if (!request) return false;
-
-          setLightboxRequest(request);
-          return true;
-        },
-        handleDoubleClickOn: (_view, _pos, node) => {
-          const request = getLightboxClickRequest(node);
-          if (!request) return false;
-
-          setLightboxRequest(request);
-          return true;
-        },
       },
       onCreate({ editor }) {
         if (editor) {
@@ -375,6 +343,17 @@ function CollabPageEditor({
     },
   });
 
+  const debouncedUpdateContent = useDebouncedCallback((newContent: any) => {
+    const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
+
+    if (pageData) {
+      queryClient.setQueryData(["pages", slugId], {
+        ...pageData,
+        content: newContent,
+      });
+    }
+  }, 3000);
+
   const handleActiveCommentEvent = (event) => {
     const { commentId, resolved } = event.detail;
 
@@ -407,7 +386,6 @@ function CollabPageEditor({
     setActiveCommentId(null);
     setShowCommentPopup(false);
     setAsideState({ tab: "", isAsideOpen: false });
-    setLightboxRequest(null);
   }, [pageId]);
 
   const isSynced = isLocalSynced && isRemoteSynced;
@@ -481,15 +459,6 @@ function CollabPageEditor({
         {editor && !editorIsEditable && (editable || canComment) && (
           <ReadonlyBubbleMenu editor={editor} />
         )}
-        {editor && (
-          <LightboxView
-            editor={editor}
-            open={!!lightboxRequest}
-            src={lightboxRequest?.src ?? ""}
-            type={lightboxRequest?.type ?? "image"}
-            onClose={() => setLightboxRequest(null)}
-          />
-        )}
         {showCommentPopup && <CommentDialog editor={editor} pageId={pageId} />}
         {showReadOnlyCommentPopup && (
           <CommentDialog editor={editor} pageId={pageId} readOnly />

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

@@ -1,27 +1,15 @@
 import "@/features/editor/styles/index.css";
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { Editor, EditorProvider } from "@tiptap/react";
+import React, { useCallback, useEffect, useMemo, useRef } from "react";
+import { EditorProvider } from "@tiptap/react";
 import { mainExtensions } from "@/features/editor/extensions/extensions";
 import { Document } from "@tiptap/extension-document";
 import { Heading, UniqueID } from "@docmost/editor-ext";
 import { Text } from "@tiptap/extension-text";
 import { Placeholder } from "@tiptap/extension-placeholder";
 import { useAtom } from "jotai";
-import {
-  lightboxRequestAtom,
-  readOnlyEditorAtom,
-} from "@/features/editor/atoms/editor-atoms.ts";
+import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
 import { useEditorScroll } from "./hooks/use-editor-scroll";
 import { TransclusionLookupProvider } from "@/features/editor/components/transclusion/transclusion-lookup-context";
-import LightboxView, {
-  getLightboxClickRequest,
-} from "@/features/editor/components/common/lightbox-view";
 
 interface PageEditorProps {
   title: string;
@@ -45,8 +33,6 @@ export default function ReadonlyPageEditor({
   shareId,
 }: PageEditorProps) {
   const [, setReadOnlyEditor] = useAtom(readOnlyEditorAtom);
-  const [lightboxRequest, setLightboxRequest] = useAtom(lightboxRequestAtom);
-  const [contentEditor, setContentEditor] = useState<Editor | null>(null);
   const isComponentMounted = useRef(false);
   const editorCreated = useRef(false);
 
@@ -63,11 +49,6 @@ export default function ReadonlyPageEditor({
     isComponentMounted.current = true;
   }, []);
 
-  useEffect(() => {
-    if (!shareId) return;
-    setLightboxRequest(null);
-  }, [pageId, shareId]);
-
   const extensions = useMemo(() => {
     const excludedExtensions = new Set([
       "uniqueID",
@@ -116,19 +97,6 @@ export default function ReadonlyPageEditor({
         textDirection="auto"
         extensions={extensions}
         content={content}
-        editorProps={
-          shareId
-            ? {
-                handleClickOn: (_view, _pos, node) => {
-                  const request = getLightboxClickRequest(node);
-                  if (!request) return false;
-
-                  setLightboxRequest(request);
-                  return true;
-                },
-              }
-            : undefined
-        }
         onCreate={({ editor }) => {
           if (editor) {
             if (pageId) {
@@ -137,22 +105,12 @@ export default function ReadonlyPageEditor({
             }
             // @ts-ignore
             setReadOnlyEditor(editor);
-            setContentEditor(editor);
 
             handleScrollTo(editor);
             editorCreated.current = true;
           }
         }}
       ></EditorProvider>
-      {shareId && contentEditor && (
-        <LightboxView
-          editor={contentEditor}
-          open={!!lightboxRequest}
-          src={lightboxRequest?.src ?? ""}
-          type={lightboxRequest?.type ?? "image"}
-          onClose={() => setLightboxRequest(null)}
-        />
-      )}
       <div style={{ paddingBottom: "20vh" }}></div>
     </TransclusionLookupProvider>
   );

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

@@ -54,9 +54,7 @@ import {
 import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
 import { searchSpotlight } from "@/features/search/constants";
-const TemplatePickerModal = React.lazy(
-  () => import("@/ee/template/components/template-picker-modal"),
-);
+import TemplatePickerModal from "@/ee/template/components/template-picker-modal";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
 import { Feature } from "@/ee/features";
@@ -408,13 +406,11 @@ function SpaceMenu({
 
       {hasTemplates && templatePickerOpened && (
         <ErrorBoundary fallbackRender={() => null}>
-          <React.Suspense fallback={null}>
-            <TemplatePickerModal
-              opened={templatePickerOpened}
-              onClose={closeTemplatePicker}
-              initialSpaceId={spaceId}
-            />
-          </React.Suspense>
+          <TemplatePickerModal
+            opened={templatePickerOpened}
+            onClose={closeTemplatePicker}
+            initialSpaceId={spaceId}
+          />
         </ErrorBoundary>
       )}
     </>

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

@@ -48,7 +48,7 @@ export class SearchService {
     const rankColumn = browseByFilters
       ? sql<number>`0`.as('rank')
       : titleOnly
-        ? sql<number>`word_similarity(lower(${titleQuery}), lower(pages.title))`.as(
+        ? sql<number>`word_similarity(lower(f_unaccent(${titleQuery})), lower(f_unaccent(pages.title)))`.as(
             'rank',
           )
         : sql<number>`ts_rank(tsv, to_tsquery('english', f_unaccent(${searchQuery})))`.as(
@@ -84,9 +84,9 @@ export class SearchService {
       .$if(!browseByFilters && titleOnly, (qb) =>
         qb.where((eb) =>
           eb(
-            sql`lower(pages.title)`,
+            sql`lower(f_unaccent(pages.title))`,
             'like',
-            sql`lower(${`%${titleLikeQuery}%`})`,
+            sql`lower(f_unaccent(${`%${titleLikeQuery}%`}))`,
           ),
         ),
       )

apps/server/src/database/migrations/20260824T211732-page-title-trgm-index.ts

@@ -1,12 +1,12 @@
 import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<any>): Promise<void> {
-  await sql`CREATE INDEX IF NOT EXISTS pages_title_trgm_idx ON pages USING gin (lower(title) gin_trgm_ops)`.execute(
+  await sql`CREATE INDEX IF NOT EXISTS pages_title_trgm_idx ON pages USING gin (lower(f_unaccent(title)) gin_trgm_ops)`.execute(
     db,
   );
 
   // separators normalized to spaces so space-typed queries match How_to_export.pdf
-  await sql`CREATE INDEX IF NOT EXISTS attachments_file_name_trgm_idx ON attachments USING gin (lower(translate(file_name, '_.-', '   ')) gin_trgm_ops)`.execute(
+  await sql`CREATE INDEX IF NOT EXISTS attachments_file_name_trgm_idx ON attachments USING gin (lower(f_unaccent(translate(file_name, '_.-', '   '))) gin_trgm_ops)`.execute(
     db,
   );
 }

apps/server/src/integrations/static/static.module.ts

@@ -71,15 +71,6 @@ export class StaticModule implements OnModuleInit {
       await app.register(fastifyStatic, {
         root: clientDistPath,
         wildcard: false,
-        setHeaders: (reply: any, pathName: string) => {
-          // Vite content-hashes everything under /assets, so they can be cached forever
-          if (/[\\/]assets[\\/]/.test(pathName)) {
-            reply.header(
-              'Cache-Control',
-              'public, max-age=31536000, immutable',
-            );
-          }
-        },
       });
 
       app.get(RENDER_PATH, (req: any, res: any) => {

package.json

@@ -95,5 +95,5 @@
       "packages/*"
     ]
   },
-  "packageManager": "pnpm@11.23.0"
+  "packageManager": "pnpm@11.15.1"
 }

pnpm-lock.yaml

@@ -397,9 +397,6 @@ importers:
       socket.io-client:
         specifier: 4.8.3
         version: 4.8.3(supports-color@10.2.2)
-      yet-another-react-lightbox:
-        specifier: ^3.32.2
-        version: 3.32.2(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
       zod:
         specifier: 4.3.6
         version: 4.3.6
@@ -10036,20 +10033,6 @@ packages:
     resolution: {integrity: sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==}
     engines: {node: '>=12'}
 
-  yet-another-react-lightbox@3.32.2:
-    resolution: {integrity: sha512-F4HtHQfUNpvkj+AmECgWM4XRdCqMY5gXpKgOUx39+T+FyxLe8II4SK/pwMyYj2X54KH9lFSQeHYY1/GfYf3SdA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@types/react': ^16 || ^17 || ^18 || ^19
-      '@types/react-dom': ^16 || ^17 || ^18 || ^19
-      react: ^16.8.0 || ^17 || ^18 || ^19
-      react-dom: ^16.8.0 || ^17 || ^18 || ^19
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   yjs@13.6.30:
     resolution: {integrity: sha512-vv/9h42eCMC81ZHDFswuu/MKzkl/vyq1BhaNGfHyOonwlG4CJbQF4oiBBJPvfdeCt/PlVDWh7Nov9D34YY09uQ==}
     engines: {node: '>=16.0.0', npm: '>=8.0.0'}
@@ -20761,14 +20744,6 @@ snapshots:
     dependencies:
       pend: 1.2.0
 
-  yet-another-react-lightbox@3.32.2(@types/react-dom@19.2.3(@types/react@19.2.17))(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
-    dependencies:
-      react: 19.2.7
-      react-dom: 19.2.7(react@19.2.7)
-    optionalDependencies:
-      '@types/react': 19.2.17
-      '@types/react-dom': 19.2.3(@types/react@19.2.17)
-
   yjs@13.6.30:
     dependencies:
       lib0: 0.2.117