chore: Compressed inefficient images automatically

fix: cap height of popovers (#10218 )
fix: Expose originalDocumentId on sourceMetadata (#10217 )
2026-06-13 11:25:03 +03:00 · 2025-09-21 20:06:10 +00:00 · 2025-09-20 12:31:41 -04:00 · 2025-09-20 12:22:15 -04:00 · 2025-09-20 08:34:28 -04:00 · 2025-09-17 23:39:21 -04:00
366 changed files with 7834 additions and 5292 deletions
@@ -211,10 +211,6 @@ GITHUB_APP_PRIVATE_KEY=
 LINEAR_CLIENT_ID=
 LINEAR_CLIENT_SECRET=

-# The GitLab integration allows previewing issue and merge request links as rich mentions
-GITLAB_CLIENT_ID=
-GITLAB_CLIENT_SECRET=
-
 # For a complete Slack integration with search and posting to channels the
 # following configs are also needed in addition to Slack authentication:
 # DOCS: https://docs.getoutline.com/s/hosting/doc/slack-G2mc8DOJHk
@@ -26,3 +26,6 @@ updates:
      aws:
        patterns:
          - "@aws-sdk/*"
+      radix-ui:
+        patterns:
+          - "@radix-ui/*"
@@ -44,7 +44,7 @@ jobs:
          node-version: 22.x
          cache: "yarn"
      - run: yarn install --frozen-lockfile --prefer-offline
-      - run: yarn lint
+      - run: yarn lint --quiet

  types:
    needs: build
@@ -7,8 +7,7 @@
      "roots": ["<rootDir>/server", "<rootDir>/plugins"],
      "moduleNameMapper": {
        "^@server/(.*)$": "<rootDir>/server/$1",
-        "^@shared/(.*)$": "<rootDir>/shared/$1",
-        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
+        "^@shared/(.*)$": "<rootDir>/shared/$1"
      },
      "setupFiles": ["<rootDir>/__mocks__/console.js"],
      "setupFilesAfterEnv": ["<rootDir>/server/test/setup.ts"],
@@ -22,8 +21,7 @@
        "^~/(.*)$": "<rootDir>/app/$1",
        "^@shared/(.*)$": "<rootDir>/shared/$1",
        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js",
-        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js",
-        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
+        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js"
      },
      "modulePaths": ["<rootDir>/app"],
      "setupFiles": ["<rootDir>/__mocks__/window.js"],
@@ -38,8 +36,7 @@
      "roots": ["<rootDir>/shared"],
      "moduleNameMapper": {
        "^@server/(.*)$": "<rootDir>/server/$1",
-        "^@shared/(.*)$": "<rootDir>/shared/$1",
-        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
+        "^@shared/(.*)$": "<rootDir>/shared/$1"
      },
      "setupFiles": ["<rootDir>/__mocks__/console.js"],
      "setupFilesAfterEnv": ["<rootDir>/shared/test/setup.ts"],
@@ -52,8 +49,7 @@
        "^~/(.*)$": "<rootDir>/app/$1",
        "^@shared/(.*)$": "<rootDir>/shared/$1",
        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js",
-        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js",
-        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
+        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js"
      },
      "setupFiles": ["<rootDir>/__mocks__/window.js"],
      "testEnvironment": "jsdom",
@@ -3,7 +3,7 @@ Business Source License 1.1
 Parameters

 Licensor:             General Outline, Inc.
-Licensed Work:        Outline 0.86.1
+Licensed Work:        Outline 0.87.4
                      The Licensed Work is (c) 2025 General Outline, Inc.
 Additional Use Grant: You may make use of the Licensed Work, provided that
                      you may not use the Licensed Work for a Document
@@ -15,7 +15,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided that
                      Licensed Work by creating teams and documents
                      controlled by such third parties.

-Change Date:          2029-08-09
+Change Date:          2029-09-18

 Change License:       Apache License, Version 2.0

@@ -7,14 +7,13 @@
  <img width="1640" alt="screenshot" src="https://user-images.githubusercontent.com/380914/110356468-26374600-7fef-11eb-9f6a-f2cc2c8c6590.png">
 </p>
 <p align="center">
-  <a href="https://circleci.com/gh/outline/outline" rel="nofollow"><img src="https://circleci.com/gh/outline/outline.svg?style=shield"></a>
  <a href="http://www.typescriptlang.org" rel="nofollow"><img src="https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg" alt="TypeScript"></a>
  <a href="https://github.com/prettier/prettier"><img src="https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat" alt="Prettier"></a>
  <a href="https://github.com/styled-components/styled-components"><img src="https://img.shields.io/badge/style-%F0%9F%92%85%20styled--components-orange.svg" alt="Styled Components"></a>
  <a href="https://translate.getoutline.com/project/outline" alt="Localized"><img src="https://badges.crowdin.net/outline/localized.svg"></a>
 </p>

-This is the source code that runs [**Outline**](https://www.getoutline.com) and all the associated services. If you want to use Outline then you don't need to run this code, we offer a hosted version of the app at [getoutline.com](https://www.getoutline.com). You can also find documentation on using Outline in [our guide](https://docs.getoutline.com/s/guide).
+This is the source code that runs [**Outline**](https://www.getoutline.com) and all the associated services. If you want to use Outline then you don't need to run this code, A hosted version of the app is offered at [getoutline.com](https://www.getoutline.com). You can also find documentation on using Outline in [our guide](https://docs.getoutline.com/s/guide).

 If you'd like to run your own copy of Outline or contribute to development then this is the place for you.

@@ -51,13 +50,14 @@ please refer to the [architecture document](docs/ARCHITECTURE.md) first for a hi

 In development Outline outputs simple logging to the console, prefixed by categories. In production it outputs JSON logs, these can be easily parsed by your preferred log ingestion pipeline.

-HTTP logging is disabled by default, but can be enabled by setting the `DEBUG=http` environment variable.
+HTTP logging is disabled by default, but can be enabled by setting the `DEBUG=http` environment variable. logging
+can be enabled for all categories by setting `DEBUG=*` or for specific categories such as `DEBUG=database` and `LOG_LEVEL=debug`, or `LOG_LEVEL=silly` for very verbose logging.

 ## Tests

 We aim to have sufficient test coverage for critical parts of the application and aren't aiming for 100% unit test coverage. All API endpoints and anything authentication related should be thoroughly tested.

-To add new tests, write your tests with [Jest](https://facebook.github.io/jest/) and add a file with `.test.js` extension next to the tested code.
+To add new tests, write your tests with [Jest](https://facebook.github.io/jest/) and add a file with `.test.ts` extension next to the tested code.

 ```shell
 # To run all tests
@@ -68,14 +68,14 @@ make watch
 ```

 Once the test database is created with `make test` you may individually run
-frontend and backend tests directly.
+frontend and backend tests directly with jest:

 ```shell
 # To run backend tests
 yarn test:server

-# To run a specific backend test
-yarn test:server myTestFile
+# To run a specific backend test in watch mode
+yarn test path/to/file.test.ts --watch

 # To run frontend tests
 yarn test:app
@@ -86,14 +86,15 @@ yarn test:app
 Sequelize is used to create and run migrations, for example:

 ```shell
-yarn sequelize migration:generate --name my-migration
-yarn sequelize db:migrate
+yarn db:create-migration --name my-migration
+yarn db:migrate
+yarn db:rollback
 ```

-Or to run migrations on test database:
+Or, to run migrations on test database:

 ```shell
-yarn sequelize db:migrate --env test
+yarn db:migrate --env test
 ```

 # Activity
@@ -27,8 +27,8 @@ export const createApiKey = createAction({

 export const revokeApiKeyFactory = ({ apiKey }: { apiKey: ApiKey }) =>
  createActionV2({
-    name: ({ t, isContextMenu }) =>
-      isContextMenu
+    name: ({ t, isMenu }) =>
+      isMenu
        ? apiKey.isExpired
          ? t("Delete")
          : `${t("Revoke")}…`
@@ -81,8 +81,7 @@ export const createCollection = createAction({
 });

 export const editCollection = createActionV2({
-  name: ({ t, isContextMenu }) =>
-    isContextMenu ? `${t("Edit")}…` : t("Edit collection"),
+  name: ({ t, isMenu }) => (isMenu ? `${t("Edit")}…` : t("Edit collection")),
  analyticsName: "Edit collection",
  section: ActiveCollectionSection,
  icon: <EditIcon />,
@@ -107,8 +106,8 @@ export const editCollection = createActionV2({
 });

 export const editCollectionPermissions = createActionV2({
-  name: ({ t, isContextMenu }) =>
-    isContextMenu ? `${t("Permissions")}…` : t("Collection permissions"),
+  name: ({ t, isMenu }) =>
+    isMenu ? `${t("Permissions")}…` : t("Collection permissions"),
  analyticsName: "Collection permissions",
  section: ActiveCollectionSection,
  icon: <PadlockIcon />,
@@ -3,7 +3,6 @@ import { toast } from "sonner";
 import Comment from "~/models/Comment";
 import CommentDeleteDialog from "~/components/CommentDeleteDialog";
 import ViewReactionsDialog from "~/components/Reactions/ViewReactionsDialog";
-import history from "~/utils/history";
 import { createActionV2 } from "..";
 import { ActiveDocumentSection } from "../sections";

@@ -50,16 +49,6 @@ export const resolveCommentFactory = ({
      stores.policies.abilities(comment.documentId).update,
    perform: async ({ t }) => {
      await comment.resolve();
-
-      const locationState = history.location.state as Record<string, unknown>;
-      history.replace({
-        ...history.location,
-        state: {
-          sidebarContext: locationState["sidebarContext"],
-          commentId: undefined,
-        },
-      });
-
      onResolve();
      toast.success(t("Thread resolved"));
    },
@@ -82,16 +71,6 @@ export const unresolveCommentFactory = ({
      stores.policies.abilities(comment.documentId).update,
    perform: async () => {
      await comment.unresolve();
-
-      const locationState = history.location.state as Record<string, unknown>;
-      history.replace({
-        ...history.location,
-        state: {
-          sidebarContext: locationState["sidebarContext"],
-          commentId: undefined,
-        },
-      });
-
      onUnresolve();
    },
  });
@@ -384,8 +384,8 @@ export const subscribeDocument = createActionV2({
  analyticsName: "Subscribe to document",
  section: ActiveDocumentSection,
  icon: <SubscribeIcon />,
-  tooltip: ({ activeCollectionId, isContextMenu, stores, t }) => {
-    if (!isContextMenu || !activeCollectionId) {
+  tooltip: ({ activeCollectionId, isMenu, stores, t }) => {
+    if (!isMenu || !activeCollectionId) {
      return undefined;
    }

@@ -393,8 +393,8 @@ export const subscribeDocument = createActionV2({
      ? t("Subscription inherited from collection")
      : undefined;
  },
-  disabled: ({ activeCollectionId, isContextMenu, stores }) => {
-    if (!isContextMenu || !activeCollectionId) {
+  disabled: ({ activeCollectionId, isMenu, stores }) => {
+    if (!isMenu || !activeCollectionId) {
      return false;
    }

@@ -430,8 +430,8 @@ export const unsubscribeDocument = createActionV2({
  analyticsName: "Unsubscribe from document",
  section: ActiveDocumentSection,
  icon: <UnsubscribeIcon />,
-  tooltip: ({ activeCollectionId, isContextMenu, stores, t }) => {
-    if (!isContextMenu || !activeCollectionId) {
+  tooltip: ({ activeCollectionId, isMenu, stores, t }) => {
+    if (!isMenu || !activeCollectionId) {
      return undefined;
    }

@@ -439,8 +439,8 @@ export const unsubscribeDocument = createActionV2({
      ? t("Subscription inherited from collection")
      : undefined;
  },
-  disabled: ({ activeCollectionId, isContextMenu, stores }) => {
-    if (!isContextMenu || !activeCollectionId) {
+  disabled: ({ activeCollectionId, isMenu, stores }) => {
+    if (!isMenu || !activeCollectionId) {
      return false;
    }

@@ -571,8 +571,7 @@ export const downloadDocumentAsMarkdown = createActionV2({
 });

 export const downloadDocument = createActionV2WithChildren({
-  name: ({ t, isContextMenu }) =>
-    isContextMenu ? t("Download") : t("Download document"),
+  name: ({ t, isMenu }) => (isMenu ? t("Download") : t("Download document")),
  analyticsName: "Download document",
  section: ActiveDocumentSection,
  icon: <DownloadIcon />,
@@ -678,8 +677,7 @@ export const copyDocument = createActionV2WithChildren({
 });

 export const duplicateDocument = createActionV2({
-  name: ({ t, isContextMenu }) =>
-    isContextMenu ? t("Duplicate") : t("Duplicate document"),
+  name: ({ t, isMenu }) => (isMenu ? t("Duplicate") : t("Duplicate document")),
  analyticsName: "Duplicate document",
  section: ActiveDocumentSection,
  icon: <DuplicateIcon />,
@@ -829,8 +827,7 @@ export const searchInDocument = createInternalLinkActionV2({
 });

 export const printDocument = createActionV2({
-  name: ({ t, isContextMenu }) =>
-    isContextMenu ? t("Print") : t("Print document"),
+  name: ({ t, isMenu }) => (isMenu ? t("Print") : t("Print document")),
  analyticsName: "Print document",
  section: ActiveDocumentSection,
  icon: <PrintIcon />,
@@ -131,8 +131,8 @@ export const navigateToTemplateSettings = createAction({
 });

 export const navigateToNotificationSettings = createInternalLinkActionV2({
-  name: ({ t, isContextMenu }) =>
-    isContextMenu ? t("Notification settings") : t("Notifications"),
+  name: ({ t, isMenu }) =>
+    isMenu ? t("Notification settings") : t("Notifications"),
  analyticsName: "Navigate to notification settings",
  section: NavigationSection,
  iconInContextMenu: false,
@@ -37,8 +37,7 @@ export const changeToSystemTheme = createActionV2({
 });

 export const changeTheme = createActionV2WithChildren({
-  name: ({ t, isContextMenu }) =>
-    isContextMenu ? t("Appearance") : t("Change theme"),
+  name: ({ t, isMenu }) => (isMenu ? t("Appearance") : t("Change theme")),
  analyticsName: "Change theme",
  placeholder: ({ t }) => t("Change theme to"),
  icon: ({ stores }) =>
@@ -3,12 +3,8 @@ import * as React from "react";
 import Tooltip, { Props as TooltipProps } from "~/components/Tooltip";
 import { performAction, performActionV2, resolve } from "~/actions";
 import useIsMounted from "~/hooks/useIsMounted";
-import {
-  Action,
-  ActionContext,
-  ActionV2Variant,
-  ActionV2WithChildren,
-} from "~/types";
+import { Action, ActionV2Variant, ActionV2WithChildren } from "~/types";
+import useActionContext from "~/hooks/useActionContext";

 export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  /** Show the button in a disabled state */
@@ -17,8 +13,6 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  hideOnActionDisabled?: boolean;
  /** Action to use on button */
  action?: Action | Exclude<ActionV2Variant, ActionV2WithChildren>;
-  /** Context of action, must be provided with action */
-  context?: ActionContext;
  /** If tooltip props are provided the button will be wrapped in a tooltip */
  tooltip?: Omit<TooltipProps, "children">;
 };
@@ -28,22 +22,20 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
 */
 const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
  function _ActionButton(
-    { action, context, tooltip, hideOnActionDisabled, ...rest }: Props,
+    { action, tooltip, hideOnActionDisabled, ...rest }: Props,
    ref: React.Ref<HTMLButtonElement>
  ) {
+    const actionContext = useActionContext({
+      isButton: true,
+    });
    const isMounted = useIsMounted();
    const [executing, setExecuting] = React.useState(false);
    const disabled = rest.disabled;

-    if (action && !context) {
-      throw new Error("Context must be provided with action");
-    }
-    if (!context || !action) {
+    if (!actionContext || !action) {
      return <button {...rest} ref={ref} />;
    }

-    const actionContext = { ...context, isButton: true };
-
    if (
      action.visible &&
      !resolve<boolean>(action.visible, actionContext) &&
@@ -53,9 +45,10 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
    }

    const label =
-      typeof action.name === "function"
+      rest["aria-label"] ??
+      (typeof action.name === "function"
        ? action.name(actionContext)
-        : action.name;
+        : action.name);

    const button = (
      <button
@@ -6,7 +6,6 @@ import Flex from "~/components/Flex";
 export const Action = styled(Flex)`
  justify-content: center;
  align-items: center;
-  padding: 0 0 0 12px;
  height: 32px;
  font-size: 15px;
  flex-shrink: 0;
@@ -18,7 +17,6 @@ export const Action = styled(Flex)`

 export const Separator = styled.div`
  flex-shrink: 0;
-  margin-left: 12px;
  width: 1px;
  height: 28px;
  background: ${s("divider")};
@@ -33,6 +31,7 @@ const Actions = styled(Flex)`
  background: ${s("background")};
  padding: 12px;
  backdrop-filter: blur(20px);
+  gap: 12px;

  @media print {
    display: none;
@@ -13,7 +13,6 @@ import ErrorSuspended from "~/scenes/Errors/ErrorSuspended";
 import Layout from "~/components/Layout";
 import RegisterKeyDown from "~/components/RegisterKeyDown";
 import Sidebar from "~/components/Sidebar";
-import SidebarRight from "~/components/Sidebar/Right";
 import SettingsSidebar from "~/components/Sidebar/Settings";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import { usePostLoginPath } from "~/hooks/useLastVisitedPath";
@@ -109,12 +108,10 @@ const AuthenticatedLayout: React.FC = ({ children }: Props) => {
    >
      {(showHistory || showComments) && (
        <Route path={`/doc/${slug}`}>
-          <SidebarRight>
-            <React.Suspense fallback={null}>
-              {showHistory && <DocumentHistory />}
-              {showComments && <DocumentComments />}
-            </React.Suspense>
-          </SidebarRight>
+          <React.Suspense fallback={null}>
+            {showHistory && <DocumentHistory />}
+            {showComments && <DocumentComments />}
+          </React.Suspense>
        </Route>
      )}
    </AnimatePresence>
@@ -25,6 +25,8 @@ type Props = {
  onClick?: React.MouseEventHandler<HTMLImageElement>;
  /** Size of the avatar, defaults to AvatarSize.Large */
  size?: AvatarSize;
+  /** Optional alt text for the avatar image */
+  alt?: string;
  /** Optional inline styles to apply to the avatar wrapper */
  style?: React.CSSProperties;
 };
@@ -53,6 +55,7 @@ function AvatarWithPresence({
  isCurrentUser,
  size = AvatarSize.Large,
  style,
+  alt,
 }: Props) {
  const { t } = useTranslation();
  const status = isPresent
@@ -83,7 +86,7 @@ function AvatarWithPresence({
          $color={user.color}
          style={style}
        >
-          <Avatar model={user} onClick={onClick} size={size} />
+          <Avatar model={user} onClick={onClick} size={size} alt={alt} />
        </AvatarPresence>
      </Tooltip>
    </>
@@ -25,7 +25,7 @@ function Breadcrumb(
  { actions, highlightFirstItem, children, max = 2 }: Props,
  ref: React.RefObject<HTMLDivElement> | null
 ) {
-  const actionContext = useActionContext({ isContextMenu: true });
+  const actionContext = useActionContext({ isMenu: true });

  const visibleActions = useComputed(
    () =>
@@ -132,6 +132,7 @@ function Collaborators(props: Props) {
          isEditing={isEditing}
          isObserving={isObserving}
          isCurrentUser={currentUserId === collaborator.id}
+          alt={t("Avatar of {{ name }}", { name: collaborator.name })}
          onClick={
            isObservable
              ? handleAvatarClick(
@@ -143,13 +143,14 @@ const ContentEditable = React.forwardRef(function _ContentEditable(
    },
    []
  );
+  const contentEditable = !disabled && !readOnly;

  return (
    <div className={className} dir={dir} onClick={onClick} tabIndex={-1}>
      {children}
      <Content
        ref={contentRef}
-        contentEditable={!disabled && !readOnly}
+        contentEditable={contentEditable}
        onInput={wrappedEvent(onInput)}
        onFocus={wrappedEvent(onFocus)}
        onBlur={wrappedEvent(onBlur)}
@@ -157,7 +158,7 @@ const ContentEditable = React.forwardRef(function _ContentEditable(
        onPaste={handlePaste}
        data-placeholder={placeholder}
        suppressContentEditableWarning
-        role="textbox"
+        role={contentEditable ? "textbox" : undefined}
        {...rest}
      >
        {innerValue}
@@ -1,5 +1,6 @@
 import { MoreIcon } from "outline-icons";
 import * as React from "react";
+import { useTranslation } from "react-i18next";
 import { MenuButton } from "reakit/Menu";
 import NudeButton from "~/components/NudeButton";

@@ -8,10 +9,16 @@ type Props = React.ComponentProps<typeof MenuButton> & {
 };

 export default function OverflowMenuButton({ className, ...rest }: Props) {
+  const { t } = useTranslation();
+
  return (
    <MenuButton {...rest}>
      {(props) => (
-        <NudeButton className={className} {...props}>
+        <NudeButton
+          className={className}
+          aria-label={t("More options")}
+          {...props}
+        >
          <MoreIcon />
        </NudeButton>
      )}
@@ -104,7 +104,7 @@ export function filterTemplateItems(items: TMenuItem[]): TMenuItem[] {

 function Template({ items, actions, context, showIcons, ...menu }: Props) {
  const ctx = useActionContext({
-    isContextMenu: true,
+    isMenu: true,
  });

  const templateItems = actions
@@ -11,9 +11,15 @@ class DocumentContext {
  /** The editor instance for this document */
  editor?: Editor;

+  /** The ID of the currently focused comment, or null if no comment is focused */
+  @observable
+  focusedCommentId: string | null = null;
+
+  /** Whether the editor has been initialized */
  @observable
  isEditorInitialized: boolean = false;

+  /** The headings in the document */
  @observable
  headings: Heading[] = [];

@@ -39,6 +45,11 @@ class DocumentContext {
    this.isEditorInitialized = initialized;
  };

+  @action
+  setFocusedCommentId = (commentId: string | null) => {
+    this.focusedCommentId = commentId;
+  };
+
  @action
  updateState = () => {
    this.updateHeadings();
@@ -25,6 +25,10 @@ import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
 import DocumentMenu from "~/menus/DocumentMenu";
 import { documentPath } from "~/utils/routeHelpers";
 import { determineSidebarContext } from "./Sidebar/components/SidebarContext";
+import { ActionContextProvider } from "~/hooks/useActionContext";
+import { useDocumentMenuAction } from "~/hooks/useDocumentMenuAction";
+import { ContextMenu } from "./Menu/ContextMenu";
+import useStores from "~/hooks/useStores";

 type Props = {
  document: Document;
@@ -50,6 +54,7 @@ function DocumentListItem(
 ) {
  const { t } = useTranslation();
  const user = useCurrentUser();
+  const { userMemberships, groupMemberships } = useStores();
  const locationSidebarContext = useLocationSidebarContext();
  const [menuOpen, handleMenuOpen, handleMenuClose] = useBoolean();

@@ -78,87 +83,110 @@ function DocumentListItem(
    !!document.title.toLowerCase().includes(highlight.toLowerCase());
  const canStar = !document.isArchived && !document.isTemplate;

+  const isShared = !!(
+    userMemberships.getByDocumentId(document.id) ||
+    groupMemberships.getByDocumentId(document.id)
+  );
+
  const sidebarContext = determineSidebarContext({
    document,
    user,
    currentContext: locationSidebarContext,
  });

-  return (
-    <DocumentLink
-      ref={itemRef}
-      dir={document.dir}
-      role="menuitem"
-      $isStarred={document.isStarred}
-      $menuOpen={menuOpen}
-      to={{
-        pathname: documentPath(document),
-        state: {
-          title: document.titleWithDefault,
-          sidebarContext,
-        },
-      }}
-      {...rest}
-      {...rovingTabIndex}
-    >
-      <Content>
-        <Heading dir={document.dir}>
-          {document.icon && (
-            <>
-              <Icon
-                value={document.icon}
-                color={document.color ?? undefined}
-                initial={document.initial}
-              />
-              &nbsp;
-            </>
-          )}
-          <Title
-            text={document.titleWithDefault}
-            highlight={highlight}
-            dir={document.dir}
-          />
-          {document.isBadgedNew && document.createdBy?.id !== user.id && (
-            <Badge yellow>{t("New")}</Badge>
-          )}
-          {document.isDraft && showDraft && (
-            <Tooltip content={t("Only visible to you")} placement="top">
-              <Badge>{t("Draft")}</Badge>
-            </Tooltip>
-          )}
-          {canStar && (
-            <StarPositioner>
-              <StarButton document={document} />
-            </StarPositioner>
-          )}
-          {document.isTemplate && showTemplate && (
-            <Badge primary>{t("Template")}</Badge>
-          )}
-        </Heading>
+  const contextMenuAction = useDocumentMenuAction({ document });

-        {!queryIsInTitle && (
-          <ResultContext
-            text={context}
-            highlight={highlight ? SEARCH_RESULT_REGEX : undefined}
-            processResult={replaceResultMarks}
-          />
-        )}
-        <DocumentMeta
-          document={document}
-          showCollection={showCollection}
-          showPublished={showPublished}
-          showParentDocuments={showParentDocuments}
-          showLastViewed
-        />
-      </Content>
-      <Actions>
-        <DocumentMenu
-          document={document}
-          onOpen={handleMenuOpen}
-          onClose={handleMenuClose}
-        />
-      </Actions>
-    </DocumentLink>
+  return (
+    <ActionContextProvider
+      value={{
+        activeDocumentId: document.id,
+        activeCollectionId:
+          !isShared && document.collectionId
+            ? document.collectionId
+            : undefined,
+      }}
+    >
+      <ContextMenu
+        action={contextMenuAction}
+        ariaLabel={t("Document options")}
+        onOpen={handleMenuOpen}
+        onClose={handleMenuClose}
+      >
+        <DocumentLink
+          ref={itemRef}
+          dir={document.dir}
+          $isStarred={document.isStarred}
+          $menuOpen={menuOpen}
+          to={{
+            pathname: documentPath(document),
+            state: {
+              title: document.titleWithDefault,
+              sidebarContext,
+            },
+          }}
+          {...rest}
+          {...rovingTabIndex}
+        >
+          <Content>
+            <Heading dir={document.dir}>
+              {document.icon && (
+                <>
+                  <Icon
+                    value={document.icon}
+                    color={document.color ?? undefined}
+                    initial={document.initial}
+                  />
+                  &nbsp;
+                </>
+              )}
+              <Title
+                text={document.titleWithDefault}
+                highlight={highlight}
+                dir={document.dir}
+              />
+              {document.isBadgedNew && document.createdBy?.id !== user.id && (
+                <Badge yellow>{t("New")}</Badge>
+              )}
+              {document.isDraft && showDraft && (
+                <Tooltip content={t("Only visible to you")} placement="top">
+                  <Badge>{t("Draft")}</Badge>
+                </Tooltip>
+              )}
+              {canStar && (
+                <StarPositioner>
+                  <StarButton document={document} />
+                </StarPositioner>
+              )}
+              {document.isTemplate && showTemplate && (
+                <Badge primary>{t("Template")}</Badge>
+              )}
+            </Heading>
+
+            {!queryIsInTitle && (
+              <ResultContext
+                text={context}
+                highlight={highlight ? SEARCH_RESULT_REGEX : undefined}
+                processResult={replaceResultMarks}
+              />
+            )}
+            <DocumentMeta
+              document={document}
+              showCollection={showCollection}
+              showPublished={showPublished}
+              showParentDocuments={showParentDocuments}
+              showLastViewed
+            />
+          </Content>
+          <Actions>
+            <DocumentMenu
+              document={document}
+              onOpen={handleMenuOpen}
+              onClose={handleMenuClose}
+            />
+          </Actions>
+        </DocumentLink>
+      </ContextMenu>
+    </ActionContextProvider>
  );
 }

@@ -252,7 +280,7 @@ const DocumentLink = styled(Link)<{
    `}
 `;

-const Heading = styled.h3<{ rtl?: boolean }>`
+const Heading = styled.span<{ rtl?: boolean }>`
  display: flex;
  justify-content: ${(props) => (props.rtl ? "flex-end" : "flex-start")};
  align-items: center;
@@ -262,6 +290,8 @@ const Heading = styled.h3<{ rtl?: boolean }>`
  color: ${s("text")};
  font-family: ${s("fontFamily")};
  font-weight: 500;
+  font-size: 20px;
+  line-height: 1.2;
 `;

 const StarPositioner = styled(Flex)`
@@ -155,26 +155,22 @@ const DocumentMeta: React.FC<Props> = ({
      }
      return (
        <Viewed>
-          •&nbsp;<Modified highlight>{t("Never viewed")}</Modified>
+          <Separator />
+          <Modified highlight>{t("Never viewed")}</Modified>
        </Viewed>
      );
    }

    return (
      <Viewed>
-        •&nbsp;{t("Viewed")} <Time dateTime={lastViewedAt} addSuffix shorten />
+        <Separator />
+        {t("Viewed")} <Time dateTime={lastViewedAt} addSuffix shorten />
      </Viewed>
    );
  };

  return (
-    <Container
-      align="center"
-      rtl={document.dir === "rtl"}
-      {...rest}
-      dir="ltr"
-      lang=""
-    >
+    <Container align="center" rtl={document.dir === "rtl"} {...rest} dir="ltr">
      {to ? (
        <Link to={to} replace={replace}>
          {content}
@@ -192,16 +188,17 @@ const DocumentMeta: React.FC<Props> = ({
      )}
      {showParentDocuments && nestedDocumentsCount > 0 && (
        <span>
-          &nbsp;• {nestedDocumentsCount}{" "}
+          <Separator />
+          {nestedDocumentsCount}{" "}
          {t("nested document", {
            count: nestedDocumentsCount,
          })}
        </span>
      )}
-      &nbsp;{timeSinceNow()}
+      {timeSinceNow()}
      {canShowProgressBar && (
        <>
-          &nbsp;•&nbsp;
+          <Separator />
          <DocumentTasks document={document} />
        </>
      )}
@@ -210,6 +207,14 @@ const DocumentMeta: React.FC<Props> = ({
  );
 };

+export const Separator = styled.span`
+  padding: 0 0.4em;
+
+  &::after {
+    content: "•";
+  }
+`;
+
 const Strong = styled.strong`
  font-weight: 550;
 `;
@@ -1,7 +1,7 @@
 import * as React from "react";
 import { toast } from "sonner";
 import styled from "styled-components";
-import { s } from "@shared/styles";
+import { s, truncateMultiline } from "@shared/styles";

 type Props = Omit<React.HTMLAttributes<HTMLInputElement>, "onSubmit"> & {
  /** A callback when the title is submitted. */
@@ -128,17 +128,21 @@ function EditableTitle(
          />
        </form>
      ) : (
-        <span
+        <Text
          onDoubleClick={canUpdate ? handleDoubleClick : undefined}
          className={rest.className}
        >
          {value}
-        </span>
+        </Text>
      )}
    </>
  );
 }

+const Text = styled.span`
+  ${truncateMultiline(3)}
+`;
+
 const Input = styled.input`
  color: ${s("text")};
  background: ${s("background")};
@@ -1,22 +1,19 @@
 import deburr from "lodash/deburr";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import { MenuButton } from "reakit/Menu";
 import styled from "styled-components";
 import { s } from "@shared/styles";
 import type { FetchPageParams } from "~/stores/base/Store";
 import Button, { Inner } from "~/components/Button";
-import ContextMenu from "~/components/ContextMenu";
-import MenuItem from "~/components/ContextMenu/MenuItem";
 import Text from "~/components/Text";
-import { useMenuState } from "~/hooks/useMenuState";
 import Input, { NativeInput, Outline } from "./Input";
 import PaginatedList, { PaginatedItem } from "./PaginatedList";
+import { MenuProvider } from "./primitives/Menu/MenuContext";
+import { Menu, MenuContent, MenuTrigger, MenuButton } from "./primitives/Menu";

 interface TFilterOption extends PaginatedItem {
  key: string;
  label: string;
-  note?: string;
  icon?: React.ReactNode;
 }

@@ -34,19 +31,17 @@ type Props = {
 const FilterOptions = ({
  options,
  selectedKeys = [],
-  defaultLabel = "Filter options",
  className,
  onSelect,
  showFilter,
  fetchQuery,
  fetchQueryOptions,
+  ...rest
 }: Props) => {
  const { t } = useTranslation();
  const searchInputRef = React.useRef<HTMLInputElement>(null);
  const listRef = React.useRef<HTMLDivElement | null>(null);
-  const menu = useMenuState({
-    modal: false,
-  });
+  const [open, setOpen] = React.useState(false);
  const selectedItems = options.filter((option) =>
    selectedKeys.includes(option.key)
  );
@@ -58,32 +53,26 @@ const FilterOptions = ({

  const renderItem = React.useCallback(
    (option) => (
-      <MenuItem
+      <MenuButton
        key={option.key}
+        icon={option.icon}
+        label={option.label}
        onClick={() => {
          onSelect(option.key);
-          menu.hide();
+          setOpen(false);
        }}
        selected={selectedKeys.includes(option.key)}
-        {...menu}
-      >
-        {option.icon}
-        {option.note ? (
-          <LabelWithNote>
-            {option.label}
-            <Note>{option.note}</Note>
-          </LabelWithNote>
-        ) : (
-          option.label
-        )}
-      </MenuItem>
+      />
    ),
-    [menu, onSelect, selectedKeys]
+    [onSelect, selectedKeys]
  );

-  const handleFilter = (ev: React.ChangeEvent<HTMLInputElement>) => {
-    setQuery(ev.target.value);
-  };
+  const handleFilter = React.useCallback(
+    (ev: React.ChangeEvent<HTMLInputElement>) => {
+      setQuery(ev.target.value);
+    },
+    []
+  );

  const filteredOptions = React.useMemo(() => {
    const normalizedQuery = deburr(query.toLowerCase());
@@ -121,13 +110,13 @@ const FilterOptions = ({

      switch (ev.key) {
        case "Escape":
-          menu.hide();
+          setOpen(false);
          break;
        case "Enter":
          if (filteredOptions.length === 1) {
            ev.preventDefault();
            onSelect(filteredOptions[0].key);
-            menu.hide();
+            setOpen(false);
          }
          break;
        case "ArrowDown":
@@ -138,7 +127,7 @@ const FilterOptions = ({
          break;
      }
    },
-    [filteredOptions, menu, onSelect]
+    [filteredOptions, onSelect]
  );

  const handleEscapeFromList = React.useCallback((ev: React.KeyboardEvent) => {
@@ -150,21 +139,21 @@ const FilterOptions = ({
  }, []);

  React.useEffect(() => {
-    if (menu.visible) {
+    if (open) {
      searchInputRef.current?.focus();
    } else {
      setQuery("");
    }
-  }, [menu.visible]);
+  }, [open]);

  const showFilterInput = showFilter || options.length > 10;
+  const defaultLabel = rest.defaultLabel || t("Filter options");

  return (
-    <>
-      <MenuButton {...menu}>
-        {(props) => (
+    <MenuProvider variant="dropdown">
+      <Menu open={open} onOpenChange={setOpen}>
+        <MenuTrigger>
          <StyledButton
-            {...props}
            className={className}
            icon={selectedItems[0]?.key && selectedItems[0]?.icon}
            neutral
@@ -172,31 +161,31 @@ const FilterOptions = ({
          >
            {selectedItems.length ? selectedLabel : defaultLabel}
          </StyledButton>
-        )}
-      </MenuButton>
-      <ContextMenu aria-label={defaultLabel} minHeight={66} {...menu}>
-        <PaginatedList<TFilterOption>
-          listRef={listRef}
-          options={{ query, ...fetchQueryOptions }}
-          items={filteredOptions}
-          fetch={fetchQuery}
-          renderItem={renderItem}
-          onEscape={handleEscapeFromList}
-          heading={showFilterInput ? <Spacer /> : undefined}
-          empty={<Empty />}
-        />
-        {showFilterInput && (
-          <SearchInput
-            ref={searchInputRef}
-            value={query}
-            onChange={handleFilter}
-            onKeyDown={handleKeyDown}
-            placeholder={`${t("Filter")}…`}
-            autoFocus
+        </MenuTrigger>
+        <MenuContent aria-label={defaultLabel} align="start">
+          <PaginatedList<TFilterOption>
+            listRef={listRef}
+            options={{ query, ...fetchQueryOptions }}
+            items={filteredOptions}
+            fetch={fetchQuery}
+            renderItem={renderItem}
+            onEscape={handleEscapeFromList}
+            heading={showFilterInput ? <Spacer /> : undefined}
+            empty={<Empty />}
          />
-        )}
-      </ContextMenu>
-    </>
+          {showFilterInput && (
+            <SearchInput
+              ref={searchInputRef}
+              value={query}
+              onChange={handleFilter}
+              onKeyDown={handleKeyDown}
+              placeholder={`${t("Filter")}…`}
+              autoFocus
+            />
+          )}
+        </MenuContent>
+      </Menu>
+    </MenuProvider>
  );
 };

@@ -242,24 +231,6 @@ const SearchInput = styled(Input)`
  }
 `;

-const Note = styled(Text)`
-  display: block;
-  margin: 2px 0;
-  line-height: 1.2em;
-  font-size: 14px;
-  font-weight: 500;
-  color: ${s("textTertiary")};
-`;
-
-const LabelWithNote = styled.div`
-  font-weight: 500;
-  text-align: left;
-
-  &:hover ${Note} {
-    color: ${(props) => props.theme.white50};
-  }
-`;
-
 export const StyledButton = styled(Button)`
  box-shadow: none;
  text-transform: none;
@@ -125,6 +125,7 @@ const Actions = styled(Flex)`
  flex-basis: 0;
  min-width: auto;
  padding-left: 8px;
+  gap: 12px;

  ${breakpoint("tablet")`
    position: unset;
@@ -30,15 +30,10 @@ const HoverPreviewIssue = React.forwardRef(function _HoverPreviewIssue(
 ) {
  const authorName = author.name;
  const urlObj = new URL(url);
-  let service;
-  
-  if (urlObj.hostname === "github.com") {
-    service = IntegrationService.GitHub;
-  } else if (urlObj.hostname === "gitlab.com") {
-    service = IntegrationService.GitLab;
-  } else {
-    service = IntegrationService.Linear;
-  }
+  const service =
+    urlObj.hostname === "github.com"
+      ? IntegrationService.GitHub
+      : IntegrationService.Linear;

  return (
    <Preview as="a" href={url} target="_blank" rel="noopener noreferrer">
@@ -0,0 +1,16 @@
+import { ArrowIcon as ArrowRightIcon } from "outline-icons";
+import styled from "styled-components";
+
+export { ArrowIcon as ArrowRightIcon } from "outline-icons";
+
+export const ArrowUpIcon = styled(ArrowRightIcon)`
+  transform: rotate(-90deg);
+`;
+
+export const ArrowDownIcon = styled(ArrowRightIcon)`
+  transform: rotate(90deg);
+`;
+
+export const ArrowLeftIcon = styled(ArrowRightIcon)`
+  transform: rotate(180deg);
+`;
@@ -0,0 +1,823 @@
+import { useEditor } from "~/editor/components/EditorContext";
+import { observer } from "mobx-react";
+import * as Dialog from "@radix-ui/react-dialog";
+import { findChildren } from "@shared/editor/queries/findChildren";
+import findIndex from "lodash/findIndex";
+import styled, { css, Keyframes, keyframes } from "styled-components";
+import { forwardRef, useEffect, useMemo, useRef, useState } from "react";
+import { sanitizeUrl } from "@shared/utils/urls";
+import { Error } from "@shared/editor/components/Image";
+import {
+  BackIcon,
+  CloseIcon,
+  CrossIcon,
+  DownloadIcon,
+  LinkIcon,
+  NextIcon,
+} from "outline-icons";
+import { depths, extraArea, s } from "@shared/styles";
+import NudeButton from "./NudeButton";
+import useIdle from "~/hooks/useIdle";
+import { Second } from "@shared/utils/time";
+import { downloadImageNode } from "@shared/editor/nodes/Image";
+import * as VisuallyHidden from "@radix-ui/react-visually-hidden";
+import { useTranslation } from "react-i18next";
+import Tooltip from "~/components/Tooltip";
+import LoadingIndicator from "./LoadingIndicator";
+import Fade from "./Fade";
+import Button from "./Button";
+import CopyToClipboard from "./CopyToClipboard";
+import { Separator } from "./Actions";
+import useSwipe from "~/hooks/useSwipe";
+
+export enum LightboxStatus {
+  READY_TO_OPEN,
+  OPENING,
+  OPENED,
+  READY_TO_CLOSE,
+  CLOSING,
+  CLOSED,
+}
+
+export enum ImageStatus {
+  LOADING,
+  ERROR,
+  LOADED,
+}
+type Status = {
+  lightbox: LightboxStatus | null;
+  image: ImageStatus | null;
+};
+
+type Animation = {
+  fadeIn?: { apply: () => Keyframes; duration: number };
+  fadeOut?: { apply: () => Keyframes; duration: number };
+  zoomIn?: { apply: () => Keyframes; duration: number };
+  zoomOut?: { apply: () => Keyframes; duration: number };
+  startTime?: number;
+};
+
+const ANIMATION_DURATION = 0.3 * Second.ms;
+
+type Props = {
+  /** Callback triggered when the active image position is updated */
+  onUpdate: (pos: number | null) => void;
+  /** The position of the currently active image in the document */
+  activePos: number | null;
+};
+
+function Lightbox({ onUpdate, activePos }: Props) {
+  const { view } = useEditor();
+  const isIdle = useIdle(3 * Second.ms);
+  const { t } = useTranslation();
+  const imgRef = useRef<HTMLImageElement | null>(null);
+  const overlayRef = useRef<HTMLDivElement | null>(null);
+  const [status, setStatus] = useState<Status>({ lightbox: null, image: null });
+  const [imageElements] = useState(
+    view?.dom.querySelectorAll(".component-image img")
+  );
+  const animation = useRef<Animation | null>(null);
+  const finalImage = useRef<{
+    center: { x: number; y: number };
+    width: number;
+    height: number;
+  } | null>(null);
+
+  const imageNodes = useMemo(
+    () =>
+      view
+        ? findChildren(
+            view.state.doc,
+            (child) => child.type === view.state.schema.nodes.image,
+            true
+          )
+        : [],
+    [view]
+  );
+  const currentImageIndex = findIndex(
+    imageNodes,
+    (node) => node.pos === activePos
+  );
+  const currentImageNode =
+    currentImageIndex >= 0 ? imageNodes[currentImageIndex].node : undefined;
+
+  // Debugging status changes
+  // useEffect(() => {
+  //   console.log(
+  //     `lstat:${status.lightbox === null ? status.lightbox : LightboxStatus[status.lightbox]}, istat:${status.image === null ? status.image : ImageStatus[status.image]}`
+  //   );
+  // }, [status]);
+
+  useEffect(() => () => view.focus(), []);
+
+  useEffect(() => {
+    !!activePos &&
+      setStatus({
+        lightbox: LightboxStatus.READY_TO_OPEN,
+        image: status.image,
+      });
+  }, [!!activePos]);
+
+  useEffect(() => {
+    if (status.image === ImageStatus.LOADED) {
+      rememberImagePosition();
+    }
+  }, [status.image]);
+
+  useEffect(() => {
+    if (
+      (status.image === ImageStatus.ERROR ||
+        status.image === ImageStatus.LOADED) &&
+      status.lightbox === LightboxStatus.READY_TO_OPEN
+    ) {
+      setupFadeIn();
+      setupZoomIn();
+      setStatus({
+        lightbox: LightboxStatus.OPENING,
+        image: status.image,
+      });
+    }
+  }, [status.image, status.lightbox]);
+
+  useEffect(() => {
+    if (status.lightbox === LightboxStatus.READY_TO_CLOSE) {
+      setupFadeOut();
+      setupZoomOut();
+      setStatus({
+        lightbox: LightboxStatus.CLOSING,
+        image: status.image,
+      });
+    }
+  }, [status.lightbox]);
+
+  useEffect(() => {
+    if (status.lightbox === LightboxStatus.CLOSED) {
+      onUpdate(null);
+    }
+  }, [status.lightbox]);
+
+  const rememberImagePosition = () => {
+    if (imgRef.current) {
+      const lightboxImgDOMRect = imgRef.current.getBoundingClientRect();
+      const {
+        top: lightboxImgTop,
+        left: lightboxImgLeft,
+        width: lightboxImgWidth,
+        height: lightboxImgHeight,
+      } = lightboxImgDOMRect;
+      finalImage.current = {
+        center: {
+          x: lightboxImgLeft + lightboxImgWidth / 2,
+          y: lightboxImgTop + lightboxImgHeight / 2,
+        },
+        width: lightboxImgWidth,
+        height: lightboxImgHeight,
+      };
+    }
+  };
+
+  const setupZoomIn = () => {
+    if (imgRef.current) {
+      // in editor
+      const editorImageEl = imageElements[currentImageIndex];
+      if (!editorImageEl) {
+        return;
+      }
+
+      const editorImgDOMRect = editorImageEl.getBoundingClientRect();
+      const {
+        top: editorImgTop,
+        left: editorImgLeft,
+        width: editorImgWidth,
+        height: editorImgHeight,
+      } = editorImgDOMRect;
+
+      const from = {
+        center: {
+          x: editorImgLeft + editorImgWidth / 2,
+          y: editorImgTop + editorImgHeight / 2,
+        },
+        width: editorImgWidth,
+        height: editorImgHeight,
+      };
+
+      // in lightbox
+      const lightboxImgDOMRect = imgRef.current.getBoundingClientRect();
+      const {
+        top: lightboxImgTop,
+        left: lightboxImgLeft,
+        width: lightboxImgWidth,
+        height: lightboxImgHeight,
+      } = lightboxImgDOMRect;
+      const to = {
+        center: {
+          x: lightboxImgLeft + lightboxImgWidth / 2,
+          y: lightboxImgTop + lightboxImgHeight / 2,
+        },
+        width: lightboxImgWidth,
+        height: lightboxImgHeight,
+      };
+
+      const zoomIn = () => {
+        const tx = from.center.x - to.center.x;
+        const ty = from.center.y - to.center.y;
+        return keyframes`
+            from {
+              translate: ${tx}px ${ty}px;
+              scale: ${from.width / to.width};
+            }
+            to {
+              translate: 0;
+              scale: 1;
+            }
+        `;
+      };
+      animation.current = {
+        ...(animation.current ?? {}),
+        zoomOut: undefined,
+        zoomIn: { apply: zoomIn, duration: ANIMATION_DURATION },
+      };
+    }
+  };
+
+  const setupFadeIn = () => {
+    const fadeIn = () => keyframes`
+                    from { opacity: 0; }
+                    to { opacity: 1; }
+                    `;
+    animation.current = {
+      ...(animation.current ?? {}),
+      fadeIn: { apply: fadeIn, duration: ANIMATION_DURATION },
+      fadeOut: undefined,
+    };
+  };
+
+  const setupFadeOut = () => {
+    const fadeOut = () => keyframes`
+              from { opacity: ${overlayRef.current ? window.getComputedStyle(overlayRef.current).opacity : 1}; }
+              to { opacity: 0; }
+              `;
+    animation.current = {
+      ...(animation.current ?? {}),
+      fadeIn: undefined,
+      fadeOut: {
+        apply: fadeOut,
+        duration: animation.current?.startTime
+          ? Date.now() - animation.current.startTime
+          : ANIMATION_DURATION,
+      },
+    };
+  };
+
+  const setupZoomOut = () => {
+    if (imgRef.current) {
+      // in lightbox
+      const lightboxImgDOMRect = imgRef.current.getBoundingClientRect();
+      const {
+        top: lightboxImgTop,
+        left: lightboxImgLeft,
+        width: lightboxImgWidth,
+        height: lightboxImgHeight,
+      } = lightboxImgDOMRect;
+      const from = {
+        center: {
+          x: lightboxImgLeft + lightboxImgWidth / 2,
+          y: lightboxImgTop + lightboxImgHeight / 2,
+        },
+        width: lightboxImgWidth,
+        height: lightboxImgHeight,
+      };
+
+      // in editor
+      const editorImageEl = imageElements[currentImageIndex];
+      let to;
+      if (editorImageEl?.isConnected) {
+        const editorImgDOMRect = editorImageEl.getBoundingClientRect();
+        const {
+          top: editorImgTop,
+          left: editorImgLeft,
+          width: editorImgWidth,
+          height: editorImgHeight,
+        } = editorImgDOMRect;
+
+        to = {
+          center: {
+            x: editorImgLeft + editorImgWidth / 2,
+            y:
+              editorImgTop + editorImgHeight / 2 >
+              window.innerHeight + editorImgHeight / 2
+                ? window.innerHeight + editorImgHeight / 2
+                : editorImgTop + editorImgHeight / 2 < -editorImgHeight / 2
+                  ? -editorImgHeight / 2
+                  : editorImgTop + editorImgHeight / 2,
+          },
+          width: editorImgWidth,
+          height: editorImgHeight,
+        };
+      } else {
+        to = {
+          center: {
+            x: from.center.x,
+            y: window.innerHeight + lightboxImgHeight / 2,
+          },
+          width: lightboxImgWidth,
+          height: lightboxImgHeight,
+        };
+      }
+
+      const zoomOut = () => {
+        const final = finalImage.current;
+        if (!final) {
+          return keyframes``;
+        }
+
+        const fromTx = from.center.x - final.center.x;
+        const fromTy = from.center.y - final.center.y;
+        const toTx = to.center.x - final.center.x;
+        const toTy = to.center.y - final.center.y;
+
+        const fromSx = from.width / final.width;
+        const fromSy = from.height / final.height;
+        const toSx = to.width / final.width;
+        const toSy = to.height / final.height;
+        return keyframes`
+            from {
+              translate: ${fromTx}px ${fromTy}px;
+              scale: ${fromSx} ${fromSy};
+            }
+            to {
+              translate: ${toTx}px ${toTy}px;
+              scale: ${toSx} ${toSy};
+            }
+        `;
+      };
+      animation.current = {
+        ...(animation.current ?? {}),
+        zoomIn: undefined,
+        zoomOut: {
+          apply: zoomOut,
+          duration: animation.current?.startTime
+            ? Date.now() - animation.current.startTime
+            : ANIMATION_DURATION,
+        },
+      };
+    }
+  };
+
+  if (!activePos) {
+    return null;
+  }
+
+  const prev = () => {
+    if (status.lightbox === LightboxStatus.OPENED) {
+      if (!activePos) {
+        return;
+      }
+      const prevIndex = currentImageIndex - 1;
+      if (prevIndex < 0) {
+        return;
+      }
+      onUpdate(imageNodes[prevIndex].pos);
+    }
+  };
+
+  const next = () => {
+    if (status.lightbox === LightboxStatus.OPENED) {
+      if (!activePos) {
+        return;
+      }
+      const nextIndex = currentImageIndex + 1;
+      if (nextIndex >= imageNodes.length) {
+        return;
+      }
+      onUpdate(imageNodes[nextIndex].pos);
+    }
+  };
+
+  const close = () => {
+    if (
+      status.lightbox === LightboxStatus.OPENING ||
+      status.lightbox === LightboxStatus.OPENED
+    ) {
+      setStatus({
+        lightbox: LightboxStatus.READY_TO_CLOSE,
+        image: status.image,
+      });
+    }
+  };
+
+  const download = () => {
+    if (currentImageNode && status.lightbox === LightboxStatus.OPENED) {
+      void downloadImageNode(currentImageNode);
+    }
+  };
+
+  const handleKeyDown = (ev: React.KeyboardEvent<HTMLDivElement>) => {
+    ev.preventDefault();
+    switch (ev.key) {
+      case "ArrowLeft": {
+        prev();
+        break;
+      }
+      case "ArrowRight": {
+        next();
+        break;
+      }
+      case "Escape": {
+        close();
+        break;
+      }
+    }
+  };
+
+  const handleFadeStart = () => {
+    if (animation.current?.fadeIn) {
+      animation.current = {
+        ...(animation.current ?? {}),
+        startTime: Date.now(),
+      };
+    }
+  };
+
+  const handleFadeEnd = () => {
+    if (animation.current?.fadeIn) {
+      animation.current = {
+        ...(animation.current ?? {}),
+        zoomIn: undefined,
+        fadeIn: undefined,
+        startTime: undefined,
+      };
+      setStatus({
+        lightbox: LightboxStatus.OPENED,
+        image: status.image,
+      });
+    } else if (animation.current?.fadeOut) {
+      setStatus({
+        lightbox: LightboxStatus.CLOSED,
+        image: null,
+      });
+    }
+  };
+
+  if (!currentImageNode) {
+    return null;
+  }
+
+  const src = sanitizeUrl(currentImageNode.attrs.src) ?? "";
+
+  return (
+    <Dialog.Root open={!!activePos}>
+      <Dialog.Portal>
+        <StyledOverlay
+          ref={overlayRef}
+          animation={animation.current}
+          onAnimationStart={handleFadeStart}
+          onAnimationEnd={handleFadeEnd}
+        />
+        <StyledContent onKeyDown={handleKeyDown}>
+          <VisuallyHidden.Root>
+            <Dialog.Title>{t("Lightbox")}</Dialog.Title>
+            <Dialog.Description>
+              {t("View, navigate, or download images in the document")}
+            </Dialog.Description>
+          </VisuallyHidden.Root>
+          <Actions animation={animation.current}>
+            <Tooltip content={t("Copy link")} placement="bottom">
+              <CopyToClipboard text={imgRef.current?.src ?? ""}>
+                <Button
+                  tabIndex={-1}
+                  aria-label={t("Copy link")}
+                  size={32}
+                  icon={<LinkIcon />}
+                  borderOnHover
+                  neutral
+                />
+              </CopyToClipboard>
+            </Tooltip>
+            <Tooltip content={t("Download")} placement="bottom">
+              <Button
+                tabIndex={-1}
+                onClick={download}
+                aria-label={t("Download")}
+                size={32}
+                icon={<DownloadIcon />}
+                borderOnHover
+                neutral
+              />
+            </Tooltip>
+            <Separator />
+            <Dialog.Close asChild>
+              <Tooltip content={t("Close")} shortcut="Esc" placement="bottom">
+                <Button
+                  tabIndex={-1}
+                  onClick={close}
+                  aria-label={t("Close")}
+                  size={32}
+                  icon={<CloseIcon />}
+                  borderOnHover
+                  neutral
+                />
+              </Tooltip>
+            </Dialog.Close>
+          </Actions>
+          {currentImageIndex > 0 && (
+            <Nav dir="left" $hidden={isIdle} animation={animation.current}>
+              <NavButton onClick={prev} size={32} aria-label={t("Previous")}>
+                <BackIcon size={32} />
+              </NavButton>
+            </Nav>
+          )}
+          <Image
+            ref={imgRef}
+            src={src}
+            alt={currentImageNode.attrs.alt ?? ""}
+            onLoading={() =>
+              setStatus({
+                lightbox: status.lightbox,
+                image: ImageStatus.LOADING,
+              })
+            }
+            onLoad={() =>
+              setStatus({
+                lightbox: status.lightbox,
+                image: ImageStatus.LOADED,
+              })
+            }
+            onError={() =>
+              setStatus({
+                lightbox: status.lightbox,
+                image: ImageStatus.ERROR,
+              })
+            }
+            onSwipeRight={prev}
+            onSwipeLeft={next}
+            onSwipeUp={close}
+            onSwipeDown={close}
+            status={status}
+            animation={animation.current}
+          />
+          {currentImageIndex < imageNodes.length - 1 && (
+            <Nav dir="right" $hidden={isIdle} animation={animation.current}>
+              <NavButton onClick={next} size={32} aria-label={t("Next")}>
+                <NextIcon size={32} />
+              </NavButton>
+            </Nav>
+          )}
+        </StyledContent>
+      </Dialog.Portal>
+    </Dialog.Root>
+  );
+}
+
+type ImageProps = {
+  src: string;
+  alt: string;
+  onLoading: () => void;
+  onLoad: () => void;
+  onError: () => void;
+  onSwipeRight: () => void;
+  onSwipeLeft: () => void;
+  onSwipeUp: () => void;
+  onSwipeDown: () => void;
+  status: Status;
+  animation: Animation | null;
+};
+
+const Image = forwardRef<HTMLImageElement, ImageProps>(function _Image(
+  {
+    src,
+    alt,
+    onLoading,
+    onLoad,
+    onError,
+    onSwipeRight,
+    onSwipeLeft,
+    onSwipeUp,
+    onSwipeDown,
+    status,
+    animation,
+  }: ImageProps,
+  ref
+) {
+  const { t } = useTranslation();
+
+  const swipeHandlers = useSwipe({
+    onSwipeRight,
+    onSwipeLeft,
+    onSwipeUp,
+    onSwipeDown,
+  });
+
+  const [hidden, setHidden] = useState(
+    status.image === null || status.image === ImageStatus.LOADING
+  );
+
+  useEffect(() => {
+    onLoading();
+  }, [src]);
+
+  useEffect(() => {
+    if (status.image === null || status.image === ImageStatus.LOADING) {
+      setHidden(true);
+    } else if (status.image === ImageStatus.LOADED) {
+      setHidden(false);
+    }
+  }, [status.image]);
+
+  return status.image === ImageStatus.ERROR ? (
+    <StyledError animation={animation} {...swipeHandlers}>
+      <CrossIcon size={16} /> {t("Image failed to load")}
+    </StyledError>
+  ) : (
+    <>
+      {status.image === ImageStatus.LOADING && <LoadingIndicator />}
+      <Figure>
+        <StyledImg
+          ref={ref}
+          src={src}
+          alt={alt}
+          animation={animation}
+          onAnimationStart={() => setHidden(false)}
+          {...swipeHandlers}
+          onError={onError}
+          onLoad={onLoad}
+          $hidden={hidden}
+        />
+        <Caption>
+          {status.image === ImageStatus.LOADED &&
+          status.lightbox === LightboxStatus.OPENED ? (
+            <Fade>{alt}</Fade>
+          ) : null}
+        </Caption>
+      </Figure>
+    </>
+  );
+});
+
+const Figure = styled("figure")`
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+`;
+
+const Caption = styled("figcaption")`
+  font-size: 14px;
+  min-height: 1.5em;
+  font-weight: normal;
+  margin-top: 8px;
+  color: ${s("textSecondary")};
+  flex-shrink: 0;
+`;
+
+const StyledOverlay = styled(Dialog.Overlay)<{
+  animation: Animation | null;
+}>`
+  position: fixed;
+  inset: 0;
+  background-color: ${s("background")};
+  z-index: ${depths.overlay};
+  ${(props) =>
+    props.animation === null
+      ? css`
+          opacity: 0;
+        `
+      : props.animation.fadeIn
+        ? css`
+            animation: ${props.animation.fadeIn.apply()}
+              ${props.animation.fadeIn.duration}ms;
+          `
+        : props.animation.fadeOut
+          ? css`
+              animation: ${props.animation.fadeOut.apply()}
+                ${props.animation.fadeOut.duration}ms;
+            `
+          : ""}
+`;
+
+const StyledImg = styled.img<{
+  $hidden: boolean;
+  animation: Animation | null;
+}>`
+  visibility: ${(props) => (props.$hidden ? "hidden" : "visible")};
+  max-width: 100%;
+  min-height: 0;
+  object-fit: contain;
+  ${(props) =>
+    props.animation?.zoomIn
+      ? css`
+          animation: ${props.animation.zoomIn.apply()}
+            ${props.animation.zoomIn.duration}ms;
+        `
+      : props.animation?.zoomOut
+        ? css`
+            animation: ${props.animation.zoomOut.apply()}
+              ${props.animation.zoomOut.duration}ms;
+          `
+        : ""}
+`;
+
+const StyledContent = styled(Dialog.Content)`
+  position: fixed;
+  inset: 0;
+  z-index: ${depths.modal};
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  outline: none;
+  padding: 56px;
+`;
+
+const Actions = styled.div<{
+  animation: Animation | null;
+}>`
+  position: absolute;
+  top: 0;
+  right: 0;
+  margin: 16px 12px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+
+  ${(props) =>
+    props.animation === null
+      ? css`
+          opacity: 0;
+        `
+      : props.animation.fadeIn
+        ? css`
+            animation: ${props.animation.fadeIn.apply()}
+              ${props.animation.fadeIn.duration}ms;
+          `
+        : props.animation.fadeOut
+          ? css`
+              animation: ${props.animation.fadeOut.apply()}
+                ${props.animation.fadeOut.duration}ms;
+            `
+          : ""}
+`;
+
+const Nav = styled.div<{
+  $hidden: boolean;
+  dir: "left" | "right";
+  animation: Animation | null;
+}>`
+  position: absolute;
+  ${(props) => (props.dir === "left" ? "left: 0;" : "right: 0;")}
+  transition: opacity 500ms ease-in-out;
+  ${(props) => props.$hidden && "opacity: 0;"}
+  ${(props) =>
+    props.animation === null
+      ? css`
+          opacity: 0;
+        `
+      : props.animation.fadeIn
+        ? css`
+            animation: ${props.animation.fadeIn.apply()}
+              ${props.animation.fadeIn.duration}ms;
+          `
+        : props.animation.fadeOut
+          ? css`
+              animation: ${props.animation.fadeOut.apply()}
+                ${props.animation.fadeOut.duration}ms;
+            `
+          : ""}
+`;
+
+const StyledError = styled(Error)<{
+  animation: Animation | null;
+}>`
+  ${(props) =>
+    props.animation === null
+      ? css`
+          opacity: 0;
+        `
+      : props.animation.fadeIn
+        ? css`
+            animation: ${props.animation.fadeIn.apply()}
+              ${props.animation.fadeIn.duration}ms;
+          `
+        : props.animation.fadeOut
+          ? css`
+              animation: ${props.animation.fadeOut.apply()}
+                ${props.animation.fadeOut.duration}ms;
+            `
+          : ""}
+`;
+
+const NavButton = styled(NudeButton)`
+  margin: 16px;
+  opacity: 0.75;
+  color: ${s("text")};
+  outline: none;
+  ${extraArea(12)}
+
+  &:hover {
+    opacity: 1;
+  }
+`;
+
+export default observer(Lightbox);
@@ -0,0 +1,93 @@
+import * as React from "react";
+import { actionV2ToMenuItem } from "~/actions";
+import useActionContext from "~/hooks/useActionContext";
+import useMobile from "~/hooks/useMobile";
+import { ActionV2Variant, ActionV2WithChildren } from "~/types";
+import { toMenuItems } from "./transformer";
+import { observer } from "mobx-react";
+import { useComputed } from "~/hooks/useComputed";
+import { Menu, MenuContent, MenuTrigger } from "~/components/primitives/Menu";
+import { MenuProvider } from "~/components/primitives/Menu/MenuContext";
+
+type Props = {
+  /** Root action with children representing the menu items */
+  action: ActionV2WithChildren;
+  /** Trigger for the menu */
+  children: React.ReactNode;
+  /** ARIA label for the menu */
+  ariaLabel: string;
+  /** Callback when menu is opened */
+  onOpen?: () => void;
+  /** Callback when menu is closed */
+  onClose?: () => void;
+};
+
+export const ContextMenu = observer(
+  ({ action, children, ariaLabel, onOpen, onClose }: Props) => {
+    const isMobile = useMobile();
+    const contentRef = React.useRef<React.ElementRef<typeof MenuContent>>(null);
+    const actionContext = useActionContext({
+      isMenu: true,
+    });
+
+    const menuItems = useComputed(() => {
+      if (!open) {
+        return [];
+      }
+
+      return (action.children as ActionV2Variant[]).map((childAction) =>
+        actionV2ToMenuItem(childAction, actionContext)
+      );
+    }, [open, action.children, actionContext]);
+
+    const handleOpenChange = React.useCallback(
+      (open: boolean) => {
+        if (open) {
+          onOpen?.();
+        } else {
+          onClose?.();
+        }
+      },
+      [onOpen, onClose]
+    );
+
+    const enablePointerEvents = React.useCallback(() => {
+      if (contentRef.current) {
+        contentRef.current.style.pointerEvents = "auto";
+      }
+    }, []);
+
+    const disablePointerEvents = React.useCallback(() => {
+      if (contentRef.current) {
+        contentRef.current.style.pointerEvents = "none";
+      }
+    }, []);
+
+    const handleCloseAutoFocus = React.useCallback(
+      (e: Event) => e.preventDefault(),
+      []
+    );
+
+    if (isMobile) {
+      return <>{children}</>;
+    }
+
+    const content = toMenuItems(menuItems);
+
+    return (
+      <MenuProvider variant="context">
+        <Menu onOpenChange={handleOpenChange}>
+          <MenuTrigger aria-label={ariaLabel}>{children}</MenuTrigger>
+          <MenuContent
+            aria-label={ariaLabel}
+            onAnimationStart={disablePointerEvents}
+            onAnimationEnd={enablePointerEvents}
+            onCloseAutoFocus={handleCloseAutoFocus}
+          >
+            {content}
+          </MenuContent>
+        </Menu>
+      </MenuProvider>
+    );
+  }
+);
@@ -8,30 +8,24 @@ import {
  DrawerTitle,
  DrawerTrigger,
 } from "~/components/primitives/Drawer";
-import {
-  DropdownMenu as DropdownMenuRoot,
-  DropdownMenuTrigger,
-  DropdownMenuContent,
-} from "~/components/primitives/DropdownMenu";
+import { Menu, MenuContent, MenuTrigger } from "~/components/primitives/Menu";
+import { MenuProvider } from "~/components/primitives/Menu/MenuContext";
 import { actionV2ToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import useMobile from "~/hooks/useMobile";
 import {
-  ActionContext,
  ActionV2Variant,
  ActionV2WithChildren,
  MenuItem,
  MenuItemWithChildren,
 } from "~/types";
-import { toDropdownMenuItems, toMobileMenuItems } from "./transformer";
+import { toMenuItems, toMobileMenuItems } from "./transformer";
 import { observer } from "mobx-react";
 import { useComputed } from "~/hooks/useComputed";

 type Props = {
  /** Root action with children representing the menu items */
  action: ActionV2WithChildren;
-  /** Action context to use - new context will be created if not provided */
-  context?: ActionContext;
  /** Trigger for the menu */
  children: React.ReactNode;
  /** Alignment w.r.t trigger - defaults to start */
@@ -52,7 +46,6 @@ export const DropdownMenu = observer(
    (
      {
        action,
-        context,
        children,
        align = "start",
        ariaLabel,
@@ -66,13 +59,10 @@ export const DropdownMenu = observer(
      const [open, setOpen] = React.useState(false);
      const isMobile = useMobile();
      const contentRef =
-        React.useRef<React.ElementRef<typeof DropdownMenuContent>>(null);
-
-      const actionContext =
-        context ??
-        useActionContext({
-          isContextMenu: true,
-        });
+        React.useRef<React.ElementRef<typeof MenuContent>>(null);
+      const actionContext = useActionContext({
+        isMenu: true,
+      });

      const menuItems = useComputed(() => {
        if (!open) {
@@ -126,24 +116,26 @@ export const DropdownMenu = observer(
        );
      }

-      const content = toDropdownMenuItems(menuItems);
+      const content = toMenuItems(menuItems);

      return (
-        <DropdownMenuRoot open={open} onOpenChange={handleOpenChange}>
-          <DropdownMenuTrigger ref={ref} aria-label={ariaLabel} {...rest}>
-            {children}
-          </DropdownMenuTrigger>
-          <DropdownMenuContent
-            align={align}
-            aria-label={ariaLabel}
-            onAnimationStart={disablePointerEvents}
-            onAnimationEnd={enablePointerEvents}
-            onCloseAutoFocus={handleCloseAutoFocus}
-          >
-            {content}
-            {append}
-          </DropdownMenuContent>
-        </DropdownMenuRoot>
+        <MenuProvider variant="dropdown">
+          <Menu open={open} onOpenChange={handleOpenChange}>
+            <MenuTrigger ref={ref} aria-label={ariaLabel} {...rest}>
+              {children}
+            </MenuTrigger>
+            <MenuContent
+              align={align}
+              aria-label={ariaLabel}
+              onAnimationStart={disablePointerEvents}
+              onAnimationEnd={enablePointerEvents}
+              onCloseAutoFocus={handleCloseAutoFocus}
+            >
+              {content}
+              {append}
+            </MenuContent>
+          </Menu>
+        </MenuProvider>
      );
    }
  )
@@ -1,28 +1,18 @@
 import { CheckmarkIcon } from "outline-icons";
-import {
-  DropdownMenuButton,
-  DropdownMenuExternalLink,
-  DropdownMenuGroup,
-  DropdownMenuInternalLink,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownSubMenu,
-  DropdownSubMenuContent,
-  DropdownSubMenuTrigger,
-} from "~/components/primitives/DropdownMenu";
 import {
  MenuButton,
-  MenuIconWrapper,
  MenuInternalLink,
  MenuExternalLink,
-  MenuLabel,
  MenuSeparator,
-  MenuDisclosure,
-  SelectedIconWrapper,
-} from "~/components/primitives/components/Menu";
+  SubMenu,
+  SubMenuTrigger,
+  SubMenuContent,
+  MenuGroup,
+} from "~/components/primitives/Menu";
+import * as Components from "~/components/primitives/components/Menu";
 import { MenuItem } from "~/types";

-export function toDropdownMenuItems(items: MenuItem[]) {
+export function toMenuItems(items: MenuItem[]) {
  const filteredItems = filterMenuItems(items);

  if (!filteredItems.length) {
@@ -39,15 +29,15 @@ export function toDropdownMenuItems(items: MenuItem[]) {

  return filteredItems.map((item, index) => {
    const icon = showIcon ? (
-      <MenuIconWrapper aria-hidden>
+      <Components.MenuIconWrapper aria-hidden>
        {"icon" in item ? item.icon : null}
-      </MenuIconWrapper>
+      </Components.MenuIconWrapper>
    ) : undefined;

    switch (item.type) {
      case "button":
        return (
-          <DropdownMenuButton
+          <MenuButton
            key={`${item.type}-${item.title}-${index}`}
            label={item.title as string}
            icon={icon}
@@ -61,7 +51,7 @@ export function toDropdownMenuItems(items: MenuItem[]) {

      case "route":
        return (
-          <DropdownMenuInternalLink
+          <MenuInternalLink
            key={`${item.type}-${item.title}-${index}`}
            label={item.title as string}
            icon={icon}
@@ -72,7 +62,7 @@ export function toDropdownMenuItems(items: MenuItem[]) {

      case "link":
        return (
-          <DropdownMenuExternalLink
+          <MenuExternalLink
            key={`${item.type}-${item.title}-${index}`}
            label={item.title as string}
            icon={icon}
@@ -85,33 +75,33 @@ export function toDropdownMenuItems(items: MenuItem[]) {
        );

      case "submenu": {
-        const submenuItems = toDropdownMenuItems(item.items);
+        const submenuItems = toMenuItems(item.items);

        if (!submenuItems?.length) {
          return null;
        }

        return (
-          <DropdownSubMenu key={`${item.type}-${item.title}-${index}`}>
-            <DropdownSubMenuTrigger
+          <SubMenu key={`${item.type}-${item.title}-${index}`}>
+            <SubMenuTrigger
              label={item.title as string}
              icon={icon}
              disabled={item.disabled}
            />
-            <DropdownSubMenuContent>{submenuItems}</DropdownSubMenuContent>
-          </DropdownSubMenu>
+            <SubMenuContent>{submenuItems}</SubMenuContent>
+          </SubMenu>
        );
      }

      case "group": {
-        const groupItems = toDropdownMenuItems(item.items);
+        const groupItems = toMenuItems(item.items);

        if (!groupItems?.length) {
          return null;
        }

        return (
-          <DropdownMenuGroup
+          <MenuGroup
            key={`${item.type}-${item.title}-${index}`}
            label={item.title as string}
            items={groupItems}
@@ -120,7 +110,7 @@ export function toDropdownMenuItems(items: MenuItem[]) {
      }

      case "separator":
-        return <DropdownMenuSeparator key={`${item.type}-${index}`} />;
+        return <MenuSeparator key={`${item.type}-${index}`} />;

      default:
        return null;
@@ -149,15 +139,15 @@ export function toMobileMenuItems(

  return filteredItems.map((item, index) => {
    const icon = showIcon ? (
-      <MenuIconWrapper aria-hidden>
+      <Components.MenuIconWrapper aria-hidden>
        {"icon" in item ? item.icon : null}
-      </MenuIconWrapper>
+      </Components.MenuIconWrapper>
    ) : undefined;

    switch (item.type) {
      case "button":
        return (
-          <MenuButton
+          <Components.MenuButton
            key={`${item.type}-${item.title}-${index}`}
            disabled={item.disabled}
            $dangerous={item.dangerous}
@@ -167,31 +157,31 @@ export function toMobileMenuItems(
            }}
          >
            {icon}
-            <MenuLabel>{item.title}</MenuLabel>
+            <Components.MenuLabel>{item.title}</Components.MenuLabel>
            {item.selected !== undefined && (
-              <SelectedIconWrapper aria-hidden>
+              <Components.SelectedIconWrapper aria-hidden>
                {item.selected ? <CheckmarkIcon /> : null}
-              </SelectedIconWrapper>
+              </Components.SelectedIconWrapper>
            )}
-          </MenuButton>
+          </Components.MenuButton>
        );

      case "route":
        return (
-          <MenuInternalLink
+          <Components.MenuInternalLink
            key={`${item.type}-${item.title}-${index}`}
            to={item.to}
            disabled={item.disabled}
            onClick={closeMenu}
          >
            {icon}
-            <MenuLabel>{item.title}</MenuLabel>
-          </MenuInternalLink>
+            <Components.MenuLabel>{item.title}</Components.MenuLabel>
+          </Components.MenuInternalLink>
        );

      case "link":
        return (
-          <MenuExternalLink
+          <Components.MenuExternalLink
            key={`${item.type}-${item.title}-${index}`}
            href={typeof item.href === "string" ? item.href : item.href.url}
            target={
@@ -201,8 +191,8 @@ export function toMobileMenuItems(
            onClick={closeMenu}
          >
            {icon}
-            <MenuLabel>{item.title}</MenuLabel>
-          </MenuExternalLink>
+            <Components.MenuLabel>{item.title}</Components.MenuLabel>
+          </Components.MenuExternalLink>
        );

      case "submenu": {
@@ -217,7 +207,7 @@ export function toMobileMenuItems(
        }

        return (
-          <MenuButton
+          <Components.MenuButton
            key={`${item.type}-${item.title}-${index}`}
            disabled={item.disabled}
            onClick={() => {
@@ -225,9 +215,9 @@ export function toMobileMenuItems(
            }}
          >
            {icon}
-            <MenuLabel>{item.title}</MenuLabel>
-            <MenuDisclosure />
-          </MenuButton>
+            <Components.MenuLabel>{item.title}</Components.MenuLabel>
+            <Components.MenuDisclosure />
+          </Components.MenuButton>
        );
      }

@@ -244,14 +234,14 @@ export function toMobileMenuItems(

        return (
          <div key={`${item.type}-${item.title}-${index}`}>
-            <DropdownMenuLabel>{item.title}</DropdownMenuLabel>
+            <Components.MenuHeader>{item.title}</Components.MenuHeader>
            {groupItems}
          </div>
        );
      }

      case "separator":
-        return <MenuSeparator key={`${item.type}-${index}`} />;
+        return <Components.MenuSeparator key={`${item.type}-${index}`} />;

      default:
        return null;
@@ -6,7 +6,6 @@ import styled from "styled-components";
 import { s, hover } from "@shared/styles";
 import Notification from "~/models/Notification";
 import { markNotificationsAsRead } from "~/actions/definitions/notifications";
-import useActionContext from "~/hooks/useActionContext";
 import useStores from "~/hooks/useStores";
 import NotificationMenu from "~/menus/NotificationMenu";
 import Desktop from "~/utils/Desktop";
@@ -32,7 +31,6 @@ function Notifications(
  { onRequestClose }: Props,
  ref: React.RefObject<HTMLDivElement>
 ) {
-  const context = useActionContext();
  const { notifications } = useStores();
  const { t } = useTranslation();
  const isEmpty = notifications.active.length === 0;
@@ -67,7 +65,10 @@ function Notifications(
          <Flex gap={8}>
            {notifications.approximateUnreadCount > 0 && (
              <Tooltip content={t("Mark all as read")}>
-                <Button action={markNotificationsAsRead} context={context}>
+                <Button
+                  action={markNotificationsAsRead}
+                  aria-label={t("Mark all as read")}
+                >
                  <MarkAsReadIcon />
                </Button>
              </Tooltip>
@@ -63,6 +63,7 @@ export const OAuthClientForm = observer(function OAuthClientForm_({
            name="avatarUrl"
            render={({ field }) => (
              <ImageInput
+                alt={t("OAuth client icon")}
                onSuccess={(url) => field.onChange(url)}
                onError={(err) => setError("avatarUrl", { message: err })}
                model={{
@@ -1,66 +0,0 @@
-import "../stores";
-import { render } from "@testing-library/react";
-import { TFunction } from "i18next";
-import { Provider } from "mobx-react";
-import { getI18n } from "react-i18next";
-import { Pagination } from "@shared/constants";
-import PaginatedList from "./PaginatedList";
-
-describe("PaginatedList", () => {
-  const i18n = getI18n();
-  const authStore = {};
-
-  const props = {
-    i18n,
-    tReady: true,
-    t: ((key: string) => key) as TFunction,
-  } as any;
-
-  it("with no items renders nothing", () => {
-    const result = render(
-      <Provider auth={authStore}>
-        <PaginatedList items={[]} renderItem={render} {...props} />
-      </Provider>
-    );
-    expect(result.container.innerHTML).toEqual("");
-  });
-
-  it("with no items renders empty prop", async () => {
-    const result = render(
-      <Provider auth={authStore}>
-        <PaginatedList
-          items={[]}
-          empty={<p>Sorry, no results</p>}
-          renderItem={render}
-          {...props}
-        />{" "}
-      </Provider>
-    );
-    await expect(
-      result.findAllByText("Sorry, no results")
-    ).resolves.toHaveLength(1);
-  });
-
-  it("calls fetch with options + pagination on mount", () => {
-    const fetch = jest.fn();
-    const options = {
-      id: "one",
-    };
-    render(
-      <Provider auth={authStore}>
-        <PaginatedList
-          items={[]}
-          fetch={fetch}
-          options={options}
-          renderItem={render}
-          {...props}
-        />{" "}
-      </Provider>
-    );
-    expect(fetch).toHaveBeenCalledWith({
-      ...options,
-      limit: Pagination.defaultLimit,
-      offset: 0,
-    });
-  });
-});
@@ -255,6 +255,7 @@ const PaginatedList = <T extends PaginatedItem>({
    <React.Fragment>
      {heading}
      <ArrowKeyNavigation
+        role={rest.role}
        aria-label={rest["aria-label"]}
        onEscape={onEscape}
        className={className}
@@ -168,6 +168,7 @@ function SearchPopover({ shareId, className }: Props) {
    <Popover open={open} onOpenChange={setOpen} modal={true}>
      <PopoverAnchor>
        <StyledInputSearch
+          role="combobox"
          aria-controls="search-results"
          aria-expanded={open}
          aria-haspopup="listbox"
@@ -176,6 +177,8 @@ function SearchPopover({ shareId, className }: Props) {
          onFocus={handleSearchInputFocus}
          onKeyDown={handleKeyDown}
          className={className}
+          label={t("Search")}
+          labelHidden
        />
      </PopoverAnchor>
      <PopoverContent
@@ -194,6 +197,7 @@ function SearchPopover({ shareId, className }: Props) {
        }}
      >
        <PaginatedList<SearchResult>
+          role="listbox"
          options={{ query, snippetMinWords: 10, snippetMaxWords: 11 }}
          items={cachedSearchResults}
          fetch={performSearch}
@@ -25,6 +25,11 @@ export const AppearanceAction = observer(() => {
          onClick={() =>
            ui.setTheme(resolvedTheme === "light" ? Theme.Dark : Theme.Light)
          }
+          aria-label={
+            resolvedTheme === "light"
+              ? t("Switch to dark")
+              : t("Switch to light")
+          }
          neutral
          borderOnHover
        />
@@ -6,7 +6,6 @@ import { Inner } from "~/components/Button";
 import ButtonSmall from "~/components/ButtonSmall";
 import Fade from "~/components/Fade";
 import InputMemberPermissionSelect from "~/components/InputMemberPermissionSelect";
-import useActionContext from "~/hooks/useActionContext";
 import { Action, Permission } from "~/types";

 export function PermissionAction({
@@ -21,7 +20,6 @@ export function PermissionAction({
  onChange: (permission: CollectionPermission | DocumentPermission) => void;
 }) {
  const { t } = useTranslation();
-  const context = useActionContext();

  return (
    <Fade timing="150ms" key="invite">
@@ -31,9 +29,7 @@ export function PermissionAction({
          onChange={onChange}
          value={permission}
        />
-        <ButtonSmall action={action} context={context}>
-          {t("Add")}
-        </ButtonSmall>
+        <ButtonSmall action={action}>{t("Add")}</ButtonSmall>
      </Flex>
    </Fade>
  );
@@ -81,6 +81,11 @@ function AppSidebar() {
                <ToggleButton
                  position="bottom"
                  image={<SidebarIcon />}
+                  aria-label={
+                    ui.sidebarCollapsed
+                      ? t("Expand sidebar")
+                      : t("Collapse sidebar")
+                  }
                  onClick={() => {
                    ui.toggleCollapsedSidebar();
                    (document.activeElement as HTMLElement)?.blur();
@@ -7,7 +7,6 @@ import { depths, s } from "@shared/styles";
 import ErrorBoundary from "~/components/ErrorBoundary";
 import Flex from "~/components/Flex";
 import ResizeBorder from "~/components/Sidebar/components/ResizeBorder";
-import useMobile from "~/hooks/useMobile";
 import useStores from "~/hooks/useStores";
 import { sidebarAppearDuration } from "~/styles/animations";

@@ -20,7 +19,6 @@ function Right({ children, border, className }: Props) {
  const theme = useTheme();
  const { ui } = useStores();
  const [isResizing, setResizing] = React.useState(false);
-  const isMobile = useMobile();
  const maxWidth = theme.sidebarMaxWidth;
  const minWidth = theme.sidebarMinWidth + 16; // padding

@@ -100,13 +98,11 @@ function Right({ children, border, className }: Props) {
    <Sidebar {...animationProps} $border={border} className={className}>
      <Position style={style} column>
        <ErrorBoundary>{children}</ErrorBoundary>
-        {!isMobile && (
-          <ResizeBorder
-            onMouseDown={handleMouseDown}
-            onDoubleClick={handleReset}
-            dir="right"
-          />
-        )}
+        <ResizeBorder
+          onMouseDown={handleMouseDown}
+          onDoubleClick={handleReset}
+          dir="right"
+        />
      </Position>
    </Sidebar>
  );
@@ -52,6 +52,9 @@ function SettingsSidebar() {
      >
        <Tooltip content={t("Toggle sidebar")} shortcut={`${metaDisplay}+.`}>
          <ToggleButton
+            aria-label={
+              ui.sidebarCollapsed ? t("Expand sidebar") : t("Collapse sidebar")
+            }
            position="bottom"
            image={<SidebarIcon />}
            onClick={() => {
@@ -96,6 +96,9 @@ const ToggleSidebar = () => {
      <ToggleButton
        position="bottom"
        image={<SidebarIcon />}
+        aria-label={
+          ui.sidebarCollapsed ? t("Expand sidebar") : t("Collapse sidebar")
+        }
        onClick={() => {
          ui.toggleCollapsedSidebar();
          (document.activeElement as HTMLElement)?.blur();
@@ -21,6 +21,7 @@ import { TooltipProvider } from "../TooltipContext";
 import ResizeBorder from "./components/ResizeBorder";
 import SidebarButton from "./components/SidebarButton";
 import ToggleButton from "./components/ToggleButton";
+import { useTranslation } from "react-i18next";

 const ANIMATION_MS = 250;

@@ -35,6 +36,7 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
  ref: React.RefObject<HTMLDivElement>
 ) {
  const [isCollapsing, setCollapsing] = React.useState(false);
+  const { t } = useTranslation();
  const theme = useTheme();
  const { ui } = useStores();
  const location = useLocation();
@@ -237,7 +239,7 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
              position="bottom"
              image={
                <Avatar
-                  alt={user.name}
+                  alt={t("Avatar of {{ name }}", { name: user.name })}
                  model={user}
                  size={24}
                  style={{ marginLeft: 4 }}
@@ -245,7 +247,11 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
              }
            >
              <NotificationsPopover>
-                <SidebarButton position="bottom" image={<NotificationIcon />} />
+                <SidebarButton
+                  position="bottom"
+                  image={<NotificationIcon />}
+                  aria-label={t("Notifications")}
+                />
              </NotificationsPopover>
            </SidebarButton>
          </AccountMenu>
@@ -150,6 +150,7 @@ const CollectionLink: React.FC<Props> = ({
                  {can.createDocument && (
                    <NudeButton
                      tooltip={{ content: t("New doc"), delay: 500 }}
+                      aria-label={t("New nested document")}
                      onClick={(ev) => {
                        ev.preventDefault();
                        setIsAddingNewChild();
@@ -364,7 +364,6 @@ function InnerDocumentLink(
                      {can.createChildDocument && (
                        <Tooltip content={t("New doc")}>
                          <NudeButton
-                            type={undefined}
                            aria-label={t("New nested document")}
                            onClick={(ev) => {
                              ev.preventDefault();
@@ -1,3 +1,4 @@
+import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
 import invariant from "invariant";
 import { observer } from "mobx-react";
 import { useCallback } from "react";
@@ -61,7 +62,12 @@ function DropToImport({ disabled, children, collectionId, documentId }: Props) {
          $isDragActive={isDragActive}
          tabIndex={-1}
        >
-          <input {...getInputProps()} />
+          <VisuallyHidden>
+            <label>
+              {t("Import files")}
+              <input {...getInputProps()} />
+            </label>
+          </VisuallyHidden>
          {isImporting && <LoadingIndicator />}
          {children}
        </DropzoneContainer>
@@ -1,7 +1,7 @@
 import { CollapsedIcon } from "outline-icons";
 import * as React from "react";
 import styled, { keyframes } from "styled-components";
-import { s } from "@shared/styles";
+import { extraArea, s } from "@shared/styles";
 import usePersistedState from "~/hooks/usePersistedState";
 import { undraggableOnDesktop } from "~/styles";

@@ -71,17 +71,18 @@ const Button = styled.button`
  font-size: 13px;
  font-weight: 600;
  user-select: none;
-  color: ${s("textTertiary")};
+  color: ${s("sidebarText")};
+  position: relative;
  letter-spacing: 0.03em;
  margin: 0;
  padding: 4px 2px 4px 12px;
-  height: 22px;
  border: 0;
  background: none;
  border-radius: 4px;
  -webkit-appearance: none;
  transition: all 100ms ease;
  ${undraggableOnDesktop()}
+  ${extraArea(4)}

  &:not(:disabled):hover,
  &:not(:disabled):active {
@@ -102,7 +103,8 @@ const Disclosure = styled(CollapsedIcon)<{ expanded?: boolean }>`
 const H3 = styled.h3`
  margin: 0;

-  &:hover {
+  &:hover,
+  &:focus-within {
    ${Disclosure} {
      opacity: 1;
    }
@@ -12,7 +12,7 @@ type Props = {

 function SidebarAction({ action, ...rest }: Props) {
  const context = useActionContext({
-    isContextMenu: false,
+    isMenu: false,
    isCommandBar: false,
    activeCollectionId: undefined,
    activeDocumentId: undefined,
@@ -3,7 +3,7 @@ import * as React from "react";
 import styled, { useTheme, css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import EventBoundary from "@shared/components/EventBoundary";
-import { s, truncateMultiline } from "@shared/styles";
+import { s } from "@shared/styles";
 import { isMobile } from "@shared/utils/browser";
 import NudeButton from "~/components/NudeButton";
 import { UnreadBadge } from "~/components/UnreadBadge";
@@ -273,7 +273,6 @@ const Label = styled.div`
  position: relative;
  width: 100%;
  line-height: 24px;
-  ${truncateMultiline(3)}

  * {
    unicode-bidi: plaintext;
@@ -10,7 +10,7 @@ import {
  unstarCollection,
 } from "~/actions/definitions/collections";
 import { starDocument, unstarDocument } from "~/actions/definitions/documents";
-import useActionContext from "~/hooks/useActionContext";
+import { ActionContextProvider } from "~/hooks/useActionContext";
 import NudeButton from "./NudeButton";

 type Props = {
@@ -27,10 +27,6 @@ type Props = {
 function Star({ size, document, collection, color, ...rest }: Props) {
  const { t } = useTranslation();
  const theme = useTheme();
-  const context = useActionContext({
-    activeDocumentId: document?.id,
-    activeCollectionId: collection?.id,
-  });

  const target = document || collection;

@@ -39,37 +35,43 @@ function Star({ size, document, collection, color, ...rest }: Props) {
  }

  return (
-    <NudeButton
-      context={context}
-      hideOnActionDisabled
-      tooltip={{
-        content: target.isStarred ? t("Unstar document") : t("Star document"),
-        delay: 500,
+    <ActionContextProvider
+      value={{
+        activeDocumentId: document?.id,
+        activeCollectionId: collection?.id,
      }}
-      action={
-        collection
-          ? collection.isStarred
-            ? unstarCollection
-            : starCollection
-          : document
-            ? document.isStarred
-              ? unstarDocument
-              : starDocument
-            : undefined
-      }
-      size={size}
-      {...rest}
    >
-      {target.isStarred ? (
-        <AnimatedStar size={size} color={theme.yellow} />
-      ) : (
-        <AnimatedStar
-          size={size}
-          color={color ?? theme.textTertiary}
-          as={UnstarredIcon}
-        />
-      )}
-    </NudeButton>
+      <NudeButton
+        hideOnActionDisabled
+        tooltip={{
+          content: target.isStarred ? t("Unstar document") : t("Star document"),
+          delay: 500,
+        }}
+        action={
+          collection
+            ? collection.isStarred
+              ? unstarCollection
+              : starCollection
+            : document
+              ? document.isStarred
+                ? unstarDocument
+                : starDocument
+              : undefined
+        }
+        size={size}
+        {...rest}
+      >
+        {target.isStarred ? (
+          <AnimatedStar size={size} color={theme.yellow} />
+        ) : (
+          <AnimatedStar
+            size={size}
+            color={color ?? theme.textTertiary}
+            as={UnstarredIcon}
+          />
+        )}
+      </NudeButton>
+    </ActionContextProvider>
  );
 }

@@ -18,6 +18,8 @@ Drawer.displayName = "Drawer";
 /** Drawer's trigger. */
 const DrawerTrigger = DrawerPrimitive.Trigger;

+const DrawerHandle = DrawerPrimitive.Handle;
+
 /** Drawer's content - renders the overlay and the actual content. */
 const DrawerContent = React.forwardRef<
  React.ElementRef<typeof DrawerPrimitive.Content>,
@@ -56,11 +58,9 @@ const DrawerTitle = React.forwardRef<
  const { hidden, children, ...rest } = props;

  const title = (
-    <TitleWrapper justify="center">
-      <Text size="medium" weight="bold">
-        {children}
-      </Text>
-    </TitleWrapper>
+    <Text size="medium" weight="bold" as={TitleWrapper} justify="center">
+      {children}
+    </Text>
  );

  return (
@@ -100,4 +100,4 @@ const TitleWrapper = styled(Flex)`
  padding: 8px 0;
 `;

-export { Drawer, DrawerTrigger, DrawerContent, DrawerTitle };
+export { Drawer, DrawerTrigger, DrawerHandle, DrawerContent, DrawerTitle };
@@ -1,291 +0,0 @@
-import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
-import { LocationDescriptor } from "history";
-import * as React from "react";
-import styled from "styled-components";
-import { depths, s } from "@shared/styles";
-import Scrollable from "~/components/Scrollable";
-import Tooltip from "~/components/Tooltip";
-import { fadeAndScaleIn } from "~/styles/animations";
-import {
-  MenuButton,
-  MenuDisclosure,
-  MenuExternalLink,
-  MenuHeader,
-  MenuInternalLink,
-  MenuLabel,
-  MenuSeparator,
-  MenuSubTrigger,
-  SelectedIconWrapper,
-} from "./components/Menu";
-import { CheckmarkIcon } from "outline-icons";
-
-const DropdownMenu = DropdownMenuPrimitive.Root;
-
-const DropdownSubMenu = DropdownMenuPrimitive.Sub;
-
-const DropdownMenuTrigger = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Trigger>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Trigger>
->((props, ref) => {
-  const { children, ...rest } = props;
-  return (
-    <DropdownMenuPrimitive.Trigger ref={ref} {...rest} asChild>
-      {children}
-    </DropdownMenuPrimitive.Trigger>
-  );
-});
-DropdownMenuTrigger.displayName = DropdownMenuPrimitive.Trigger.displayName;
-
-const DropdownMenuContent = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content>
->((props, ref) => {
-  const { children, ...rest } = props;
-
-  return (
-    <DropdownMenuPrimitive.Portal>
-      <DropdownMenuPrimitive.Content
-        ref={ref}
-        {...rest}
-        sideOffset={4}
-        collisionPadding={6}
-        asChild
-      >
-        <StyledScrollable hiddenScrollbars>{children}</StyledScrollable>
-      </DropdownMenuPrimitive.Content>
-    </DropdownMenuPrimitive.Portal>
-  );
-});
-DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;
-
-type DropdownSubMenuTriggerProps = BaseDropdownItemProps &
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger>;
-
-const DropdownSubMenuTrigger = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
-  DropdownSubMenuTriggerProps
->((props, ref) => {
-  const { label, icon, disabled, ...rest } = props;
-
-  return (
-    <DropdownMenuPrimitive.SubTrigger ref={ref} {...rest} asChild>
-      <MenuSubTrigger disabled={disabled}>
-        {icon}
-        <MenuLabel>{label}</MenuLabel>
-        <MenuDisclosure />
-      </MenuSubTrigger>
-    </DropdownMenuPrimitive.SubTrigger>
-  );
-});
-DropdownSubMenuTrigger.displayName =
-  DropdownMenuPrimitive.SubTrigger.displayName;
-
-const DropdownSubMenuContent = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>
->((props, ref) => {
-  const { children, ...rest } = props;
-
-  return (
-    <DropdownMenuPrimitive.Portal>
-      <DropdownMenuPrimitive.SubContent
-        ref={ref}
-        {...rest}
-        collisionPadding={6}
-        asChild
-      >
-        <StyledScrollable hiddenScrollbars>{children}</StyledScrollable>
-      </DropdownMenuPrimitive.SubContent>
-    </DropdownMenuPrimitive.Portal>
-  );
-});
-DropdownSubMenuContent.displayName =
-  DropdownMenuPrimitive.SubContent.displayName;
-
-type DropdownMenuGroupProps = {
-  label: string;
-  items: React.ReactNode[];
-} & Omit<
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Group>,
-  "children" | "asChild"
->;
-
-const DropdownMenuGroup = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Group>,
-  DropdownMenuGroupProps
->((props, ref) => {
-  const { label, items, ...rest } = props;
-
-  return (
-    <DropdownMenuPrimitive.Group ref={ref} {...rest}>
-      <DropdownMenuLabel>{label}</DropdownMenuLabel>
-      {items}
-    </DropdownMenuPrimitive.Group>
-  );
-});
-DropdownMenuGroup.displayName = DropdownMenuPrimitive.Group.displayName;
-
-type BaseDropdownItemProps = {
-  label: string;
-  icon?: React.ReactElement;
-  disabled?: boolean;
-};
-
-type DropdownMenuButtonProps = BaseDropdownItemProps & {
-  onClick: (event: React.MouseEvent<HTMLButtonElement>) => void;
-  tooltip?: React.ReactChild;
-  selected?: boolean;
-  dangerous?: boolean;
-} & Omit<
-    React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item>,
-    "children" | "asChild" | "onClick"
-  >;
-
-const DropdownMenuButton = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Item>,
-  DropdownMenuButtonProps
->((props, ref) => {
-  const {
-    label,
-    icon,
-    tooltip,
-    disabled,
-    selected,
-    dangerous,
-    onClick,
-    ...rest
-  } = props;
-
-  const button = (
-    <DropdownMenuPrimitive.Item ref={ref} disabled={disabled} {...rest} asChild>
-      <MenuButton disabled={disabled} $dangerous={dangerous} onClick={onClick}>
-        {icon}
-        <MenuLabel>{label}</MenuLabel>
-        {selected !== undefined && (
-          <SelectedIconWrapper aria-hidden>
-            {selected ? <CheckmarkIcon /> : null}
-          </SelectedIconWrapper>
-        )}
-      </MenuButton>
-    </DropdownMenuPrimitive.Item>
-  );
-
-  return tooltip ? (
-    <Tooltip content={tooltip} placement="bottom">
-      <div>{button}</div>
-    </Tooltip>
-  ) : (
-    <>{button}</>
-  );
-});
-DropdownMenuButton.displayName = "DropdownMenuButton";
-
-type DropdownMenuInternalLinkProps = BaseDropdownItemProps & {
-  to: LocationDescriptor;
-} & Omit<
-    React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item>,
-    "children" | "asChild" | "onClick"
-  >;
-
-const DropdownMenuInternalLink = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Item>,
-  DropdownMenuInternalLinkProps
->((props, ref) => {
-  const { label, icon, disabled, to, ...rest } = props;
-
-  return (
-    <DropdownMenuPrimitive.Item ref={ref} disabled={disabled} {...rest} asChild>
-      <MenuInternalLink to={to} disabled={disabled}>
-        {icon}
-        <MenuLabel>{label}</MenuLabel>
-      </MenuInternalLink>
-    </DropdownMenuPrimitive.Item>
-  );
-});
-DropdownMenuInternalLink.displayName = "DropdownMenuInternalLink";
-
-type DropdownMenuExternalLinkProps = BaseDropdownItemProps & {
-  href: string;
-  target?: string;
-} & Omit<
-    React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item>,
-    "children" | "asChild" | "onClick"
-  >;
-
-const DropdownMenuExternalLink = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Item>,
-  DropdownMenuExternalLinkProps
->((props, ref) => {
-  const { label, icon, disabled, href, target, ...rest } = props;
-
-  return (
-    <DropdownMenuPrimitive.Item ref={ref} disabled={disabled} {...rest} asChild>
-      <MenuExternalLink href={href} target={target} disabled={disabled}>
-        {icon}
-        <MenuLabel>{label}</MenuLabel>
-      </MenuExternalLink>
-    </DropdownMenuPrimitive.Item>
-  );
-});
-DropdownMenuExternalLink.displayName = "DropdownMenuExternalLink";
-
-const DropdownMenuSeparator = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Separator>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>
->((props, ref) => (
-  <DropdownMenuPrimitive.Separator ref={ref} {...props} asChild>
-    <MenuSeparator />
-  </DropdownMenuPrimitive.Separator>
-));
-DropdownMenuSeparator.displayName = "DropdownMenuSeparator";
-
-const DropdownMenuLabel = React.forwardRef<
-  React.ElementRef<typeof DropdownMenuPrimitive.Label>,
-  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label>
->(({ className, children, ...props }, ref) => (
-  <DropdownMenuPrimitive.Label ref={ref} {...props} asChild>
-    <MenuHeader>{children}</MenuHeader>
-  </DropdownMenuPrimitive.Label>
-));
-DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName;
-
-/** Styled components */
-const StyledScrollable = styled(Scrollable)`
-  z-index: ${depths.menu};
-  min-width: 180px;
-  max-width: 276px;
-  min-height: 44px;
-  max-height: min(85vh, var(--radix-dropdown-menu-content-available-height));
-  font-weight: normal;
-
-  background: ${s("menuBackground")};
-  box-shadow: ${s("menuShadow")};
-  border-radius: 6px;
-  padding: 6px;
-  outline: none;
-
-  transform-origin: var(--radix-dropdown-menu-content-transform-origin);
-
-  &[data-state="open"] {
-    animation: ${fadeAndScaleIn} 150ms ease-out;
-  }
-
-  @media print {
-    display: none;
-  }
-`;
-
-export {
-  DropdownMenu,
-  DropdownMenuTrigger,
-  DropdownMenuContent,
-  DropdownMenuButton,
-  DropdownMenuInternalLink,
-  DropdownMenuExternalLink,
-  DropdownMenuSeparator,
-  DropdownMenuGroup,
-  DropdownMenuLabel,
-  DropdownSubMenu,
-  DropdownSubMenuTrigger,
-  DropdownSubMenuContent,
-};
@@ -0,0 +1,19 @@
+import { CSRF } from "@shared/constants";
+import { useCsrfToken } from "~/hooks/useCsrfToken";
+
+/**
+ * Form component that automatically includes a CSRF token as a hidden input field.
+ */
+export const Form = ({
+  children,
+  ...props
+}: React.FormHTMLAttributes<HTMLFormElement>) => {
+  const token = useCsrfToken();
+
+  return (
+    <form {...props}>
+      {token && <input type="hidden" name={CSRF.fieldName} value={token} />}
+      {children}
+    </form>
+  );
+};
@@ -0,0 +1,23 @@
+import { createContext, useContext, useMemo } from "react";
+
+type MenuVariant = "dropdown" | "context";
+
+const MenuContext = createContext<{
+  variant: MenuVariant;
+}>({
+  variant: "dropdown",
+});
+
+export function MenuProvider({
+  variant,
+  children,
+}: {
+  variant: MenuVariant;
+  children: React.ReactNode;
+}) {
+  const ctx = useMemo(() => ({ variant }), [variant]);
+
+  return <MenuContext.Provider value={ctx}>{children}</MenuContext.Provider>;
+}
+
+export const useMenuContext = () => useContext(MenuContext);
@@ -0,0 +1,435 @@
+import * as ContextMenuPrimitive from "@radix-ui/react-context-menu";
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+import * as Components from "../components/Menu";
+import { LocationDescriptor } from "history";
+import * as React from "react";
+import Tooltip from "~/components/Tooltip";
+import { CheckmarkIcon } from "outline-icons";
+import { useMenuContext } from "./MenuContext";
+
+type MenuProps = React.ComponentPropsWithoutRef<
+  typeof DropdownMenuPrimitive.Root
+> &
+  React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Root>;
+
+const Menu = ({ children, ...rest }: MenuProps) => {
+  const { variant } = useMenuContext();
+
+  const Root =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.Root
+      : ContextMenuPrimitive.Root;
+
+  return <Root {...rest}>{children}</Root>;
+};
+
+type SubMenuProps = React.ComponentPropsWithoutRef<
+  typeof DropdownMenuPrimitive.Sub
+> &
+  React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Sub>;
+
+const SubMenu = ({ children, ...rest }: SubMenuProps) => {
+  const { variant } = useMenuContext();
+
+  const Sub =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.Sub
+      : ContextMenuPrimitive.Sub;
+
+  return <Sub {...rest}>{children}</Sub>;
+};
+
+type TriggerProps = React.ComponentPropsWithoutRef<
+  typeof DropdownMenuPrimitive.Trigger
+> &
+  React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Trigger>;
+
+const MenuTrigger = React.forwardRef<
+  | React.ElementRef<typeof DropdownMenuPrimitive.Trigger>
+  | React.ElementRef<typeof ContextMenuPrimitive.Trigger>,
+  TriggerProps
+>((props, ref) => {
+  const { variant } = useMenuContext();
+  const { children, ...rest } = props;
+
+  const Trigger =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.Trigger
+      : ContextMenuPrimitive.Trigger;
+
+  return (
+    <Trigger ref={ref} {...rest} asChild>
+      {children}
+    </Trigger>
+  );
+});
+MenuTrigger.displayName = "MenuTrigger";
+
+type ContentProps = React.ComponentPropsWithoutRef<
+  typeof DropdownMenuPrimitive.Content
+> &
+  React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Content>;
+
+const MenuContent = React.forwardRef<
+  | React.ElementRef<typeof DropdownMenuPrimitive.Content>
+  | React.ElementRef<typeof ContextMenuPrimitive.Content>,
+  ContentProps
+>((props, ref) => {
+  const { variant } = useMenuContext();
+  const { children, ...rest } = props;
+
+  const Portal =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.Portal
+      : ContextMenuPrimitive.Portal;
+
+  const Content =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.Content
+      : ContextMenuPrimitive.Content;
+
+  const offsetProp =
+    variant === "dropdown" ? { sideOffset: 4 } : { alignOffset: 4 };
+
+  const contentProps = {
+    maxHeightVar:
+      variant === "dropdown"
+        ? "--radix-dropdown-menu-content-available-height"
+        : "--radix-context-menu-content-available-height",
+    transformOriginVar:
+      variant === "dropdown"
+        ? "--radix-dropdown-menu-content-transform-origin"
+        : "--radix-context-menu-content-transform-origin",
+  };
+
+  return (
+    <Portal>
+      <Content ref={ref} {...rest} {...offsetProp} collisionPadding={6} asChild>
+        <Components.MenuContent {...contentProps} hiddenScrollbars>
+          {children}
+        </Components.MenuContent>
+      </Content>
+    </Portal>
+  );
+});
+MenuContent.displayName = "MenuContent";
+
+type SubMenuTriggerProps = BaseItemProps &
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> &
+  React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.SubTrigger>;
+
+const SubMenuTrigger = React.forwardRef<
+  | React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>
+  | React.ElementRef<typeof ContextMenuPrimitive.SubTrigger>,
+  SubMenuTriggerProps
+>((props, ref) => {
+  const { variant } = useMenuContext();
+  const { label, icon, disabled, ...rest } = props;
+
+  const Trigger =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.SubTrigger
+      : ContextMenuPrimitive.SubTrigger;
+
+  return (
+    <Trigger ref={ref} {...rest} asChild>
+      <Components.MenuSubTrigger disabled={disabled}>
+        {icon}
+        <Components.MenuLabel>{label}</Components.MenuLabel>
+        <Components.MenuDisclosure />
+      </Components.MenuSubTrigger>
+    </Trigger>
+  );
+});
+SubMenuTrigger.displayName = "SubMenuTrigger";
+
+type SubMenuContentProps = React.ComponentPropsWithoutRef<
+  typeof DropdownMenuPrimitive.SubContent
+> &
+  React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.SubContent>;
+
+const SubMenuContent = React.forwardRef<
+  | React.ElementRef<typeof DropdownMenuPrimitive.SubContent>
+  | React.ElementRef<typeof ContextMenuPrimitive.SubContent>,
+  SubMenuContentProps
+>((props, ref) => {
+  const { variant } = useMenuContext();
+  const { children, ...rest } = props;
+
+  const Portal =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.Portal
+      : ContextMenuPrimitive.Portal;
+
+  const Content =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.SubContent
+      : ContextMenuPrimitive.SubContent;
+
+  const contentProps = {
+    maxHeightVar:
+      variant === "dropdown"
+        ? "--radix-dropdown-menu-content-available-height"
+        : "--radix-context-menu-content-available-height",
+    transformOriginVar:
+      variant === "dropdown"
+        ? "--radix-dropdown-menu-content-transform-origin"
+        : "--radix-context-menu-content-transform-origin",
+  };
+
+  return (
+    <Portal>
+      <Content ref={ref} {...rest} collisionPadding={6} asChild>
+        <Components.MenuContent {...contentProps} hiddenScrollbars>
+          {children}
+        </Components.MenuContent>
+      </Content>
+    </Portal>
+  );
+});
+SubMenuContent.displayName = "SubMenuContent";
+
+type MenuGroupProps = {
+  label: string;
+  items: React.ReactNode[];
+} & Omit<
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Group>,
+  "children" | "asChild"
+> &
+  Omit<
+    React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Group>,
+    "children" | "asChild"
+  >;
+
+const MenuGroup = React.forwardRef<
+  | React.ElementRef<typeof DropdownMenuPrimitive.Group>
+  | React.ElementRef<typeof ContextMenuPrimitive.Group>,
+  MenuGroupProps
+>((props, ref) => {
+  const { variant } = useMenuContext();
+  const { label, items, ...rest } = props;
+
+  const Group =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.Group
+      : ContextMenuPrimitive.Group;
+
+  return (
+    <Group ref={ref} {...rest}>
+      <MenuLabel>{label}</MenuLabel>
+      {items}
+    </Group>
+  );
+});
+MenuGroup.displayName = "MenuGroup";
+
+type BaseItemProps = {
+  label: string;
+  icon?: React.ReactElement;
+  disabled?: boolean;
+};
+
+type MenuButtonProps = BaseItemProps & {
+  onClick: (event: React.MouseEvent<HTMLButtonElement>) => void;
+  tooltip?: React.ReactChild;
+  selected?: boolean;
+  dangerous?: boolean;
+} & Omit<
+    React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item>,
+    "children" | "asChild" | "onClick"
+  > &
+  Omit<
+    React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Item>,
+    "children" | "asChild" | "onClick"
+  >;
+
+const MenuButton = React.forwardRef<
+  | React.ElementRef<typeof DropdownMenuPrimitive.Item>
+  | React.ElementRef<typeof ContextMenuPrimitive.Item>,
+  MenuButtonProps
+>((props, ref) => {
+  const { variant } = useMenuContext();
+  const {
+    label,
+    icon,
+    tooltip,
+    disabled,
+    selected,
+    dangerous,
+    onClick,
+    ...rest
+  } = props;
+
+  const Item =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.Item
+      : ContextMenuPrimitive.Item;
+
+  const button = (
+    <Item ref={ref} disabled={disabled} {...rest} asChild>
+      <Components.MenuButton
+        disabled={disabled}
+        $dangerous={dangerous}
+        onClick={onClick}
+      >
+        {icon}
+        <Components.MenuLabel>{label}</Components.MenuLabel>
+        {selected !== undefined && (
+          <Components.SelectedIconWrapper aria-hidden>
+            {selected ? <CheckmarkIcon /> : null}
+          </Components.SelectedIconWrapper>
+        )}
+      </Components.MenuButton>
+    </Item>
+  );
+
+  return tooltip ? (
+    <Tooltip content={tooltip} placement="bottom">
+      <div>{button}</div>
+    </Tooltip>
+  ) : (
+    <>{button}</>
+  );
+});
+MenuButton.displayName = "MenuButton";
+
+type MenuInternalLinkProps = BaseItemProps & {
+  to: LocationDescriptor;
+} & Omit<
+    React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item>,
+    "children" | "asChild" | "onClick"
+  > &
+  Omit<
+    React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Item>,
+    "children" | "asChild" | "onClick"
+  >;
+
+const MenuInternalLink = React.forwardRef<
+  | React.ElementRef<typeof DropdownMenuPrimitive.Item>
+  | React.ElementRef<typeof ContextMenuPrimitive.Item>,
+  MenuInternalLinkProps
+>((props, ref) => {
+  const { variant } = useMenuContext();
+  const { label, icon, disabled, to, ...rest } = props;
+
+  const Item =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.Item
+      : ContextMenuPrimitive.Item;
+
+  return (
+    <Item ref={ref} disabled={disabled} {...rest} asChild>
+      <Components.MenuInternalLink to={to} disabled={disabled}>
+        {icon}
+        <Components.MenuLabel>{label}</Components.MenuLabel>
+      </Components.MenuInternalLink>
+    </Item>
+  );
+});
+MenuInternalLink.displayName = "MenuInternalLink";
+
+type MenuExternalLinkProps = BaseItemProps & {
+  href: string;
+  target?: string;
+} & Omit<
+    React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item>,
+    "children" | "asChild" | "onClick"
+  > &
+  Omit<
+    React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Item>,
+    "children" | "asChild" | "onClick"
+  >;
+
+const MenuExternalLink = React.forwardRef<
+  | React.ElementRef<typeof DropdownMenuPrimitive.Item>
+  | React.ElementRef<typeof ContextMenuPrimitive.Item>,
+  MenuExternalLinkProps
+>((props, ref) => {
+  const { variant } = useMenuContext();
+  const { label, icon, disabled, href, target, ...rest } = props;
+
+  const Item =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.Item
+      : ContextMenuPrimitive.Item;
+
+  return (
+    <Item ref={ref} disabled={disabled} {...rest} asChild>
+      <Components.MenuExternalLink
+        href={href}
+        target={target}
+        disabled={disabled}
+      >
+        {icon}
+        <Components.MenuLabel>{label}</Components.MenuLabel>
+      </Components.MenuExternalLink>
+    </Item>
+  );
+});
+MenuExternalLink.displayName = "MenuExternalLink";
+
+type MenuSeparatorProps = React.ComponentPropsWithoutRef<
+  typeof DropdownMenuPrimitive.Separator
+> &
+  React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Separator>;
+
+const MenuSeparator = React.forwardRef<
+  | React.ElementRef<typeof DropdownMenuPrimitive.Separator>
+  | React.ElementRef<typeof ContextMenuPrimitive.Separator>,
+  MenuSeparatorProps
+>((props, ref) => {
+  const { variant } = useMenuContext();
+
+  const Separator =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.Separator
+      : ContextMenuPrimitive.Separator;
+
+  return (
+    <Separator ref={ref} {...props} asChild>
+      <Components.MenuSeparator />
+    </Separator>
+  );
+});
+MenuSeparator.displayName = "MenuSeparator";
+
+type MenuLabelProps = React.ComponentPropsWithoutRef<
+  typeof DropdownMenuPrimitive.Label
+> &
+  React.ComponentPropsWithoutRef<typeof ContextMenuPrimitive.Label>;
+
+const MenuLabel = React.forwardRef<
+  | React.ElementRef<typeof DropdownMenuPrimitive.Label>
+  | React.ElementRef<typeof ContextMenuPrimitive.Label>,
+  MenuLabelProps
+>((props, ref) => {
+  const { variant } = useMenuContext();
+  const { children, ...rest } = props;
+
+  const Label =
+    variant === "dropdown"
+      ? DropdownMenuPrimitive.Label
+      : ContextMenuPrimitive.Label;
+
+  return (
+    <Label ref={ref} {...rest} asChild>
+      <Components.MenuHeader>{children}</Components.MenuHeader>
+    </Label>
+  );
+});
+MenuLabel.displayName = "MenuLabel";
+
+export {
+  Menu,
+  MenuTrigger,
+  MenuContent,
+  MenuButton,
+  MenuInternalLink,
+  MenuExternalLink,
+  MenuSeparator,
+  MenuGroup,
+  MenuLabel,
+  SubMenu,
+  SubMenuTrigger,
+  SubMenuContent,
+};
@@ -90,7 +90,7 @@ type StyledContentProps = {

 const StyledContent = styled(PopoverPrimitive.Content)<StyledContentProps>`
  z-index: ${depths.modal};
-  max-height: var(--radix-popover-content-available-height);
+  max-height: min(85vh, var(--radix-popover-content-available-height));
  transform-origin: var(--radix-popover-content-transform-origin);

  background: ${s("menuBackground")};
@@ -3,7 +3,9 @@ import { ellipsis } from "polished";
 import { Link } from "react-router-dom";
 import styled, { css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
-import { s } from "@shared/styles";
+import { depths, s } from "@shared/styles";
+import Scrollable from "~/components/Scrollable";
+import { fadeAndScaleIn } from "~/styles/animations";

 type BaseMenuItemProps = {
  disabled?: boolean;
@@ -135,3 +137,31 @@ export const SelectedIconWrapper = styled.span`
  color: ${s("textSecondary")};
  flex-shrink: 0;
 `;
+
+export const MenuContent = styled(Scrollable)<{
+  maxHeightVar: string;
+  transformOriginVar: string;
+}>`
+  z-index: ${depths.menu};
+  min-width: 180px;
+  max-width: 276px;
+  min-height: 44px;
+  max-height: ${({ maxHeightVar }) => `min(85vh, var(${maxHeightVar}))`};
+  font-weight: normal;
+
+  background: ${s("menuBackground")};
+  box-shadow: ${s("menuShadow")};
+  border-radius: 6px;
+  padding: 6px;
+  outline: none;
+
+  transform-origin: ${({ transformOriginVar }) => `var(${transformOriginVar})`};
+
+  &[data-state="open"] {
+    animation: ${fadeAndScaleIn} 150ms ease-out;
+  }
+
+  @media print {
+    display: none;
+  }
+`;
@@ -347,6 +347,7 @@ export default function FindAndReplace({
        <ButtonLarge
          disabled={disabled}
          onClick={() => editor.commands.prevSearchMatch()}
+          aria-label={t("Previous match")}
        >
          <CaretUpIcon />
        </ButtonLarge>
@@ -355,6 +356,7 @@ export default function FindAndReplace({
        <ButtonLarge
          disabled={disabled}
          onClick={() => editor.commands.nextSearchMatch()}
+          aria-label={t("Next match")}
        >
          <CaretDownIcon />
        </ButtonLarge>
@@ -390,7 +392,10 @@ export default function FindAndReplace({
                  shortcut={`${altDisplay}+${metaDisplay}+c`}
                  placement="bottom"
                >
-                  <ButtonSmall onClick={handleCaseSensitive}>
+                  <ButtonSmall
+                    onClick={handleCaseSensitive}
+                    aria-label={t("Match case")}
+                  >
                    <CaseSensitiveIcon
                      color={caseSensitive ? theme.accent : theme.textSecondary}
                    />
@@ -401,7 +406,10 @@ export default function FindAndReplace({
                  shortcut={`${altDisplay}+${metaDisplay}+r`}
                  placement="bottom"
                >
-                  <ButtonSmall onClick={handleRegex}>
+                  <ButtonSmall
+                    onClick={handleRegex}
+                    aria-label={t("Enable regex")}
+                  >
                    <RegexIcon
                      color={regexEnabled ? theme.accent : theme.textSecondary}
                    />
@@ -416,7 +424,10 @@ export default function FindAndReplace({
                shortcut={`${altDisplay}+${metaDisplay}+f`}
                placement="bottom"
              >
-                <ButtonLarge onClick={handleMore}>
+                <ButtonLarge
+                  onClick={handleMore}
+                  aria-label={t("Replace options")}
+                >
                  <ReplaceIcon color={theme.textSecondary} />
                </ButtonLarge>
              </Tooltip>
@@ -7,6 +7,7 @@ import { EditorStyleHelper } from "@shared/editor/styles/EditorStyleHelper";
 import { extraArea } from "@shared/styles";
 import Input, { NativeInput, Outline } from "~/components/Input";
 import { useEditor } from "./EditorContext";
+import { useTranslation } from "react-i18next";

 type Dimension = {
  width: string;
@@ -20,6 +21,7 @@ export function MediaDimension() {
    width: { min: number; max: number };
    height: { min: number; max: number };
  }>();
+  const { t } = useTranslation();
  const { view, commands } = useEditor();
  const { state } = view;
  const { selection } = state;
@@ -31,8 +33,8 @@ export function MediaDimension() {
    height = node.attrs.height as number;

  const [localDimension, setLocalDimension] = useState<Dimension>(() => ({
-    width: String(width),
-    height: String(height),
+    width: width ? String(width) : "",
+    height: height ? String(height) : "",
    changed: "none",
  }));
  const [error, setError] = useState<{ width: boolean; height: boolean }>({
@@ -57,8 +59,8 @@ export function MediaDimension() {

  const reset = useCallback(() => {
    setLocalDimension({
-      width: String(width),
-      height: String(height),
+      width: width ? String(width) : "",
+      height: height ? String(height) : "",
      changed: "none",
    });
    setError({ width: false, height: false });
@@ -205,6 +207,9 @@ export function MediaDimension() {
  return (
    <StyledFlex ref={ref} align="center">
      <StyledInput
+        label={t("Image width")}
+        labelHidden
+        placeholder={t("Width")}
        value={localDimension.width}
        onChange={handleChange("width")}
        onBlur={handleBlur}
@@ -212,9 +217,12 @@ export function MediaDimension() {
        $error={error.width}
      />
      <Text size="xsmall" type="tertiary">
-        x
+        ×
      </Text>
      <StyledInput
+        label={t("Image height")}
+        labelHidden
+        placeholder={t("Height")}
        value={localDimension.height}
        onChange={handleChange("height")}
        onBlur={handleBlur}
@@ -221,7 +221,7 @@ export default function SelectionToolbar(props: Props) {
  } else if (isNoticeSelection && selection.empty) {
    items = getNoticeMenuItems(state, readOnly, dictionary);
  } else {
-    items = getFormattingMenuItems(state, isTemplate, isMobile, dictionary);
+    items = getFormattingMenuItems(state, isTemplate, dictionary);
  }

  // Some extensions may be disabled, remove corresponding items
@@ -64,7 +64,11 @@ function ToolbarDropdown(props: { active: boolean; item: MenuItem }) {
    <>
      <MenuButton {...menu}>
        {(buttonProps) => (
-          <ToolbarButton {...buttonProps} hovering={menu.visible}>
+          <ToolbarButton
+            {...buttonProps}
+            hovering={menu.visible}
+            aria-label={item.tooltip}
+          >
            {item.label && <Label>{item.label}</Label>}
            {item.icon}
          </ToolbarButton>
@@ -118,6 +122,7 @@ function ToolbarMenu(props: Props) {
                <ToolbarButton
                  onClick={handleClick(item)}
                  active={isActive && !item.label}
+                  aria-label={item.label ? undefined : item.tooltip}
                >
                  {item.label && <Label>{item.label}</Label>}
                  {item.icon}
@@ -44,9 +44,7 @@ export default class ClipboardTextSerializer extends Extension {
                  softBreak: true,
                })
              : slice.content.content
-                  .map((node) =>
-                    ProsemirrorHelper.toPlainText(node, this.editor.schema)
-                  )
+                  .map((node) => ProsemirrorHelper.toPlainText(node))
                  .join("");
          },
        },
@@ -291,6 +291,12 @@ export default class FindAndReplaceExtension extends Extension {
          const from = type === "inline" ? pos + i : pos;
          const to = from + (type === "inline" ? m[0].length : node.nodeSize);

+          // Prevent wrap around matches when the regex matches at the end of the deburred
+          // string and continues matching at the start of the original string
+          if (i + this.searchTerm.length > text.length) {
+            continue;
+          }
+
          // Check if already exists in results, possible due to duplicated
          // search string on L257
          if (this.results.some((r) => r.from === from && r.to === to)) {
@@ -459,6 +459,7 @@ export default class PasteHandler extends Extension {
    const { view, schema } = this.editor;
    const { state } = view;
    const { from } = state.selection;
+    let tr = state.tr;

    const links: string[] = [];
    let allLinks = true;
@@ -480,22 +481,26 @@ export default class PasteHandler extends Extension {
      return false;
    });

-    if (!allLinks || !links.length) {
-      return;
-    }
+    const showPasteMenu = allLinks && links.length;

-    const placeholderId = links[0];
-    const to = from + listNode.nodeSize;
+    // it's possible that the links can be converted to mentions
+    if (showPasteMenu) {
+      const placeholderId = links[0];
+      const to = from + listNode.nodeSize;

-    const transaction = state.tr
-      .replaceSelectionWith(listNode)
-      .setMeta(this.key, {
+      tr = state.tr.replaceSelectionWith(listNode).setMeta(this.key, {
        add: { from, to, id: placeholderId },
      });
+    } else {
+      // Paste as simple list
+      tr = tr.replaceSelectionWith(listNode, this.shiftKey);
+    }

-    view.dispatch(transaction);
+    view.dispatch(tr);

-    this.showPasteMenu(links);
+    if (showPasteMenu) {
+      this.showPasteMenu(links);
+    }
  }

  private placeholderId = () =>
@@ -35,7 +35,6 @@ import Extension, {
 import ExtensionManager from "@shared/editor/lib/ExtensionManager";
 import { MarkdownSerializer } from "@shared/editor/lib/markdown/serializer";
 import textBetween from "@shared/editor/lib/textBetween";
-import { getTextSerializers } from "@shared/editor/lib/textSerializers";
 import Mark from "@shared/editor/marks/Mark";
 import { basicExtensions as extensions } from "@shared/editor/nodes";
 import Node from "@shared/editor/nodes/Node";
@@ -55,6 +54,7 @@ import EditorContext from "./components/EditorContext";
 import { NodeViewRenderer } from "./components/NodeViewRenderer";
 import SelectionToolbar from "./components/SelectionToolbar";
 import WithTheme from "./components/WithTheme";
+import Lightbox from "~/components/Lightbox";

 export type Props = {
  /** An optional identifier for the editor context. It is used to persist local settings */
@@ -146,6 +146,8 @@ type State = {
  isEditorFocused: boolean;
  /** If the toolbar for a text selection is visible */
  selectionToolbarOpen: boolean;
+  /** Position of image in doc that's being currently viewed in Lightbox */
+  activeLightboxImgPos: number | null;
 };

 /**
@@ -175,6 +177,7 @@ export class Editor extends React.PureComponent<
    isRTL: false,
    isEditorFocused: false,
    selectionToolbarOpen: false,
+    activeLightboxImgPos: null,
  };

  isInitialized = false;
@@ -495,6 +498,7 @@ export class Editor extends React.PureComponent<

    // Tell third-party libraries and screen-readers that this is an input
    view.dom.setAttribute("role", "textbox");
+    view.dom.setAttribute("aria-label", "Editor content");

    return view;
  }
@@ -627,8 +631,7 @@ export class Editor extends React.PureComponent<
   *
   * @returns A list of headings in the document
   */
-  public getHeadings = () =>
-    ProsemirrorHelper.getHeadings(this.view.state.doc, this.schema);
+  public getHeadings = () => ProsemirrorHelper.getHeadings(this.view.state.doc);

  /**
   * Return the images in the current editor.
@@ -714,6 +717,13 @@ export class Editor extends React.PureComponent<
    dispatch(tr);
  };

+  public updateActiveLightbox = (pos: number | null) => {
+    this.setState((state) => ({
+      ...state,
+      activeLightboxImgPos: pos,
+    }));
+  };
+
  /**
   * Return the plain text content of the current editor.
   *
@@ -721,9 +731,8 @@ export class Editor extends React.PureComponent<
   */
  public getPlainText = () => {
    const { doc } = this.view.state;
-    const textSerializers = getTextSerializers(this.schema);

-    return textBetween(doc, 0, doc.content.size, textSerializers);
+    return textBetween(doc, 0, doc.content.size);
  };

  private dispatchThemeChanged = (event: CustomEvent) => {
@@ -834,6 +843,12 @@ export class Editor extends React.PureComponent<
              )}
            </Observer>
          </Flex>
+          {this.state.activeLightboxImgPos && (
+            <Lightbox
+              onUpdate={this.updateActiveLightbox}
+              activePos={this.state.activeLightboxImgPos}
+            />
+          )}
        </EditorContext.Provider>
      </PortalContext.Provider>
    );
@@ -30,17 +30,22 @@ import { MenuItem } from "@shared/editor/types";
 import { metaDisplay } from "@shared/utils/keyboard";
 import CircleIcon from "~/components/Icons/CircleIcon";
 import { Dictionary } from "~/hooks/useDictionary";
+import {
+  isMobile as isMobileDevice,
+  isTouchDevice,
+} from "@shared/utils/browser";

 export default function formattingMenuItems(
  state: EditorState,
  isTemplate: boolean,
-  isMobile: boolean,
  dictionary: Dictionary
 ): MenuItem[] {
  const { schema } = state;
  const isCode = isInCode(state);
  const isCodeBlock = isInCode(state, { onlyBlock: true });
  const isEmpty = state.selection.empty;
+  const isMobile = isMobileDevice();
+  const isTouch = isTouchDevice();

  const highlight = getMarksBetween(
    state.selection.from,
@@ -198,7 +203,7 @@ export default function formattingMenuItems(
      shortcut: `⇧+Tab`,
      icon: <OutdentIcon />,
      visible:
-        isMobile && isInList(state, { types: ["ordered_list", "bullet_list"] }),
+        isTouch && isInList(state, { types: ["ordered_list", "bullet_list"] }),
    },
    {
      name: "indentList",
@@ -206,21 +211,21 @@ export default function formattingMenuItems(
      shortcut: `Tab`,
      icon: <IndentIcon />,
      visible:
-        isMobile && isInList(state, { types: ["ordered_list", "bullet_list"] }),
+        isTouch && isInList(state, { types: ["ordered_list", "bullet_list"] }),
    },
    {
      name: "outdentCheckboxList",
      tooltip: dictionary.outdent,
      shortcut: `⇧+Tab`,
      icon: <OutdentIcon />,
-      visible: isMobile && isInList(state, { types: ["checkbox_list"] }),
+      visible: isTouch && isInList(state, { types: ["checkbox_list"] }),
    },
    {
      name: "indentCheckboxList",
      tooltip: dictionary.indent,
      shortcut: `Tab`,
      icon: <IndentIcon />,
-      visible: isMobile && isInList(state, { types: ["checkbox_list"] }),
+      visible: isTouch && isInList(state, { types: ["checkbox_list"] }),
    },
    {
      name: "separator",
@@ -5,15 +5,15 @@ import {
  AlignCenterIcon,
  InsertLeftIcon,
  InsertRightIcon,
-  ArrowIcon,
  MoreIcon,
  TableHeaderColumnIcon,
  TableMergeCellsIcon,
  TableSplitCellsIcon,
+  AlphabeticalSortIcon,
+  AlphabeticalReverseSortIcon,
 } from "outline-icons";
 import { EditorState } from "prosemirror-state";
-import { CellSelection } from "prosemirror-tables";
-import styled from "styled-components";
+import { CellSelection, selectedRect } from "prosemirror-tables";
 import { isNodeActive } from "@shared/editor/queries/isNodeActive";
 import {
  isMergedCellSelection,
@@ -21,6 +21,7 @@ import {
 } from "@shared/editor/queries/table";
 import { MenuItem } from "@shared/editor/types";
 import { Dictionary } from "~/hooks/useDictionary";
+import { ArrowLeftIcon, ArrowRightIcon } from "~/components/Icons/ArrowIcon";

 export default function tableColMenuItems(
  state: EditorState,
@@ -34,6 +35,8 @@ export default function tableColMenuItems(
    return [];
  }

+  const tableMap = selectedRect(state);
+
  return [
    {
      name: "setColumnAttr",
@@ -75,13 +78,13 @@ export default function tableColMenuItems(
      name: "sortTable",
      tooltip: dictionary.sortAsc,
      attrs: { index, direction: "asc" },
-      icon: <SortAscIcon />,
+      icon: <AlphabeticalSortIcon />,
    },
    {
      name: "sortTable",
      tooltip: dictionary.sortDesc,
      attrs: { index, direction: "desc" },
-      icon: <SortDescIcon />,
+      icon: <AlphabeticalReverseSortIcon />,
    },
    {
      name: "separator",
@@ -107,6 +110,23 @@ export default function tableColMenuItems(
          icon: <InsertRightIcon />,
          attrs: { index },
        },
+        {
+          name: "moveTableColumn",
+          label: dictionary.moveColumnLeft,
+          icon: <ArrowLeftIcon />,
+          attrs: { from: index, to: index - 1 },
+          visible: index > 0,
+        },
+        {
+          name: "moveTableColumn",
+          label: dictionary.moveColumnRight,
+          icon: <ArrowRightIcon />,
+          attrs: { from: index, to: index + 1 },
+          visible: index < tableMap.map.width - 1,
+        },
+        {
+          name: "separator",
+        },
        {
          name: "mergeCells",
          label: dictionary.mergeCells,
@@ -132,11 +152,3 @@ export default function tableColMenuItems(
    },
  ];
 }
-
-const SortAscIcon = styled(ArrowIcon)`
-  transform: rotate(-90deg);
-`;
-
-const SortDescIcon = styled(ArrowIcon)`
-  transform: rotate(90deg);
-`;
@@ -8,13 +8,14 @@ import {
  TableMergeCellsIcon,
 } from "outline-icons";
 import { EditorState } from "prosemirror-state";
-import { CellSelection } from "prosemirror-tables";
+import { CellSelection, selectedRect } from "prosemirror-tables";
 import {
  isMergedCellSelection,
  isMultipleCellSelection,
 } from "@shared/editor/queries/table";
 import { MenuItem } from "@shared/editor/types";
 import { Dictionary } from "~/hooks/useDictionary";
+import { ArrowDownIcon, ArrowUpIcon } from "~/components/Icons/ArrowIcon";

 export default function tableRowMenuItems(
  state: EditorState,
@@ -22,10 +23,13 @@ export default function tableRowMenuItems(
  dictionary: Dictionary
 ): MenuItem[] {
  const { selection } = state;
+
  if (!(selection instanceof CellSelection)) {
    return [];
  }

+  const tableMap = selectedRect(state);
+
  return [
    {
      icon: <MoreIcon />,
@@ -48,6 +52,23 @@ export default function tableRowMenuItems(
          icon: <InsertBelowIcon />,
          attrs: { index },
        },
+        {
+          name: "moveTableRow",
+          label: dictionary.moveRowUp,
+          icon: <ArrowUpIcon />,
+          attrs: { from: index, to: index - 1 },
+          visible: index > 0,
+        },
+        {
+          name: "moveTableRow",
+          label: dictionary.moveRowDown,
+          icon: <ArrowDownIcon />,
+          attrs: { from: index, to: index + 1 },
+          visible: index < tableMap.map.height - 1,
+        },
+        {
+          name: "separator",
+        },
        {
          name: "mergeCells",
          label: dictionary.mergeCells,
@@ -1,33 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { useLocation } from "react-router";
-import useStores from "~/hooks/useStores";
-import { ActionContext } from "~/types";
-
-/**
- * Hook to get the current action context, an object that is passed to all
- * action definitions.
- *
- * @param overrides Overides of the default action context.
- * @returns The current action context.
- */
-export default function useActionContext(
-  overrides?: Partial<ActionContext>
-): ActionContext {
-  const stores = useStores();
-  const { t } = useTranslation();
-  const location = useLocation();
-
-  return {
-    isContextMenu: false,
-    isCommandBar: false,
-    isButton: false,
-    activeCollectionId: stores.ui.activeCollectionId ?? undefined,
-    activeDocumentId: stores.ui.activeDocumentId,
-    currentUserId: stores.auth.user?.id,
-    currentTeamId: stores.auth.team?.id,
-    ...overrides,
-    location,
-    stores,
-    t,
-  };
-}
@@ -0,0 +1,102 @@
+import { observer } from "mobx-react";
+import React, { createContext, useContext, ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+import { useLocation } from "react-router";
+import useStores from "~/hooks/useStores";
+import { ActionContext as ActionContextType } from "~/types";
+
+export const ActionContext = createContext<ActionContextType | undefined>(
+  undefined
+);
+
+type ActionContextProviderProps = {
+  children: ReactNode;
+  value?: Partial<ActionContextType>;
+};
+
+/**
+ * Provider that allows overriding the action context at different levels
+ * of the React component tree.
+ *
+ * @example
+ * ```tsx
+ * // Override context for a command bar
+ * <ActionContextProvider value={{ isCommandBar: true }}>
+ *   <CommandBar />
+ * </ActionContextProvider>
+ *
+ * // Nested overrides
+ * <ActionContextProvider value={{ activeCollectionId: "collection-1" }}>
+ *   <CollectionView />
+ *   <ActionContextProvider value={{ activeDocumentId: "doc-1" }}>
+ *     <DocumentView />
+ *   </ActionContextProvider>
+ * </ActionContextProvider>
+ * ```
+ */
+export const ActionContextProvider = observer(function ActionContextProvider_({
+  children,
+  value = {},
+}: ActionContextProviderProps) {
+  const parentContext = useContext(ActionContext);
+  const stores = useStores();
+  const { t } = useTranslation();
+  const location = useLocation();
+
+  // Create the base context if we don't have a parent context
+  const baseContext: ActionContextType = parentContext ?? {
+    isMenu: false,
+    isCommandBar: false,
+    isButton: false,
+    activeCollectionId: stores.ui.activeCollectionId ?? undefined,
+    activeDocumentId: stores.ui.activeDocumentId ?? undefined,
+    currentUserId: stores.auth.user?.id,
+    currentTeamId: stores.auth.team?.id,
+    location,
+    stores,
+    t,
+  };
+
+  // Merge the parent context with the provided overrides
+  const contextValue: ActionContextType = {
+    ...baseContext,
+    ...value,
+  };
+
+  return (
+    <ActionContext.Provider value={contextValue}>
+      {children}
+    </ActionContext.Provider>
+  );
+});
+
+/**
+ * Hook to get the current action context, an object that is passed to all
+ * action definitions.
+ *
+ * This hook respects the ActionContextProvider hierarchy, merging values from:
+ * 1. Default system context (stores, location, translation)
+ * 2. Parent ActionContextProvider values (if any)
+ * 3. Local overrides parameter (highest priority)
+ *
+ * @param overrides Optional overrides of the action context. These will be
+ *                 merged with any provider context and take highest priority.
+ * @returns The current action context with all overrides applied.
+ */
+export default function useActionContext(
+  overrides?: Partial<ActionContextType>
+): ActionContextType {
+  const contextValue = useContext(ActionContext);
+
+  // If we have a context value from a provider, use it as the base
+  if (contextValue) {
+    return {
+      ...contextValue,
+      ...overrides,
+    };
+  }
+
+  throw new Error(
+    "useActionContext must be used within an ActionContextProvider"
+  );
+}
@@ -9,6 +9,7 @@ import { CustomTheme } from "@shared/types";
 import type { Theme } from "~/stores/UiStore";
 import useMediaQuery from "~/hooks/useMediaQuery";
 import useStores from "./useStores";
+import useQuery from "./useQuery";

 /**
 * Builds a theme based on the current user's preferences, the current device
@@ -23,9 +24,11 @@ export default function useBuildTheme(
  overrideTheme?: Theme
 ) {
  const { ui } = useStores();
+  const params = useQuery();
  const isMobile = useMediaQuery(`(max-width: ${breakpoints.tablet}px)`);
  const isPrinting = useMediaQuery("print");
-  const resolvedTheme = overrideTheme ?? ui.resolvedTheme;
+  const queryTheme = (params.get("theme") as Theme) || undefined;
+  const resolvedTheme = overrideTheme ?? queryTheme ?? ui.resolvedTheme;

  const theme = useMemo(
    () =>
@@ -0,0 +1,30 @@
+import { CSRF } from "@shared/constants";
+import { useState, useEffect } from "react";
+import { getCookie } from "tiny-cookie";
+
+/**
+ * React hook for accessing CSRF tokens in components
+ *
+ * @returns The CSRF token string or null if not found
+ */
+export function useCsrfToken() {
+  const [token, setToken] = useState<string | null>(null);
+
+  useEffect(() => {
+    const updateToken = () => {
+      const currentToken = getCookie(CSRF.cookieName);
+
+      setToken(currentToken);
+    };
+
+    // Initial load
+    updateToken();
+
+    // Listen for cookie changes (when navigating or refreshing)
+    const interval = setInterval(updateToken, 1000);
+
+    return () => clearInterval(interval);
+  }, []);
+
+  return token;
+}
@@ -11,10 +11,14 @@ export default function useDictionary() {

  return useMemo(
    () => ({
-      addColumnAfter: t("Add column after"),
-      addColumnBefore: t("Add column before"),
-      addRowAfter: t("Add row after"),
-      addRowBefore: t("Add row before"),
+      addColumnAfter: t("Insert after"),
+      addColumnBefore: t("Insert before"),
+      moveRowUp: t("Move up"),
+      moveRowDown: t("Move down"),
+      moveColumnLeft: t("Move left"),
+      moveColumnRight: t("Move right"),
+      addRowAfter: t("Insert after"),
+      addRowBefore: t("Insert before"),
      alignCenter: t("Align center"),
      alignLeft: t("Align left"),
      alignRight: t("Align right"),
@@ -35,7 +39,7 @@ export default function useDictionary() {
      deleteRow: t("Delete"),
      deleteTable: t("Delete table"),
      deleteAttachment: t("Delete file"),
-      dimensions: t("Width x Height"),
+      dimensions: `${t("Width")} × ${t("Height")}`,
      download: t("Download"),
      downloadAttachment: t("Download file"),
      replaceAttachment: t("Replace file"),
@@ -0,0 +1,135 @@
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { InputIcon, SearchIcon } from "outline-icons";
+import { ActionV2Separator, createActionV2 } from "~/actions";
+import {
+  restoreDocument,
+  unsubscribeDocument,
+  subscribeDocument,
+  restoreDocumentToCollection,
+  starDocument,
+  unstarDocument,
+  editDocument,
+  shareDocument,
+  createNestedDocument,
+  importDocument,
+  createTemplateFromDocument,
+  duplicateDocument,
+  publishDocument,
+  unpublishDocument,
+  archiveDocument,
+  moveDocument,
+  moveTemplate,
+  applyTemplateFactory,
+  pinDocument,
+  createDocumentFromTemplate,
+  openDocumentComments,
+  openDocumentHistory,
+  openDocumentInsights,
+  downloadDocument,
+  copyDocument,
+  printDocument,
+  searchInDocument,
+  deleteDocument,
+  leaveDocument,
+  permanentlyDeleteDocument,
+} from "~/actions/definitions/documents";
+import { ActiveDocumentSection } from "~/actions/sections";
+import useMobile from "./useMobile";
+import Document from "~/models/Document";
+import usePolicy from "./usePolicy";
+import useCurrentUser from "./useCurrentUser";
+import { useTemplateMenuActions } from "./useTemplateMenuActions";
+import { useMenuAction } from "./useMenuAction";
+
+type Props = {
+  /** Document for which the actions are generated */
+  document: Document;
+  /** Invoked when the "Find and replace" menu item is clicked */
+  onFindAndReplace?: () => void;
+  /** Invoked when the "Rename" menu item is clicked */
+  onRename?: () => void;
+  /** Callback when a template is selected to apply its content to the document */
+  onSelectTemplate?: (template: Document) => void;
+};
+
+export function useDocumentMenuAction({
+  document,
+  onFindAndReplace,
+  onRename,
+  onSelectTemplate,
+}: Props) {
+  const { t } = useTranslation();
+  const isMobile = useMobile();
+  const user = useCurrentUser();
+
+  const can = usePolicy(document);
+
+  const templateMenuActions = useTemplateMenuActions({
+    document,
+    onSelectTemplate,
+  });
+
+  const actions = useMemo(
+    () => [
+      restoreDocument,
+      restoreDocumentToCollection,
+      starDocument,
+      unstarDocument,
+      subscribeDocument,
+      unsubscribeDocument,
+      createActionV2({
+        name: `${t("Find and replace")}…`,
+        section: ActiveDocumentSection,
+        icon: <SearchIcon />,
+        visible: !!onFindAndReplace && isMobile,
+        perform: () => onFindAndReplace?.(),
+      }),
+      ActionV2Separator,
+      editDocument,
+      createActionV2({
+        name: `${t("Rename")}…`,
+        section: ActiveDocumentSection,
+        icon: <InputIcon />,
+        visible: !!can.update && !user.separateEditMode && !!onRename,
+        perform: () => requestAnimationFrame(() => onRename?.()),
+      }),
+      shareDocument,
+      createNestedDocument,
+      importDocument,
+      createTemplateFromDocument,
+      duplicateDocument,
+      publishDocument,
+      unpublishDocument,
+      archiveDocument,
+      moveDocument,
+      moveTemplate,
+      applyTemplateFactory({ actions: templateMenuActions }),
+      pinDocument,
+      createDocumentFromTemplate,
+      ActionV2Separator,
+      openDocumentComments,
+      openDocumentHistory,
+      openDocumentInsights,
+      downloadDocument,
+      copyDocument,
+      printDocument,
+      searchInDocument,
+      ActionV2Separator,
+      deleteDocument,
+      permanentlyDeleteDocument,
+      leaveDocument,
+    ],
+    [
+      t,
+      isMobile,
+      templateMenuActions,
+      can.update,
+      user.separateEditMode,
+      onFindAndReplace,
+      onRename,
+    ]
+  );
+
+  return useMenuAction(actions);
+}
@@ -5,6 +5,7 @@ import { isDocumentUrl, isInternalUrl } from "@shared/utils/urls";
 import { sharedModelPath } from "~/utils/routeHelpers";
 import { isHash } from "~/utils/urls";
 import useStores from "./useStores";
+import { isFirefox } from "@shared/utils/browser";

 type Params = {
  /** The share ID of the document being viewed, if any */
@@ -57,7 +58,7 @@ export default function useEditorClickHandlers({ shareId }: Params) {
        }

        if (isDocumentUrl(navigateTo)) {
-          const document = documents.getByUrl(navigateTo);
+          const document = documents.get(navigateTo);
          if (document) {
            navigateTo = document.path;
          }
@@ -78,6 +79,12 @@ export default function useEditorClickHandlers({ shareId }: Params) {
          window.open(navigateTo, "_blank");
        }
      } else {
+        // Middle-click events in Firefox are not prevented in the same way as other browsers
+        // so we need to explicitly return here to prevent two tabs from being opened when
+        // middle-clicking a link (#10083).
+        if (event?.button === 1 && isFirefox()) {
+          return;
+        }
        window.open(href, "_blank");
      }
    },
@@ -1,13 +1,44 @@
-import { useLocation } from "react-router-dom";
 import useQuery from "~/hooks/useQuery";
 import useStores from "./useStores";
+import { useDocumentContext } from "~/components/DocumentContext";
+import { useEffect } from "react";
+import { useHistory } from "react-router-dom";

-export default function useFocusedComment() {
+/**
+ * Custom hook to retrieve the currently focused comment in a document.
+ * It checks both the document context and the query string for the comment ID.
+ * If a comment is focused, it returns the comment itself or the parent thread if it exists
+ */
+export function useFocusedComment() {
  const { comments } = useStores();
-  const location = useLocation<{ commentId?: string }>();
+  const context = useDocumentContext();
  const query = useQuery();
-  const focusedCommentId = location.state?.commentId || query.get("commentId");
+  const focusedCommentId = context.focusedCommentId || query.get("commentId");
  const comment = focusedCommentId ? comments.get(focusedCommentId) : undefined;
+  const history = useHistory();
+
+  // Move the query string into context
+  useEffect(() => {
+    if (focusedCommentId && context.focusedCommentId !== focusedCommentId) {
+      context.setFocusedCommentId(focusedCommentId);
+    }
+  }, [focusedCommentId, context]);
+
+  // Clear query string from location
+  useEffect(() => {
+    if (focusedCommentId) {
+      const params = new URLSearchParams(history.location.search);
+
+      if (params.get("commentId") === focusedCommentId) {
+        params.delete("commentId");
+        history.replace({
+          pathname: history.location.pathname,
+          search: params.toString(),
+          state: history.location.state,
+        });
+      }
+    }
+  }, [focusedCommentId, history]);

  return comment?.parentCommentId
    ? comments.get(comment.parentCommentId)
@@ -1,9 +1,10 @@
-import { useState, useCallback } from "react";
+import { useState, useCallback, useEffect } from "react";
 import { Primitive } from "utility-types";
 import Storage from "@shared/utils/Storage";
 import { isBrowser } from "@shared/utils/browser";
 import Logger from "~/utils/Logger";
 import useEventListener from "./useEventListener";
+import usePrevious from "./usePrevious";

 type Options = {
  /* Whether to listen and react to changes in the value from other tabs */
@@ -41,6 +42,7 @@ export default function usePersistedState<T extends Primitive | object>(
  defaultValue: T,
  options?: Options
 ): [T, (value: T) => void] {
+  const previousKey = usePrevious(key);
  const [storedValue, setStoredValue] = useState(() => {
    if (!isBrowser) {
      return defaultValue;
@@ -65,6 +67,13 @@ export default function usePersistedState<T extends Primitive | object>(
    [key, storedValue]
  );

+  // Sync state when key changes
+  useEffect(() => {
+    if (previousKey !== key) {
+      setStoredValue(Storage.get(key) ?? defaultValue);
+    }
+  }, [previousKey, key, defaultValue]);
+
  // Listen to the key changing in other tabs so we can keep UI in sync
  useEventListener("storage", (event: StorageEvent) => {
    if (options?.listen !== false && event.key === key && event.newValue) {
@@ -0,0 +1,76 @@
+import { isNumber } from "lodash";
+import { useRef } from "react";
+
+type Props = {
+  onSwipeRight: () => void;
+  onSwipeLeft: () => void;
+  onSwipeUp: () => void;
+  onSwipeDown: () => void;
+};
+
+export default function useSwipe({
+  onSwipeRight,
+  onSwipeLeft,
+  onSwipeUp,
+  onSwipeDown,
+}: Props) {
+  const touchXStart = useRef<number>();
+  const touchXEnd = useRef<number>();
+  const touchYStart = useRef<number>();
+  const touchYEnd = useRef<number>();
+
+  const resetTouchPoints = () => {
+    touchXStart.current = undefined;
+    touchXEnd.current = undefined;
+    touchYStart.current = undefined;
+    touchYEnd.current = undefined;
+  };
+
+  const onTouchStart = (e: React.TouchEvent<HTMLImageElement>) => {
+    touchXStart.current = e.changedTouches[0].screenX;
+    touchYStart.current = e.changedTouches[0].screenY;
+  };
+
+  const onTouchMove = (e: React.TouchEvent<HTMLImageElement>) => {
+    if (isNumber(touchXStart.current) && isNumber(touchYStart.current)) {
+      touchXEnd.current = e.changedTouches[0].screenX;
+      touchYEnd.current = e.changedTouches[0].screenY;
+      const dx = touchXEnd.current - touchXStart.current;
+      const dy = touchYEnd.current - touchYStart.current;
+
+      const swipeRight = dx > 0 && Math.abs(dy) < Math.abs(dx);
+      if (swipeRight) {
+        resetTouchPoints();
+        return onSwipeRight();
+      }
+
+      const swipeLeft = dx < 0 && Math.abs(dy) < Math.abs(dx);
+      if (swipeLeft) {
+        resetTouchPoints();
+        return onSwipeLeft();
+      }
+
+      const swipeDown = dy > 0 && Math.abs(dy) > Math.abs(dx);
+      if (swipeDown) {
+        resetTouchPoints();
+        return onSwipeDown();
+      }
+
+      const swipeUp = dy < 0 && Math.abs(dy) > Math.abs(dx);
+      if (swipeUp) {
+        resetTouchPoints();
+        return onSwipeUp();
+      }
+    }
+  };
+
+  const onTouchCancel = () => {
+    resetTouchPoints();
+  };
+
+  return {
+    onTouchStart,
+    onTouchMove,
+    onTouchCancel,
+  };
+}
@@ -25,6 +25,7 @@ import Logger from "./utils/Logger";
 import { PluginManager } from "./utils/PluginManager";
 import history from "./utils/history";
 import { initSentry } from "./utils/sentry";
+import { ActionContextProvider } from "./hooks/useActionContext";

 // Load plugins as soon as possible
 void PluginManager.loadPlugins();
@@ -52,27 +53,29 @@ if (element) {
      <HelmetProvider>
        <Provider {...stores}>
          <Analytics>
-            <Theme>
-              <ErrorBoundary showTitle>
-                <KBarProvider actions={[]} options={commandBarOptions}>
-                  <LazyPolyfill>
-                    <LazyMotion features={loadFeatures}>
-                      <Router history={history}>
-                        <PageScroll>
-                          <PageTheme />
-                          <ScrollToTop>
-                            <Routes />
-                          </ScrollToTop>
-                          <Toasts />
-                          <Dialogs />
-                          <Desktop />
-                        </PageScroll>
-                      </Router>
-                    </LazyMotion>
-                  </LazyPolyfill>
-                </KBarProvider>
-              </ErrorBoundary>
-            </Theme>
+            <Router history={history}>
+              <Theme>
+                <ErrorBoundary showTitle>
+                  <KBarProvider actions={[]} options={commandBarOptions}>
+                    <LazyPolyfill>
+                      <LazyMotion features={loadFeatures}>
+                        <ActionContextProvider>
+                          <PageScroll>
+                            <PageTheme />
+                            <ScrollToTop>
+                              <Routes />
+                            </ScrollToTop>
+                            <Toasts />
+                            <Dialogs />
+                            <Desktop />
+                          </PageScroll>
+                        </ActionContextProvider>
+                      </LazyMotion>
+                    </LazyPolyfill>
+                  </KBarProvider>
+                </ErrorBoundary>
+              </Theme>
+            </Router>
          </Analytics>
        </Provider>
      </HelmetProvider>
@@ -36,7 +36,7 @@ import {
  createDocument,
  exportCollection,
 } from "~/actions/definitions/collections";
-import useActionContext from "~/hooks/useActionContext";
+import { ActionContextProvider } from "~/hooks/useActionContext";
 import usePolicy from "~/hooks/usePolicy";
 import useRequest from "~/hooks/useRequest";
 import useStores from "~/hooks/useStores";
@@ -130,11 +130,6 @@ function CollectionMenu({
  );

  const can = usePolicy(collection);
-  const context = useActionContext({
-    isContextMenu: true,
-    activeCollectionId: collection.id,
-  });
-
  const sortAlphabetical = collection.sort.field === "title";
  const sortDir = collection.sort.direction;

@@ -228,7 +223,7 @@ function CollectionMenu({
  const rootAction = useMenuAction(actions);

  return (
-    <>
+    <ActionContextProvider value={{ activeCollectionId: collection.id }}>
      <VisuallyHidden.Root>
        <label>
          {t("Import document")}
@@ -244,7 +239,6 @@ function CollectionMenu({
      </VisuallyHidden.Root>
      <DropdownMenu
        action={rootAction}
-        context={context}
        align={align}
        onOpen={onOpen}
        onClose={onClose}
@@ -255,7 +249,7 @@ function CollectionMenu({
          onPointerEnter={handlePointerEnter}
        />
      </DropdownMenu>
-    </>
+    </ActionContextProvider>
  );
 }

@@ -1,6 +1,5 @@
 import noop from "lodash/noop";
 import { observer } from "mobx-react";
-import { InputIcon, SearchIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
@@ -11,49 +10,14 @@ import Document from "~/models/Document";
 import { DropdownMenu } from "~/components/Menu/DropdownMenu";
 import { OverflowMenuButton } from "~/components/Menu/OverflowMenuButton";
 import Switch from "~/components/Switch";
-import { ActionV2Separator, createActionV2 } from "~/actions";
-import {
-  pinDocument,
-  createTemplateFromDocument,
-  subscribeDocument,
-  unsubscribeDocument,
-  moveDocument,
-  deleteDocument,
-  permanentlyDeleteDocument,
-  downloadDocument,
-  importDocument,
-  starDocument,
-  unstarDocument,
-  duplicateDocument,
-  archiveDocument,
-  openDocumentHistory,
-  openDocumentInsights,
-  publishDocument,
-  unpublishDocument,
-  printDocument,
-  openDocumentComments,
-  createDocumentFromTemplate,
-  createNestedDocument,
-  shareDocument,
-  copyDocument,
-  searchInDocument,
-  leaveDocument,
-  moveTemplate,
-  restoreDocument,
-  restoreDocumentToCollection,
-  editDocument,
-  applyTemplateFactory,
-} from "~/actions/definitions/documents";
-import useActionContext from "~/hooks/useActionContext";
+import { ActionContextProvider } from "~/hooks/useActionContext";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useMobile from "~/hooks/useMobile";
 import usePolicy from "~/hooks/usePolicy";
 import useRequest from "~/hooks/useRequest";
 import useStores from "~/hooks/useStores";
-import { ActiveDocumentSection } from "~/actions/sections";
-import { useTemplateMenuActions } from "~/hooks/useTemplateMenuActions";
-import { useMenuAction } from "~/hooks/useMenuAction";
 import { MenuSeparator } from "~/components/primitives/components/Menu";
+import { useDocumentMenuAction } from "~/hooks/useDocumentMenuAction";

 type Props = {
  /** Document for which the menu is to be shown */
@@ -95,7 +59,13 @@ function DocumentMenu({
  const isMobile = useMobile();
  const can = usePolicy(document);

-  const { subscriptions, pins } = useStores();
+  const { userMemberships, groupMemberships, subscriptions, pins } =
+    useStores();
+
+  const isShared = !!(
+    userMemberships.getByDocumentId(document.id) ||
+    groupMemberships.getByDocumentId(document.id)
+  );

  const {
    loading: auxDataLoading,
@@ -155,80 +125,13 @@ function DocumentMenu({
    [document]
  );

-  const templateMenuActions = useTemplateMenuActions({
+  const rootAction = useDocumentMenuAction({
    document,
+    onFindAndReplace,
+    onRename,
    onSelectTemplate,
  });

-  const actions = React.useMemo(
-    () => [
-      restoreDocument,
-      restoreDocumentToCollection,
-      starDocument,
-      unstarDocument,
-      subscribeDocument,
-      unsubscribeDocument,
-      createActionV2({
-        name: `${t("Find and replace")}…`,
-        section: ActiveDocumentSection,
-        icon: <SearchIcon />,
-        visible: !!onFindAndReplace && isMobile,
-        perform: () => onFindAndReplace?.(),
-      }),
-      ActionV2Separator,
-      editDocument,
-      createActionV2({
-        name: `${t("Rename")}…`,
-        section: ActiveDocumentSection,
-        icon: <InputIcon />,
-        visible: !!can.update && !user.separateEditMode && !!onRename,
-        perform: () => requestAnimationFrame(() => onRename?.()),
-      }),
-      shareDocument,
-      createNestedDocument,
-      importDocument,
-      createTemplateFromDocument,
-      duplicateDocument,
-      publishDocument,
-      unpublishDocument,
-      archiveDocument,
-      moveDocument,
-      moveTemplate,
-      applyTemplateFactory({ actions: templateMenuActions }),
-      pinDocument,
-      createDocumentFromTemplate,
-      ActionV2Separator,
-      openDocumentComments,
-      openDocumentHistory,
-      openDocumentInsights,
-      downloadDocument,
-      copyDocument,
-      printDocument,
-      searchInDocument,
-      ActionV2Separator,
-      deleteDocument,
-      permanentlyDeleteDocument,
-      leaveDocument,
-    ],
-    [
-      t,
-      isMobile,
-      templateMenuActions,
-      can.update,
-      user.separateEditMode,
-      onFindAndReplace,
-      onRename,
-    ]
-  );
-
-  const rootAction = useMenuAction(actions);
-
-  const context = useActionContext({
-    isContextMenu: true,
-    activeDocumentId: document.id,
-    activeCollectionId: document.collectionId ?? undefined,
-  });
-
  const toggleSwitches = React.useMemo<React.ReactNode>(() => {
    if (!can.update || !(showDisplayOptions || showToggleEmbeds)) {
      return;
@@ -280,6 +183,7 @@ function DocumentMenu({
  }, [
    t,
    can.update,
+    can.updateInsights,
    document.embedsDisabled,
    document.fullWidth,
    document.insightsEnabled,
@@ -288,23 +192,33 @@ function DocumentMenu({
    showToggleEmbeds,
    handleEmbedsToggle,
    handleFullWidthToggle,
+    handleInsightsToggle,
  ]);

  return (
-    <DropdownMenu
-      action={rootAction}
-      context={context}
-      align={align}
-      onOpen={onOpen}
-      onClose={onClose}
-      ariaLabel={t("Document options")}
-      append={toggleSwitches}
+    <ActionContextProvider
+      value={{
+        activeDocumentId: document.id,
+        activeCollectionId:
+          !isShared && document.collectionId
+            ? document.collectionId
+            : undefined,
+      }}
    >
-      <OverflowMenuButton
-        neutral={neutral}
-        onPointerEnter={handlePointerEnter}
-      />
-    </DropdownMenu>
+      <DropdownMenu
+        action={rootAction}
+        align={align}
+        onOpen={onOpen}
+        onClose={onClose}
+        ariaLabel={t("Document options")}
+        append={toggleSwitches}
+      >
+        <OverflowMenuButton
+          neutral={neutral}
+          onPointerEnter={handlePointerEnter}
+        />
+      </DropdownMenu>
+    </ActionContextProvider>
  );
 }

@@ -1,38 +0,0 @@
-import { observer } from "mobx-react";
-import { useTranslation } from "react-i18next";
-import { DropdownMenu } from "~/components/Menu/DropdownMenu";
-import { OverflowMenuButton } from "~/components/Menu/OverflowMenuButton";
-import { useMenuAction } from "~/hooks/useMenuAction";
-import { useMemo } from "react";
-import { createActionV2 } from "~/actions";
-import { GroupSection } from "~/actions/sections";
-
-type Props = {
-  onRemove: () => void;
-};
-
-function GroupMemberMenu({ onRemove }: Props) {
-  const { t } = useTranslation();
-
-  const actions = useMemo(
-    () => [
-      createActionV2({
-        name: t("Remove"),
-        section: GroupSection,
-        dangerous: true,
-        perform: onRemove,
-      }),
-    ],
-    [t, onRemove]
-  );
-
-  const rootAction = useMenuAction(actions);
-
-  return (
-    <DropdownMenu action={rootAction} ariaLabel={t("Group member options")}>
-      <OverflowMenuButton />
-    </DropdownMenu>
-  );
-}
-
-export default observer(GroupMemberMenu);
@@ -20,7 +20,7 @@ const NotificationMenu: React.FC = () => {

  return (
    <DropdownMenu action={rootAction} ariaLabel={t("Notifications")}>
-      <Button>
+      <Button aria-label={t("Notifications")}>
        <MoreIcon />
      </Button>
    </DropdownMenu>
@@ -8,9 +8,9 @@ import {
  copyLinkToRevision,
  restoreRevision,
 } from "~/actions/definitions/revisions";
-import useActionContext from "~/hooks/useActionContext";
 import { useMemo } from "react";
 import { useMenuAction } from "~/hooks/useMenuAction";
+import { ActionContextProvider } from "~/hooks/useActionContext";

 type Props = {
  document: Document;
@@ -19,11 +19,6 @@ type Props = {

 function RevisionMenu({ document }: Props) {
  const { t } = useTranslation();
-  const context = useActionContext({
-    isContextMenu: true,
-    activeDocumentId: document.id,
-  });
-
  const actions = useMemo(
    () => [restoreRevision, ActionV2Separator, copyLinkToRevision],
    []
@@ -32,14 +27,15 @@ function RevisionMenu({ document }: Props) {
  const rootAction = useMenuAction(actions);

  return (
-    <DropdownMenu
-      action={rootAction}
-      context={context}
-      align="end"
-      ariaLabel={t("Revision options")}
-    >
-      <OverflowMenuButton />
-    </DropdownMenu>
+    <ActionContextProvider value={{ activeDocumentId: document.id }}>
+      <DropdownMenu
+        action={rootAction}
+        align="end"
+        ariaLabel={t("Revision options")}
+      >
+        <OverflowMenuButton />
+      </DropdownMenu>
+    </ActionContextProvider>
  );
 }

@@ -21,7 +21,7 @@ type Props = {

 const TeamMenu: React.FC = ({ children }: Props) => {
  const { t } = useTranslation();
-  const context = useActionContext({ isContextMenu: true });
+  const context = useActionContext({ isMenu: true });

  // NOTE: it's useful to memoize on the team id and session because the action
  // menu is not cached at all.
@@ -2,6 +2,8 @@ import { isPast } from "date-fns";
 import { computed, observable } from "mobx";
 import ParanoidModel from "./base/ParanoidModel";
 import Field from "./decorators/Field";
+import User from "./User";
+import Relation from "./decorators/Relation";

 class ApiKey extends ParanoidModel {
  static modelName = "ApiKey";
@@ -25,6 +27,10 @@ class ApiKey extends ParanoidModel {
  @observable
  lastActiveAt?: string;

+  /** The user who this API key belongs to. */
+  @Relation(() => User)
+  user: User;
+
  /** The user ID that the API key belongs to. */
  userId: string;

@@ -723,8 +723,7 @@ export default class Document extends ArchivableModel implements Searchable {
      marks: extensionManager.marks,
    });
    const text = ProsemirrorHelper.toPlainText(
-      Node.fromJSON(schema, this.data),
-      schema
+      Node.fromJSON(schema, this.data)
    );
    return text;
  };
@@ -2,6 +2,7 @@ import { computed, observable } from "mobx";
 import GroupMembership from "./GroupMembership";
 import Model from "./base/Model";
 import Field from "./decorators/Field";
+import { GroupPermission } from "@shared/types";

 class Group extends Model {
  static modelName = "Group";
@@ -25,6 +26,18 @@ class Group extends Model {
    return users.inGroup(this.id);
  }

+  @computed
+  get admins() {
+    const { groupUsers } = this.store.rootStore;
+    return groupUsers.orderedData
+      .filter(
+        (groupUser) =>
+          groupUser.groupId === this.id &&
+          groupUser.permission === GroupPermission.Admin
+      )
+      .map((groupUser) => groupUser.user);
+  }
+
  /**
   * Returns the direct memberships that this group has to documents. Documents that the current
   * user already has access to through a collection, archived, and trashed documents are not included.
@@ -1,7 +1,9 @@
+import { GroupPermission } from "@shared/types";
 import Group from "./Group";
 import User from "./User";
 import Model from "./base/Model";
 import Relation from "./decorators/Relation";
+import Field from "./decorators/Field";

 /**
 * Represents a user's membership to a group.
@@ -22,6 +24,10 @@ class GroupUser extends Model {
  /** The group that the user belongs to. */
  @Relation(() => Group, { onDelete: "cascade" })
  group: Group;
+
+  /** The permission of the user in the group. */
+  @Field
+  permission: GroupPermission;
 }

 export default GroupUser;
@@ -8,7 +8,6 @@ import { AvatarSize } from "~/components/Avatar";
 import Facepile from "~/components/Facepile";
 import Fade from "~/components/Fade";
 import NudeButton from "~/components/NudeButton";
-import useActionContext from "~/hooks/useActionContext";
 import useMobile from "~/hooks/useMobile";
 import useStores from "~/hooks/useStores";

@@ -24,7 +23,6 @@ const MembershipPreview = ({ collection, limit = 8 }: Props) => {
  const { t } = useTranslation();
  const { memberships, groupMemberships, users } = useStores();
  const collectionUsers = users.inCollection(collection.id);
-  const context = useActionContext();
  const isMobile = useMobile();

  useEffect(() => {
@@ -72,7 +70,6 @@ const MembershipPreview = ({ collection, limit = 8 }: Props) => {

  return (
    <NudeButton
-      context={context}
      tooltip={{
        content:
          usersCount > 0
@@ -48,6 +48,7 @@ import MembershipPreview from "./components/MembershipPreview";
 import Notices from "./components/Notices";
 import Overview from "./components/Overview";
 import ShareButton from "./components/ShareButton";
+import first from "lodash/first";

 const IconPicker = lazy(() => import("~/components/IconPicker"));

@@ -75,8 +76,7 @@ const CollectionScene = observer(function _CollectionScene() {
  const id = params.id || "";
  const urlId = id.split("-").pop() ?? "";

-  const collection: Collection | null | undefined =
-    collections.getByUrl(id) || collections.get(id);
+  const collection: Collection | null | undefined = collections.get(id);
  const can = usePolicy(collection);

  const { pins, count } = usePinnedDocuments(urlId, collection?.id);
@@ -207,7 +207,7 @@ const CollectionScene = observer(function _CollectionScene() {
                <Suspense fallback={fallbackIcon}>
                  <IconPicker
                    icon={collection.icon ?? "collection"}
-                    color={collection.color ?? colorPalette[0]}
+                    color={collection.color ?? (first(colorPalette) as string)}
                    initial={collection.initial}
                    size={40}
                    popoverPosition="bottom-start"
@@ -1,23 +1,22 @@
-import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { useHistory, useLocation } from "react-router-dom";
 import styled from "styled-components";
 import { s } from "@shared/styles";
 import { UserPreference } from "@shared/types";
 import { InputSelect, Option } from "~/components/InputSelect";
 import useCurrentUser from "~/hooks/useCurrentUser";
-import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
-import useQuery from "~/hooks/useQuery";
 import { CommentSortType } from "~/types";

-const CommentSortMenu = () => {
+type Props = {
+  /** Callback when the sort type changes */
+  onChange?: (sortType: CommentSortType | "resolved") => void;
+  /** Whether resolved comments are being viewed */
+  viewingResolved?: boolean;
+};
+
+const CommentSortMenu = ({ viewingResolved, onChange }: Props) => {
  const { t } = useTranslation();
-  const location = useLocation();
-  const sidebarContext = useLocationSidebarContext();
-  const history = useHistory();
  const user = useCurrentUser();
-  const params = useQuery();

  const preferredSortType = user.getPreference(
    UserPreference.SortCommentsByOrderInDocument
@@ -25,42 +24,23 @@ const CommentSortMenu = () => {
    ? CommentSortType.OrderInDocument
    : CommentSortType.MostRecent;

-  const viewingResolved = params.get("resolved") === "";
  const value = viewingResolved ? "resolved" : preferredSortType;

  const handleChange = React.useCallback(
-    (val: string) => {
-      if (val === "resolved") {
-        history.push({
-          search: queryString.stringify({
-            ...queryString.parse(location.search),
-            resolved: "",
-          }),
-          pathname: location.pathname,
-          state: { sidebarContext },
-        });
-        return;
+    (val: CommentSortType | "resolved") => {
+      if (val !== "resolved") {
+        if (val !== preferredSortType) {
+          user.setPreference(
+            UserPreference.SortCommentsByOrderInDocument,
+            val === CommentSortType.OrderInDocument
+          );
+          void user.save();
+        }
      }

-      const sortType = val as CommentSortType;
-      if (sortType !== preferredSortType) {
-        user.setPreference(
-          UserPreference.SortCommentsByOrderInDocument,
-          sortType === CommentSortType.OrderInDocument
-        );
-        void user.save();
-      }
-
-      history.push({
-        search: queryString.stringify({
-          ...queryString.parse(location.search),
-          resolved: undefined,
-        }),
-        pathname: location.pathname,
-        state: { sidebarContext },
-      });
+      onChange?.(val);
    },
-    [history, location, sidebarContext, user, preferredSortType]
+    [user, onChange, preferredSortType]
  );

  const options: Option[] = React.useMemo(
@@ -2,7 +2,6 @@ import { observer } from "mobx-react";
 import { darken } from "polished";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import { useHistory, useLocation } from "react-router-dom";
 import scrollIntoView from "scroll-into-view-if-needed";
 import styled, { css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
@@ -17,7 +16,6 @@ import Facepile from "~/components/Facepile";
 import Fade from "~/components/Fade";
 import { ResizingHeightContainer } from "~/components/ResizingHeightContainer";
 import useBoolean from "~/hooks/useBoolean";
-import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
 import useOnClickOutside from "~/hooks/useOnClickOutside";
 import usePersistedState from "~/hooks/usePersistedState";
 import usePolicy from "~/hooks/usePolicy";
@@ -51,14 +49,11 @@ function CommentThread({
  collapseNumDisplayed = 3,
 }: Props) {
  const [scrollOnMount] = React.useState(focused && !window.location.hash);
-  const { editor } = useDocumentContext();
+  const { editor, setFocusedCommentId } = useDocumentContext();
  const { comments } = useStores();
  const topRef = React.useRef<HTMLDivElement>(null);
  const replyRef = React.useRef<HTMLDivElement>(null);
  const { t } = useTranslation();
-  const history = useHistory();
-  const location = useLocation();
-  const sidebarContext = useLocationSidebarContext();
  const [autoFocus, setAutoFocusOn, setAutoFocusOff] = useBoolean(thread.isNew);
  const user = useCurrentUser();

@@ -102,14 +97,7 @@ function CommentThread({
      !(event.target as HTMLElement).classList.contains("comment") &&
      event.defaultPrevented === false
    ) {
-      history.replace({
-        search: location.search,
-        pathname: location.pathname,
-        state: {
-          commentId: undefined,
-          sidebarContext,
-        },
-      });
+      setFocusedCommentId(null);
    }
  });

@@ -118,15 +106,7 @@ function CommentThread({
  }, [editor, thread.id]);

  const handleClickThread = () => {
-    history.replace({
-      // Clear any commentId from the URL when explicitly focusing a thread
-      search: thread.isResolved ? "resolved=" : "",
-      pathname: location.pathname.replace(/\/history$/, ""),
-      state: {
-        commentId: thread.id,
-        sidebarContext,
-      },
-    });
+    setFocusedCommentId(thread.id);
  };

  const handleClickExpand = (ev: React.SyntheticEvent) => {
@@ -24,12 +24,12 @@ import Text from "~/components/Text";
 import Time from "~/components/Time";
 import Tooltip from "~/components/Tooltip";
 import { resolveCommentFactory } from "~/actions/definitions/comments";
-import useActionContext from "~/hooks/useActionContext";
 import useBoolean from "~/hooks/useBoolean";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import CommentMenu from "~/menus/CommentMenu";
 import CommentEditor from "./CommentEditor";
 import { HighlightedText } from "./HighlightText";
+import { useDocumentContext } from "~/components/DocumentContext";

 /**
 * Hook to calculate if we should display a timestamp on a comment
@@ -111,6 +111,7 @@ function CommentThreadItem({
  onEditStart,
  onEditEnd,
 }: Props) {
+  const { setFocusedCommentId } = useDocumentContext();
  const { t } = useTranslation();
  const user = useCurrentUser();
  const [data, setData] = React.useState(comment.data);
@@ -154,6 +155,9 @@ function CommentThreadItem({
  const handleUpdate = React.useCallback(
    (attrs: { resolved: boolean }) => {
      onUpdate?.(comment.id, attrs);
+      if ("resolved" in attrs) {
+        setFocusedCommentId(null);
+      }
    },
    [comment.id, onUpdate]
  );
@@ -307,14 +311,12 @@ const ResolveButton = ({
  comment: Comment;
  onUpdate: (attrs: { resolved: boolean }) => void;
 }) => {
-  const context = useActionContext();
  const { t } = useTranslation();

  return (
    <Tooltip content={t("Mark as resolved")} placement="top">
      <Action
        as={NudeButton}
-        context={context}
        action={resolveCommentFactory({
          comment,
          onResolve: () => onUpdate({ resolved: true }),
@@ -1,6 +1,5 @@
 import { AnimatePresence } from "framer-motion";
 import { observer } from "mobx-react";
-import { ArrowIcon } from "outline-icons";
 import { useRef, useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useRouteMatch } from "react-router-dom";
@@ -13,7 +12,7 @@ import Fade from "~/components/Fade";
 import Flex from "~/components/Flex";
 import Scrollable from "~/components/Scrollable";
 import useCurrentUser from "~/hooks/useCurrentUser";
-import useFocusedComment from "~/hooks/useFocusedComment";
+import { useFocusedComment } from "~/hooks/useFocusedComment";
 import useKeyDown from "~/hooks/useKeyDown";
 import usePersistedState from "~/hooks/usePersistedState";
 import usePolicy from "~/hooks/usePolicy";
@@ -24,6 +23,8 @@ import CommentForm from "./CommentForm";
 import CommentSortMenu from "./CommentSortMenu";
 import CommentThread from "./CommentThread";
 import Sidebar from "./SidebarLayout";
+import useMobile from "~/hooks/useMobile";
+import { ArrowDownIcon } from "~/components/Icons/ArrowIcon";

 function Comments() {
  const { ui, comments, documents } = useStores();
@@ -31,11 +32,15 @@ function Comments() {
  const { editor, isEditorInitialized } = useDocumentContext();
  const { t } = useTranslation();
  const match = useRouteMatch<{ documentSlug: string }>();
-  const params = useQuery();
-  const document = documents.getByUrl(match.params.documentSlug);
+  const document = documents.get(match.params.documentSlug);
  const focusedComment = useFocusedComment();
  const can = usePolicy(document);
+  const isMobile = useMobile();

+  const query = useQuery();
+  const [viewingResolved, setViewingResolved] = useState(
+    query.get("resolved") !== null || focusedComment?.isResolved || false
+  );
  const scrollableRef = useRef<HTMLDivElement | null>(null);
  const prevThreadCount = useRef(0);
  const isAtBottom = useRef(true);
@@ -43,6 +48,13 @@ function Comments() {

  useKeyDown("Escape", () => document && ui.set({ commentsExpanded: false }));

+  // Account for the resolved status of the comment changing
+  useEffect(() => {
+    if (focusedComment && focusedComment.isResolved !== viewingResolved) {
+      setViewingResolved(focusedComment.isResolved);
+    }
+  }, [focusedComment, viewingResolved]);
+
  const [draft, onSaveDraft] = usePersistedState<ProsemirrorData | undefined>(
    `draft-${document?.id}-new`,
    undefined
@@ -57,7 +69,6 @@ function Comments() {
      }
    : { type: CommentSortType.MostRecent };

-  const viewingResolved = params.get("resolved") === "";
  const threads = !document
    ? []
    : viewingResolved
@@ -115,75 +126,85 @@ function Comments() {
    prevThreadCount.current = threads.length;
  }, [sortOption.type, threads.length, viewingResolved]);

-  if (!document || !isEditorInitialized) {
-    return null;
-  }
+  const content =
+    !document || !isEditorInitialized ? null : (
+      <>
+        <Scrollable
+          id="comments"
+          bottomShadow={!focusedComment}
+          hiddenScrollbars
+          topShadow
+          ref={scrollableRef}
+          onScroll={handleScroll}
+        >
+          <Wrapper $hasComments={hasComments}>
+            {hasComments ? (
+              threads.map((thread) => (
+                <CommentThread
+                  key={thread.id}
+                  comment={thread}
+                  document={document}
+                  recessed={!!focusedComment && focusedComment.id !== thread.id}
+                  focused={focusedComment?.id === thread.id}
+                />
+              ))
+            ) : (
+              <NoComments align="center" justify="center" auto>
+                <PositionedEmpty>
+                  {viewingResolved
+                    ? t("No resolved comments")
+                    : t("No comments yet")}
+                </PositionedEmpty>
+              </NoComments>
+            )}
+            {showJumpToRecentBtn && (
+              <Fade>
+                <JumpToRecent onClick={scrollToBottom}>
+                  <Flex align="center">
+                    {t("New comments")}&nbsp;
+                    <ArrowDownIcon size={20} />
+                  </Flex>
+                </JumpToRecent>
+              </Fade>
+            )}
+          </Wrapper>
+        </Scrollable>
+        <AnimatePresence initial={false}>
+          {(!focusedComment || isMobile) && can.comment && !viewingResolved && (
+            <NewCommentForm
+              draft={draft}
+              onSaveDraft={onSaveDraft}
+              documentId={document.id}
+              placeholder={`${t("Add a comment")}…`}
+              autoFocus={false}
+              dir={document.dir}
+              animatePresence
+              standalone
+            />
+          )}
+        </AnimatePresence>
+      </>
+    );

  return (
    <Sidebar
      title={
-        <Flex align="center" justify="space-between" auto>
-          <span>{t("Comments")}</span>
-          <CommentSortMenu />
+        <Flex align="center" justify="space-between" gap={8} auto>
+          <div style={isMobile ? { padding: "0 8px" } : undefined}>
+            {t("Comments")}
+          </div>
+          <CommentSortMenu
+            viewingResolved={viewingResolved}
+            onChange={(val) => {
+              setViewingResolved(val === "resolved");
+            }}
+          />
        </Flex>
      }
      onClose={() => ui.set({ commentsExpanded: false })}
      scrollable={false}
    >
-      <Scrollable
-        id="comments"
-        bottomShadow={!focusedComment}
-        hiddenScrollbars
-        topShadow
-        ref={scrollableRef}
-        onScroll={handleScroll}
-      >
-        <Wrapper $hasComments={hasComments}>
-          {hasComments ? (
-            threads.map((thread) => (
-              <CommentThread
-                key={thread.id}
-                comment={thread}
-                document={document}
-                recessed={!!focusedComment && focusedComment.id !== thread.id}
-                focused={focusedComment?.id === thread.id}
-              />
-            ))
-          ) : (
-            <NoComments align="center" justify="center" auto>
-              <PositionedEmpty>
-                {viewingResolved
-                  ? t("No resolved comments")
-                  : t("No comments yet")}
-              </PositionedEmpty>
-            </NoComments>
-          )}
-          {showJumpToRecentBtn && (
-            <Fade>
-              <JumpToRecent onClick={scrollToBottom}>
-                <Flex align="center">
-                  {t("New comments")}&nbsp;
-                  <ArrowDownIcon size={20} />
-                </Flex>
-              </JumpToRecent>
-            </Fade>
-          )}
-        </Wrapper>
-      </Scrollable>
-      <AnimatePresence initial={false}>
-        {!focusedComment && can.comment && !viewingResolved && (
-          <NewCommentForm
-            draft={draft}
-            onSaveDraft={onSaveDraft}
-            documentId={document.id}
-            placeholder={`${t("Add a comment")}…`}
-            autoFocus={false}
-            dir={document.dir}
-            animatePresence
-            standalone
-          />
-        )}
-      </AnimatePresence>
+      {content}
    </Sidebar>
  );
 }
@@ -217,10 +238,6 @@ const JumpToRecent = styled(ButtonSmall)`
  }
 `;

-const ArrowDownIcon = styled(ArrowIcon)`
-  transform: rotate(90deg);
-`;
-
 const NewCommentForm = styled(CommentForm)<{ dir?: "ltr" | "rtl" }>`
  padding: 12px;
  padding-right: ${(props) => (props.dir !== "rtl" ? "18px" : "12px")};
@@ -67,9 +67,7 @@ function DataLoader({ match, children }: Props) {
  const { revisionId, documentSlug } = match.params;

  // Allows loading by /doc/slug-<urlId> or /doc/<id>
-  const document =
-    documents.getByUrl(match.params.documentSlug) ??
-    documents.get(match.params.documentSlug);
+  const document = documents.get(match.params.documentSlug);

  if (document) {
    setDocument(document);
@@ -9,14 +9,15 @@ import { TeamPreference } from "@shared/types";
 import Document from "~/models/Document";
 import Revision from "~/models/Revision";
 import { openDocumentInsights } from "~/actions/definitions/documents";
-import DocumentMeta from "~/components/DocumentMeta";
+import DocumentMeta, { Separator } from "~/components/DocumentMeta";
 import Fade from "~/components/Fade";
-import useActionContext from "~/hooks/useActionContext";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
+import breakpoint from "styled-components-breakpoint";
 import { documentPath } from "~/utils/routeHelpers";
+import NudeButton from "~/components/NudeButton";

 type Props = {
  /* The document to display meta data for */
@@ -36,9 +37,6 @@ function TitleDocumentMeta({ to, document, revision, ...rest }: Props) {
  const onlyYou = totalViewers === 1 && documentViews[0].userId;
  const viewsLoadedOnMount = useRef(totalViewers > 0);
  const can = usePolicy(document);
-  const actionContext = useActionContext({
-    activeDocumentId: document.id,
-  });

  const Wrapper = viewsLoadedOnMount.current ? Fragment : Fade;

@@ -49,7 +47,7 @@ function TitleDocumentMeta({ to, document, revision, ...rest }: Props) {
    <Meta document={document} revision={revision} to={to} replace {...rest}>
      {commentingEnabled && can.comment && (
        <>
-          &nbsp;•&nbsp;
+          <Separator />
          <CommentLink
            to={{
              pathname: documentPath(document),
@@ -69,10 +67,8 @@ function TitleDocumentMeta({ to, document, revision, ...rest }: Props) {
      !document.isDraft &&
      !document.isTemplate ? (
        <Wrapper>
-          &nbsp;•&nbsp;
-          <InsightsButton
-            onClick={() => openDocumentInsights.perform(actionContext)}
-          >
+          <Separator />
+          <InsightsButton action={openDocumentInsights}>
            {t("Viewed by")}{" "}
            {onlyYou
              ? t("only you")
@@ -91,7 +87,7 @@ const CommentLink = styled(Link)`
  align-items: center;
 `;

-const InsightsButton = styled.button`
+const InsightsButton = styled(NudeButton)`
  background: none;
  border: none;
  padding: 0;
@@ -113,6 +109,16 @@ export const Meta = styled(DocumentMeta)<{ rtl?: boolean }>`
  user-select: none;
  z-index: 1;

+  ${breakpoint("mobile", "tablet")`
+    flex-direction: column;
+    align-items: flex-start;
+    line-height: 1.6;
+
+    ${Separator} {
+      display: none;
+    }
+  `}
+
  a {
    color: inherit;
    cursor: var(--pointer);
@@ -23,6 +23,7 @@ import { useDocumentContext } from "~/components/DocumentContext";
 import { PopoverButton } from "~/components/IconPicker/components/PopoverButton";
 import useBoolean from "~/hooks/useBoolean";
 import usePolicy from "~/hooks/usePolicy";
+import { useTranslation } from "react-i18next";

 const IconPicker = React.lazy(() => import("~/components/IconPicker"));

@@ -70,6 +71,7 @@ const DocumentTitle = React.forwardRef(function _DocumentTitle(
  }: Props,
  externalRef: React.RefObject<RefHandle>
 ) {
+  const { t } = useTranslation();
  const ref = React.useRef<RefHandle>(null);
  const [iconPickerIsOpen, handleOpen, setIconPickerClosed] = useBoolean();
  const { editor } = useDocumentContext();
@@ -249,6 +251,7 @@ const DocumentTitle = React.forwardRef(function _DocumentTitle(
      autoFocus={!title}
      maxLength={DocumentValidation.maxTitleLength}
      readOnly={readOnly}
+      aria-label={t("Document title")}
      dir="auto"
      ref={mergeRefs([ref, externalRef])}
    >
--- a/Show More
+++ b/Show More