fix: Fix TypeScript error in naturalSort.ts by ensuring string conversion

- Fix LazyComponent type in client/index.tsx
- Remove unused contentType variable in UploadGitLabProjectAvatarTask.ts
- Remove unused UnfurlIssueOrPR import in gitlab.ts

.env.sample

@@ -211,6 +211,10 @@ 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

.github/dependabot.yml

@@ -26,6 +26,3 @@ updates:
       aws:
         patterns:
           - "@aws-sdk/*"
-      radix-ui:
-        patterns:
-          - "@radix-ui/*"

.github/workflows/auto_close_prs.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Close unsigned PRs
-        uses: actions/github-script@v8
+        uses: actions/github-script@v6
         with:
           script: |
             const now = new Date();

.github/workflows/calibreapp-image-actions.yml

@@ -40,7 +40,7 @@ jobs:
        github.event.pull_request.head.repo.full_name == github.repository)
     steps:
       - name: Checkout Branch
-        uses: actions/checkout@v5
+        uses: actions/checkout@v2
       - name: Compress Images
         id: calibre
         uses: calibreapp/image-actions@main
@@ -48,7 +48,6 @@ jobs:
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           # For non-Pull Requests, run in compressOnly mode and we'll PR after.
           compressOnly: ${{ github.event_name != 'pull_request' }}
-          minPctChange: "10"
       - name: Create Pull Request
         # If it's not a Pull Request then commit any changes as a new PR.
         if: |

.github/workflows/ci.yml

@@ -25,9 +25,9 @@ jobs:
         node-version: [20.x, 22.x]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: "yarn"
@@ -38,20 +38,20 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-node@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 22.x
           cache: "yarn"
       - run: yarn install --frozen-lockfile --prefer-offline
-      - run: yarn lint --quiet
+      - run: yarn lint
 
   types:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-node@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 22.x
           cache: "yarn"
@@ -65,7 +65,7 @@ jobs:
       server: ${{ steps.filter.outputs.server }}
       app: ${{ steps.filter.outputs.app }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -92,8 +92,8 @@ jobs:
       matrix:
         test-group: [app, shared]
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-node@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 22.x
           cache: "yarn"
@@ -124,8 +124,8 @@ jobs:
         shard: [1, 2, 3, 4]
 
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-node@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 22.x
           cache: "yarn"
@@ -141,8 +141,8 @@ jobs:
     if: ${{ needs.changes.outputs.app == 'true' && github.repository == 'outline/outline' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-node@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 22.x
           cache: "yarn"

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v2
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/docker.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubicloud-standard-8-arm
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -93,7 +93,7 @@ jobs:
     runs-on: ubicloud-standard-8
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/lint.yml

@@ -0,0 +1,30 @@
+name: Lint
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  run-linters:
+    if: startsWith(github.actor, 'codegen-sh')
+    name: Run linters
+    runs-on: ubuntu-latest
+
+    permissions:
+      # Give the default GITHUB_TOKEN write permission to commit and push the
+      # added or changed files to the repository.
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+          cache: "yarn"
+      - run: yarn install --frozen-lockfile --prefer-offline
+      - run: yarn lint --fix
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "Applied automatic fixes"

.github/workflows/stale.yml

@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v5
         with:
           stale-pr-message: "This PR is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 5 days"
           stale-issue-message: "This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 5 days"

.jestconfig.json

@@ -7,7 +7,8 @@
       "roots": ["<rootDir>/server", "<rootDir>/plugins"],
       "moduleNameMapper": {
         "^@server/(.*)$": "<rootDir>/server/$1",
-        "^@shared/(.*)$": "<rootDir>/shared/$1"
+        "^@shared/(.*)$": "<rootDir>/shared/$1",
+        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
       },
       "setupFiles": ["<rootDir>/__mocks__/console.js"],
       "setupFilesAfterEnv": ["<rootDir>/server/test/setup.ts"],
@@ -20,7 +21,9 @@
       "moduleNameMapper": {
         "^~/(.*)$": "<rootDir>/app/$1",
         "^@shared/(.*)$": "<rootDir>/shared/$1",
-        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js"
+        "^.*[.](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"
       },
       "modulePaths": ["<rootDir>/app"],
       "setupFiles": ["<rootDir>/__mocks__/window.js"],
@@ -35,7 +38,8 @@
       "roots": ["<rootDir>/shared"],
       "moduleNameMapper": {
         "^@server/(.*)$": "<rootDir>/server/$1",
-        "^@shared/(.*)$": "<rootDir>/shared/$1"
+        "^@shared/(.*)$": "<rootDir>/shared/$1",
+        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
       },
       "setupFiles": ["<rootDir>/__mocks__/console.js"],
       "setupFilesAfterEnv": ["<rootDir>/shared/test/setup.ts"],
@@ -47,7 +51,9 @@
       "moduleNameMapper": {
         "^~/(.*)$": "<rootDir>/app/$1",
         "^@shared/(.*)$": "<rootDir>/shared/$1",
-        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js"
+        "^.*[.](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"
       },
       "setupFiles": ["<rootDir>/__mocks__/window.js"],
       "testEnvironment": "jsdom",

.sequelizerc

@@ -5,7 +5,7 @@ require("@dotenvx/dotenvx").config({
 var path = require('path');
 
 module.exports = {
-  'config': path.resolve('server/config', 'database.js'),
+  'config': path.resolve('server/config', 'database.json'),
   'migrations-path': path.resolve('server', 'migrations'),
   'models-path': path.resolve('server', 'models'),
 }

Dockerfile

@@ -6,7 +6,7 @@ ARG APP_PATH
 WORKDIR $APP_PATH
 
 # ---
-FROM node:22.21.0-slim AS runner
+FROM node:22-slim AS runner
 
 LABEL org.opencontainers.image.source="https://github.com/outline/outline"
 
@@ -14,13 +14,7 @@ ARG APP_PATH
 WORKDIR $APP_PATH
 ENV NODE_ENV=production
 
-# Create a non-root user compatible with Debian and BusyBox based images
-RUN addgroup --gid 1001 nodejs && \
-    adduser --uid 1001 --ingroup nodejs nodejs && \
-    mkdir -p /var/lib/outline && \
-    chown -R nodejs:nodejs /var/lib/outline
-
-COPY --from=base --chown=nodejs:nodejs $APP_PATH/build ./build
+COPY --from=base $APP_PATH/build ./build
 COPY --from=base $APP_PATH/server ./server
 COPY --from=base $APP_PATH/public ./public
 COPY --from=base $APP_PATH/.sequelizerc ./.sequelizerc
@@ -29,13 +23,20 @@ COPY --from=base $APP_PATH/package.json ./package.json
 
 # Install wget to healthcheck the server
 RUN  apt-get update \
-    && apt-get install -y wget \
-    && rm -rf /var/lib/apt/lists/*
+  && apt-get install -y wget \
+  && rm -rf /var/lib/apt/lists/*
+
+# Create a non-root user compatible with Debian and BusyBox based images
+RUN addgroup --gid 1001 nodejs && \
+  adduser --uid 1001 --ingroup nodejs nodejs && \
+  chown -R nodejs:nodejs $APP_PATH/build && \
+  mkdir -p /var/lib/outline && \
+  chown -R nodejs:nodejs /var/lib/outline
 
 ENV FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data
 RUN mkdir -p "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
-    chown -R nodejs:nodejs "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
-    chmod 1777 "$FILE_STORAGE_LOCAL_ROOT_DIR"
+  chown -R nodejs:nodejs "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
+  chmod 1777 "$FILE_STORAGE_LOCAL_ROOT_DIR"
 
 VOLUME /var/lib/outline/data
 

Dockerfile.base

@@ -1,5 +1,5 @@
 ARG APP_PATH=/opt/outline
-FROM node:22.21.0 AS deps
+FROM node:20 AS deps
 
 ARG APP_PATH
 WORKDIR $APP_PATH

LICENSE

@@ -3,7 +3,7 @@ Business Source License 1.1
 Parameters
 
 Licensor:             General Outline, Inc.
-Licensed Work:        Outline 1.0.1
+Licensed Work:        Outline 0.86.1
                       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-10-29
+Change Date:          2029-08-09
 
 Change License:       Apache License, Version 2.0
 

README.md

@@ -7,13 +7,14 @@
   <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, 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).
+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).
 
 If you'd like to run your own copy of Outline or contribute to development then this is the place for you.
 
@@ -50,14 +51,13 @@ 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. 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.
+HTTP logging is disabled by default, but can be enabled by setting the `DEBUG=http` environment variable.
 
 ## 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.ts` 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.js` 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 with jest:
+frontend and backend tests directly.
 
 ```shell
 # To run backend tests
 yarn test:server
 
-# To run a specific backend test in watch mode
-yarn test path/to/file.test.ts --watch
+# To run a specific backend test
+yarn test:server myTestFile
 
 # To run frontend tests
 yarn test:app
@@ -86,15 +86,14 @@ yarn test:app
 Sequelize is used to create and run migrations, for example:
 
 ```shell
-yarn db:create-migration --name my-migration
-yarn db:migrate
-yarn db:rollback
+yarn sequelize migration:generate --name my-migration
+yarn sequelize db:migrate
 ```
 
-Or, to run migrations on test database:
+Or to run migrations on test database:
 
 ```shell
-yarn db:migrate --env test
+yarn sequelize db:migrate --env test
 ```
 
 # Activity

app/.oxlintrc.json

@@ -5,13 +5,6 @@
     {
       "files": ["**/*.{jsx,tsx}"],
       "rules": {
-        "no-restricted-globals": [
-          "error",
-          {
-            "name": "crypto",
-            "message": "Do not use, does not work in environments without SSL."
-          }
-        ],
         "no-restricted-imports": [
           "error",
           {
@@ -20,6 +13,13 @@
                 "group": ["mime-types"],
                 "message": "Do not use the mime-types package in the browser."
               }
+            ],
+            "paths": [
+              {
+                "name": "reakit/Menu",
+                "importNames": ["useMenuState"],
+                "message": "Do not use useMenuState from reakit/Menu. Use useMenuState instead."
+              }
             ]
           }
         ]

app/actions/definitions/apiKeys.tsx

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

app/actions/definitions/collections.tsx

@@ -1,12 +1,8 @@
 import {
-  AlphabeticalReverseSortIcon,
-  AlphabeticalSortIcon,
   ArchiveIcon,
   CollectionIcon,
   EditIcon,
   ExportIcon,
-  ImportIcon,
-  ManualSortIcon,
   NewDocumentIcon,
   PadlockIcon,
   PlusIcon,
@@ -26,11 +22,11 @@ import { CollectionNew } from "~/components/Collection/CollectionNew";
 import CollectionDeleteDialog from "~/components/CollectionDeleteDialog";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import DynamicCollectionIcon from "~/components/Icons/CollectionIcon";
+import SharePopover from "~/components/Sharing/Collection/SharePopover";
 import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
 import {
   createAction,
   createActionV2,
-  createActionV2WithChildren,
   createInternalLinkActionV2,
 } from "~/actions";
 import { ActiveCollectionSection, CollectionSection } from "~/actions/sections";
@@ -41,16 +37,10 @@ import {
   searchPath,
 } from "~/utils/routeHelpers";
 import ExportDialog from "~/components/ExportDialog";
-import { getEventFiles } from "@shared/utils/files";
-import history from "~/utils/history";
-import lazyWithRetry from "~/utils/lazyWithRetry";
 
 const ColorCollectionIcon = ({ collection }: { collection: Collection }) => (
   <DynamicCollectionIcon collection={collection} />
 );
-const SharePopover = lazyWithRetry(
-  () => import("~/components/Sharing/Collection/SharePopover")
-);
 
 export const openCollection = createAction({
   name: ({ t }) => t("Open collection"),
@@ -91,7 +81,8 @@ export const createCollection = createAction({
 });
 
 export const editCollection = createActionV2({
-  name: ({ t, isMenu }) => (isMenu ? `${t("Edit")}…` : t("Edit collection")),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? `${t("Edit")}…` : t("Edit collection"),
   analyticsName: "Edit collection",
   section: ActiveCollectionSection,
   icon: <EditIcon />,
@@ -116,8 +107,8 @@ export const editCollection = createActionV2({
 });
 
 export const editCollectionPermissions = createActionV2({
-  name: ({ t, isMenu }) =>
-    isMenu ? `${t("Permissions")}…` : t("Collection permissions"),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? `${t("Permissions")}…` : t("Collection permissions"),
   analyticsName: "Collection permissions",
   section: ActiveCollectionSection,
   icon: <PadlockIcon />,
@@ -147,129 +138,6 @@ export const editCollectionPermissions = createActionV2({
   },
 });
 
-export const importDocument = createActionV2({
-  name: ({ t }) => t("Import document"),
-  analyticsName: "Import document",
-  section: ActiveCollectionSection,
-  icon: <ImportIcon />,
-  visible: ({ activeCollectionId, stores }) => {
-    if (activeCollectionId) {
-      return !!stores.policies.abilities(activeCollectionId).createDocument;
-    }
-
-    return false;
-  },
-  perform: ({ activeCollectionId, stores }) => {
-    const { documents } = stores;
-    const input = document.createElement("input");
-    input.type = "file";
-    input.accept = documents.importFileTypes.join(", ");
-
-    input.onchange = async (ev) => {
-      const files = getEventFiles(ev);
-      const file = files[0];
-
-      try {
-        const document = await documents.import(
-          file,
-          null,
-          activeCollectionId,
-          {
-            publish: true,
-          }
-        );
-        history.push(document.url);
-      } catch (err) {
-        toast.error(err.message);
-      }
-    };
-
-    input.click();
-  },
-});
-
-export const sortCollection = createActionV2WithChildren({
-  name: ({ t }) => t("Sort in sidebar"),
-  section: ActiveCollectionSection,
-  visible: ({ activeCollectionId, stores }) =>
-    !!activeCollectionId &&
-    !!stores.policies.abilities(activeCollectionId).update,
-  icon: ({ activeCollectionId, stores }) => {
-    const collection = stores.collections.get(activeCollectionId);
-    const sortAlphabetical = collection?.sort.field === "title";
-    const sortDir = collection?.sort.direction;
-
-    return sortAlphabetical ? (
-      sortDir === "asc" ? (
-        <AlphabeticalSortIcon />
-      ) : (
-        <AlphabeticalReverseSortIcon />
-      )
-    ) : (
-      <ManualSortIcon />
-    );
-  },
-  children: [
-    createActionV2({
-      name: ({ t }) => t("A-Z sort"),
-      section: ActiveCollectionSection,
-      selected: ({ activeCollectionId, stores }) => {
-        const collection = stores.collections.get(activeCollectionId);
-        return (
-          collection?.sort.field === "title" &&
-          collection?.sort.direction === "asc"
-        );
-      },
-      perform: ({ activeCollectionId, stores }) => {
-        const collection = stores.collections.get(activeCollectionId);
-        return collection?.save({
-          sort: {
-            field: "title",
-            direction: "asc",
-          },
-        });
-      },
-    }),
-    createActionV2({
-      name: ({ t }) => t("Z-A sort"),
-      section: ActiveCollectionSection,
-      selected: ({ activeCollectionId, stores }) => {
-        const collection = stores.collections.get(activeCollectionId);
-        return (
-          collection?.sort.field === "title" &&
-          collection?.sort.direction === "desc"
-        );
-      },
-      perform: ({ activeCollectionId, stores }) => {
-        const collection = stores.collections.get(activeCollectionId);
-        return collection?.save({
-          sort: {
-            field: "title",
-            direction: "desc",
-          },
-        });
-      },
-    }),
-    createActionV2({
-      name: ({ t }) => t("Manual sort"),
-      section: ActiveCollectionSection,
-      selected: ({ activeCollectionId, stores }) => {
-        const collection = stores.collections.get(activeCollectionId);
-        return collection?.sort.field !== "title";
-      },
-      perform: ({ activeCollectionId, stores }) => {
-        const collection = stores.collections.get(activeCollectionId);
-        return collection?.save({
-          sort: {
-            field: "index",
-            direction: "asc",
-          },
-        });
-      },
-    }),
-  ],
-});
-
 export const searchInCollection = createInternalLinkActionV2({
   name: ({ t }) => t("Search in collection"),
   analyticsName: "Search collection",

app/actions/definitions/comments.tsx

@@ -3,6 +3,7 @@ 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";
 
@@ -49,6 +50,16 @@ 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"));
     },
@@ -71,6 +82,16 @@ 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();
     },
   });

app/actions/definitions/developer.tsx

@@ -176,21 +176,6 @@ export const toggleDebugLogging = createAction({
   },
 });
 
-export const toggleDebugSafeArea = createAction({
-  name: () => "Toggle menu safe area debugging",
-  icon: <ToolsIcon />,
-  section: DeveloperSection,
-  visible: () => env.ENVIRONMENT === "development",
-  perform: ({ stores }) => {
-    stores.ui.toggleDebugSafeArea();
-    toast.message(
-      stores.ui.debugSafeArea
-        ? "Menu safe area debugging enabled"
-        : "Menu safe area debugging disabled"
-    );
-  },
-});
-
 export const toggleFeatureFlag = createAction({
   name: "Toggle feature flag",
   icon: <BeakerIcon />,
@@ -224,7 +209,6 @@ export const developer = createAction({
   children: [
     copyId,
     toggleDebugLogging,
-    toggleDebugSafeArea,
     toggleFeatureFlag,
     createToast,
     createTestUsers,

app/actions/definitions/documents.tsx

@@ -50,6 +50,7 @@ import DeleteDocumentsInTrash from "~/scenes/Trash/components/DeleteDocumentsInT
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import DocumentCopy from "~/components/DocumentCopy";
 import MarkdownIcon from "~/components/Icons/MarkdownIcon";
+import SharePopover from "~/components/Sharing/Document";
 import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
 import DocumentTemplatizeDialog from "~/components/TemplatizeDialog";
 import {
@@ -81,14 +82,7 @@ import {
 import capitalize from "lodash/capitalize";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
 import { ActionV2, ActionV2Group, ActionV2Separator } from "~/types";
-import lazyWithRetry from "~/utils/lazyWithRetry";
-
-const Insights = lazyWithRetry(
-  () => import("~/scenes/Document/components/Insights")
-);
-const SharePopover = lazyWithRetry(
-  () => import("~/components/Sharing/Document/SharePopover")
-);
+import Insights from "~/scenes/Document/components/Insights";
 
 export const openDocument = createAction({
   name: ({ t }) => t("Open document"),
@@ -390,8 +384,8 @@ export const subscribeDocument = createActionV2({
   analyticsName: "Subscribe to document",
   section: ActiveDocumentSection,
   icon: <SubscribeIcon />,
-  tooltip: ({ activeCollectionId, isMenu, stores, t }) => {
-    if (!isMenu || !activeCollectionId) {
+  tooltip: ({ activeCollectionId, isContextMenu, stores, t }) => {
+    if (!isContextMenu || !activeCollectionId) {
       return undefined;
     }
 
@@ -399,8 +393,8 @@ export const subscribeDocument = createActionV2({
       ? t("Subscription inherited from collection")
       : undefined;
   },
-  disabled: ({ activeCollectionId, isMenu, stores }) => {
-    if (!isMenu || !activeCollectionId) {
+  disabled: ({ activeCollectionId, isContextMenu, stores }) => {
+    if (!isContextMenu || !activeCollectionId) {
       return false;
     }
 
@@ -436,8 +430,8 @@ export const unsubscribeDocument = createActionV2({
   analyticsName: "Unsubscribe from document",
   section: ActiveDocumentSection,
   icon: <UnsubscribeIcon />,
-  tooltip: ({ activeCollectionId, isMenu, stores, t }) => {
-    if (!isMenu || !activeCollectionId) {
+  tooltip: ({ activeCollectionId, isContextMenu, stores, t }) => {
+    if (!isContextMenu || !activeCollectionId) {
       return undefined;
     }
 
@@ -445,8 +439,8 @@ export const unsubscribeDocument = createActionV2({
       ? t("Subscription inherited from collection")
       : undefined;
   },
-  disabled: ({ activeCollectionId, isMenu, stores }) => {
-    if (!isMenu || !activeCollectionId) {
+  disabled: ({ activeCollectionId, isContextMenu, stores }) => {
+    if (!isContextMenu || !activeCollectionId) {
       return false;
     }
 
@@ -577,7 +571,8 @@ export const downloadDocumentAsMarkdown = createActionV2({
 });
 
 export const downloadDocument = createActionV2WithChildren({
-  name: ({ t, isMenu }) => (isMenu ? t("Download") : t("Download document")),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Download") : t("Download document"),
   analyticsName: "Download document",
   section: ActiveDocumentSection,
   icon: <DownloadIcon />,
@@ -599,15 +594,12 @@ export const copyDocumentAsMarkdown = createActionV2({
   iconInContextMenu: false,
   visible: ({ activeDocumentId, stores }) =>
     !!activeDocumentId && stores.policies.abilities(activeDocumentId).download,
-  perform: async ({ stores, activeDocumentId, t }) => {
+  perform: ({ stores, activeDocumentId, t }) => {
     const document = activeDocumentId
       ? stores.documents.get(activeDocumentId)
       : undefined;
     if (document) {
-      const { ProsemirrorHelper } = await import(
-        "~/models/helpers/ProsemirrorHelper"
-      );
-      copy(ProsemirrorHelper.toMarkdown(document));
+      copy(document.toMarkdown());
       toast.success(t("Markdown copied to clipboard"));
     }
   },
@@ -621,15 +613,12 @@ export const copyDocumentAsPlainText = createActionV2({
   iconInContextMenu: false,
   visible: ({ activeDocumentId, stores }) =>
     !!activeDocumentId && stores.policies.abilities(activeDocumentId).download,
-  perform: async ({ stores, activeDocumentId, t }) => {
+  perform: ({ stores, activeDocumentId, t }) => {
     const document = activeDocumentId
       ? stores.documents.get(activeDocumentId)
       : undefined;
     if (document) {
-      const { ProsemirrorHelper } = await import(
-        "~/models/helpers/ProsemirrorHelper"
-      );
-      copy(ProsemirrorHelper.toPlainText(document));
+      copy(document.toPlainText());
       toast.success(t("Text copied to clipboard"));
     }
   },
@@ -689,7 +678,8 @@ export const copyDocument = createActionV2WithChildren({
 });
 
 export const duplicateDocument = createActionV2({
-  name: ({ t, isMenu }) => (isMenu ? t("Duplicate") : t("Duplicate document")),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Duplicate") : t("Duplicate document"),
   analyticsName: "Duplicate document",
   section: ActiveDocumentSection,
   icon: <DuplicateIcon />,
@@ -839,7 +829,8 @@ export const searchInDocument = createInternalLinkActionV2({
 });
 
 export const printDocument = createActionV2({
-  name: ({ t, isMenu }) => (isMenu ? t("Print") : t("Print document")),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Print") : t("Print document"),
   analyticsName: "Print document",
   section: ActiveDocumentSection,
   icon: <PrintIcon />,
@@ -861,7 +852,7 @@ export const importDocument = createActionV2({
     }
 
     if (activeCollectionId) {
-      return !!stores.policies.abilities(activeCollectionId).createDocument;
+      return !!stores.policies.abilities(activeCollectionId).update;
     }
 
     return false;
@@ -874,6 +865,7 @@ export const importDocument = createActionV2({
 
     input.onchange = async (ev) => {
       const files = getEventFiles(ev);
+
       const file = files[0];
 
       try {

app/actions/definitions/navigation.tsx

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

app/actions/definitions/settings.tsx

@@ -37,7 +37,8 @@ export const changeToSystemTheme = createActionV2({
 });
 
 export const changeTheme = createActionV2WithChildren({
-  name: ({ t, isMenu }) => (isMenu ? t("Appearance") : t("Change theme")),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Appearance") : t("Change theme"),
   analyticsName: "Change theme",
   placeholder: ({ t }) => t("Change theme to"),
   icon: ({ stores }) =>

app/actions/definitions/users.tsx

@@ -22,7 +22,6 @@ export const inviteUser = createAction({
   perform: ({ t }) => {
     stores.dialogs.openModal({
       title: t("Invite to workspace"),
-      width: "500px",
       content: <Invite onSubmit={stores.dialogs.closeAllModals} />,
     });
   },

app/actions/index.ts

@@ -1,8 +1,8 @@
 import { LocationDescriptor } from "history";
-import { v4 as uuidv4 } from "uuid";
 import flattenDeep from "lodash/flattenDeep";
 import { toast } from "sonner";
 import { Optional } from "utility-types";
+import { v4 as uuidv4 } from "uuid";
 import {
   Action,
   ActionContext,

app/components/ActionButton.tsx

@@ -3,8 +3,12 @@ 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, ActionV2Variant, ActionV2WithChildren } from "~/types";
-import useActionContext from "~/hooks/useActionContext";
+import {
+  Action,
+  ActionContext,
+  ActionV2Variant,
+  ActionV2WithChildren,
+} from "~/types";
 
 export type Props = React.HTMLAttributes<HTMLButtonElement> & {
   /** Show the button in a disabled state */
@@ -13,6 +17,8 @@ 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">;
 };
@@ -22,20 +28,22 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  */
 const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
   function _ActionButton(
-    { action, tooltip, hideOnActionDisabled, ...rest }: Props,
+    { action, context, 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 (!actionContext || !action) {
+    if (action && !context) {
+      throw new Error("Context must be provided with action");
+    }
+    if (!context || !action) {
       return <button {...rest} ref={ref} />;
     }
 
+    const actionContext = { ...context, isButton: true };
+
     if (
       action.visible &&
       !resolve<boolean>(action.visible, actionContext) &&
@@ -45,10 +53,9 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
     }
 
     const label =
-      rest["aria-label"] ??
-      (typeof action.name === "function"
+      typeof action.name === "function"
         ? action.name(actionContext)
-        : action.name);
+        : action.name;
 
     const button = (
       <button

app/components/Actions.ts

@@ -6,6 +6,7 @@ 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;
@@ -17,6 +18,7 @@ export const Action = styled(Flex)`
 
 export const Separator = styled.div`
   flex-shrink: 0;
+  margin-left: 12px;
   width: 1px;
   height: 28px;
   background: ${s("divider")};
@@ -31,7 +33,6 @@ const Actions = styled(Flex)`
   background: ${s("background")};
   padding: 12px;
   backdrop-filter: blur(20px);
-  gap: 12px;
 
   @media print {
     display: none;

app/components/AuthenticatedLayout.tsx

@@ -13,6 +13,8 @@ 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";
 import usePolicy from "~/hooks/usePolicy";
@@ -29,7 +31,6 @@ import {
 import { DocumentContextProvider } from "./DocumentContext";
 import Fade from "./Fade";
 import { PortalContext } from "./Portal";
-import CommandBar from "./CommandBar";
 
 const DocumentComments = lazyWithRetry(
   () => import("~/scenes/Document/components/Comments")
@@ -37,9 +38,8 @@ const DocumentComments = lazyWithRetry(
 const DocumentHistory = lazyWithRetry(
   () => import("~/scenes/Document/components/History")
 );
-const SettingsSidebar = lazyWithRetry(
-  () => import("~/components/Sidebar/Settings")
-);
+
+const CommandBar = lazyWithRetry(() => import("~/components/CommandBar"));
 
 type Props = {
   children?: React.ReactNode;
@@ -109,10 +109,12 @@ const AuthenticatedLayout: React.FC = ({ children }: Props) => {
     >
       {(showHistory || showComments) && (
         <Route path={`/doc/${slug}`}>
-          <React.Suspense fallback={null}>
-            {showHistory && <DocumentHistory />}
-            {showComments && <DocumentComments />}
-          </React.Suspense>
+          <SidebarRight>
+            <React.Suspense fallback={null}>
+              {showHistory && <DocumentHistory />}
+              {showComments && <DocumentComments />}
+            </React.Suspense>
+          </SidebarRight>
         </Route>
       )}
     </AnimatePresence>
@@ -131,7 +133,9 @@ const AuthenticatedLayout: React.FC = ({ children }: Props) => {
           <RegisterKeyDown trigger="t" handler={goToSearch} />
           <RegisterKeyDown trigger="/" handler={goToSearch} />
           {children}
-          <CommandBar />
+          <React.Suspense fallback={null}>
+            <CommandBar />
+          </React.Suspense>
         </Layout>
       </PortalContext.Provider>
     </DocumentContextProvider>

app/components/Avatar/Avatar.tsx

@@ -2,7 +2,6 @@ import * as React from "react";
 import styled from "styled-components";
 import useBoolean from "~/hooks/useBoolean";
 import Initials from "./Initials";
-import Tooltip from "../Tooltip";
 
 export enum AvatarSize {
   Small = 16,
@@ -23,7 +22,6 @@ export interface IAvatar {
   avatarUrl: string | null;
   color?: string;
   initial?: string;
-  name?: string;
   id?: string;
 }
 
@@ -44,8 +42,6 @@ type Props = {
   className?: string;
   /** Optional style */
   style?: React.CSSProperties;
-  /** Whether to show a tooltip */
-  showTooltip?: boolean;
 };
 
 function Avatar(props: Props) {
@@ -54,13 +50,12 @@ function Avatar(props: Props) {
     style,
     variant = AvatarVariant.Round,
     className,
-    showTooltip,
     ...rest
   } = props;
   const src = props.src || model?.avatarUrl;
   const [error, handleError] = useBoolean(false);
 
-  const content = (
+  return (
     <Relative
       style={style}
       $variant={variant}
@@ -78,12 +73,6 @@ function Avatar(props: Props) {
       )}
     </Relative>
   );
-
-  return showTooltip ? (
-    <Tooltip content={props.alt || model?.name || ""}>{content}</Tooltip>
-  ) : (
-    content
-  );
 }
 
 Avatar.defaultProps = {

app/components/Avatar/AvatarWithPresence.tsx

@@ -25,8 +25,6 @@ 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;
 };
@@ -55,7 +53,6 @@ function AvatarWithPresence({
   isCurrentUser,
   size = AvatarSize.Large,
   style,
-  alt,
 }: Props) {
   const { t } = useTranslation();
   const status = isPresent
@@ -86,7 +83,7 @@ function AvatarWithPresence({
           $color={user.color}
           style={style}
         >
-          <Avatar model={user} onClick={onClick} size={size} alt={alt} />
+          <Avatar model={user} onClick={onClick} size={size} />
         </AvatarPresence>
       </Tooltip>
     </>

app/components/Avatar/GroupAvatar.tsx

@@ -26,7 +26,6 @@ export function GroupAvatar({
   return (
     <Squircle color={color ?? theme.text} size={size} className={className}>
       <GroupIcon
-        data-fixed-color
         color={backgroundColor ?? theme.background}
         size={size * 0.75}
       />

app/components/Branding.tsx

@@ -1,4 +1,3 @@
-import * as React from "react";
 import styled from "styled-components";
 import { depths, s } from "@shared/styles";
 import env from "~/env";
@@ -45,4 +44,4 @@ const Link = styled.a`
   }
 `;
 
-export default React.memo(Branding);
+export default Branding;

app/components/Breadcrumb.tsx

@@ -25,7 +25,7 @@ function Breadcrumb(
   { actions, highlightFirstItem, children, max = 2 }: Props,
   ref: React.RefObject<HTMLDivElement> | null
 ) {
-  const actionContext = useActionContext({ isMenu: true });
+  const actionContext = useActionContext({ isContextMenu: true });
 
   const visibleActions = useComputed(
     () =>

app/components/Collaborators.tsx

@@ -125,14 +125,13 @@ function Collaborators(props: Props) {
 
       return (
         <AvatarWithPresence
-          {...rest}
           key={collaborator.id}
+          {...rest}
           user={collaborator}
           isPresent={isPresent}
           isEditing={isEditing}
           isObserving={isObserving}
           isCurrentUser={currentUserId === collaborator.id}
-          alt={t("Avatar of {{ name }}", { name: collaborator.name })}
           onClick={
             isObservable
               ? handleAvatarClick(

app/components/ContentEditable.tsx

@@ -143,14 +143,13 @@ 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={contentEditable}
+        contentEditable={!disabled && !readOnly}
         onInput={wrappedEvent(onInput)}
         onFocus={wrappedEvent(onFocus)}
         onBlur={wrappedEvent(onBlur)}
@@ -158,7 +157,7 @@ const ContentEditable = React.forwardRef(function _ContentEditable(
         onPaste={handlePaste}
         data-placeholder={placeholder}
         suppressContentEditableWarning
-        role={contentEditable ? "textbox" : undefined}
+        role="textbox"
         {...rest}
       >
         {innerValue}

app/components/ContextMenu/Header.ts

@@ -0,0 +1,13 @@
+import styled from "styled-components";
+import { s } from "@shared/styles";
+
+const Header = styled.h3`
+  font-size: 11px;
+  font-weight: 600;
+  text-transform: uppercase;
+  color: ${s("sidebarText")};
+  letter-spacing: 0.04em;
+  margin: 1em 12px 0.5em;
+`;
+
+export default Header;

app/components/ContextMenu/MenuIconWrapper.ts

@@ -0,0 +1,13 @@
+import styled from "styled-components";
+import { s } from "@shared/styles";
+
+const MenuIconWrapper = styled.span`
+  width: 24px;
+  height: 24px;
+  margin-right: 6px;
+  margin-left: -4px;
+  color: ${s("textSecondary")};
+  flex-shrink: 0;
+`;
+
+export default MenuIconWrapper;

app/components/ContextMenu/MenuItem.tsx

@@ -0,0 +1,217 @@
+import { LocationDescriptor } from "history";
+import { CheckmarkIcon } from "outline-icons";
+import { ellipsis, transparentize } from "polished";
+import * as React from "react";
+import { mergeRefs } from "react-merge-refs";
+import { MenuItem as BaseMenuItem } from "reakit/Menu";
+import styled, { css } from "styled-components";
+import breakpoint from "styled-components-breakpoint";
+import { s } from "@shared/styles";
+import Text from "../Text";
+import MenuIconWrapper from "./MenuIconWrapper";
+
+type Props = {
+  id?: string;
+  onClick?: (event: React.MouseEvent) => void | Promise<void>;
+  onPointerMove?: (event: React.MouseEvent) => void | Promise<void>;
+  active?: boolean;
+  selected?: boolean;
+  disabled?: boolean;
+  dangerous?: boolean;
+  to?: LocationDescriptor;
+  href?: string;
+  target?: string;
+  as?: string | React.ComponentType<any>;
+  hide?: () => void;
+  level?: number;
+  icon?: React.ReactNode;
+  children?: React.ReactNode;
+  ref?: React.LegacyRef<HTMLButtonElement> | undefined;
+};
+
+const MenuItem = (
+  {
+    onClick,
+    onPointerMove,
+    children,
+    active,
+    selected,
+    disabled,
+    as,
+    hide,
+    icon,
+    ...rest
+  }: Props,
+  ref: React.Ref<HTMLAnchorElement>
+) => {
+  const content = React.useCallback(
+    (props) => {
+      // Preventing default mousedown otherwise menu items do not work in Firefox,
+      // which triggers the hideOnClickOutside handler first via mousedown – hiding
+      // and un-rendering the menu contents.
+      const preventDefault = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+      };
+
+      const handleClick = async (ev: React.MouseEvent) => {
+        hide?.();
+
+        if (onClick) {
+          preventDefault(ev);
+          await onClick(ev);
+        }
+      };
+
+      return (
+        <MenuAnchor
+          {...props}
+          $active={active}
+          as={onClick ? "button" : as}
+          onClick={handleClick}
+          onPointerDown={preventDefault}
+          onMouseDown={preventDefault}
+          ref={mergeRefs([
+            ref,
+            props.ref as React.RefObject<HTMLAnchorElement>,
+          ])}
+        >
+          {selected !== undefined && (
+            <SelectedWrapper aria-hidden>
+              {selected ? <CheckmarkIcon /> : <Spacer />}
+            </SelectedWrapper>
+          )}
+          {icon && <MenuIconWrapper aria-hidden>{icon}</MenuIconWrapper>}
+          <Title>{children}</Title>
+        </MenuAnchor>
+      );
+    },
+    [active, as, hide, icon, onClick, ref, children, selected]
+  );
+
+  return (
+    <BaseMenuItem
+      onClick={disabled ? undefined : onClick}
+      onPointerMove={disabled ? undefined : onPointerMove}
+      disabled={disabled}
+      hide={hide}
+      {...rest}
+    >
+      {content}
+    </BaseMenuItem>
+  );
+};
+
+const Spacer = styled.svg`
+  width: 24px;
+  height: 24px;
+  flex-shrink: 0;
+`;
+
+const Title = styled.div`
+  ${ellipsis()}
+  flex-grow: 1;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+`;
+
+type MenuAnchorProps = {
+  level?: number;
+  disabled?: boolean;
+  dangerous?: boolean;
+  disclosure?: boolean;
+  $active?: boolean;
+};
+
+export const MenuAnchorCSS = css<MenuAnchorProps>`
+  display: flex;
+  margin: 0;
+  border: 0;
+  padding: 12px;
+  border-radius: 4px;
+  padding-left: ${(props) => 12 + (props.level || 0) * 10}px;
+  width: 100%;
+  min-height: 32px;
+  background: none;
+  color: ${(props) =>
+    props.disabled ? props.theme.textTertiary : props.theme.textSecondary};
+  justify-content: left;
+  align-items: center;
+  font-size: 16px;
+  cursor: default;
+  user-select: none;
+  white-space: nowrap;
+  position: relative;
+
+  svg {
+    flex-shrink: 0;
+    opacity: ${(props) => (props.disabled ? ".5" : 1)};
+  }
+
+  ${(props) => props.disabled && "pointer-events: none;"}
+
+  ${(props) =>
+    props.$active === undefined &&
+    !props.disabled &&
+    `
+  @media (hover: hover) {
+    &:hover,
+    &:focus,
+    &:focus-visible {
+      color: ${props.theme.accentText};
+      background: ${props.dangerous ? props.theme.danger : props.theme.accent};
+      outline-color: ${
+        props.dangerous ? props.theme.danger : props.theme.accent
+      };
+      box-shadow: none;
+      cursor: var(--pointer);
+
+      svg {
+        color: ${props.theme.accentText};
+        fill: ${props.theme.accentText};
+      }
+
+      ${Text} {
+        color: ${transparentize(0.5, props.theme.accentText)};
+      }
+    }
+  }
+  `}
+
+  ${(props) =>
+    props.$active &&
+    !props.disabled &&
+    `
+      color: ${props.theme.accentText};
+      background: ${props.dangerous ? props.theme.danger : props.theme.accent};
+      box-shadow: none;
+      cursor: var(--pointer);
+
+      svg {
+        fill: ${props.theme.accentText};
+      }
+    `}
+
+  ${breakpoint("tablet")`
+    padding: 4px 12px;
+    padding-right: ${(props: MenuAnchorProps) =>
+      props.disclosure ? 32 : 12}px;
+    font-size: 14px;
+  `}
+`;
+
+export const MenuAnchor = styled.a`
+  ${MenuAnchorCSS}
+`;
+
+const SelectedWrapper = styled.span`
+  width: 24px;
+  height: 24px;
+  margin-right: 4px;
+  margin-left: -8px;
+  flex-shrink: 0;
+  color: ${s("textSecondary")};
+`;
+
+export default React.forwardRef<HTMLAnchorElement, Props>(MenuItem);

app/components/ContextMenu/MouseSafeArea.tsx

@@ -1,8 +1,5 @@
-import { observer } from "mobx-react";
 import * as React from "react";
 import { useMousePosition } from "~/hooks/useMousePosition";
-import usePrevious from "~/hooks/usePrevious";
-import useStores from "~/hooks/useStores";
 
 type Positions = {
   /** Sub-menu x */
@@ -24,7 +21,7 @@ type Positions = {
  * allow moving cursor to lower parts of sub-menu without the sub-menu
  * disappearing.
  */
-export const MouseSafeArea = observer(function MouseSafeArea_(props: {
+export default function MouseSafeArea(props: {
   parentRef: React.RefObject<HTMLElement | null>;
 }) {
   const {
@@ -33,32 +30,15 @@ export const MouseSafeArea = observer(function MouseSafeArea_(props: {
     height: h = 0,
     width: w = 0,
   } = props.parentRef.current?.getBoundingClientRect() || {};
-  const { ui } = useStores();
   const [mouseX, mouseY] = useMousePosition();
-  const [isVisible, setIsVisible] = React.useState(true);
   const positions = { x, y, h, w, mouseX, mouseY };
-  const distance = Math.abs(mouseX - x);
-  const prevDistance = usePrevious(distance) ?? distance;
-
-  // Hide the safe area if the mouse is moving _away_ from the menu
-  React.useEffect(() => {
-    if (distance > prevDistance) {
-      setIsVisible(false);
-    } else if (distance < prevDistance) {
-      setIsVisible(true);
-    }
-  }, [distance, prevDistance]);
-
-  if (!isVisible) {
-    return null;
-  }
 
   return (
     <div
       style={{
         position: "absolute",
         top: 0,
-        backgroundColor: ui.debugSafeArea ? "rgba(255,0,0,0.2)" : undefined,
+        // backgroundColor: "rgba(255,0,0,0.1)", // Uncomment to debug
         right: getRight(positions),
         left: getLeft(positions),
         height: h,
@@ -67,26 +47,24 @@ export const MouseSafeArea = observer(function MouseSafeArea_(props: {
       }}
     />
   );
-});
-
-const buffer = 10;
+}
 
 const getLeft = ({ x, mouseX }: Positions) =>
-  mouseX > x ? undefined : -Math.max(x - mouseX + buffer, buffer) + "px";
+  mouseX > x ? undefined : -Math.max(x - mouseX, 10) + "px";
 
 const getRight = ({ x, w, mouseX }: Positions) =>
-  mouseX > x ? -Math.max(mouseX - (x + w) + buffer, buffer) + "px" : undefined;
+  mouseX > x ? -Math.max(mouseX - (x + w), 10) + "px" : undefined;
 
 const getWidth = ({ x, w, mouseX }: Positions) =>
   mouseX > x
-    ? Math.max(mouseX - (x + w - buffer), buffer) + "px"
-    : Math.max(x - mouseX + buffer, buffer) + "px";
+    ? Math.max(mouseX - (x + w), 10) + "px"
+    : Math.max(x - mouseX, 10) + "px";
 
 const getClipPath = ({ x, y, h, mouseX, mouseY }: Positions) =>
   mouseX > x
-    ? `polygon(0% 0%, 0% 100%, 100% ${
+    ? `polygon(0% 0%, 0% 100%, 100% ${(100 * (mouseY - y)) / h - 10}%, 100% ${
         (100 * (mouseY - y)) / h + 5
-      }%, 100% ${(100 * (mouseY - y)) / h - buffer}%)`
-    : `polygon(100% 0%, 0% ${(100 * (mouseY - y)) / h - buffer}%, 0% ${
+      }%)`
+    : `polygon(100% 0%, 0% ${(100 * (mouseY - y)) / h - 10}%, 0% ${
         (100 * (mouseY - y)) / h + 5
       }%, 100% 100%)`;

app/components/ContextMenu/OverflowMenuButton.tsx

@@ -0,0 +1,20 @@
+import { MoreIcon } from "outline-icons";
+import * as React from "react";
+import { MenuButton } from "reakit/Menu";
+import NudeButton from "~/components/NudeButton";
+
+type Props = React.ComponentProps<typeof MenuButton> & {
+  className?: string;
+};
+
+export default function OverflowMenuButton({ className, ...rest }: Props) {
+  return (
+    <MenuButton {...rest}>
+      {(props) => (
+        <NudeButton className={className} {...props}>
+          <MoreIcon />
+        </NudeButton>
+      )}
+    </MenuButton>
+  );
+}

app/components/ContextMenu/Separator.tsx

@@ -0,0 +1,15 @@
+import * as React from "react";
+import { MenuSeparator } from "reakit/Menu";
+import styled from "styled-components";
+
+export default function Separator(rest: React.HTMLAttributes<HTMLHRElement>) {
+  return (
+    <MenuSeparator {...rest}>
+      {(props) => <HorizontalRule {...props} />}
+    </MenuSeparator>
+  );
+}
+
+const HorizontalRule = styled.hr`
+  margin: 6px 0;
+`;

app/components/ContextMenu/Template.tsx

@@ -0,0 +1,264 @@
+import { ExpandedIcon } from "outline-icons";
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
+import {
+  MenuButton,
+  MenuItem as BaseMenuItem,
+  MenuStateReturn,
+} from "reakit/Menu";
+import styled, { useTheme } from "styled-components";
+import MenuIconWrapper from "~/components/ContextMenu/MenuIconWrapper";
+import Flex from "~/components/Flex";
+import { actionToMenuItem } from "~/actions";
+import useActionContext from "~/hooks/useActionContext";
+import { useMenuState } from "~/hooks/useMenuState";
+import {
+  Action,
+  ActionContext,
+  MenuSeparator,
+  MenuHeading,
+  MenuItem as TMenuItem,
+} from "~/types";
+import Tooltip from "../Tooltip";
+import Header from "./Header";
+import MenuItem, { MenuAnchor } from "./MenuItem";
+import MouseSafeArea from "./MouseSafeArea";
+import Separator from "./Separator";
+import ContextMenu from ".";
+
+type Props = Omit<MenuStateReturn, "items"> & {
+  actions?: (Action | MenuSeparator | MenuHeading)[];
+  context?: Partial<ActionContext>;
+  items?: TMenuItem[];
+  showIcons?: boolean;
+};
+
+const Disclosure = styled(ExpandedIcon)`
+  transform: rotate(270deg);
+  position: absolute;
+  right: 8px;
+`;
+
+type SubMenuProps = MenuStateReturn & {
+  templateItems: TMenuItem[];
+  parentMenuState: Omit<MenuStateReturn, "items">;
+  title: React.ReactNode;
+};
+
+const SubMenu = React.forwardRef(function _Template(
+  { templateItems, title, parentMenuState, ...rest }: SubMenuProps,
+  ref: React.LegacyRef<HTMLButtonElement>
+) {
+  const { t } = useTranslation();
+  const theme = useTheme();
+  const menu = useMenuState({
+    parentId: parentMenuState.baseId,
+  });
+
+  return (
+    <>
+      <MenuButton ref={ref} {...menu} {...rest}>
+        {(props) => (
+          <MenuAnchor disclosure {...props}>
+            {title} <Disclosure color={theme.textTertiary} />
+          </MenuAnchor>
+        )}
+      </MenuButton>
+      <ContextMenu
+        {...menu}
+        aria-label={t("Submenu")}
+        onClick={parentMenuState.hide}
+        parentMenuState={parentMenuState}
+      >
+        <MouseSafeArea parentRef={menu.unstable_popoverRef} />
+        <Template {...menu} items={templateItems} />
+      </ContextMenu>
+    </>
+  );
+});
+
+export function filterTemplateItems(items: TMenuItem[]): TMenuItem[] {
+  return items
+    .filter((item) => item.visible !== false)
+    .reduce((acc, item) => {
+      // trim separator if the previous item was a separator
+      if (
+        item.type === "separator" &&
+        acc[acc.length - 1]?.type === "separator"
+      ) {
+        return acc;
+      }
+      return [...acc, item];
+    }, [] as TMenuItem[])
+    .filter((item, index, arr) => {
+      if (
+        item.type === "separator" &&
+        (index === 0 || index === arr.length - 1)
+      ) {
+        return false;
+      }
+      return true;
+    });
+}
+
+function Template({ items, actions, context, showIcons, ...menu }: Props) {
+  const ctx = useActionContext({
+    isContextMenu: true,
+  });
+
+  const templateItems = actions
+    ? actions.map((item) =>
+        item.type === "separator" || item.type === "heading"
+          ? item
+          : actionToMenuItem(item, ctx)
+      )
+    : items || [];
+
+  const filteredTemplates = filterTemplateItems(templateItems);
+
+  const iconIsPresentInAnyMenuItem = filteredTemplates.find(
+    (item) =>
+      item.type !== "separator" && item.type !== "heading" && !!item.icon
+  );
+
+  return (
+    <>
+      {filteredTemplates.map((item, index) => {
+        if (
+          iconIsPresentInAnyMenuItem &&
+          item.type !== "separator" &&
+          item.type !== "heading" &&
+          showIcons !== false
+        ) {
+          item.icon = item.icon || <MenuIconWrapper aria-hidden />;
+        }
+
+        if (item.type === "route") {
+          return (
+            <MenuItem
+              as={Link}
+              id={`${item.title}-${index}`}
+              to={item.to}
+              key={`${item.type}-${item.title}-${index}`}
+              disabled={item.disabled}
+              selected={item.selected}
+              icon={showIcons !== false ? item.icon : undefined}
+              {...menu}
+            >
+              {item.title}
+            </MenuItem>
+          );
+        }
+
+        if (item.type === "link") {
+          return (
+            <MenuItem
+              id={`${item.title}-${index}`}
+              href={typeof item.href === "string" ? item.href : item.href.url}
+              key={`${item.type}-${item.title}-${index}`}
+              disabled={item.disabled}
+              selected={item.selected}
+              level={item.level}
+              target={
+                typeof item.href === "string" ? undefined : item.href.target
+              }
+              icon={showIcons !== false ? item.icon : undefined}
+              {...menu}
+            >
+              {item.title}
+            </MenuItem>
+          );
+        }
+
+        if (item.type === "button") {
+          const menuItem = (
+            <MenuItem
+              as="button"
+              id={`${item.title}-${index}`}
+              onClick={item.onClick}
+              disabled={item.disabled}
+              selected={item.selected}
+              dangerous={item.dangerous}
+              key={`${item.type}-${item.title}-${index}`}
+              icon={showIcons !== false ? item.icon : undefined}
+              {...menu}
+            >
+              {item.title}
+            </MenuItem>
+          );
+
+          return item.tooltip ? (
+            <Tooltip
+              content={item.tooltip}
+              placement={"bottom"}
+              key={`tooltip-${item.title}-${index}`}
+            >
+              <div>{menuItem}</div>
+            </Tooltip>
+          ) : (
+            <React.Fragment key={`${item.type}-${item.title}-${index}`}>
+              {menuItem}
+            </React.Fragment>
+          );
+        }
+
+        if (item.type === "submenu") {
+          // Skip rendering empty submenus
+          return item.items.length > 0 ? (
+            <BaseMenuItem
+              key={`${item.type}-${item.title}-${index}`}
+              as={SubMenu}
+              id={`${item.title}-${index}`}
+              templateItems={item.items}
+              parentMenuState={menu}
+              title={
+                <Title
+                  title={item.title}
+                  icon={showIcons !== false ? item.icon : undefined}
+                />
+              }
+              {...menu}
+            />
+          ) : null;
+        }
+
+        if (item.type === "separator") {
+          return <Separator key={`separator-${index}`} />;
+        }
+
+        if (item.type === "heading") {
+          return (
+            <Header key={`heading-${item.title}-${index}`}>{item.title}</Header>
+          );
+        }
+
+        // This should never be reached for Reakit dropdown menu.
+        // Added for exhaustiveness check.
+        if (item.type === "group") {
+          return null;
+        }
+
+        const _exhaustiveCheck: never = item;
+        return _exhaustiveCheck;
+      })}
+    </>
+  );
+}
+
+function Title({
+  title,
+  icon,
+}: {
+  title: React.ReactNode;
+  icon?: React.ReactNode;
+}) {
+  return (
+    <Flex align="center">
+      {icon && <MenuIconWrapper aria-hidden>{icon}</MenuIconWrapper>}
+      {title}
+    </Flex>
+  );
+}
+
+export default React.memo<Props>(Template);

app/components/ContextMenu/index.tsx

@@ -0,0 +1,317 @@
+import { disableBodyScroll, enableBodyScroll } from "body-scroll-lock";
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import { Menu, MenuStateReturn } from "reakit/Menu";
+import styled, { DefaultTheme } from "styled-components";
+import breakpoint from "styled-components-breakpoint";
+import { depths, s } from "@shared/styles";
+import Scrollable from "~/components/Scrollable";
+import useEventListener from "~/hooks/useEventListener";
+import useMenuContext from "~/hooks/useMenuContext";
+import useMenuHeight from "~/hooks/useMenuHeight";
+import useMobile from "~/hooks/useMobile";
+import usePrevious from "~/hooks/usePrevious";
+import useStores from "~/hooks/useStores";
+import useUnmount from "~/hooks/useUnmount";
+import {
+  fadeIn,
+  fadeAndSlideUp,
+  fadeAndSlideDown,
+  mobileContextMenu,
+} from "~/styles/animations";
+
+export type Placement =
+  | "auto-start"
+  | "auto"
+  | "auto-end"
+  | "top-start"
+  | "top"
+  | "top-end"
+  | "right-start"
+  | "right"
+  | "right-end"
+  | "bottom-end"
+  | "bottom"
+  | "bottom-start"
+  | "left-end"
+  | "left"
+  | "left-start";
+
+type Props = MenuStateReturn & {
+  "aria-label"?: string;
+  /** Reference to the rendered menu div element */
+  menuRef?: React.RefObject<HTMLDivElement>;
+  /** The parent menu state if this is a submenu. */
+  parentMenuState?: Omit<MenuStateReturn, "items">;
+  /** Called when the context menu is opened. */
+  onOpen?: () => void;
+  /** Called when the context menu is closed. */
+  onClose?: () => void;
+  /** Called when the context menu is clicked. */
+  onClick?: (ev: React.MouseEvent) => void;
+  /** The maximum width of the context menu. */
+  maxWidth?: number;
+  /** The minimum height of the context menu. */
+  minHeight?: number;
+  children?: React.ReactNode;
+};
+
+const ContextMenu: React.FC<Props> = ({
+  menuRef,
+  children,
+  onOpen,
+  onClose,
+  parentMenuState,
+  ...rest
+}: Props) => {
+  const previousVisible = usePrevious(rest.visible);
+  const { ui } = useStores();
+  const { t } = useTranslation();
+  const { setIsMenuOpen } = useMenuContext();
+  const isMobile = useMobile();
+  const isSubMenu = !!parentMenuState;
+
+  useUnmount(() => {
+    setIsMenuOpen(false);
+  });
+
+  React.useEffect(() => {
+    if (rest.visible && !previousVisible) {
+      onOpen?.();
+
+      if (!isSubMenu) {
+        setIsMenuOpen(true);
+      }
+    }
+
+    if (!rest.visible && previousVisible) {
+      onClose?.();
+
+      if (!isSubMenu) {
+        setIsMenuOpen(false);
+      }
+    }
+  }, [
+    onOpen,
+    onClose,
+    previousVisible,
+    rest.visible,
+    ui.sidebarCollapsed,
+    setIsMenuOpen,
+    isSubMenu,
+    t,
+  ]);
+
+  // Perf win – don't render anything until the menu has been opened
+  if (!rest.visible && !previousVisible) {
+    return null;
+  }
+
+  // sets the menu height based on the available space between the disclosure/
+  // trigger and the bottom of the window
+  return (
+    <>
+      <Menu
+        ref={menuRef}
+        hideOnClickOutside={!isMobile}
+        preventBodyScroll={false}
+        {...rest}
+      >
+        {(props) => (
+          <InnerContextMenu
+            // oxlint-disable-next-line @typescript-eslint/no-explicit-any
+            menuProps={props as any}
+            {...rest}
+            isSubMenu={isSubMenu}
+          >
+            {children}
+          </InnerContextMenu>
+        )}
+      </Menu>
+    </>
+  );
+};
+
+type InnerContextMenuProps = MenuStateReturn & {
+  isSubMenu: boolean;
+  menuProps: { style?: React.CSSProperties; placement: string };
+  children: React.ReactNode;
+  maxWidth?: number;
+  minHeight?: number;
+};
+
+/**
+ * Inner context menu allows deferring expensive window measurement hooks etc
+ * until the menu is actually opened.
+ */
+const InnerContextMenu = (props: InnerContextMenuProps) => {
+  const { menuProps } = props;
+  // kind of hacky, but this is an effective way of telling which way
+  // the menu will _actually_ be placed when taking into account screen
+  // positioning.
+  const topAnchor =
+    menuProps.style?.top === "0" || menuProps.style?.position === "fixed";
+  const rightAnchor = menuProps.placement === "bottom-end";
+  const backgroundRef = React.useRef<HTMLDivElement>(null);
+  const isMobile = useMobile();
+
+  const maxHeight = useMenuHeight({
+    visible: props.visible,
+    elementRef: props.unstable_disclosureRef,
+  });
+
+  // We must manually manage scroll lock for iOS support so that the scrollable
+  // element can be passed into body-scroll-lock. See:
+  // https://github.com/ariakit/ariakit/issues/469
+  React.useEffect(() => {
+    const scrollElement = backgroundRef.current;
+    if (props.visible && scrollElement && !props.isSubMenu) {
+      disableBodyScroll(scrollElement, {
+        reserveScrollBarGap: true,
+      });
+    }
+    return () => {
+      if (scrollElement && !props.isSubMenu) {
+        enableBodyScroll(scrollElement);
+      }
+    };
+  }, [props.isSubMenu, props.visible]);
+
+  useEventListener(
+    "animationstart",
+    (event) => {
+      if (event.target instanceof HTMLElement) {
+        const parent = event.target.parentElement;
+        if (parent) {
+          parent.style.pointerEvents = "none";
+        }
+      }
+    },
+    backgroundRef.current
+  );
+
+  useEventListener(
+    "animationend",
+    (event) => {
+      if (event.target instanceof HTMLElement) {
+        const parent = event.target.parentElement;
+        if (parent) {
+          parent.style.pointerEvents = "auto";
+        }
+      }
+    },
+    backgroundRef.current
+  );
+
+  const style =
+    topAnchor && !isMobile
+      ? {
+          maxHeight,
+        }
+      : undefined;
+
+  return (
+    <>
+      {isMobile && (
+        <Backdrop
+          onClick={(ev) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+            props.hide?.();
+          }}
+        />
+      )}
+      <Position {...menuProps}>
+        <Background
+          dir="auto"
+          maxWidth={props.maxWidth}
+          minHeight={props.minHeight}
+          topAnchor={topAnchor}
+          rightAnchor={rightAnchor}
+          ref={backgroundRef}
+          hiddenScrollbars
+          style={style}
+        >
+          {props.visible || props.animating ? props.children : null}
+        </Background>
+      </Position>
+    </>
+  );
+};
+
+export default ContextMenu;
+
+export const Backdrop = styled.div`
+  animation: ${fadeIn} 200ms ease-in-out;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: ${s("backdrop")};
+  z-index: ${depths.menu - 1};
+`;
+
+export const Position = styled.div`
+  position: absolute;
+  z-index: ${depths.menu};
+
+  // Note: pointer events are re-enabled after the animation ends, see event listeners above
+  pointer-events: none;
+
+  &:focus-visible {
+    transition-delay: 250ms;
+    transition-property: outline-width;
+    transition-duration: 0;
+    outline: none;
+  }
+
+  /*
+   * overrides make mobile-first coding style challenging
+   * so we explicitly define mobile breakpoint here
+   */
+  ${breakpoint("mobile", "tablet")`
+    position: fixed !important;
+    transform: none !important;
+    top: auto !important;
+    right: 8px !important;
+    bottom: 16px !important;
+    left: 8px !important;
+  `};
+`;
+
+type BackgroundProps = {
+  topAnchor?: boolean;
+  rightAnchor?: boolean;
+  maxWidth?: number;
+  minHeight?: number;
+  theme: DefaultTheme;
+};
+
+export const Background = styled(Scrollable)<BackgroundProps>`
+  animation: ${mobileContextMenu} 200ms ease;
+  transform-origin: 50% 100%;
+  max-width: 100%;
+  background: ${s("menuBackground")};
+  border-radius: 6px;
+  padding: 6px;
+  min-width: 180px;
+  min-height: ${(props) => props.minHeight || 44}px;
+  max-height: 75vh;
+  font-weight: normal;
+
+  @media print {
+    display: none;
+  }
+
+  ${breakpoint("tablet")`
+    animation: ${(props: BackgroundProps) =>
+      props.topAnchor ? fadeAndSlideDown : fadeAndSlideUp} 200ms ease;
+    transform-origin: ${(props: BackgroundProps) =>
+      props.rightAnchor ? "75%" : "25%"} 0;
+    max-width: ${(props: BackgroundProps) => props.maxWidth ?? 276}px;
+    max-height: 100vh;
+    background: ${(props: BackgroundProps) => props.theme.menuBackground};
+    box-shadow: ${(props: BackgroundProps) => props.theme.menuShadow};
+  `};
+`;

app/components/Dialogs.tsx

@@ -1,10 +1,7 @@
 import { observer } from "mobx-react";
-import { Suspense } from "react";
+import Guide from "~/components/Guide";
+import Modal from "~/components/Modal";
 import useStores from "~/hooks/useStores";
-import lazyWithRetry from "~/utils/lazyWithRetry";
-
-const Guide = lazyWithRetry(() => import("~/components/Guide"));
-const Modal = lazyWithRetry(() => import("~/components/Modal"));
 
 function Dialogs() {
   const { dialogs } = useStores();
@@ -12,7 +9,7 @@ function Dialogs() {
   const modals = [...modalStack];
 
   return (
-    <Suspense fallback={null}>
+    <>
       {guide ? (
         <Guide
           isOpen={guide.isOpen}
@@ -32,13 +29,11 @@ function Dialogs() {
           }}
           title={modal.title}
           style={modal.style}
-          width={modal.width}
-          height={modal.height}
         >
           {modal.content}
         </Modal>
       ))}
-    </Suspense>
+    </>
   );
 }
 

app/components/DocumentCard.tsx

@@ -3,8 +3,8 @@ import { CSS } from "@dnd-kit/utilities";
 import { subDays } from "date-fns";
 import { m } from "framer-motion";
 import { observer } from "mobx-react";
-import { CloseIcon, DocumentIcon, ClockIcon } from "outline-icons";
-import { useRef, useCallback, Suspense } from "react";
+import { CloseIcon, DocumentIcon, ClockIcon, EyeIcon } from "outline-icons";
+import { useRef, useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import styled, { useTheme } from "styled-components";
@@ -19,12 +19,10 @@ import Flex from "~/components/Flex";
 import NudeButton from "~/components/NudeButton";
 import Time from "~/components/Time";
 import useStores from "~/hooks/useStores";
+import { useTextStats } from "~/hooks/useTextStats";
 import CollectionIcon from "./Icons/CollectionIcon";
 import Text from "./Text";
 import Tooltip from "./Tooltip";
-import lazyWithRetry from "~/utils/lazyWithRetry";
-
-const ReadingTime = lazyWithRetry(() => import("./ReadingTime"));
 
 type Props = {
   /** The pin record */
@@ -78,13 +76,6 @@ function DocumentCard(props: Props) {
   const isRecentlyUpdated =
     new Date(document.updatedAt) > subDays(new Date(), 7);
 
-  const updatedAt = (
-    <>
-      <Clock size={18} />
-      <Time dateTime={document.updatedAt} addSuffix shorten />
-    </>
-  );
-
   return (
     <Reorderable
       ref={setNodeRef}
@@ -159,11 +150,12 @@ function DocumentCard(props: Props) {
               </Heading>
               <DocumentMeta size="xsmall">
                 {isRecentlyUpdated ? (
-                  updatedAt
+                  <>
+                    <Clock size={18} />
+                    <Time dateTime={document.updatedAt} addSuffix shorten />
+                  </>
                 ) : (
-                  <Suspense fallback={updatedAt}>
-                    <ReadingTime document={document} />
-                  </Suspense>
+                  <ReadingTime document={document} />
                 )}
               </DocumentMeta>
             </div>
@@ -185,6 +177,21 @@ function DocumentCard(props: Props) {
   );
 }
 
+const ReadingTime = ({ document }: { document: Document }) => {
+  const { t } = useTranslation();
+  const markdown = useMemo(() => document.toMarkdown(), [document]);
+  const stats = useTextStats(markdown);
+
+  return (
+    <>
+      <EyeIcon size={18} />
+      {t(`{{ minutes }}m read`, {
+        minutes: stats.total.readingTime,
+      })}
+    </>
+  );
+};
+
 const DocumentSquircle = ({
   icon,
   color,

app/components/DocumentContext.tsx

@@ -11,15 +11,9 @@ 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[] = [];
 
@@ -45,11 +39,6 @@ class DocumentContext {
     this.isEditorInitialized = initialized;
   };
 
-  @action
-  setFocusedCommentId = (commentId: string | null) => {
-    this.focusedCommentId = commentId;
-  };
-
   @action
   updateState = () => {
     this.updateHeadings();

app/components/DocumentExplorer.tsx

@@ -3,7 +3,6 @@ import concat from "lodash/concat";
 import difference from "lodash/difference";
 import fill from "lodash/fill";
 import filter from "lodash/filter";
-import flatten from "lodash/flatten";
 import includes from "lodash/includes";
 import map from "lodash/map";
 import { observer } from "mobx-react";
@@ -28,6 +27,7 @@ import Text from "~/components/Text";
 import useMobile from "~/hooks/useMobile";
 import useStores from "~/hooks/useStores";
 import { ancestors, descendants, flattenTree } from "~/utils/tree";
+import flatten from "lodash/flatten";
 
 type Props = {
   /** Action taken upon submission of selected item, could be publish, move etc. */
@@ -49,13 +49,8 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
   const [searchTerm, setSearchTerm] = React.useState<string>();
   const [selectedNode, selectNode] = React.useState<NavigationNode | null>(
     () => {
-      if (!defaultValue) {
-        return null;
-      }
-
-      // Search through all nodes in the tree, not just top-level items
-      const allNodes = flatten(items.map(flattenTree));
-      const node = allNodes.find((item) => item.id === defaultValue);
+      const node =
+        defaultValue && items.find((item) => item.id === defaultValue);
       return node || null;
     }
   );
@@ -64,9 +59,7 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
   const [activeNode, setActiveNode] = React.useState<number>(0);
   const [expandedNodes, setExpandedNodes] = React.useState<string[]>(() => {
     if (defaultValue) {
-      // Search through all nodes in the tree, not just top-level items
-      const allNodes = flatten(items.map(flattenTree));
-      const node = allNodes.find((item) => item.id === defaultValue);
+      const node = items.find((item) => item.id === defaultValue);
       if (node) {
         return ancestors(node).map((ancestorNode) => ancestorNode.id);
       }
@@ -111,6 +104,19 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
     );
   }, [items.length]);
 
+  React.useEffect(() => {
+    onSelect(selectedNode);
+  }, [selectedNode, onSelect]);
+
+  React.useEffect(() => {
+    if (defaultValue && selectedNode && listRef) {
+      const index = nodes.findIndex((node) => node.id === selectedNode.id);
+      if (index > 0) {
+        setTimeout(() => listRef.current?.scrollToItem(index, "center"), 50);
+      }
+    }
+  }, []);
+
   function getNodes() {
     function includeDescendants(item: NavigationNode): NavigationNode[] {
       return expandedNodes.includes(item.id)
@@ -124,19 +130,6 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
   }
 
   const nodes = getNodes();
-
-  React.useEffect(() => {
-    onSelect(selectedNode);
-  }, [selectedNode, onSelect]);
-
-  React.useEffect(() => {
-    if (defaultValue && selectedNode && listRef) {
-      const index = nodes.findIndex((node) => node.id === selectedNode.id);
-      if (index > 0) {
-        setTimeout(() => listRef.current?.scrollToItem(index, "center"), 50);
-      }
-    }
-  }, [defaultValue, selectedNode, nodes]);
   const baseDepth = nodes.reduce(
     (min, node) => (node.depth ? Math.min(min, node.depth) : min),
     Infinity

app/components/DocumentListItem.tsx

@@ -25,10 +25,6 @@ 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;
@@ -54,7 +50,6 @@ function DocumentListItem(
 ) {
   const { t } = useTranslation();
   const user = useCurrentUser();
-  const { userMemberships, groupMemberships } = useStores();
   const locationSidebarContext = useLocationSidebarContext();
   const [menuOpen, handleMenuOpen, handleMenuClose] = useBoolean();
 
@@ -83,110 +78,87 @@ 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,
   });
 
-  const contextMenuAction = useDocumentMenuAction({ documentId: document.id });
-
   return (
-    <ActionContextProvider
-      value={{
-        activeDocumentId: document.id,
-        activeCollectionId:
-          !isShared && document.collectionId
-            ? document.collectionId
-            : undefined,
+    <DocumentLink
+      ref={itemRef}
+      dir={document.dir}
+      role="menuitem"
+      $isStarred={document.isStarred}
+      $menuOpen={menuOpen}
+      to={{
+        pathname: documentPath(document),
+        state: {
+          title: document.titleWithDefault,
+          sidebarContext,
+        },
       }}
+      {...rest}
+      {...rovingTabIndex}
     >
-      <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}
+      <Content>
+        <Heading dir={document.dir}>
+          {document.icon && (
+            <>
+              <Icon
+                value={document.icon}
+                color={document.color ?? undefined}
+                initial={document.initial}
               />
-              {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>
+              &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>
+        {!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>
   );
 }
 
@@ -280,7 +252,7 @@ const DocumentLink = styled(Link)<{
     `}
 `;
 
-const Heading = styled.span<{ rtl?: boolean }>`
+const Heading = styled.h3<{ rtl?: boolean }>`
   display: flex;
   justify-content: ${(props) => (props.rtl ? "flex-end" : "flex-start")};
   align-items: center;
@@ -290,8 +262,6 @@ const Heading = styled.span<{ rtl?: boolean }>`
   color: ${s("text")};
   font-family: ${s("fontFamily")};
   font-weight: 500;
-  font-size: 20px;
-  line-height: 1.2;
 `;
 
 const StarPositioner = styled(Flex)`

app/components/DocumentMeta.tsx

@@ -155,22 +155,26 @@ const DocumentMeta: React.FC<Props> = ({
       }
       return (
         <Viewed>
-          <Separator />
-          <Modified highlight>{t("Never viewed")}</Modified>
+          •&nbsp;<Modified highlight>{t("Never viewed")}</Modified>
         </Viewed>
       );
     }
 
     return (
       <Viewed>
-        <Separator />
-        {t("Viewed")} <Time dateTime={lastViewedAt} addSuffix shorten />
+        •&nbsp;{t("Viewed")} <Time dateTime={lastViewedAt} addSuffix shorten />
       </Viewed>
     );
   };
 
   return (
-    <Container align="center" rtl={document.dir === "rtl"} {...rest} dir="ltr">
+    <Container
+      align="center"
+      rtl={document.dir === "rtl"}
+      {...rest}
+      dir="ltr"
+      lang=""
+    >
       {to ? (
         <Link to={to} replace={replace}>
           {content}
@@ -188,17 +192,16 @@ const DocumentMeta: React.FC<Props> = ({
       )}
       {showParentDocuments && nestedDocumentsCount > 0 && (
         <span>
-          <Separator />
-          {nestedDocumentsCount}{" "}
+          &nbsp;• {nestedDocumentsCount}{" "}
           {t("nested document", {
             count: nestedDocumentsCount,
           })}
         </span>
       )}
-      {timeSinceNow()}
+      &nbsp;{timeSinceNow()}
       {canShowProgressBar && (
         <>
-          <Separator />
+          &nbsp;•&nbsp;
           <DocumentTasks document={document} />
         </>
       )}
@@ -207,14 +210,6 @@ const DocumentMeta: React.FC<Props> = ({
   );
 };
 
-export const Separator = styled.span`
-  padding: 0 0.4em;
-
-  &::after {
-    content: "•";
-  }
-`;
-
 const Strong = styled.strong`
   font-weight: 550;
 `;

app/components/DocumentTasks.tsx

@@ -39,7 +39,6 @@ function DocumentTasks({ document }: Props) {
   const done = completed === total;
   const previousDone = usePrevious(done);
   const message = getMessage(t, total, completed);
-
   return (
     <>
       {completed === total ? (

app/components/EditableTitle.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { toast } from "sonner";
 import styled from "styled-components";
-import { s, truncateMultiline } from "@shared/styles";
+import { s } from "@shared/styles";
 
 type Props = Omit<React.HTMLAttributes<HTMLInputElement>, "onSubmit"> & {
   /** A callback when the title is submitted. */
@@ -32,7 +32,6 @@ function EditableTitle(
   const [isEditing, setIsEditing] = React.useState(rest.isEditing || false);
   const [originalValue, setOriginalValue] = React.useState(title);
   const [value, setValue] = React.useState(title);
-  const [isSubmitting, setIsSubmitting] = React.useState(false);
 
   React.useImperativeHandle(ref, () => ({
     setIsEditing,
@@ -66,10 +65,6 @@ function EditableTitle(
       ev.preventDefault();
       ev.stopPropagation();
 
-      if (isSubmitting) {
-        return;
-      }
-
       const trimmedValue = value.trim();
 
       if (trimmedValue === originalValue || trimmedValue.length === 0) {
@@ -79,22 +74,18 @@ function EditableTitle(
         return;
       }
 
-      setIsSubmitting(true);
       try {
         await onSubmit(trimmedValue);
         setOriginalValue(trimmedValue);
-        setIsEditing(false);
       } catch (error) {
-        setValue(value);
-        setIsEditing(true);
-
+        setValue(originalValue);
         toast.error(error.message);
         throw error;
       } finally {
-        setIsSubmitting(false);
+        setIsEditing(false);
       }
     },
-    [originalValue, value, onCancel, onSubmit, isSubmitting]
+    [originalValue, value, onCancel, onSubmit]
   );
 
   const handleKeyDown = React.useCallback(
@@ -137,21 +128,17 @@ function EditableTitle(
           />
         </form>
       ) : (
-        <Text
+        <span
           onDoubleClick={canUpdate ? handleDoubleClick : undefined}
           className={rest.className}
         >
           {value}
-        </Text>
+        </span>
       )}
     </>
   );
 }
 
-const Text = styled.span`
-  ${truncateMultiline(3)}
-`;
-
 const Input = styled.input`
   color: ${s("text")};
   background: ${s("background")};

app/components/ExportDialog.tsx

@@ -25,7 +25,6 @@ function ExportDialog({ collection, onSubmit }: Props) {
   );
   const [includeAttachments, setIncludeAttachments] =
     React.useState<boolean>(true);
-  const [includePrivate, setIncludePrivate] = React.useState<boolean>(true);
   const user = useCurrentUser();
   const { collections } = useStores();
   const { t } = useTranslation();
@@ -45,13 +44,6 @@ function ExportDialog({ collection, onSubmit }: Props) {
     []
   );
 
-  const handleIncludePrivateChange = React.useCallback(
-    (ev: React.ChangeEvent<HTMLInputElement>) => {
-      setIncludePrivate(ev.target.checked);
-    },
-    []
-  );
-
   const handleSubmit = async () => {
     if (collection) {
       await collection.export(format, includeAttachments);
@@ -67,7 +59,7 @@ function ExportDialog({ collection, onSubmit }: Props) {
         },
       });
     } else {
-      await collections.export({ format, includeAttachments, includePrivate });
+      await collections.export(format, includeAttachments);
       toast.success(t("Export started"));
     }
     onSubmit();
@@ -131,62 +123,37 @@ function ExportDialog({ collection, onSubmit }: Props) {
               <Text as="p" size="small" weight="bold">
                 {item.title}
               </Text>
-              <Text size="small" type="secondary">
-                {item.description}
-              </Text>
+              <Text size="small">{item.description}</Text>
             </div>
           </Option>
         ))}
       </Flex>
-      <HR />
-      <Flex gap={12} column>
-        <Option>
-          <input
-            type="checkbox"
-            name="includeAttachments"
-            checked={includeAttachments}
-            onChange={handleIncludeAttachmentsChange}
-          />
-          <div>
-            <Text as="p" size="small" weight="bold">
-              {t("Include attachments")}
-            </Text>
-            <Text size="small" type="secondary">
-              {t("Including uploaded images and files in the exported data")}.
-            </Text>{" "}
-          </div>
-        </Option>
-        <Option>
-          <input
-            type="checkbox"
-            name="includePrivate"
-            checked={includePrivate}
-            onChange={handleIncludePrivateChange}
-          />
-          <div>
-            <Text as="p" size="small" weight="bold">
-              {t("Include private collections")}
-            </Text>
-          </div>
-        </Option>
-      </Flex>
+      <hr />
+      <Option>
+        <input
+          type="checkbox"
+          name="includeAttachments"
+          checked={includeAttachments}
+          onChange={handleIncludeAttachmentsChange}
+        />
+        <div>
+          <Text as="p" size="small" weight="bold">
+            {t("Include attachments")}
+          </Text>
+          <Text size="small">
+            {t("Including uploaded images and files in the exported data")}.
+          </Text>{" "}
+        </div>
+      </Option>
     </ConfirmationDialog>
   );
 }
 
-const HR = styled.hr`
-  margin: 16px 0;
-`;
-
 const Option = styled.label`
   display: flex;
-  align-items: start;
+  align-items: center;
   gap: 16px;
 
-  input {
-    margin-top: 4px;
-  }
-
   p {
     margin: 0;
   }

app/components/Facepile.tsx

@@ -5,7 +5,6 @@ import styled from "styled-components";
 import User from "~/models/User";
 import { Avatar, AvatarSize } from "~/components/Avatar";
 import Flex from "~/components/Flex";
-import { s } from "@shared/styles";
 
 type Props = {
   /** The users to display */
@@ -22,8 +21,6 @@ type Props = {
       model: User;
     }
   >;
-  /** Whether to show tooltips on hover, defaults to true */
-  showTooltip?: boolean;
 };
 
 function Facepile({
@@ -32,7 +29,6 @@ function Facepile({
   size = AvatarSize.Large,
   limit = 8,
   renderAvatar = Avatar,
-  showTooltip = true,
   ...rest
 }: Props) {
   const { t } = useTranslation();
@@ -55,7 +51,6 @@ function Facepile({
           <Component
             key={model.id}
             {...{
-              showTooltip,
               model,
               size,
               style: {
@@ -106,11 +101,6 @@ const Avatars = styled(Flex)`
   align-items: center;
   flex-direction: row-reverse;
   cursor: var(--pointer);
-
-  *:hover {
-    clip-path: none !important;
-    box-shadow: 0 0 0 2px ${s("background")};
-  }
 `;
 
 export default observer(Facepile);

app/components/FilterOptions.tsx

@@ -1,19 +1,22 @@
 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;
 }
 
@@ -31,17 +34,19 @@ 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 [open, setOpen] = React.useState(false);
+  const menu = useMenuState({
+    modal: false,
+  });
   const selectedItems = options.filter((option) =>
     selectedKeys.includes(option.key)
   );
@@ -53,26 +58,32 @@ const FilterOptions = ({
 
   const renderItem = React.useCallback(
     (option) => (
-      <MenuButton
+      <MenuItem
         key={option.key}
-        icon={option.icon}
-        label={option.label}
         onClick={() => {
           onSelect(option.key);
-          setOpen(false);
+          menu.hide();
         }}
         selected={selectedKeys.includes(option.key)}
-      />
+        {...menu}
+      >
+        {option.icon}
+        {option.note ? (
+          <LabelWithNote>
+            {option.label}
+            <Note>{option.note}</Note>
+          </LabelWithNote>
+        ) : (
+          option.label
+        )}
+      </MenuItem>
     ),
-    [onSelect, selectedKeys]
+    [menu, onSelect, selectedKeys]
   );
 
-  const handleFilter = React.useCallback(
-    (ev: React.ChangeEvent<HTMLInputElement>) => {
-      setQuery(ev.target.value);
-    },
-    []
-  );
+  const handleFilter = (ev: React.ChangeEvent<HTMLInputElement>) => {
+    setQuery(ev.target.value);
+  };
 
   const filteredOptions = React.useMemo(() => {
     const normalizedQuery = deburr(query.toLowerCase());
@@ -110,13 +121,13 @@ const FilterOptions = ({
 
       switch (ev.key) {
         case "Escape":
-          setOpen(false);
+          menu.hide();
           break;
         case "Enter":
           if (filteredOptions.length === 1) {
             ev.preventDefault();
             onSelect(filteredOptions[0].key);
-            setOpen(false);
+            menu.hide();
           }
           break;
         case "ArrowDown":
@@ -127,7 +138,7 @@ const FilterOptions = ({
           break;
       }
     },
-    [filteredOptions, onSelect]
+    [filteredOptions, menu, onSelect]
   );
 
   const handleEscapeFromList = React.useCallback((ev: React.KeyboardEvent) => {
@@ -139,21 +150,21 @@ const FilterOptions = ({
   }, []);
 
   React.useEffect(() => {
-    if (open) {
+    if (menu.visible) {
       searchInputRef.current?.focus();
     } else {
       setQuery("");
     }
-  }, [open]);
+  }, [menu.visible]);
 
   const showFilterInput = showFilter || options.length > 10;
-  const defaultLabel = rest.defaultLabel || t("Filter options");
 
   return (
-    <MenuProvider variant="dropdown">
-      <Menu open={open} onOpenChange={setOpen}>
-        <MenuTrigger>
+    <>
+      <MenuButton {...menu}>
+        {(props) => (
           <StyledButton
+            {...props}
             className={className}
             icon={selectedItems[0]?.key && selectedItems[0]?.icon}
             neutral
@@ -161,31 +172,31 @@ const FilterOptions = ({
           >
             {selectedItems.length ? selectedLabel : defaultLabel}
           </StyledButton>
-        </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 />}
+        )}
+      </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
           />
-          {showFilterInput && (
-            <SearchInput
-              ref={searchInputRef}
-              value={query}
-              onChange={handleFilter}
-              onKeyDown={handleKeyDown}
-              placeholder={`${t("Filter")}…`}
-              autoFocus
-            />
-          )}
-        </MenuContent>
-      </Menu>
-    </MenuProvider>
+        )}
+      </ContextMenu>
+    </>
   );
 };
 
@@ -231,6 +242,24 @@ 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;

app/components/Header.tsx

@@ -125,7 +125,6 @@ const Actions = styled(Flex)`
   flex-basis: 0;
   min-width: auto;
   padding-left: 8px;
-  gap: 12px;
 
   ${breakpoint("tablet")`
     position: unset;

app/components/HoverPreview/HoverPreview.tsx

@@ -13,7 +13,6 @@ import useStores from "~/hooks/useStores";
 import LoadingIndicator from "../LoadingIndicator";
 import { CARD_MARGIN } from "./Components";
 import HoverPreviewDocument from "./HoverPreviewDocument";
-import HoverPreviewGroup from "./HoverPreviewGroup";
 import HoverPreviewIssue from "./HoverPreviewIssue";
 import HoverPreviewLink from "./HoverPreviewLink";
 import HoverPreviewMention from "./HoverPreviewMention";
@@ -133,13 +132,6 @@ const HoverPreviewDesktop = observer(
                   lastActive={data.lastActive}
                   email={data.email}
                 />
-              ) : data.type === UnfurlResourceType.Group ? (
-                <HoverPreviewGroup
-                  ref={cardRef}
-                  name={data.name}
-                  memberCount={data.memberCount}
-                  users={data.users}
-                />
               ) : data.type === UnfurlResourceType.Document ? (
                 <HoverPreviewDocument
                   ref={cardRef}
@@ -303,10 +295,10 @@ const Pointer = styled.div<{ top: number; left: number; direction: Direction }>`
 
   &:before {
     border: 8px solid transparent;
-    ${({ direction }) =>
+    ${({ direction, theme }) =>
       direction === Direction.UP
-        ? `border-bottom-color: rgba(0, 0, 0, 0.1)`
-        : `border-top-color: rgba(0, 0, 0, 0.1)`};
+        ? `border-bottom-color: ${theme.menuBorder || "rgba(0, 0, 0, 0.1)"}`
+        : `border-top-color: ${theme.menuBorder || "rgba(0, 0, 0, 0.1)"}`};
     ${({ direction }) =>
       direction === Direction.UP ? "right: -1px" : "left: -1px"};
   }

app/components/HoverPreview/HoverPreviewGroup.tsx

@@ -1,59 +0,0 @@
-import * as React from "react";
-import { UnfurlResourceType, UnfurlResponse } from "@shared/types";
-import { MAX_AVATAR_DISPLAY } from "@shared/constants";
-import User from "~/models/User";
-import Facepile from "~/components/Facepile";
-import Flex from "~/components/Flex";
-import {
-  Preview,
-  Title,
-  Info,
-  Card,
-  CardContent,
-  Description,
-} from "./Components";
-import ErrorBoundary from "../ErrorBoundary";
-
-type Props = Omit<UnfurlResponse[UnfurlResourceType.Group], "type">;
-
-const HoverPreviewGroup = React.forwardRef(function _HoverPreviewGroup(
-  { name, memberCount, users }: Props,
-  ref: React.Ref<HTMLDivElement>
-) {
-  return (
-    <Preview as="div">
-      <Card fadeOut={false} ref={ref}>
-        <CardContent>
-          <ErrorBoundary showTitle={false} reloadOnChunkMissing={false}>
-            <Flex column gap={2} align="start">
-              <Title>{name}</Title>
-              <Info>
-                {memberCount === 1 ? "1 member" : `${memberCount} members`}
-              </Info>
-              {users.length > 0 && (
-                <Description>
-                  <Facepile
-                    users={users.map(
-                      (member) =>
-                        ({
-                          id: member.id,
-                          name: member.name,
-                          avatarUrl: member.avatarUrl,
-                          color: member.color,
-                          initial: member.name ? member.name[0] : "?",
-                        }) as User
-                    )}
-                    overflow={Math.max(0, memberCount - users.length)}
-                    limit={MAX_AVATAR_DISPLAY}
-                  />
-                </Description>
-              )}
-            </Flex>
-          </ErrorBoundary>
-        </CardContent>
-      </Card>
-    </Preview>
-  );
-});
-
-export default HoverPreviewGroup;

app/components/HoverPreview/HoverPreviewIssue.tsx

@@ -30,10 +30,15 @@ const HoverPreviewIssue = React.forwardRef(function _HoverPreviewIssue(
 ) {
   const authorName = author.name;
   const urlObj = new URL(url);
-  const service =
-    urlObj.hostname === "github.com"
-      ? IntegrationService.GitHub
-      : IntegrationService.Linear;
+  let service;
+
+  if (urlObj.hostname === "github.com") {
+    service = IntegrationService.GitHub;
+  } else if (urlObj.hostname === "gitlab.com") {
+    service = IntegrationService.GitLab;
+  } else {
+    service = IntegrationService.Linear;
+  }
 
   return (
     <Preview as="a" href={url} target="_blank" rel="noopener noreferrer">

app/components/HoverPreview/HoverPreviewMention.tsx

@@ -7,7 +7,7 @@ import { Preview, Title, Info, Card, CardContent } from "./Components";
 type Props = Omit<UnfurlResponse[UnfurlResourceType.Mention], "type">;
 
 const HoverPreviewMention = React.forwardRef(function _HoverPreviewMention(
-  { avatarUrl, name, lastActive, color }: Props,
+  { avatarUrl, name, lastActive, color, email }: Props,
   ref: React.Ref<HTMLDivElement>
 ) {
   return (
@@ -25,6 +25,7 @@ const HoverPreviewMention = React.forwardRef(function _HoverPreviewMention(
             />
             <Flex column gap={2} justify="center">
               <Title>{name}</Title>
+              {email && <Info>{email}</Info>}
               <Info>{lastActive}</Info>
             </Flex>
           </Flex>

app/components/Icons/ArrowIcon.tsx

@@ -1,16 +0,0 @@
-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);
-`;

app/components/InputSelect.tsx

@@ -1,10 +1,12 @@
 import * as VisuallyHidden from "@radix-ui/react-visually-hidden";
 import { QuestionMarkIcon } from "outline-icons";
+import { transparentize } from "polished";
 import * as React from "react";
 import styled from "styled-components";
 import { s } from "@shared/styles";
 import Text from "~/components/Text";
 import useMobile from "~/hooks/useMobile";
+import Separator from "./ContextMenu/Separator";
 import Flex from "./Flex";
 import { LabelText } from "./Input";
 import NudeButton from "./NudeButton";
@@ -217,9 +219,9 @@ const MobileSelect = React.forwardRef<HTMLButtonElement, MobileSelectProps>(
     );
 
     const renderOption = React.useCallback(
-      (option: Option, idx: number) => {
+      (option: Option) => {
         if (option.type === "separator") {
-          return <InputSelectSeparator key={`separator-${idx}`} />;
+          return <Separator />;
         }
 
         const isSelected = option === selectedOption;
@@ -341,9 +343,9 @@ function Option({
       {option.description && (
         <>
           &nbsp;
-          <Text type="tertiary" size="small" ellipsis>
+          <Description type="tertiary" size="small" ellipsis>
             – {option.description}
-          </Text>
+          </Description>
         </>
       )}
     </OptionContainer>
@@ -359,6 +361,15 @@ const OptionContainer = styled(Flex)`
   min-height: 24px;
 `;
 
+const Description = styled(Text)`
+  @media (hover: hover) {
+    &:hover,
+    &:focus {
+      color: ${(props) => transparentize(0.5, props.theme.accentText)};
+    }
+  }
+`;
+
 const IconWrapper = styled.span`
   display: flex;
   justify-content: center;

app/components/Layout.tsx

@@ -12,6 +12,7 @@ import SkipNavLink from "~/components/SkipNavLink";
 import env from "~/env";
 import useAutoRefresh from "~/hooks/useAutoRefresh";
 import useKeyDown from "~/hooks/useKeyDown";
+import { MenuProvider } from "~/hooks/useMenuContext";
 import useStores from "~/hooks/useStores";
 
 type Props = {
@@ -37,39 +38,41 @@ const Layout = React.forwardRef(function Layout_(
   });
 
   return (
-    <Container column auto ref={ref}>
-      <Helmet>
-        <title>{title ? title : env.APP_NAME}</title>
-      </Helmet>
+    <MenuProvider>
+      <Container column auto ref={ref}>
+        <Helmet>
+          <title>{title ? title : env.APP_NAME}</title>
+        </Helmet>
 
-      <SkipNavLink />
+        <SkipNavLink />
 
-      {ui.progressBarVisible && <LoadingIndicatorBar />}
+        {ui.progressBarVisible && <LoadingIndicatorBar />}
 
-      <Container auto>
-        {sidebar}
+        <Container auto>
+          <MenuProvider>{sidebar}</MenuProvider>
 
-        <SkipNavContent />
-        <Content
-          auto
-          justify="center"
-          $isResizing={ui.sidebarIsResizing}
-          $sidebarCollapsed={sidebarCollapsed}
-          $hasSidebar={!!sidebar}
-          style={
-            sidebarCollapsed
-              ? undefined
-              : {
-                  marginLeft: `${ui.sidebarWidth}px`,
-                }
-          }
-        >
-          {children}
-        </Content>
+          <SkipNavContent />
+          <Content
+            auto
+            justify="center"
+            $isResizing={ui.sidebarIsResizing}
+            $sidebarCollapsed={sidebarCollapsed}
+            $hasSidebar={!!sidebar}
+            style={
+              sidebarCollapsed
+                ? undefined
+                : {
+                    marginLeft: `${ui.sidebarWidth}px`,
+                  }
+            }
+          >
+            {children}
+          </Content>
 
-        {sidebarRight}
+          {sidebarRight}
+        </Container>
       </Container>
-    </Container>
+    </MenuProvider>
   );
 });
 

app/components/LazyLoad.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
 import lazyWithRetry from "~/utils/lazyWithRetry";
 
-export interface LazyComponent<T extends React.ComponentType<any>> {
+export interface LazyComponent<T extends React.ComponentType<unknown>> {
   Component: React.LazyExoticComponent<T>;
   preload: () => Promise<{ default: T }>;
 }
@@ -34,7 +34,7 @@ interface LazyLoadOptions {
  * MyComponent.preload();
  * ```
  */
-export function createLazyComponent<T extends React.ComponentType<any>>(
+export function createLazyComponent<T extends React.ComponentType<unknown>>(
   factory: () => Promise<{ default: T }>,
   options: LazyLoadOptions = {}
 ): LazyComponent<T> {

app/components/Menu/ContextMenu.tsx

@@ -1,93 +0,0 @@
-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 || !action || menuItems.length === 0) {
-      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>
-    );
-  }
-);

app/components/Menu/DropdownMenu.tsx

@@ -8,24 +8,30 @@ import {
   DrawerTitle,
   DrawerTrigger,
 } from "~/components/primitives/Drawer";
-import { Menu, MenuContent, MenuTrigger } from "~/components/primitives/Menu";
-import { MenuProvider } from "~/components/primitives/Menu/MenuContext";
+import {
+  DropdownMenu as DropdownMenuRoot,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+} from "~/components/primitives/DropdownMenu";
 import { actionV2ToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import useMobile from "~/hooks/useMobile";
 import {
+  ActionContext,
   ActionV2Variant,
   ActionV2WithChildren,
   MenuItem,
   MenuItemWithChildren,
 } from "~/types";
-import { toMenuItems, toMobileMenuItems } from "./transformer";
+import { toDropdownMenuItems, 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 */
@@ -46,6 +52,7 @@ export const DropdownMenu = observer(
     (
       {
         action,
+        context,
         children,
         align = "start",
         ariaLabel,
@@ -59,10 +66,13 @@ export const DropdownMenu = observer(
       const [open, setOpen] = React.useState(false);
       const isMobile = useMobile();
       const contentRef =
-        React.useRef<React.ElementRef<typeof MenuContent>>(null);
-      const actionContext = useActionContext({
-        isMenu: true,
-      });
+        React.useRef<React.ElementRef<typeof DropdownMenuContent>>(null);
+
+      const actionContext =
+        context ??
+        useActionContext({
+          isContextMenu: true,
+        });
 
       const menuItems = useComputed(() => {
         if (!open) {
@@ -116,26 +126,24 @@ export const DropdownMenu = observer(
         );
       }
 
-      const content = toMenuItems(menuItems);
+      const content = toDropdownMenuItems(menuItems);
 
       return (
-        <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>
+        <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>
       );
     }
   )

app/components/Menu/transformer.tsx

@@ -1,22 +1,29 @@
 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,
-  SubMenu,
-  SubMenuTrigger,
-  SubMenuContent,
-  MenuGroup,
-} from "~/components/primitives/Menu";
-import * as Components from "~/components/primitives/components/Menu";
+  MenuDisclosure,
+  SelectedIconWrapper,
+} from "~/components/primitives/components/Menu";
 import { MenuItem } from "~/types";
-import { MouseSafeArea } from "~/components/MouseSafeArea";
-import { createRef } from "react";
 
-export function toMenuItems(items: MenuItem[]) {
+export function toDropdownMenuItems(items: MenuItem[]) {
   const filteredItems = filterMenuItems(items);
-  const parentRef = createRef<HTMLDivElement>();
 
   if (!filteredItems.length) {
     return null;
@@ -32,15 +39,15 @@ export function toMenuItems(items: MenuItem[]) {
 
   return filteredItems.map((item, index) => {
     const icon = showIcon ? (
-      <Components.MenuIconWrapper aria-hidden>
+      <MenuIconWrapper aria-hidden>
         {"icon" in item ? item.icon : null}
-      </Components.MenuIconWrapper>
+      </MenuIconWrapper>
     ) : undefined;
 
     switch (item.type) {
       case "button":
         return (
-          <MenuButton
+          <DropdownMenuButton
             key={`${item.type}-${item.title}-${index}`}
             label={item.title as string}
             icon={icon}
@@ -54,7 +61,7 @@ export function toMenuItems(items: MenuItem[]) {
 
       case "route":
         return (
-          <MenuInternalLink
+          <DropdownMenuInternalLink
             key={`${item.type}-${item.title}-${index}`}
             label={item.title as string}
             icon={icon}
@@ -65,7 +72,7 @@ export function toMenuItems(items: MenuItem[]) {
 
       case "link":
         return (
-          <MenuExternalLink
+          <DropdownMenuExternalLink
             key={`${item.type}-${item.title}-${index}`}
             label={item.title as string}
             icon={icon}
@@ -78,36 +85,33 @@ export function toMenuItems(items: MenuItem[]) {
         );
 
       case "submenu": {
-        const submenuItems = toMenuItems(item.items);
+        const submenuItems = toDropdownMenuItems(item.items);
 
         if (!submenuItems?.length) {
           return null;
         }
 
         return (
-          <SubMenu key={`${item.type}-${item.title}-${index}`}>
-            <SubMenuTrigger
+          <DropdownSubMenu key={`${item.type}-${item.title}-${index}`}>
+            <DropdownSubMenuTrigger
               label={item.title as string}
               icon={icon}
               disabled={item.disabled}
             />
-            <SubMenuContent ref={parentRef}>
-              <MouseSafeArea parentRef={parentRef} />
-              {submenuItems}
-            </SubMenuContent>
-          </SubMenu>
+            <DropdownSubMenuContent>{submenuItems}</DropdownSubMenuContent>
+          </DropdownSubMenu>
         );
       }
 
       case "group": {
-        const groupItems = toMenuItems(item.items);
+        const groupItems = toDropdownMenuItems(item.items);
 
         if (!groupItems?.length) {
           return null;
         }
 
         return (
-          <MenuGroup
+          <DropdownMenuGroup
             key={`${item.type}-${item.title}-${index}`}
             label={item.title as string}
             items={groupItems}
@@ -116,7 +120,7 @@ export function toMenuItems(items: MenuItem[]) {
       }
 
       case "separator":
-        return <MenuSeparator key={`${item.type}-${index}`} />;
+        return <DropdownMenuSeparator key={`${item.type}-${index}`} />;
 
       default:
         return null;
@@ -145,15 +149,15 @@ export function toMobileMenuItems(
 
   return filteredItems.map((item, index) => {
     const icon = showIcon ? (
-      <Components.MenuIconWrapper aria-hidden>
+      <MenuIconWrapper aria-hidden>
         {"icon" in item ? item.icon : null}
-      </Components.MenuIconWrapper>
+      </MenuIconWrapper>
     ) : undefined;
 
     switch (item.type) {
       case "button":
         return (
-          <Components.MenuButton
+          <MenuButton
             key={`${item.type}-${item.title}-${index}`}
             disabled={item.disabled}
             $dangerous={item.dangerous}
@@ -163,31 +167,31 @@ export function toMobileMenuItems(
             }}
           >
             {icon}
-            <Components.MenuLabel>{item.title}</Components.MenuLabel>
+            <MenuLabel>{item.title}</MenuLabel>
             {item.selected !== undefined && (
-              <Components.SelectedIconWrapper aria-hidden>
+              <SelectedIconWrapper aria-hidden>
                 {item.selected ? <CheckmarkIcon /> : null}
-              </Components.SelectedIconWrapper>
+              </SelectedIconWrapper>
             )}
-          </Components.MenuButton>
+          </MenuButton>
         );
 
       case "route":
         return (
-          <Components.MenuInternalLink
+          <MenuInternalLink
             key={`${item.type}-${item.title}-${index}`}
             to={item.to}
             disabled={item.disabled}
             onClick={closeMenu}
           >
             {icon}
-            <Components.MenuLabel>{item.title}</Components.MenuLabel>
-          </Components.MenuInternalLink>
+            <MenuLabel>{item.title}</MenuLabel>
+          </MenuInternalLink>
         );
 
       case "link":
         return (
-          <Components.MenuExternalLink
+          <MenuExternalLink
             key={`${item.type}-${item.title}-${index}`}
             href={typeof item.href === "string" ? item.href : item.href.url}
             target={
@@ -197,8 +201,8 @@ export function toMobileMenuItems(
             onClick={closeMenu}
           >
             {icon}
-            <Components.MenuLabel>{item.title}</Components.MenuLabel>
-          </Components.MenuExternalLink>
+            <MenuLabel>{item.title}</MenuLabel>
+          </MenuExternalLink>
         );
 
       case "submenu": {
@@ -213,7 +217,7 @@ export function toMobileMenuItems(
         }
 
         return (
-          <Components.MenuButton
+          <MenuButton
             key={`${item.type}-${item.title}-${index}`}
             disabled={item.disabled}
             onClick={() => {
@@ -221,9 +225,9 @@ export function toMobileMenuItems(
             }}
           >
             {icon}
-            <Components.MenuLabel>{item.title}</Components.MenuLabel>
-            <Components.MenuDisclosure />
-          </Components.MenuButton>
+            <MenuLabel>{item.title}</MenuLabel>
+            <MenuDisclosure />
+          </MenuButton>
         );
       }
 
@@ -240,14 +244,14 @@ export function toMobileMenuItems(
 
         return (
           <div key={`${item.type}-${item.title}-${index}`}>
-            <Components.MenuHeader>{item.title}</Components.MenuHeader>
+            <DropdownMenuLabel>{item.title}</DropdownMenuLabel>
             {groupItems}
           </div>
         );
       }
 
       case "separator":
-        return <Components.MenuSeparator key={`${item.type}-${index}`} />;
+        return <MenuSeparator key={`${item.type}-${index}`} />;
 
       default:
         return null;

app/components/Modal.tsx

@@ -22,8 +22,6 @@ type Props = {
   isOpen: boolean;
   title?: React.ReactNode;
   style?: React.CSSProperties;
-  width?: number | string;
-  height?: number | string;
   onRequestClose: () => void;
 };
 
@@ -32,8 +30,6 @@ const Modal: React.FC<Props> = ({
   isOpen,
   title = "Untitled",
   style,
-  width,
-  height,
   onRequestClose,
 }: Props) => {
   const wasOpen = usePrevious(isOpen);
@@ -61,7 +57,7 @@ const Modal: React.FC<Props> = ({
         >
           {isMobile ? (
             <Mobile>
-              <MobileContent>
+              <Content>
                 <Centered onClick={(ev) => ev.stopPropagation()} column>
                   {title && (
                     <Text size="xlarge" weight="bold">
@@ -70,7 +66,7 @@ const Modal: React.FC<Props> = ({
                   )}
                   <ErrorBoundary>{children}</ErrorBoundary>
                 </Centered>
-              </MobileContent>
+              </Content>
               <Close onClick={onRequestClose}>
                 <CloseIcon size={32} />
               </Close>
@@ -80,7 +76,7 @@ const Modal: React.FC<Props> = ({
               </Back>
             </Mobile>
           ) : (
-            <Wrapper $width={width} $height={height}>
+            <Small>
               <Centered
                 onClick={(ev) => ev.stopPropagation()}
                 // maxHeight needed for proper overflow behavior in Safari
@@ -88,9 +84,9 @@ const Modal: React.FC<Props> = ({
                 column
                 reverse
               >
-                <DesktopContent style={style} shadow>
+                <SmallContent style={style} shadow>
                   <ErrorBoundary component="div">{children}</ErrorBoundary>
-                </DesktopContent>
+                </SmallContent>
                 <Header>
                   {title && <Text size="large">{title}</Text>}
                   <NudeButton onClick={onRequestClose}>
@@ -98,7 +94,7 @@ const Modal: React.FC<Props> = ({
                   </NudeButton>
                 </Header>
               </Centered>
-            </Wrapper>
+            </Small>
           )}
         </StyledContent>
       </Dialog.Portal>
@@ -146,7 +142,7 @@ const Mobile = styled.div`
   outline: none;
 `;
 
-const MobileContent = styled(Scrollable)`
+const Content = styled(Scrollable)`
   width: 100%;
   padding: 8vh 12px;
 
@@ -155,10 +151,6 @@ const MobileContent = styled(Scrollable)`
   `};
 `;
 
-const DesktopContent = styled(Scrollable)`
-  padding: 8px 24px 24px;
-`;
-
 const Centered = styled(Flex)`
   width: 640px;
   max-width: 100%;
@@ -215,17 +207,14 @@ const Header = styled(Flex)`
   padding: 24px 24px 12px;
 `;
 
-const Wrapper = styled.div<{
-  $width?: number | string;
-  $height?: number | string;
-}>`
+const Small = styled.div`
   animation: ${fadeAndScaleIn} 250ms ease;
 
   margin: 25vh auto auto auto;
   width: 75vw;
   min-width: 350px;
-  max-width: ${(props) => props.$width || "450px"};
-  max-height: ${(props) => props.$height || "70vh"};
+  max-width: 450px;
+  max-height: 65vh;
   z-index: ${depths.modal};
   display: flex;
   justify-content: center;
@@ -248,4 +237,8 @@ const Wrapper = styled.div<{
   }
 `;
 
+const SmallContent = styled(Scrollable)`
+  padding: 8px 24px 24px;
+`;
+
 export default observer(Modal);

app/components/Notifications/NotificationListItem.tsx

@@ -6,17 +6,13 @@ import { Link } from "react-router-dom";
 import styled from "styled-components";
 import { s, hover, truncateMultiline } from "@shared/styles";
 import Notification from "~/models/Notification";
+import CommentEditor from "~/scenes/Document/components/CommentEditor";
 import useStores from "~/hooks/useStores";
 import { Avatar, AvatarSize, AvatarVariant } from "../Avatar";
 import Flex from "../Flex";
 import Text from "../Text";
 import Time from "../Time";
 import { UnreadBadge } from "../UnreadBadge";
-import lazyWithRetry from "~/utils/lazyWithRetry";
-
-const CommentEditor = lazyWithRetry(
-  () => import("~/scenes/Document/components/CommentEditor")
-);
 
 type Props = {
   notification: Notification;

app/components/Notifications/Notifications.tsx

@@ -6,6 +6,7 @@ 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";
@@ -31,6 +32,7 @@ function Notifications(
   { onRequestClose }: Props,
   ref: React.RefObject<HTMLDivElement>
 ) {
+  const context = useActionContext();
   const { notifications } = useStores();
   const { t } = useTranslation();
   const isEmpty = notifications.active.length === 0;
@@ -65,10 +67,7 @@ function Notifications(
           <Flex gap={8}>
             {notifications.approximateUnreadCount > 0 && (
               <Tooltip content={t("Mark all as read")}>
-                <Button
-                  action={markNotificationsAsRead}
-                  aria-label={t("Mark all as read")}
-                >
+                <Button action={markNotificationsAsRead} context={context}>
                   <MarkAsReadIcon />
                 </Button>
               </Tooltip>

app/components/Notifications/NotificationsPopover.tsx

@@ -1,5 +1,5 @@
 import { observer } from "mobx-react";
-import { Suspense, useCallback, useEffect, useRef, useState } from "react";
+import * as React from "react";
 import { useTranslation } from "react-i18next";
 import {
   Popover,
@@ -7,9 +7,7 @@ import {
   PopoverContent,
 } from "~/components/primitives/Popover";
 import useStores from "~/hooks/useStores";
-import lazyWithRetry from "~/utils/lazyWithRetry";
-
-const Notifications = lazyWithRetry(() => import("./Notifications"));
+import Notifications from "./Notifications";
 
 type Props = {
   children?: React.ReactNode;
@@ -18,18 +16,18 @@ type Props = {
 const NotificationsPopover: React.FC = ({ children }: Props) => {
   const { t } = useTranslation();
   const { notifications } = useStores();
-  const [open, setOpen] = useState(false);
-  const scrollableRef = useRef<HTMLDivElement>(null);
+  const [open, setOpen] = React.useState(false);
+  const scrollableRef = React.useRef<HTMLDivElement>(null);
 
-  useEffect(() => {
+  React.useEffect(() => {
     void notifications.fetchPage({ archived: false });
   }, [notifications]);
 
-  const handleRequestClose = useCallback(() => {
+  const handleRequestClose = React.useCallback(() => {
     setOpen(false);
   }, []);
 
-  const handleAutoFocus = useCallback((event: Event) => {
+  const handleAutoFocus = React.useCallback((event: Event) => {
     // Prevent focus from moving to the popover content
     event.preventDefault();
 
@@ -50,12 +48,10 @@ const NotificationsPopover: React.FC = ({ children }: Props) => {
         onOpenAutoFocus={handleAutoFocus}
         shrink
       >
-        <Suspense fallback={null}>
-          <Notifications
-            onRequestClose={handleRequestClose}
-            ref={scrollableRef}
-          />
-        </Suspense>
+        <Notifications
+          onRequestClose={handleRequestClose}
+          ref={scrollableRef}
+        />
       </PopoverContent>
     </Popover>
   );

app/components/OAuthClient/OAuthClientForm.tsx

@@ -63,7 +63,6 @@ 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={{

app/components/PaginatedList.test.tsx

@@ -0,0 +1,66 @@
+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 unknown;
+
+  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,
+    });
+  });
+});

app/components/PaginatedList.tsx

@@ -34,11 +34,11 @@ interface Props<T extends PaginatedItem>
    * @param options Pagination and other query options
    */
   fetch?: (
-    options: Record<string, any> | undefined
+    options: Record<string, unknown> | undefined
   ) => Promise<unknown[] | undefined> | undefined;
 
   /** Additional options to pass to the fetch function */
-  options?: Record<string, any>;
+  options?: Record<string, unknown>;
 
   /** Optional header content to display above the list */
   heading?: React.ReactNode;
@@ -77,7 +77,9 @@ interface Props<T extends PaginatedItem>
    * Function to render section headings (typically date-based)
    * @param name The heading text or element to render
    */
-  renderHeading?: (name: React.ReactElement<any> | string) => React.ReactNode;
+  renderHeading?: (
+    name: React.ReactElement<unknown> | string
+  ) => React.ReactNode;
 
   /**
    * Handler for escape key press
@@ -206,7 +208,7 @@ const PaginatedList = <T extends PaginatedItem>({
     if (fetch) {
       void fetchResults();
     }
-  }, [fetch]);
+  }, [fetch, fetchResults]);
 
   // Handle updates to fetch or options
   React.useEffect(() => {
@@ -255,7 +257,6 @@ const PaginatedList = <T extends PaginatedItem>({
     <React.Fragment>
       {heading}
       <ArrowKeyNavigation
-        role={rest.role}
         aria-label={rest["aria-label"]}
         onEscape={onEscape}
         className={className}

app/components/ReadingTime.tsx

@@ -1,26 +0,0 @@
-import { EyeIcon } from "outline-icons";
-import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { useTextStats } from "~/hooks/useTextStats";
-import type Document from "~/models/Document";
-import { ProsemirrorHelper } from "~/models/helpers/ProsemirrorHelper";
-
-const ReadingTime = ({ document }: { document: Document }) => {
-  const { t } = useTranslation();
-  const markdown = useMemo(
-    () => ProsemirrorHelper.toMarkdown(document),
-    [document]
-  );
-  const stats = useTextStats(markdown);
-
-  return (
-    <>
-      <EyeIcon size={18} />
-      {t(`{{ minutes }}m read`, {
-        minutes: stats.total.readingTime,
-      })}
-    </>
-  );
-};
-
-export default ReadingTime;

app/components/SearchPopover.tsx

@@ -168,7 +168,6 @@ 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"
@@ -177,8 +176,6 @@ function SearchPopover({ shareId, className }: Props) {
           onFocus={handleSearchInputFocus}
           onKeyDown={handleKeyDown}
           className={className}
-          label={t("Search")}
-          labelHidden
         />
       </PopoverAnchor>
       <PopoverContent
@@ -197,7 +194,6 @@ function SearchPopover({ shareId, className }: Props) {
         }}
       >
         <PaginatedList<SearchResult>
-          role="listbox"
           options={{ query, snippetMinWords: 10, snippetMaxWords: 11 }}
           items={cachedSearchResults}
           fetch={performSearch}

app/components/Sharing/Collection/PublicAccess.tsx

@@ -71,19 +71,6 @@ function InnerPublicAccess({ collection, share }: Props) {
     [share]
   );
 
-  const handleShowTOCChanged = useCallback(
-    async (checked: boolean) => {
-      try {
-        await share?.save({
-          showTOC: checked,
-        });
-      } catch (err) {
-        toast.error(err.message);
-      }
-    },
-    [share]
-  );
-
   const handlePublishedChange = useCallback(
     async (checked: boolean) => {
       try {
@@ -217,31 +204,6 @@ function InnerPublicAccess({ collection, share }: Props) {
                 />
               }
             />
-            <ListItem
-              title={
-                <Text type="tertiary" as={Flex}>
-                  {t("Show table of contents")}&nbsp;
-                  <Tooltip
-                    content={t(
-                      "Display the table of contents on documents by default"
-                    )}
-                  >
-                    <NudeButton size={18}>
-                      <QuestionMarkIcon size={18} />
-                    </NudeButton>
-                  </Tooltip>
-                </Text>
-              }
-              actions={
-                <Switch
-                  aria-label={t("Show table of contents")}
-                  checked={share?.showTOC ?? false}
-                  onChange={handleShowTOCChanged}
-                  width={26}
-                  height={14}
-                />
-              }
-            />
             <ShareLinkInput
               type="text"
               ref={inputRef}

app/components/Sharing/Document/PublicAccess.tsx

@@ -77,19 +77,6 @@ function PublicAccess({ document, share, sharedParent }: Props) {
     [share]
   );
 
-  const handleShowTOCChanged = React.useCallback(
-    async (checked: boolean) => {
-      try {
-        await share?.save({
-          showTOC: checked,
-        });
-      } catch (err) {
-        toast.error(err.message);
-      }
-    },
-    [share]
-  );
-
   const handlePublishedChange = React.useCallback(
     async (checked: boolean) => {
       try {
@@ -254,31 +241,6 @@ function PublicAccess({ document, share, sharedParent }: Props) {
                 />
               }
             />
-            <ListItem
-              title={
-                <Text type="tertiary" as={Flex}>
-                  {t("Show table of contents")}&nbsp;
-                  <Tooltip
-                    content={t(
-                      "Display the table of contents on documents by default"
-                    )}
-                  >
-                    <NudeButton size={18}>
-                      <QuestionMarkIcon size={18} />
-                    </NudeButton>
-                  </Tooltip>
-                </Text>
-              }
-              actions={
-                <Switch
-                  aria-label={t("Show table of contents")}
-                  checked={share?.showTOC ?? false}
-                  onChange={handleShowTOCChanged}
-                  width={26}
-                  height={14}
-                />
-              }
-            />
           </>
         )}
 

app/components/Sharing/components/Actions.tsx

@@ -25,11 +25,6 @@ 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
         />

app/components/Sharing/components/PermissionAction.tsx

@@ -6,6 +6,7 @@ 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({
@@ -20,6 +21,7 @@ export function PermissionAction({
   onChange: (permission: CollectionPermission | DocumentPermission) => void;
 }) {
   const { t } = useTranslation();
+  const context = useActionContext();
 
   return (
     <Fade timing="150ms" key="invite">
@@ -29,7 +31,9 @@ export function PermissionAction({
           onChange={onChange}
           value={permission}
         />
-        <ButtonSmall action={action}>{t("Add")}</ButtonSmall>
+        <ButtonSmall action={action} context={context}>
+          {t("Add")}
+        </ButtonSmall>
       </Flex>
     </Fade>
   );

app/components/Sidebar/App.tsx

@@ -81,11 +81,6 @@ 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();

app/components/Sidebar/Right.tsx

@@ -7,6 +7,7 @@ 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";
 
@@ -19,6 +20,7 @@ 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
 
@@ -98,11 +100,13 @@ function Right({ children, border, className }: Props) {
     <Sidebar {...animationProps} $border={border} className={className}>
       <Position style={style} column>
         <ErrorBoundary>{children}</ErrorBoundary>
-        <ResizeBorder
-          onMouseDown={handleMouseDown}
-          onDoubleClick={handleReset}
-          dir="right"
-        />
+        {!isMobile && (
+          <ResizeBorder
+            onMouseDown={handleMouseDown}
+            onDoubleClick={handleReset}
+            dir="right"
+          />
+        )}
       </Position>
     </Sidebar>
   );

app/components/Sidebar/Settings.tsx

@@ -52,9 +52,6 @@ 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={() => {

app/components/Sidebar/Shared.tsx

@@ -22,7 +22,6 @@ import { SharedCollectionLink } from "./components/SharedCollectionLink";
 import { SharedDocumentLink } from "./components/SharedDocumentLink";
 import SidebarButton from "./components/SidebarButton";
 import ToggleButton from "./components/ToggleButton";
-import { useEffect } from "react";
 
 type Props = {
   share: Share;
@@ -38,16 +37,12 @@ function SharedSidebar({ share }: Props) {
   const rootNode = share.tree;
   const shareId = share.urlId || share.id;
 
-  useEffect(() => {
-    ui.tocVisible = share.showTOC;
-  }, []);
-
   if (!rootNode?.children.length) {
     return null;
   }
 
   return (
-    <StyledSidebar $hoverTransition={!teamAvailable} canResize={false}>
+    <StyledSidebar $hoverTransition={!teamAvailable}>
       {teamAvailable && (
         <SidebarButton
           title={team.name}
@@ -57,7 +52,9 @@ function SharedSidebar({ share }: Props) {
           onClick={() =>
             history.push(user ? homePath() : sharedModelPath(shareId))
           }
-        />
+        >
+          <ToggleSidebar />
+        </SidebarButton>
       )}
       <ScrollContainer topShadow flex>
         <TopSection>
@@ -99,9 +96,6 @@ 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();
@@ -144,8 +138,7 @@ const StyledSidebar = styled(Sidebar)<{ $hoverTransition: boolean }>`
   ${({ $hoverTransition }) =>
     $hoverTransition &&
     `
-      @media (hover: hover) {
-        &:${hover} {
+      &: ${hover} {
         ${StyledSearchPopover} {
           width: 85%;
         }
@@ -153,7 +146,6 @@ const StyledSidebar = styled(Sidebar)<{ $hoverTransition: boolean }>`
         ${ToggleWrapper} {
           opacity: 1;
           transform: translateX(0);
-          }
         }
       }
     `}

app/components/Sidebar/Sidebar.tsx

@@ -7,6 +7,7 @@ import { depths, s } from "@shared/styles";
 import { Avatar } from "~/components/Avatar";
 import Flex from "~/components/Flex";
 import useCurrentUser from "~/hooks/useCurrentUser";
+import useMenuContext from "~/hooks/useMenuContext";
 import useMobile from "~/hooks/useMobile";
 import usePrevious from "~/hooks/usePrevious";
 import useStores from "~/hooks/useStores";
@@ -20,32 +21,29 @@ 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;
 
 type Props = {
-  hidden?: boolean;
-  /**  Whether the sidebar can be resized and collapsed, defaults to true. */
-  canResize?: boolean;
-  className?: string;
   children: React.ReactNode;
+  hidden?: boolean;
+  className?: string;
 };
 
 const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
-  { children, hidden = false, canResize = true, className }: Props,
+  { children, hidden = false, className }: Props,
   ref: React.RefObject<HTMLDivElement>
 ) {
   const [isCollapsing, setCollapsing] = React.useState(false);
-  const { t } = useTranslation();
   const theme = useTheme();
   const { ui } = useStores();
   const location = useLocation();
   const previousLocation = usePrevious(location);
+  const { isMenuOpen } = useMenuContext();
   const user = useCurrentUser({ rejectOnEmpty: false });
   const isMobile = useMobile();
   const width = ui.sidebarWidth;
-  const collapsed = ui.sidebarIsClosed && canResize;
+  const collapsed = ui.sidebarIsClosed && !isMenuOpen;
   const maxWidth = theme.sidebarMaxWidth;
   const minWidth = theme.sidebarMinWidth + 16; // padding
 
@@ -239,7 +237,7 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
               position="bottom"
               image={
                 <Avatar
-                  alt={t("Avatar of {{ name }}", { name: user.name })}
+                  alt={user.name}
                   model={user}
                   size={24}
                   style={{ marginLeft: 4 }}
@@ -247,21 +245,15 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
               }
             >
               <NotificationsPopover>
-                <SidebarButton
-                  position="bottom"
-                  image={<NotificationIcon />}
-                  aria-label={t("Notifications")}
-                />
+                <SidebarButton position="bottom" image={<NotificationIcon />} />
               </NotificationsPopover>
             </SidebarButton>
           </AccountMenu>
         )}
-        {canResize && (
-          <ResizeBorder
-            onMouseDown={handleMouseDown}
-            onDoubleClick={ui.sidebarIsClosed ? undefined : handleReset}
-          />
-        )}
+        <ResizeBorder
+          onMouseDown={handleMouseDown}
+          onDoubleClick={ui.sidebarIsClosed ? undefined : handleReset}
+        />
       </Container>
       {ui.mobileSidebarVisible && <Backdrop onClick={ui.toggleMobileSidebar} />}
     </TooltipProvider>

app/components/Sidebar/components/CollectionLink.tsx

@@ -25,8 +25,6 @@ import DropToImport from "./DropToImport";
 import Relative from "./Relative";
 import { SidebarContextType, useSidebarContext } from "./SidebarContext";
 import SidebarLink from "./SidebarLink";
-import { useCollectionMenuAction } from "~/hooks/useCollectionMenuAction";
-import { ActionContextProvider } from "~/hooks/useActionContext";
 
 type Props = {
   collection: Collection;
@@ -86,43 +84,33 @@ const CollectionLink: React.FC<Props> = ({
     editableTitleRef.current?.setIsEditing(true);
   }, [editableTitleRef]);
 
-  const newChildTitleRef = React.useRef<RefHandle>(null);
   const [isAddingNewChild, setIsAddingNewChild, closeAddingNewChild] =
     useBoolean();
 
   const handleNewDoc = React.useCallback(
     async (input) => {
-      try {
-        newChildTitleRef.current?.setIsEditing(false);
-        const newDocument = await documents.create(
-          {
-            collectionId: collection.id,
-            title: input,
-            fullWidth: user.getPreference(UserPreference.FullWidthDocuments),
-            data: ProsemirrorHelper.getEmptyDocument(),
-          },
-          { publish: true }
-        );
-        collection?.addDocument(newDocument);
+      const newDocument = await documents.create(
+        {
+          collectionId: collection.id,
+          title: input,
+          fullWidth: user.getPreference(UserPreference.FullWidthDocuments),
+          data: ProsemirrorHelper.getEmptyDocument(),
+        },
+        { publish: true }
+      );
+      collection?.addDocument(newDocument);
 
-        closeAddingNewChild();
-        history.push({
-          pathname: documentEditPath(newDocument),
-          state: { sidebarContext },
-        });
-      } catch (_err) {
-        newChildTitleRef.current?.setIsEditing(true);
-      }
+      closeAddingNewChild();
+      history.push({
+        pathname: documentEditPath(newDocument),
+        state: { sidebarContext },
+      });
     },
     [user, sidebarContext, closeAddingNewChild, history, collection, documents]
   );
 
-  const contextMenuAction = useCollectionMenuAction({
-    collectionId: collection.id,
-  });
-
   return (
-    <ActionContextProvider value={{ activeCollectionId: collection.id }}>
+    <>
       <Relative ref={mergeRefs([parentRef, dropRef])}>
         <DropToImport collectionId={collection.id}>
           <SidebarLink
@@ -134,7 +122,6 @@ const CollectionLink: React.FC<Props> = ({
             expanded={expanded}
             onDisclosureClick={onDisclosureClick}
             onClickIntent={handlePrefetch}
-            contextAction={contextMenuAction}
             icon={
               <CollectionIcon collection={collection} expanded={expanded} />
             }
@@ -163,7 +150,6 @@ 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();
@@ -198,12 +184,11 @@ const CollectionLink: React.FC<Props> = ({
               onCancel={closeAddingNewChild}
               onSubmit={handleNewDoc}
               maxLength={DocumentValidation.maxTitleLength}
-              ref={newChildTitleRef}
             />
           }
         />
       )}
-    </ActionContextProvider>
+    </>
   );
 };
 

app/components/Sidebar/components/Collections.tsx

@@ -18,14 +18,10 @@ import PlaceholderCollections from "./PlaceholderCollections";
 import Relative from "./Relative";
 import SidebarAction from "./SidebarAction";
 import SidebarContext from "./SidebarContext";
-import SidebarLink from "./SidebarLink";
-import Text from "@shared/components/Text";
-import usePolicy from "~/hooks/usePolicy";
 
 function Collections() {
-  const { documents, auth, collections } = useStores();
+  const { documents, collections } = useStores();
   const { t } = useTranslation();
-  const can = usePolicy(auth.team?.id);
   const orderedCollections = collections.allActive;
 
   const params = useMemo(
@@ -61,7 +57,7 @@ function Collections() {
             <PaginatedList<Collection>
               options={params}
               aria-label={t("Collections")}
-              items={orderedCollections}
+              items={collections.allActive}
               loading={<PlaceholderCollections />}
               heading={
                 isDraggingAnyCollection ? (
@@ -72,20 +68,6 @@ function Collections() {
                   />
                 ) : undefined
               }
-              empty={
-                // No need for empty state if we're displaying the createCollection action
-                can.createCollection ? null : (
-                  <SidebarLink
-                    label={
-                      <Text type="tertiary" size="small" italic>
-                        {t("No collections")}
-                      </Text>
-                    }
-                    onClick={() => {}}
-                    depth={1.5}
-                  />
-                )
-              }
               renderError={(props) => <StyledError {...props} />}
               renderItem={(item, index) => (
                 <DraggableCollectionLink

app/components/Sidebar/components/Disclosure.tsx

@@ -22,7 +22,7 @@ function Disclosure({ onClick, root, expanded, ...rest }: Props) {
       aria-label={expanded ? t("Collapse") : t("Expand")}
       {...rest}
     >
-      <StyledCollapsedIcon $expanded={expanded} size={20} />
+      <StyledCollapsedIcon expanded={expanded} size={20} />
     </Button>
   );
 }
@@ -52,13 +52,13 @@ const Button = styled(NudeButton)<{ $root?: boolean }>`
 `;
 
 const StyledCollapsedIcon = styled(CollapsedIcon)<{
-  $expanded?: boolean;
+  expanded?: boolean;
 }>`
   transition:
     opacity 100ms ease,
     transform 100ms ease,
     fill 50ms !important;
-  ${(props) => !props.$expanded && "transform: rotate(-90deg);"};
+  ${(props) => !props.expanded && "transform: rotate(-90deg);"};
 `;
 
 // Enables identifying this component within styled components

app/components/Sidebar/components/DocumentLink.tsx

@@ -35,8 +35,6 @@ import { SidebarContextType, useSidebarContext } from "./SidebarContext";
 import SidebarLink from "./SidebarLink";
 import UserMembership from "~/models/UserMembership";
 import GroupMembership from "~/models/GroupMembership";
-import { ActionContextProvider } from "~/hooks/useActionContext";
-import { useDocumentMenuAction } from "~/hooks/useDocumentMenuAction";
 
 type Props = {
   node: NavigationNode;
@@ -281,36 +279,30 @@ function InnerDocumentLink(
     [setExpanded, setCollapsed, hasChildren, expanded]
   );
 
-  const newChildTitleRef = React.useRef<RefHandle>(null);
   const [isAddingNewChild, setIsAddingNewChild, closeAddingNewChild] =
     useBoolean();
 
   const handleNewDoc = React.useCallback(
     async (input) => {
-      try {
-        newChildTitleRef.current?.setIsEditing(false);
-        const newDocument = await documents.create(
-          {
-            collectionId: collection?.id,
-            parentDocumentId: node.id,
-            fullWidth:
-              doc?.fullWidth ??
-              user.getPreference(UserPreference.FullWidthDocuments),
-            title: input,
-            data: ProsemirrorHelper.getEmptyDocument(),
-          },
-          { publish: true }
-        );
-        collection?.addDocument(newDocument, node.id);
+      const newDocument = await documents.create(
+        {
+          collectionId: collection?.id,
+          parentDocumentId: node.id,
+          fullWidth:
+            doc?.fullWidth ??
+            user.getPreference(UserPreference.FullWidthDocuments),
+          title: input,
+          data: ProsemirrorHelper.getEmptyDocument(),
+        },
+        { publish: true }
+      );
+      collection?.addDocument(newDocument, node.id);
 
-        closeAddingNewChild();
-        history.push({
-          pathname: documentEditPath(newDocument),
-          state: { sidebarContext },
-        });
-      } catch (_err) {
-        newChildTitleRef.current?.setIsEditing(true);
-      }
+      closeAddingNewChild();
+      history.push({
+        pathname: documentEditPath(newDocument),
+        state: { sidebarContext },
+      });
     },
     [
       documents,
@@ -324,70 +316,8 @@ function InnerDocumentLink(
     ]
   );
 
-  const contextMenuAction = useDocumentMenuAction({ documentId: node.id });
-
-  const labelElement = React.useMemo(
-    () => (
-      <EditableTitle
-        title={title}
-        onSubmit={handleTitleChange}
-        isEditing={isEditing}
-        onEditing={setIsEditing}
-        canUpdate={canUpdate}
-        maxLength={DocumentValidation.maxTitleLength}
-        ref={editableTitleRef}
-      />
-    ),
-    [title, handleTitleChange, isEditing, setIsEditing, canUpdate]
-  );
-
-  const menuElement = React.useMemo(
-    () =>
-      document && !isMoving && !isEditing && !isDraggingAnyDocument ? (
-        <Fade>
-          {can.createChildDocument && (
-            <Tooltip content={t("New doc")}>
-              <NudeButton
-                aria-label={t("New nested document")}
-                onClick={(ev) => {
-                  ev.preventDefault();
-                  setIsAddingNewChild();
-                  setExpanded();
-                }}
-              >
-                <PlusIcon />
-              </NudeButton>
-            </Tooltip>
-          )}
-          <DocumentMenu
-            document={document}
-            onRename={handleRename}
-            onOpen={handleMenuOpen}
-            onClose={handleMenuClose}
-          />
-        </Fade>
-      ) : undefined,
-    [
-      document,
-      isMoving,
-      isEditing,
-      isDraggingAnyDocument,
-      can.createChildDocument,
-      t,
-      setIsAddingNewChild,
-      setExpanded,
-      handleRename,
-      handleMenuOpen,
-      handleMenuClose,
-    ]
-  );
-
   return (
-    <ActionContextProvider
-      value={{
-        activeDocumentId: node.id,
-      }}
-    >
+    <>
       <Relative ref={parentRef}>
         <Draggable
           key={node.id}
@@ -404,10 +334,19 @@ function InnerDocumentLink(
                 expanded={hasChildren ? isExpanded : undefined}
                 onDisclosureClick={handleDisclosureClick}
                 onClickIntent={handlePrefetch}
-                contextAction={contextMenuAction}
                 to={toPath}
                 icon={iconElement}
-                label={labelElement}
+                label={
+                  <EditableTitle
+                    title={title}
+                    onSubmit={handleTitleChange}
+                    isEditing={isEditing}
+                    onEditing={setIsEditing}
+                    canUpdate={canUpdate}
+                    maxLength={DocumentValidation.maxTitleLength}
+                    ref={editableTitleRef}
+                  />
+                }
                 isActive={isActiveCheck}
                 isActiveDrop={isOverReparent && canDropToReparent}
                 depth={depth}
@@ -416,7 +355,36 @@ function InnerDocumentLink(
                 scrollIntoViewIfNeeded={sidebarContext === "collections"}
                 isDraft={isDraft}
                 ref={ref}
-                menu={menuElement}
+                menu={
+                  document &&
+                  !isMoving &&
+                  !isEditing &&
+                  !isDraggingAnyDocument ? (
+                    <Fade>
+                      {can.createChildDocument && (
+                        <Tooltip content={t("New doc")}>
+                          <NudeButton
+                            type={undefined}
+                            aria-label={t("New nested document")}
+                            onClick={(ev) => {
+                              ev.preventDefault();
+                              setIsAddingNewChild();
+                              setExpanded();
+                            }}
+                          >
+                            <PlusIcon />
+                          </NudeButton>
+                        </Tooltip>
+                      )}
+                      <DocumentMenu
+                        document={document}
+                        onRename={handleRename}
+                        onOpen={handleMenuOpen}
+                        onClose={handleMenuClose}
+                      />
+                    </Fade>
+                  ) : undefined
+                }
               />
             </DropToImport>
           </div>
@@ -438,7 +406,6 @@ function InnerDocumentLink(
               onCancel={closeAddingNewChild}
               onSubmit={handleNewDoc}
               maxLength={DocumentValidation.maxTitleLength}
-              ref={newChildTitleRef}
             />
           }
         />
@@ -459,7 +426,7 @@ function InnerDocumentLink(
           />
         ))}
       </Folder>
-    </ActionContextProvider>
+    </>
   );
 }
 

app/components/Sidebar/components/DropToImport.tsx

@@ -1,4 +1,3 @@
-import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
 import invariant from "invariant";
 import { observer } from "mobx-react";
 import { useCallback } from "react";
@@ -62,12 +61,7 @@ function DropToImport({ disabled, children, collectionId, documentId }: Props) {
           $isDragActive={isDragActive}
           tabIndex={-1}
         >
-          <VisuallyHidden>
-            <label>
-              {t("Import files")}
-              <input {...getInputProps()} />
-            </label>
-          </VisuallyHidden>
+          <input {...getInputProps()} />
           {isImporting && <LoadingIndicator />}
           {children}
         </DropzoneContainer>

app/components/Sidebar/components/GroupLink.tsx

@@ -8,32 +8,19 @@ import Relative from "./Relative";
 import SharedWithMeLink from "./SharedWithMeLink";
 import SidebarContext, { groupSidebarContext } from "./SidebarContext";
 import SidebarLink from "./SidebarLink";
-import { RequestResponse } from "~/hooks/usePaginatedRequest";
-import GroupMembership from "~/models/GroupMembership";
-import { t } from "i18next";
-import { toast } from "sonner";
 
 type Props = {
   /** The group to render */
   group: Group;
-  /** The response from the group memberships request */
-  response: RequestResponse<GroupMembership>;
 };
 
-const GroupLink: React.FC<Props> = ({ group, response }) => {
+const GroupLink: React.FC<Props> = ({ group }) => {
   const locationSidebarContext = useLocationSidebarContext();
   const sidebarContext = groupSidebarContext(group.id);
-  const { loading, next, end, error } = response;
   const [expanded, setExpanded] = React.useState(
     locationSidebarContext === sidebarContext
   );
 
-  React.useEffect(() => {
-    if (error) {
-      toast.error(t("Could not load shared documents"));
-    }
-  }, [error, t]);
-
   const handleDisclosureClick = React.useCallback((ev) => {
     ev?.preventDefault();
     setExpanded((e) => !e);
@@ -63,14 +50,6 @@ const GroupLink: React.FC<Props> = ({ group, response }) => {
               depth={1}
             />
           ))}
-          {!end && (
-            <SidebarLink
-              onClick={next}
-              label={`${t("Show more")}…`}
-              disabled={loading}
-              depth={0}
-            />
-          )}
         </Folder>
       </SidebarContext.Provider>
     </Relative>

app/components/Sidebar/components/Header.tsx

@@ -1,7 +1,7 @@
 import { CollapsedIcon } from "outline-icons";
 import * as React from "react";
 import styled, { keyframes } from "styled-components";
-import { extraArea, s } from "@shared/styles";
+import { s } from "@shared/styles";
 import usePersistedState from "~/hooks/usePersistedState";
 import { undraggableOnDesktop } from "~/styles";
 
@@ -41,7 +41,7 @@ export const Header: React.FC<Props> = ({ id, title, children }: Props) => {
       <H3>
         <Button onClick={handleClick} disabled={!id}>
           {title}
-          {id && <Disclosure $expanded={expanded} size={20} />}
+          {id && <Disclosure expanded={expanded} size={20} />}
         </Button>
       </H3>
       {expanded && (firstRender ? children : <Fade>{children}</Fade>)}
@@ -71,18 +71,17 @@ const Button = styled.button`
   font-size: 13px;
   font-weight: 600;
   user-select: none;
-  color: ${s("sidebarText")};
-  position: relative;
+  color: ${s("textTertiary")};
   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 {
@@ -91,20 +90,19 @@ const Button = styled.button`
   }
 `;
 
-const Disclosure = styled(CollapsedIcon)<{ $expanded?: boolean }>`
+const Disclosure = styled(CollapsedIcon)<{ expanded?: boolean }>`
   transition:
     opacity 100ms ease,
     transform 100ms ease,
     fill 50ms !important;
-  ${(props) => !props.$expanded && "transform: rotate(-90deg);"};
+  ${({ expanded }) => !expanded && "transform: rotate(-90deg);"};
   opacity: 0;
 `;
 
 const H3 = styled.h3`
   margin: 0;
 
-  &:hover,
-  &:focus-within {
+  &:hover {
     ${Disclosure} {
       opacity: 1;
     }

app/components/Sidebar/components/SharedWithMe.tsx

@@ -30,9 +30,7 @@ function SharedWithMe() {
   const history = useHistory();
   const locationSidebarContext = useLocationSidebarContext();
 
-  const gmResponse = usePaginatedRequest<GroupMembership>(
-    groupMemberships.fetchAll
-  );
+  usePaginatedRequest<GroupMembership>(groupMemberships.fetchAll);
 
   const { loading, next, end, error, page } =
     usePaginatedRequest<UserMembership>(userMemberships.fetchPage, {
@@ -110,7 +108,7 @@ function SharedWithMe() {
       <Flex column>
         <Header id="shared" title={t("Shared with me")}>
           {user.groupsWithDocumentMemberships.map((group) => (
-            <GroupLink key={group.id} group={group} response={gmResponse} />
+            <GroupLink key={group.id} group={group} />
           ))}
           <Relative>
             {reorderProps.isDragging && (

app/components/Sidebar/components/SidebarAction.tsx

@@ -12,7 +12,7 @@ type Props = {
 
 function SidebarAction({ action, ...rest }: Props) {
   const context = useActionContext({
-    isMenu: false,
+    isContextMenu: false,
     isCommandBar: false,
     activeCollectionId: undefined,
     activeDocumentId: undefined,

app/components/Sidebar/components/SidebarLink.tsx

@@ -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 } from "@shared/styles";
+import { s, truncateMultiline } from "@shared/styles";
 import { isMobile } from "@shared/utils/browser";
 import NudeButton from "~/components/NudeButton";
 import { UnreadBadge } from "~/components/UnreadBadge";
@@ -11,10 +11,6 @@ import useClickIntent from "~/hooks/useClickIntent";
 import { undraggableOnDesktop } from "~/styles";
 import Disclosure from "./Disclosure";
 import NavLink, { Props as NavLinkProps } from "./NavLink";
-import { ActionV2WithChildren } from "~/types";
-import { ContextMenu } from "~/components/Menu/ContextMenu";
-import { useTranslation } from "react-i18next";
-import useBoolean from "~/hooks/useBoolean";
 
 type Props = Omit<NavLinkProps, "to"> & {
   to?: LocationDescriptor;
@@ -36,7 +32,6 @@ type Props = Omit<NavLinkProps, "to"> & {
   isDraft?: boolean;
   depth?: number;
   scrollIntoViewIfNeeded?: boolean;
-  contextAction?: ActionV2WithChildren;
 };
 
 const activeDropStyle = {
@@ -67,29 +62,19 @@ function SidebarLink(
     onDisclosureClick,
     disabled,
     unreadBadge,
-    contextAction,
     ...rest
   }: Props,
   ref: React.RefObject<HTMLAnchorElement>
 ) {
-  const { t } = useTranslation();
   const theme = useTheme();
   const { handleMouseEnter, handleMouseLeave } = useClickIntent(onClickIntent);
   const style = React.useMemo(
     () => ({
       paddingLeft: `${(depth || 0) * 16 + 12}px`,
-      paddingRight: unreadBadge ? "32px" : undefined,
     }),
     [depth]
   );
 
-  const unreadStyle = React.useMemo(
-    () => ({
-      right: -12,
-    }),
-    []
-  );
-
   const activeStyle = React.useMemo(
     () => ({
       color: theme.text,
@@ -99,58 +84,41 @@ function SidebarLink(
     [theme.text, theme.sidebarActiveBackground, style]
   );
 
-  const hoverStyle = React.useMemo(
-    () => ({
-      color: theme.text,
-      ...style,
-    }),
-    [theme.text, style]
-  );
-
-  const [openContextMenu, setOpen, setClosed] = useBoolean(false);
-
   return (
     <>
-      <ContextMenu
-        action={contextAction}
-        ariaLabel={t("Link options")}
-        onOpen={setOpen}
-        onClose={setClosed}
+      <Link
+        $isActiveDrop={isActiveDrop}
+        $isDraft={isDraft}
+        $disabled={disabled}
+        activeStyle={isActiveDrop ? activeDropStyle : activeStyle}
+        style={active ? activeStyle : style}
+        onClick={onClick}
+        onMouseEnter={handleMouseEnter}
+        onMouseLeave={handleMouseLeave}
+        // @ts-expect-error exact does not exist on div
+        exact={exact !== false}
+        to={to}
+        as={to ? undefined : href ? "a" : "div"}
+        href={href}
+        className={className}
+        ref={ref}
+        {...rest}
       >
-        <Link
-          $isActiveDrop={isActiveDrop}
-          $isDraft={isDraft}
-          $disabled={disabled}
-          activeStyle={isActiveDrop ? activeDropStyle : activeStyle}
-          style={openContextMenu ? hoverStyle : active ? activeStyle : style}
-          onClick={onClick}
-          onMouseEnter={handleMouseEnter}
-          onMouseLeave={handleMouseLeave}
-          // @ts-expect-error exact does not exist on div
-          exact={exact !== false}
-          to={to}
-          as={to ? undefined : href ? "a" : "div"}
-          href={href}
-          className={className}
-          ref={ref}
-          {...rest}
-        >
-          <Content>
-            {expanded !== undefined && (
-              <Disclosure
-                expanded={expanded}
-                onMouseDown={onDisclosureClick}
-                onClick={preventDefault}
-                root={depth === 0}
-                tabIndex={-1}
-              />
-            )}
-            {icon && <IconWrapper>{icon}</IconWrapper>}
-            <Label>{label}</Label>
-            {unreadBadge && <UnreadBadge style={unreadStyle} />}
-          </Content>
-        </Link>
-      </ContextMenu>
+        <Content>
+          {expanded !== undefined && (
+            <Disclosure
+              expanded={expanded}
+              onMouseDown={onDisclosureClick}
+              onClick={preventDefault}
+              root={depth === 0}
+              tabIndex={-1}
+            />
+          )}
+          {icon && <IconWrapper>{icon}</IconWrapper>}
+          <Label>{label}</Label>
+          {unreadBadge && <UnreadBadge />}
+        </Content>
+      </Link>
       {menu && <Actions showActions={showActions}>{menu}</Actions>}
     </>
   );
@@ -305,6 +273,7 @@ const Label = styled.div`
   position: relative;
   width: 100%;
   line-height: 24px;
+  ${truncateMultiline(3)}
 
   * {
     unicode-bidi: plaintext;

app/components/Sidebar/components/StarredLink.tsx

@@ -28,174 +28,11 @@ import SidebarContext, {
   starredSidebarContext,
 } from "./SidebarContext";
 import SidebarLink from "./SidebarLink";
-import { ActionContextProvider } from "~/hooks/useActionContext";
-import { useDocumentMenuAction } from "~/hooks/useDocumentMenuAction";
-import { type ConnectDragSource } from "react-dnd";
 
 type Props = {
   star: Star;
 };
 
-type StarredDocumentLinkProps = {
-  star: Star;
-  documentId: string;
-  expanded: boolean;
-  sidebarContext: SidebarContextType;
-  isDragging: boolean;
-  handleDisclosureClick: (ev?: React.MouseEvent<HTMLButtonElement>) => void;
-  handlePrefetch: () => void;
-  icon: React.ReactNode;
-  label: React.ReactNode;
-  menuOpen: boolean;
-  handleMenuOpen: () => void;
-  handleMenuClose: () => void;
-  draggableRef: ConnectDragSource;
-  cursor: React.ReactNode;
-};
-
-type StarredCollectionLinkProps = {
-  star: Star;
-  collection: any;
-  expanded: boolean;
-  sidebarContext: SidebarContextType;
-  isDragging: boolean;
-  handleDisclosureClick: (ev?: React.MouseEvent<HTMLButtonElement>) => void;
-  draggableRef: ConnectDragSource;
-  cursor: React.ReactNode;
-  displayChildDocuments: boolean;
-  reorderStarProps: any;
-};
-
-function StarredDocumentLink({
-  star,
-  documentId,
-  expanded,
-  sidebarContext,
-  isDragging,
-  handleDisclosureClick,
-  handlePrefetch,
-  icon,
-  label,
-  menuOpen,
-  handleMenuOpen,
-  handleMenuClose,
-  draggableRef,
-  cursor,
-}: StarredDocumentLinkProps) {
-  const { collections, documents } = useStores();
-
-  const document = documents.get(documentId);
-
-  const documentCollection = document?.collectionId
-    ? collections.get(document.collectionId)
-    : undefined;
-  const childDocuments = documentCollection
-    ? documentCollection.getChildrenForDocument(documentId)
-    : [];
-  const hasChildDocuments = childDocuments.length > 0;
-  const displayChildDocuments = expanded && !isDragging;
-  const contextMenuAction = useDocumentMenuAction({ documentId });
-
-  if (!document) {
-    return null;
-  }
-
-  return (
-    <ActionContextProvider
-      value={{
-        activeDocumentId: document.id,
-      }}
-    >
-      <Draggable key={star.id} ref={draggableRef} $isDragging={isDragging}>
-        <SidebarLink
-          depth={0}
-          to={{
-            pathname: document.url,
-            state: { sidebarContext },
-          }}
-          expanded={hasChildDocuments && !isDragging ? expanded : undefined}
-          onDisclosureClick={handleDisclosureClick}
-          onClickIntent={handlePrefetch}
-          contextAction={contextMenuAction}
-          icon={icon}
-          isActive={(
-            match,
-            location: Location<{ sidebarContext?: SidebarContextType }>
-          ) => !!match && location.state?.sidebarContext === sidebarContext}
-          label={label}
-          exact={false}
-          showActions={menuOpen}
-          menu={
-            document && !isDragging ? (
-              <Fade>
-                <DocumentMenu
-                  document={document}
-                  onOpen={handleMenuOpen}
-                  onClose={handleMenuClose}
-                />
-              </Fade>
-            ) : undefined
-          }
-        />
-      </Draggable>
-      <SidebarContext.Provider value={sidebarContext}>
-        <Relative>
-          <Folder expanded={displayChildDocuments}>
-            {childDocuments.map((node, index) => (
-              <DocumentLink
-                key={node.id}
-                node={node}
-                collection={documentCollection}
-                activeDocument={documents.active}
-                prefetchDocument={documents.prefetchDocument}
-                isDraft={node.isDraft}
-                depth={2}
-                index={index}
-              />
-            ))}
-          </Folder>
-          {cursor}
-        </Relative>
-      </SidebarContext.Provider>
-    </ActionContextProvider>
-  );
-}
-
-function StarredCollectionLink({
-  star,
-  collection,
-  sidebarContext,
-  isDragging,
-  handleDisclosureClick,
-  draggableRef,
-  cursor,
-  displayChildDocuments,
-  reorderStarProps,
-}: StarredCollectionLinkProps) {
-  const { documents } = useStores();
-
-  return (
-    <SidebarContext.Provider value={sidebarContext}>
-      <Draggable key={star?.id} ref={draggableRef} $isDragging={isDragging}>
-        <CollectionLink
-          collection={collection}
-          expanded={isDragging ? undefined : displayChildDocuments}
-          activeDocument={documents.active}
-          onDisclosureClick={handleDisclosureClick}
-          isDraggingAnyCollection={reorderStarProps.isDragging}
-        />
-      </Draggable>
-      <Relative>
-        <CollectionLinkChildren
-          collection={collection}
-          expanded={displayChildDocuments}
-        />
-        {cursor}
-      </Relative>
-    </SidebarContext.Provider>
-  );
-}
-
 function StarredLink({ star }: Props) {
   const theme = useTheme();
   const { ui, collections, documents } = useStores();
@@ -286,40 +123,95 @@ function StarredLink({ star }: Props) {
   );
 
   if (documentId) {
+    const document = documents.get(documentId);
+    if (!document) {
+      return null;
+    }
+
+    const documentCollection = document.collectionId
+      ? collections.get(document.collectionId)
+      : undefined;
+    const childDocuments = documentCollection
+      ? documentCollection.getChildrenForDocument(documentId)
+      : [];
+    const hasChildDocuments = childDocuments.length > 0;
+
     return (
-      <StarredDocumentLink
-        star={star}
-        documentId={documentId}
-        expanded={expanded}
-        sidebarContext={sidebarContext}
-        isDragging={isDragging}
-        handleDisclosureClick={handleDisclosureClick}
-        handlePrefetch={handlePrefetch}
-        icon={icon}
-        label={label}
-        menuOpen={menuOpen}
-        handleMenuOpen={handleMenuOpen}
-        handleMenuClose={handleMenuClose}
-        draggableRef={draggableRef}
-        cursor={cursor}
-      />
+      <>
+        <Draggable key={star.id} ref={draggableRef} $isDragging={isDragging}>
+          <SidebarLink
+            depth={0}
+            to={{
+              pathname: document.url,
+              state: { sidebarContext },
+            }}
+            expanded={hasChildDocuments && !isDragging ? expanded : undefined}
+            onDisclosureClick={handleDisclosureClick}
+            onClickIntent={handlePrefetch}
+            icon={icon}
+            isActive={(
+              match,
+              location: Location<{ sidebarContext?: SidebarContextType }>
+            ) => !!match && location.state?.sidebarContext === sidebarContext}
+            label={label}
+            exact={false}
+            showActions={menuOpen}
+            menu={
+              document && !isDragging ? (
+                <Fade>
+                  <DocumentMenu
+                    document={document}
+                    onOpen={handleMenuOpen}
+                    onClose={handleMenuClose}
+                  />
+                </Fade>
+              ) : undefined
+            }
+          />
+        </Draggable>
+        <SidebarContext.Provider value={sidebarContext}>
+          <Relative>
+            <Folder expanded={displayChildDocuments}>
+              {childDocuments.map((node, index) => (
+                <DocumentLink
+                  key={node.id}
+                  node={node}
+                  collection={documentCollection}
+                  activeDocument={documents.active}
+                  prefetchDocument={documents.prefetchDocument}
+                  isDraft={node.isDraft}
+                  depth={2}
+                  index={index}
+                />
+              ))}
+            </Folder>
+            {cursor}
+          </Relative>
+        </SidebarContext.Provider>
+      </>
     );
   }
 
   if (collection) {
     return (
-      <StarredCollectionLink
-        star={star}
-        collection={collection}
-        expanded={expanded}
-        sidebarContext={sidebarContext}
-        isDragging={isDragging}
-        handleDisclosureClick={handleDisclosureClick}
-        draggableRef={draggableRef}
-        cursor={cursor}
-        displayChildDocuments={displayChildDocuments}
-        reorderStarProps={reorderStarProps}
-      />
+      <SidebarContext.Provider value={sidebarContext}>
+        <Draggable key={star?.id} ref={draggableRef} $isDragging={isDragging}>
+          <CollectionLink
+            collection={collection}
+            expanded={isDragging ? undefined : displayChildDocuments}
+            activeDocument={documents.active}
+            onDisclosureClick={handleDisclosureClick}
+            isDraggingAnyCollection={reorderStarProps.isDragging}
+          />
+        </Draggable>
+        <Relative>
+          <CollectionLinkChildren
+            collection={collection}
+            expanded={displayChildDocuments}
+          />
+          {cursor}
+        </Relative>
+      </SidebarContext.Provider>
     );
   }
 

app/components/Sidebar/hooks/useCollectionDocuments.ts

@@ -7,28 +7,18 @@ export default function useCollectionDocuments(
   collection: Collection | undefined,
   activeDocument: Document | undefined
 ) {
-  const insertDraftDocument = useMemo(
-    () =>
-      activeDocument &&
-      activeDocument.isActive &&
-      activeDocument.isDraft &&
-      activeDocument.collectionId === collection?.id &&
-      !activeDocument.parentDocumentId,
-    [
-      activeDocument?.isActive,
-      activeDocument?.isDraft,
-      activeDocument?.collectionId,
-      activeDocument?.parentDocumentId,
-      collection?.id,
-    ]
-  );
-
   return useMemo(() => {
     if (!collection?.sortedDocuments) {
       return undefined;
     }
 
-    return insertDraftDocument && activeDocument
+    const insertDraftDocument =
+      activeDocument?.isActive &&
+      activeDocument?.isDraft &&
+      activeDocument?.collectionId === collection.id &&
+      !activeDocument?.parentDocumentId;
+
+    return insertDraftDocument
       ? sortNavigationNodes(
           [activeDocument.asNavigationNode, ...collection.sortedDocuments],
           collection.sort,
@@ -36,9 +26,14 @@ export default function useCollectionDocuments(
         )
       : collection.sortedDocuments;
   }, [
-    insertDraftDocument,
+    activeDocument?.isActive,
+    activeDocument?.isDraft,
+    activeDocument?.collectionId,
+    activeDocument?.parentDocumentId,
     activeDocument?.asNavigationNode,
+    collection,
     collection?.sortedDocuments,
+    collection?.id,
     collection?.sort,
   ]);
 }

app/components/Sidebar/hooks/useSidebarLabelAndIcon.tsx

@@ -22,11 +22,7 @@ export function useSidebarLabelAndIcon(
       return {
         label: document.titleWithDefault,
         icon: document.icon ? (
-          <Icon
-            value={document.icon}
-            initial={document.initial}
-            color={document.color ?? undefined}
-          />
+          <Icon value={document.icon} color={document.color ?? undefined} />
         ) : (
           icon
         ),

app/components/Star.tsx

@@ -10,7 +10,7 @@ import {
   unstarCollection,
 } from "~/actions/definitions/collections";
 import { starDocument, unstarDocument } from "~/actions/definitions/documents";
-import { ActionContextProvider } from "~/hooks/useActionContext";
+import useActionContext from "~/hooks/useActionContext";
 import NudeButton from "./NudeButton";
 
 type Props = {
@@ -27,6 +27,10 @@ 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;
 
@@ -35,43 +39,37 @@ function Star({ size, document, collection, color, ...rest }: Props) {
   }
 
   return (
-    <ActionContextProvider
-      value={{
-        activeDocumentId: document?.id,
-        activeCollectionId: collection?.id,
+    <NudeButton
+      context={context}
+      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}
     >
-      <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>
+      {target.isStarred ? (
+        <AnimatedStar size={size} color={theme.yellow} />
+      ) : (
+        <AnimatedStar
+          size={size}
+          color={color ?? theme.textTertiary}
+          as={UnstarredIcon}
+        />
+      )}
+    </NudeButton>
   );
 }
 

app/components/Theme.tsx

@@ -5,6 +5,7 @@ import GlobalStyles from "@shared/styles/globals";
 import { TeamPreference, UserPreference } from "@shared/types";
 import useBuildTheme from "~/hooks/useBuildTheme";
 import useStores from "~/hooks/useStores";
+import { TooltipStyles } from "./Tooltip";
 
 type Props = {
   children?: React.ReactNode;
@@ -29,6 +30,7 @@ const Theme: React.FC = ({ children }: Props) => {
   return (
     <ThemeProvider theme={theme}>
       <>
+        <TooltipStyles />
         <GlobalStyles
           useCursorPointer={auth.user?.getPreference(
             UserPreference.UseCursorPointer