chore: Compressed inefficient images automatically

.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,8 +38,8 @@ 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"
@@ -50,8 +50,8 @@ 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"
@@ -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

@@ -1,7 +1,6 @@
 {
   "workerIdleMemoryLimit": "0.75",
   "maxWorkers": "50%",
-  "transformIgnorePatterns": ["node_modules/(?!(franc|trigram-utils)/)"],
   "projects": [
     {
       "displayName": "server",
@@ -21,7 +20,8 @@
       "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"
       },
       "modulePaths": ["<rootDir>/app"],
       "setupFiles": ["<rootDir>/__mocks__/window.js"],
@@ -48,7 +48,8 @@
       "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"
       },
       "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'),
 }

AGENTS.md

@@ -1,192 +0,0 @@
-Outline is a fast, collaborative knowledge base built for teams. It's built with React and TypeScript in both frontend and backend, uses a real-time collaboration engine, and is designed for excellent performance and user experience. The backend is a Koa server with an RPC API and uses PostgreSQL and Redis. The application can be self-hosted or used as a cloud service.
-
-There is a web client which is fully responsive and works on mobile devices.
-
-**Monorepo Structure:**
-
-- **`app/`** - React web application with MobX state management
-- **`server/`** - Koa API server with Sequelize ORM and background workers
-- **`shared/`** - Shared TypeScript types, utilities, and editor components
-- **`plugins/`** - Plugin system for extending functionality
-- **`public/`** - Static assets served directly
-- **Various config files** - TypeScript, Vite, Jest, Prettier, Oxlint configurations
-
-Refer to /docs/ARCHITECTURE.md for detailed architecture documentation.
-
-## Instructions
-
-You're an expert in the following areas:
-
-- TypeScript
-- React and React Router
-- MobX and MobX-React
-- Node.js and Koa
-- Sequelize ORM
-- PostgreSQL
-- Redis
-- HTML, CSS and Styled Components
-- Prosemirror (rich text editor)
-- WebSockets and real-time collaboration
-
-## General Guidelines
-
-- Use early returns for readability.
-- Emphasize type safety and static analysis.
-- Follow consistent Prettier formatting.
-- Do not replace smart quotes ("") or ('') with simple quotes ("").
-
-## Dependencies and Upgrading
-
-- Use yarn for all dependency management.
-- After updating dependency versions, install to update lockfiles:
-
-```bash
-yarn install
-```
-
-## TypeScript Usage
-
-- Use strict mode.
-- Avoid "unknown" unless absolutely necessary.
-- Never use "any".
-- Prefer type definitions; avoid type assertions (as, !).
-- Always use curly braces for if statements.
-- Avoid # for private properties.
-- Prefer interface over type for object shapes.
-
-## Classes & Code Organization
-
-### Class Member Order
-
-1. Public static variables
-2. Public static methods
-3. Public variables
-4. Public methods
-6. Protected variables & methods
-8. Private variables & methods
-
-### Exports
-
-- Exported members must appear at the top of the file.
-- Prefer named exports for components & classes.
-- Document ALL public/exported functions with JSDoc.
-
-## React Usage
-
-- Use functional components with hooks.
-- Event handlers should be prefixed with "handle", like "handleClick" for onClick.
-- Avoid unnecessary re-renders by using React.memo, useMemo, and useCallback appropriately.
-- Use descriptive prop types with TypeScript interfaces.
-- You do not need to import React unless it is used directly.
-- Use styled-components for component styling.
-- Ensure high accessibility (a11y) standards using ARIA roles and semantic HTML.
-
-## MobX State Management
-
-- Use MobX stores for global state management.
-- Keep stores in `app/stores/`.
-- Use `observable`, `action`, and `computed` decorators appropriately.
-- Prefer computed values over manual calculations in render.
-- Keep business logic in stores, not components.
-
-## Database & ORM
-
-- Use Sequelize models in `server/models/`.
-- Generate migrations with Sequelize CLI:
-
-```bash
-yarn sequelize migration:create --name=add-field-to-table
-```
-
-- Run migrations with `yarn db:migrate`.
-- Use transactions for multi-table operations.
-- Add appropriate indexes for query performance.
-- Always handle database errors gracefully.
-
-## API Design
-
-- RESTful endpoints under `/api/`.
-- Authentication endpoints under `/auth/`.
-- Use consistent error responses.
-- Validate request data using the validation middleware and schemas
-- Use presenters to format API responses.
-- Keep API routes thin, use model methods for business logic, or commands if logic spans multiple models.
-
-## Authentication & Authorization
-
-- JWT tokens for authentication.
-- Policies in `server/policies/` for authorization.
-- Use cancan-style ability checks.
-- Use authenticated middleware for protected routes.
-- Always verify user permissions before data access.
-
-## Real-time Collaboration
-
-- WebSocket connections for real-time updates.
-- Use Y.js for collaborative editing.
-- Handle connection state changes gracefully.
-
-## Documentation
-
-- All public/exported functions & classes must have JSDoc.
-- Include:
-  - Description
-  - @param and @return (start lowercase, end with period)
-  - @throws if applicable
-- Add a newline between the description and the @ block.
-- Use correct punctuation.
-
-## Testing
-
-- Run tests with Jest:
-
-```bash
-# Run all tests
-yarn test
-
-# Run specific test suites
-yarn test:app      # Frontend tests
-yarn test:server   # Backend tests
-yarn test:shared   # Shared code tests
-
-# Run specific test file
-yarn test path/to/test.spec.ts
-```
-
-- Write unit tests for utilities and business logic in a collocated .test.ts file.
-- Mock external dependencies appropriately in __mocks__ folder.
-- Aim for high code coverage but focus on critical paths.
-
-## Code Quality
-
-- Use Oxlint for linting: `yarn lint`
-- Format code with Prettier: `yarn format`
-- Check types with TypeScript: `yarn tsc`
-- Pre-commit hooks run automatically via Husky.
-- Fix linting issues before committing.
-
-## Error Handling
-
-- Use custom error classes in `server/errors.ts`.
-- Always catch and handle errors appropriately.
-- Log errors with appropriate context.
-- Return user-friendly error messages.
-- Never expose sensitive information in errors.
-
-## Performance
-
-- Use React.memo for expensive components.
-- Implement pagination for large lists.
-- Use database indexes effectively.
-- Cache expensive computations.
-- Monitor performance with appropriate tools.
-- Lazy load routes and components where appropriate.
-
-## Security
-
-- Sanitize all user input.
-- Use CSRF protection.
-- Use rateLimiter middleware for sensitive endpoints.
-- Follow OWASP guidelines.
-- Never store sensitive data in plain text.
-- Use environment variables for secrets.

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.1.0
+Licensed Work:        Outline 0.87.4
                       The Licensed Work is (c) 2025 General Outline, Inc.
 Additional Use Grant: You may make use of the Licensed Work, provided that
                       you may not use the Licensed Work for a Document
@@ -15,7 +15,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided that
                       Licensed Work by creating teams and documents
                       controlled by such third parties.
 
-Change Date:          2029-11-16
+Change Date:          2029-09-18
 
 Change License:       Apache License, Version 2.0
 

app.json

@@ -194,11 +194,6 @@
       "description": "Use a secure SMTP connection (optional)",
       "required": false
     },
-    "SMTP_DISABLE_STARTTLS": {
-      "value": "false",
-      "description": "Disable STARTTLS even if the server supports it (optional)",
-      "required": false
-    },
     "SMTP_TLS_CIPHERS": {
       "description": "Override SMTP cipher configuration (optional)",
       "required": false

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

@@ -3,7 +3,7 @@ import stores from "~/stores";
 import ApiKey from "~/models/ApiKey";
 import ApiKeyNew from "~/scenes/ApiKeyNew";
 import ApiKeyRevokeDialog from "~/scenes/Settings/components/ApiKeyRevokeDialog";
-import { createAction } from "..";
+import { createAction, createActionV2 } from "..";
 import { SettingsSection } from "../sections";
 
 export const createApiKey = createAction({
@@ -26,7 +26,7 @@ export const createApiKey = createAction({
 });
 
 export const revokeApiKeyFactory = ({ apiKey }: { apiKey: ApiKey }) =>
-  createAction({
+  createActionV2({
     name: ({ t, isMenu }) =>
       isMenu
         ? apiKey.isExpired

app/actions/definitions/bulkDocuments.tsx

@@ -1,123 +0,0 @@
-import { ArchiveIcon, MoveIcon, TrashIcon } from "outline-icons";
-import DocumentMove from "~/scenes/DocumentMove";
-import { createAction } from "~/actions";
-import { ActiveDocumentSection } from "~/actions/sections";
-import DocumentDelete from "~/scenes/DocumentDelete";
-import DocumentArchive from "~/scenes/DocumentArchive";
-import Document from "~/models/Document";
-
-type Props = {
-  documents: Document[];
-};
-
-/**
- * Archive multiple documents at once.
- */
-export const bulkArchiveDocuments = ({ documents }: Props) =>
-  createAction({
-    name: ({ t }) => `${t("Archive")}…`,
-    analyticsName: "Bulk archive documents",
-    section: ActiveDocumentSection,
-    icon: <ArchiveIcon />,
-    visible: ({ stores }) => {
-      if (documents.length === 0) {
-        return false;
-      }
-      return documents.every(({ id }) => stores.policies.abilities(id).archive);
-    },
-    perform: async ({ stores, t }) => {
-      const { dialogs, documents: documentsStore } = stores;
-      const count = documents.length;
-
-      if (count === 0) {
-        return;
-      }
-
-      dialogs.openModal({
-        title: t("Archive {{ count }} documents", { count }),
-        content: (
-          <DocumentArchive
-            documents={documents}
-            onSubmit={() => documentsStore.clearSelection()}
-          />
-        ),
-      });
-    },
-  });
-
-/**
- * Move multiple documents at once.
- */
-export const bulkMoveDocuments = ({ documents }: Props) =>
-  createAction({
-    name: ({ t }) => `${t("Move")}…`,
-    analyticsName: "Bulk move documents",
-    section: ActiveDocumentSection,
-    icon: <MoveIcon />,
-    visible: ({ stores }) => {
-      if (documents.length === 0) {
-        return false;
-      }
-      return documents.every(({ id }) => stores.policies.abilities(id).move);
-    },
-    perform: ({ stores, t }) => {
-      const { dialogs, documents: documentsStore } = stores;
-      const count = documents.length;
-
-      if (count === 0) {
-        return;
-      }
-
-      dialogs.openModal({
-        title: t("Move {{ count }} documents", { count }),
-        content: (
-          <DocumentMove
-            documents={documents}
-            onSubmit={() => documentsStore.clearSelection()}
-          />
-        ),
-      });
-    },
-  });
-
-/**
- * Delete multiple documents at once.
- */
-export const bulkDeleteDocuments = ({ documents }: Props) =>
-  createAction({
-    name: ({ t }) => `${t("Delete")}…`,
-    analyticsName: "Bulk delete documents",
-    section: ActiveDocumentSection,
-    icon: <TrashIcon />,
-    dangerous: true,
-    visible: ({ stores }) => {
-      if (documents.length === 0) {
-        return false;
-      }
-      return documents.every(({ id }) => stores.policies.abilities(id).delete);
-    },
-    perform: async ({ stores, t }) => {
-      const { dialogs, documents: documentsStore } = stores;
-      const count = documents.length;
-
-      if (count === 0) {
-        return;
-      }
-
-      dialogs.openModal({
-        title: t("Delete {{ count }} documents", { count }),
-        content: (
-          <DocumentDelete
-            documents={documents}
-            onSubmit={() => documentsStore.clearSelection()}
-          />
-        ),
-      });
-    },
-  });
-
-export const rootBulkDocumentActions = [
-  bulkArchiveDocuments,
-  bulkMoveDocuments,
-  bulkDeleteDocuments,
-];

app/actions/definitions/collections.tsx

@@ -1,12 +1,8 @@
 import {
-  AlphabeticalReverseSortIcon,
-  AlphabeticalSortIcon,
   ArchiveIcon,
   CollectionIcon,
   EditIcon,
   ExportIcon,
-  ImportIcon,
-  ManualSortIcon,
   NewDocumentIcon,
   PadlockIcon,
   PlusIcon,
@@ -26,11 +22,12 @@ 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,
-  createActionWithChildren,
-  createInternalLinkAction,
+  createActionV2,
+  createInternalLinkActionV2,
 } from "~/actions";
 import { ActiveCollectionSection, CollectionSection } from "~/actions/sections";
 import { setPersistedState } from "~/hooks/usePersistedState";
@@ -40,18 +37,12 @@ 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 = createActionWithChildren({
+export const openCollection = createAction({
   name: ({ t }) => t("Open collection"),
   analyticsName: "Open collection",
   section: CollectionSection,
@@ -59,17 +50,15 @@ export const openCollection = createActionWithChildren({
   icon: <CollectionIcon />,
   children: ({ stores }) => {
     const collections = stores.collections.orderedData;
-    return collections.map((collection) =>
-      createInternalLinkAction({
-        // Note: using url which includes the slug rather than id here to bust
-        // cache if the collection is renamed
-        id: collection.path,
-        name: collection.name,
-        icon: <ColorCollectionIcon collection={collection} />,
-        section: CollectionSection,
-        to: collection.path,
-      })
-    );
+    return collections.map((collection) => ({
+      // Note: using url which includes the slug rather than id here to bust
+      // cache if the collection is renamed
+      id: collection.path,
+      name: collection.name,
+      icon: <ColorCollectionIcon collection={collection} />,
+      section: CollectionSection,
+      to: collection.path,
+    }));
   },
 });
 
@@ -91,7 +80,7 @@ export const createCollection = createAction({
   },
 });
 
-export const editCollection = createAction({
+export const editCollection = createActionV2({
   name: ({ t, isMenu }) => (isMenu ? `${t("Edit")}…` : t("Edit collection")),
   analyticsName: "Edit collection",
   section: ActiveCollectionSection,
@@ -116,7 +105,7 @@ export const editCollection = createAction({
   },
 });
 
-export const editCollectionPermissions = createAction({
+export const editCollectionPermissions = createActionV2({
   name: ({ t, isMenu }) =>
     isMenu ? `${t("Permissions")}…` : t("Collection permissions"),
   analyticsName: "Collection permissions",
@@ -148,130 +137,7 @@ export const editCollectionPermissions = createAction({
   },
 });
 
-export const importDocument = createAction({
-  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.importFileTypesString;
-
-    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 = createActionWithChildren({
-  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: [
-    createAction({
-      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",
-          },
-        });
-      },
-    }),
-    createAction({
-      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",
-          },
-        });
-      },
-    }),
-    createAction({
-      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 = createInternalLinkAction({
+export const searchInCollection = createInternalLinkActionV2({
   name: ({ t }) => t("Search in collection"),
   analyticsName: "Search collection",
   section: ActiveCollectionSection,
@@ -302,7 +168,7 @@ export const searchInCollection = createInternalLinkAction({
   },
 });
 
-export const starCollection = createAction({
+export const starCollection = createActionV2({
   name: ({ t }) => t("Star"),
   analyticsName: "Star collection",
   section: ActiveCollectionSection,
@@ -329,7 +195,7 @@ export const starCollection = createAction({
   },
 });
 
-export const unstarCollection = createAction({
+export const unstarCollection = createActionV2({
   name: ({ t }) => t("Unstar"),
   analyticsName: "Unstar collection",
   section: ActiveCollectionSection,
@@ -355,7 +221,7 @@ export const unstarCollection = createAction({
   },
 });
 
-export const subscribeCollection = createAction({
+export const subscribeCollection = createActionV2({
   name: ({ t }) => t("Subscribe"),
   analyticsName: "Subscribe to collection",
   section: ActiveCollectionSection,
@@ -386,7 +252,7 @@ export const subscribeCollection = createAction({
   },
 });
 
-export const unsubscribeCollection = createAction({
+export const unsubscribeCollection = createActionV2({
   name: ({ t }) => t("Unsubscribe"),
   analyticsName: "Unsubscribe from collection",
   section: ActiveCollectionSection,
@@ -417,7 +283,7 @@ export const unsubscribeCollection = createAction({
   },
 });
 
-export const archiveCollection = createAction({
+export const archiveCollection = createActionV2({
   name: ({ t }) => `${t("Archive")}…`,
   analyticsName: "Archive collection",
   section: ActiveCollectionSection,
@@ -458,7 +324,7 @@ export const archiveCollection = createAction({
   },
 });
 
-export const restoreCollection = createAction({
+export const restoreCollection = createActionV2({
   name: ({ t }) => t("Restore"),
   analyticsName: "Restore collection",
   section: CollectionSection,
@@ -483,7 +349,7 @@ export const restoreCollection = createAction({
   },
 });
 
-export const deleteCollection = createAction({
+export const deleteCollection = createActionV2({
   name: ({ t }) => `${t("Delete")}…`,
   analyticsName: "Delete collection",
   section: ActiveCollectionSection,
@@ -517,7 +383,7 @@ export const deleteCollection = createAction({
   },
 });
 
-export const exportCollection = createAction({
+export const exportCollection = createActionV2({
   name: ({ t }) => `${t("Export")}…`,
   analyticsName: "Export collection",
   section: ActiveCollectionSection,
@@ -527,7 +393,10 @@ export const exportCollection = createAction({
       return false;
     }
 
-    return !!stores.policies.abilities(activeCollectionId).export;
+    return (
+      !!stores.policies.abilities(currentTeamId).createExport &&
+      !!stores.policies.abilities(activeCollectionId).export
+    );
   },
   perform: async ({ activeCollectionId, stores, t }) => {
     if (!activeCollectionId) {
@@ -550,7 +419,7 @@ export const exportCollection = createAction({
   },
 });
 
-export const createDocument = createInternalLinkAction({
+export const createDocument = createInternalLinkActionV2({
   name: ({ t }) => t("New document"),
   analyticsName: "New document",
   section: ActiveCollectionSection,
@@ -572,7 +441,7 @@ export const createDocument = createInternalLinkAction({
   },
 });
 
-export const createTemplate = createInternalLinkAction({
+export const createTemplate = createInternalLinkActionV2({
   name: ({ t }) => t("New template"),
   analyticsName: "New template",
   section: ActiveCollectionSection,

app/actions/definitions/comments.tsx

@@ -3,7 +3,7 @@ import { toast } from "sonner";
 import Comment from "~/models/Comment";
 import CommentDeleteDialog from "~/components/CommentDeleteDialog";
 import ViewReactionsDialog from "~/components/Reactions/ViewReactionsDialog";
-import { createAction } from "..";
+import { createActionV2 } from "..";
 import { ActiveDocumentSection } from "../sections";
 
 export const deleteCommentFactory = ({
@@ -13,7 +13,7 @@ export const deleteCommentFactory = ({
   comment: Comment;
   onDelete: () => void;
 }) =>
-  createAction({
+  createActionV2({
     name: ({ t }) => `${t("Delete")}…`,
     analyticsName: "Delete comment",
     section: ActiveDocumentSection,
@@ -39,7 +39,7 @@ export const resolveCommentFactory = ({
   comment: Comment;
   onResolve: () => void;
 }) =>
-  createAction({
+  createActionV2({
     name: ({ t }) => t("Mark as resolved"),
     analyticsName: "Resolve thread",
     section: ActiveDocumentSection,
@@ -61,7 +61,7 @@ export const unresolveCommentFactory = ({
   comment: Comment;
   onUnresolve: () => void;
 }) =>
-  createAction({
+  createActionV2({
     name: ({ t }) => t("Mark as unresolved"),
     analyticsName: "Unresolve thread",
     section: ActiveDocumentSection,
@@ -80,7 +80,7 @@ export const viewCommentReactionsFactory = ({
 }: {
   comment: Comment;
 }) =>
-  createAction({
+  createActionV2({
     name: ({ t }) => `${t("View reactions")}`,
     analyticsName: "View comment reactions",
     section: ActiveDocumentSection,

app/actions/definitions/developer.tsx

@@ -9,7 +9,7 @@ import {
   UserIcon,
 } from "outline-icons";
 import { toast } from "sonner";
-import { createAction, createActionWithChildren } from "~/actions";
+import { createAction } from "~/actions";
 import { DeveloperSection } from "~/actions/sections";
 import env from "~/env";
 import { client } from "~/utils/ApiClient";
@@ -19,7 +19,7 @@ import { deleteAllDatabases } from "~/utils/developer";
 import history from "~/utils/history";
 import { homePath } from "~/utils/routeHelpers";
 
-export const copyId = createActionWithChildren({
+export const copyId = createAction({
   name: ({ t }) => t("Copy ID"),
   icon: <CopyIcon />,
   keywords: "uuid",
@@ -176,22 +176,7 @@ 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 = createActionWithChildren({
+export const toggleFeatureFlag = createAction({
   name: "Toggle feature flag",
   icon: <BeakerIcon />,
   section: DeveloperSection,
@@ -215,7 +200,7 @@ export const toggleFeatureFlag = createActionWithChildren({
   ),
 });
 
-export const developer = createActionWithChildren({
+export const developer = createAction({
   name: ({ t }) => t("Development"),
   keywords: "debug",
   icon: <ToolsIcon />,
@@ -224,7 +209,6 @@ export const developer = createActionWithChildren({
   children: [
     copyId,
     toggleDebugLogging,
-    toggleDebugSafeArea,
     toggleFeatureFlag,
     createToast,
     createTestUsers,

app/actions/definitions/documents.tsx

@@ -47,15 +47,18 @@ import DocumentMove from "~/scenes/DocumentMove";
 import DocumentPermanentDelete from "~/scenes/DocumentPermanentDelete";
 import DocumentPublish from "~/scenes/DocumentPublish";
 import DeleteDocumentsInTrash from "~/scenes/Trash/components/DeleteDocumentsInTrash";
+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 {
   createAction,
-  createActionGroup,
-  createActionWithChildren,
-  createInternalLinkAction,
+  createActionV2,
+  createActionV2Group,
+  createActionV2WithChildren,
+  createInternalLinkActionV2,
 } from "~/actions";
 import {
   ActiveDocumentSection,
@@ -78,18 +81,10 @@ import {
 } from "~/utils/routeHelpers";
 import capitalize from "lodash/capitalize";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
-import { Action, ActionGroup, ActionSeparator } from "~/types";
-import lazyWithRetry from "~/utils/lazyWithRetry";
-import DocumentArchive from "~/scenes/DocumentArchive";
+import { ActionV2, ActionV2Group, ActionV2Separator } from "~/types";
+import Insights from "~/scenes/Document/components/Insights";
 
-const Insights = lazyWithRetry(
-  () => import("~/scenes/Document/components/Insights")
-);
-const SharePopover = lazyWithRetry(
-  () => import("~/components/Sharing/Document/SharePopover")
-);
-
-export const openDocument = createActionWithChildren({
+export const openDocument = createAction({
   name: ({ t }) => t("Open document"),
   analyticsName: "Open document",
   section: DocumentSection,
@@ -103,29 +98,23 @@ export const openDocument = createActionWithChildren({
     );
     const documents = stores.documents.orderedData;
 
-    return uniqBy([...documents, ...nodes], "id").map((item) =>
-      createInternalLinkAction({
-        // Note: using url which includes the slug rather than id here to bust
-        // cache if the document is renamed
-        id: item.url,
-        name: item.title,
-        icon: item.icon ? (
-          <Icon
-            value={item.icon}
-            initial={item.title}
-            color={item.color ?? undefined}
-          />
-        ) : (
-          <DocumentIcon />
-        ),
-        section: DocumentSection,
-        to: item.url,
-      })
-    );
+    return uniqBy([...documents, ...nodes], "id").map((item) => ({
+      // Note: using url which includes the slug rather than id here to bust
+      // cache if the document is renamed
+      id: item.url,
+      name: item.title,
+      icon: item.icon ? (
+        <Icon value={item.icon} color={item.color ?? undefined} />
+      ) : (
+        <DocumentIcon />
+      ),
+      section: DocumentSection,
+      to: item.url,
+    }));
   },
 });
 
-export const editDocument = createInternalLinkAction({
+export const editDocument = createInternalLinkActionV2({
   name: ({ t }) => t("Edit"),
   analyticsName: "Edit document",
   section: ActiveDocumentSection,
@@ -157,7 +146,7 @@ export const editDocument = createInternalLinkAction({
   },
 });
 
-export const createDocument = createInternalLinkAction({
+export const createDocument = createAction({
   name: ({ t }) => t("New document"),
   analyticsName: "New document",
   section: DocumentSection,
@@ -175,18 +164,13 @@ export const createDocument = createInternalLinkAction({
       !!currentTeamId && stores.policies.abilities(currentTeamId).createDocument
     );
   },
-  to: ({ activeCollectionId, sidebarContext }) => {
-    const [pathname, search] = newDocumentPath(activeCollectionId).split("?");
-
-    return {
-      pathname,
-      search,
-      state: { sidebarContext },
-    };
-  },
+  perform: ({ activeCollectionId, sidebarContext }) =>
+    history.push(newDocumentPath(activeCollectionId), {
+      sidebarContext,
+    }),
 });
 
-export const createDraftDocument = createInternalLinkAction({
+export const createDraftDocument = createAction({
   name: ({ t }) => t("New draft"),
   analyticsName: "New document",
   section: DocumentSection,
@@ -194,13 +178,13 @@ export const createDraftDocument = createInternalLinkAction({
   keywords: "create document",
   visible: ({ currentTeamId, stores }) =>
     !!currentTeamId && stores.policies.abilities(currentTeamId).createDocument,
-  to: ({ sidebarContext }) => ({
-    pathname: newDocumentPath(),
-    state: { sidebarContext },
-  }),
+  perform: ({ sidebarContext }) =>
+    history.push(newDocumentPath(), {
+      sidebarContext,
+    }),
 });
 
-export const createDocumentFromTemplate = createInternalLinkAction({
+export const createDocumentFromTemplate = createInternalLinkActionV2({
   name: ({ t }) => t("New from template"),
   analyticsName: "New document",
   section: DocumentSection,
@@ -247,7 +231,7 @@ export const createDocumentFromTemplate = createInternalLinkAction({
   },
 });
 
-export const createNestedDocument = createInternalLinkAction({
+export const createNestedDocument = createInternalLinkActionV2({
   name: ({ t }) => t("New nested document"),
   analyticsName: "New document",
   section: ActiveDocumentSection,
@@ -270,7 +254,7 @@ export const createNestedDocument = createInternalLinkAction({
   },
 });
 
-export const starDocument = createAction({
+export const starDocument = createActionV2({
   name: ({ t }) => t("Star"),
   analyticsName: "Star document",
   section: ActiveDocumentSection,
@@ -296,7 +280,7 @@ export const starDocument = createAction({
   },
 });
 
-export const unstarDocument = createAction({
+export const unstarDocument = createActionV2({
   name: ({ t }) => t("Unstar"),
   analyticsName: "Unstar document",
   section: ActiveDocumentSection,
@@ -322,7 +306,7 @@ export const unstarDocument = createAction({
   },
 });
 
-export const publishDocument = createAction({
+export const publishDocument = createActionV2({
   name: ({ t }) => t("Publish"),
   analyticsName: "Publish document",
   section: ActiveDocumentSection,
@@ -364,7 +348,7 @@ export const publishDocument = createAction({
   },
 });
 
-export const unpublishDocument = createAction({
+export const unpublishDocument = createActionV2({
   name: ({ t }) => t("Unpublish"),
   analyticsName: "Unpublish document",
   section: ActiveDocumentSection,
@@ -395,7 +379,7 @@ export const unpublishDocument = createAction({
   },
 });
 
-export const subscribeDocument = createAction({
+export const subscribeDocument = createActionV2({
   name: ({ t }) => t("Subscribe"),
   analyticsName: "Subscribe to document",
   section: ActiveDocumentSection,
@@ -441,7 +425,7 @@ export const subscribeDocument = createAction({
   },
 });
 
-export const unsubscribeDocument = createAction({
+export const unsubscribeDocument = createActionV2({
   name: ({ t }) => t("Unsubscribe"),
   analyticsName: "Unsubscribe from document",
   section: ActiveDocumentSection,
@@ -489,7 +473,7 @@ export const unsubscribeDocument = createAction({
   },
 });
 
-export const shareDocument = createAction({
+export const shareDocument = createActionV2({
   name: ({ t }) => `${t("Permissions")}…`,
   analyticsName: "Share document",
   section: ActiveDocumentSection,
@@ -522,7 +506,7 @@ export const shareDocument = createAction({
   },
 });
 
-export const downloadDocumentAsHTML = createAction({
+export const downloadDocumentAsHTML = createActionV2({
   name: ({ t }) => t("HTML"),
   analyticsName: "Download document as HTML",
   section: ActiveDocumentSection,
@@ -541,7 +525,7 @@ export const downloadDocumentAsHTML = createAction({
   },
 });
 
-export const downloadDocumentAsPDF = createAction({
+export const downloadDocumentAsPDF = createActionV2({
   name: ({ t }) => t("PDF"),
   analyticsName: "Download document as PDF",
   section: ActiveDocumentSection,
@@ -567,7 +551,7 @@ export const downloadDocumentAsPDF = createAction({
   },
 });
 
-export const downloadDocumentAsMarkdown = createAction({
+export const downloadDocumentAsMarkdown = createActionV2({
   name: ({ t }) => t("Markdown"),
   analyticsName: "Download document as Markdown",
   section: ActiveDocumentSection,
@@ -586,7 +570,7 @@ export const downloadDocumentAsMarkdown = createAction({
   },
 });
 
-export const downloadDocument = createActionWithChildren({
+export const downloadDocument = createActionV2WithChildren({
   name: ({ t, isMenu }) => (isMenu ? t("Download") : t("Download document")),
   analyticsName: "Download document",
   section: ActiveDocumentSection,
@@ -601,7 +585,7 @@ export const downloadDocument = createActionWithChildren({
   ],
 });
 
-export const copyDocumentAsMarkdown = createAction({
+export const copyDocumentAsMarkdown = createActionV2({
   name: ({ t }) => t("Copy as Markdown"),
   section: ActiveDocumentSection,
   keywords: "clipboard",
@@ -609,21 +593,18 @@ export const copyDocumentAsMarkdown = createAction({
   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"));
     }
   },
 });
 
-export const copyDocumentAsPlainText = createAction({
+export const copyDocumentAsPlainText = createActionV2({
   name: ({ t }) => t("Copy as text"),
   section: ActiveDocumentSection,
   keywords: "clipboard",
@@ -631,21 +612,18 @@ export const copyDocumentAsPlainText = createAction({
   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"));
     }
   },
 });
 
-export const copyDocumentShareLink = createAction({
+export const copyDocumentShareLink = createActionV2({
   name: ({ t }) => t("Copy public link"),
   section: ActiveDocumentSection,
   keywords: "clipboard share",
@@ -666,7 +644,7 @@ export const copyDocumentShareLink = createAction({
   },
 });
 
-export const copyDocumentLink = createAction({
+export const copyDocumentLink = createActionV2({
   name: ({ t }) => t("Copy link"),
   section: ActiveDocumentSection,
   keywords: "clipboard",
@@ -684,7 +662,7 @@ export const copyDocumentLink = createAction({
   },
 });
 
-export const copyDocument = createActionWithChildren({
+export const copyDocument = createActionV2WithChildren({
   name: ({ t }) => t("Copy"),
   analyticsName: "Copy document",
   section: ActiveDocumentSection,
@@ -698,7 +676,7 @@ export const copyDocument = createActionWithChildren({
   ],
 });
 
-export const duplicateDocument = createAction({
+export const duplicateDocument = createActionV2({
   name: ({ t, isMenu }) => (isMenu ? t("Duplicate") : t("Duplicate document")),
   analyticsName: "Duplicate document",
   section: ActiveDocumentSection,
@@ -733,7 +711,7 @@ export const duplicateDocument = createAction({
  * Pin a document to a collection. Pinned documents will be displayed at the top
  * of the collection for all collection members to see.
  */
-export const pinDocumentToCollection = createAction({
+export const pinDocumentToCollection = createActionV2({
   name: ({ activeDocumentId = "", t, stores }) => {
     const selectedDocument = stores.documents.get(activeDocumentId);
     const collectionName = selectedDocument
@@ -778,7 +756,7 @@ export const pinDocumentToCollection = createAction({
  * Pin a document to team home. Pinned documents will be displayed at the top
  * of the home screen for all team members to see.
  */
-export const pinDocumentToHome = createAction({
+export const pinDocumentToHome = createActionV2({
   name: ({ t }) => t("Pin to home"),
   analyticsName: "Pin document to home",
   section: ActiveDocumentSection,
@@ -810,7 +788,7 @@ export const pinDocumentToHome = createAction({
   },
 });
 
-export const pinDocument = createActionWithChildren({
+export const pinDocument = createActionV2WithChildren({
   name: ({ t }) => t("Pin"),
   analyticsName: "Pin document",
   section: ActiveDocumentSection,
@@ -818,7 +796,7 @@ export const pinDocument = createActionWithChildren({
   children: [pinDocumentToCollection, pinDocumentToHome],
 });
 
-export const searchInDocument = createInternalLinkAction({
+export const searchInDocument = createInternalLinkActionV2({
   name: ({ t }) => t("Search in document"),
   analyticsName: "Search document",
   section: ActiveDocumentSection,
@@ -848,7 +826,7 @@ export const searchInDocument = createInternalLinkAction({
   },
 });
 
-export const printDocument = createAction({
+export const printDocument = createActionV2({
   name: ({ t, isMenu }) => (isMenu ? t("Print") : t("Print document")),
   analyticsName: "Print document",
   section: ActiveDocumentSection,
@@ -859,7 +837,7 @@ export const printDocument = createAction({
   },
 });
 
-export const importDocument = createAction({
+export const importDocument = createActionV2({
   name: ({ t }) => t("Import document"),
   analyticsName: "Import document",
   section: DocumentSection,
@@ -871,7 +849,7 @@ export const importDocument = createAction({
     }
 
     if (activeCollectionId) {
-      return !!stores.policies.abilities(activeCollectionId).createDocument;
+      return !!stores.policies.abilities(activeCollectionId).update;
     }
 
     return false;
@@ -880,10 +858,11 @@ export const importDocument = createAction({
     const { documents } = stores;
     const input = document.createElement("input");
     input.type = "file";
-    input.accept = documents.importFileTypesString;
+    input.accept = documents.importFileTypes.join(", ");
 
     input.onchange = async (ev) => {
       const files = getEventFiles(ev);
+
       const file = files[0];
 
       try {
@@ -905,7 +884,7 @@ export const importDocument = createAction({
   },
 });
 
-export const createTemplateFromDocument = createAction({
+export const createTemplateFromDocument = createActionV2({
   name: ({ t }) => t("Templatize"),
   analyticsName: "Templatize document",
   section: ActiveDocumentSection,
@@ -956,7 +935,7 @@ export const openRandomDocument = createAction({
 });
 
 export const searchDocumentsForQuery = (query: string) =>
-  createInternalLinkAction({
+  createAction({
     id: "search",
     name: ({ t }) =>
       t(`Search documents for "{{searchQuery}}"`, { searchQuery: query }),
@@ -967,7 +946,7 @@ export const searchDocumentsForQuery = (query: string) =>
     visible: ({ location }) => location.pathname !== searchPath(),
   });
 
-export const moveTemplateToWorkspace = createAction({
+export const moveTemplateToWorkspace = createActionV2({
   name: ({ t }) => t("Move to workspace"),
   analyticsName: "Move template to workspace",
   section: DocumentSection,
@@ -997,7 +976,7 @@ export const moveTemplateToWorkspace = createAction({
   },
 });
 
-export const moveDocumentToCollection = createAction({
+export const moveDocumentToCollection = createActionV2({
   name: ({ activeDocumentId, stores, t }) => {
     if (!activeDocumentId) {
       return t("Move");
@@ -1028,13 +1007,13 @@ export const moveDocumentToCollection = createAction({
         title: t("Move {{ documentType }}", {
           documentType: document.noun,
         }),
-        content: <DocumentMove documents={[document]} />,
+        content: <DocumentMove document={document} />,
       });
     }
   },
 });
 
-export const moveDocument = createAction({
+export const moveDocument = createActionV2({
   name: ({ t }) => t("Move"),
   analyticsName: "Move document",
   section: ActiveDocumentSection,
@@ -1053,7 +1032,7 @@ export const moveDocument = createAction({
   perform: moveDocumentToCollection.perform,
 });
 
-export const moveTemplate = createActionWithChildren({
+export const moveTemplate = createActionV2WithChildren({
   name: ({ t }) => t("Move"),
   analyticsName: "Move document",
   section: ActiveDocumentSection,
@@ -1072,7 +1051,7 @@ export const moveTemplate = createActionWithChildren({
   children: [moveTemplateToWorkspace, moveDocumentToCollection],
 });
 
-export const archiveDocument = createAction({
+export const archiveDocument = createActionV2({
   name: ({ t }) => `${t("Archive")}…`,
   analyticsName: "Archive document",
   section: ActiveDocumentSection,
@@ -1094,13 +1073,25 @@ export const archiveDocument = createAction({
 
       dialogs.openModal({
         title: t("Are you sure you want to archive this document?"),
-        content: <DocumentArchive documents={[document]} />,
+        content: (
+          <ConfirmationDialog
+            onSubmit={async () => {
+              await document.archive();
+              toast.success(t("Document archived"));
+            }}
+            savingText={`${t("Archiving")}…`}
+          >
+            {t(
+              "Archiving this document will remove it from the collection and search results."
+            )}
+          </ConfirmationDialog>
+        ),
       });
     }
   },
 });
 
-export const restoreDocument = createAction({
+export const restoreDocument = createActionV2({
   name: ({ t }) => `${t("Restore")}`,
   analyticsName: "Restore document",
   section: ActiveDocumentSection,
@@ -1140,7 +1131,7 @@ export const restoreDocument = createAction({
   },
 });
 
-export const restoreDocumentToCollection = createActionWithChildren({
+export const restoreDocumentToCollection = createActionV2WithChildren({
   name: ({ t }) => `${t("Restore")}…`,
   analyticsName: "Restore document",
   section: ActiveDocumentSection,
@@ -1175,7 +1166,7 @@ export const restoreDocumentToCollection = createActionWithChildren({
 
     const actions = collections.orderedData.map((collection) => {
       const can = policies.abilities(collection.id);
-      return createAction({
+      return createActionV2({
         name: collection.name,
         section: ActiveDocumentSection,
         icon: <CollectionIcon collection={collection} />,
@@ -1191,11 +1182,11 @@ export const restoreDocumentToCollection = createActionWithChildren({
       });
     });
 
-    return [createActionGroup({ name: t("Choose a collection"), actions })];
+    return [createActionV2Group({ name: t("Choose a collection"), actions })];
   },
 });
 
-export const deleteDocument = createAction({
+export const deleteDocument = createActionV2({
   name: ({ t }) => `${t("Delete")}…`,
   analyticsName: "Delete document",
   section: ActiveDocumentSection,
@@ -1218,13 +1209,18 @@ export const deleteDocument = createAction({
         title: t("Delete {{ documentName }}", {
           documentName: document.noun,
         }),
-        content: <DocumentDelete documents={[document]} />,
+        content: (
+          <DocumentDelete
+            document={document}
+            onSubmit={stores.dialogs.closeAllModals}
+          />
+        ),
       });
     }
   },
 });
 
-export const permanentlyDeleteDocument = createAction({
+export const permanentlyDeleteDocument = createActionV2({
   name: ({ t }) => t("Permanently delete"),
   analyticsName: "Permanently delete document",
   section: ActiveDocumentSection,
@@ -1279,7 +1275,7 @@ export const permanentlyDeleteDocumentsInTrash = createAction({
   },
 });
 
-export const openDocumentComments = createAction({
+export const openDocumentComments = createActionV2({
   name: ({ t }) => t("Comments"),
   analyticsName: "Open comments",
   section: ActiveDocumentSection,
@@ -1302,7 +1298,7 @@ export const openDocumentComments = createAction({
   },
 });
 
-export const openDocumentHistory = createInternalLinkAction({
+export const openDocumentHistory = createInternalLinkActionV2({
   name: ({ t }) => t("History"),
   analyticsName: "Open document history",
   section: ActiveDocumentSection,
@@ -1329,7 +1325,7 @@ export const openDocumentHistory = createInternalLinkAction({
   },
 });
 
-export const openDocumentInsights = createAction({
+export const openDocumentInsights = createActionV2({
   name: ({ t }) => t("Insights"),
   analyticsName: "Open document insights",
   section: ActiveDocumentSection,
@@ -1362,7 +1358,7 @@ export const openDocumentInsights = createAction({
   },
 });
 
-export const leaveDocument = createAction({
+export const leaveDocument = createActionV2({
   name: ({ t }) => t("Leave document"),
   analyticsName: "Leave document",
   section: ActiveDocumentSection,
@@ -1401,9 +1397,9 @@ export const leaveDocument = createAction({
 export const applyTemplateFactory = ({
   actions,
 }: {
-  actions: (Action | ActionGroup | ActionSeparator)[];
+  actions: (ActionV2 | ActionV2Group | ActionV2Separator)[];
 }) =>
-  createActionWithChildren({
+  createActionV2WithChildren({
     name: ({ t }) => t("Apply template"),
     analyticsName: "Apply template",
     section: ActiveDocumentSection,

app/actions/definitions/emojis.tsx

@@ -1,21 +0,0 @@
-import { PlusIcon } from "outline-icons";
-import { createAction } from "~/actions";
-import { TeamSection } from "../sections";
-import stores from "~/stores";
-import { EmojiCreateDialog } from "~/components/EmojiCreateDialog";
-
-export const createEmoji = createAction({
-  name: ({ t }) => `${t("New emoji")}…`,
-  analyticsName: "Create emoji",
-  icon: <PlusIcon />,
-  keywords: "emoji custom upload image",
-  section: TeamSection,
-  visible: () =>
-    stores.policies.abilities(stores.auth.team?.id || "").createEmoji,
-  perform: ({ t }) => {
-    stores.dialogs.openModal({
-      title: t("Upload emoji"),
-      content: <EmojiCreateDialog onSubmit={stores.dialogs.closeAllModals} />,
-    });
-  },
-});

app/actions/definitions/integrations.tsx

@@ -3,27 +3,8 @@ import stores from "~/stores";
 import { createAction } from "..";
 import { SettingsSection } from "../sections";
 import Integration from "~/models/Integration";
-import { DisconnectAnalyticsDialog } from "~/scenes/Settings/components/DisconnectAnalyticsDialog";
 import { IntegrationType } from "@shared/types";
-import { settingsPath } from "@shared/utils/routeHelpers";
-import history from "~/utils/history";
-
-export const disconnectIntegrationFactory = (integration?: Integration) =>
-  createAction({
-    name: ({ t }) => t("Disconnect"),
-    analyticsName: "Disconnect integration",
-    section: SettingsSection,
-    icon: <TrashIcon />,
-    keywords: "disconnect",
-    visible: () => !!integration,
-    perform: async ({ event }) => {
-      event?.preventDefault();
-      event?.stopPropagation();
-
-      await integration?.delete();
-      history.push(settingsPath("integrations"));
-    },
-  });
+import { DisconnectAnalyticsDialog } from "~/components/DisconnectAnalyticsDialog";
 
 export const disconnectAnalyticsIntegrationFactory = (
   integration?: Integration<IntegrationType.Analytics>

app/actions/definitions/navigation.tsx

@@ -21,8 +21,9 @@ import SearchQuery from "~/models/SearchQuery";
 import KeyboardShortcuts from "~/scenes/KeyboardShortcuts";
 import {
   createAction,
-  createExternalLinkAction,
-  createInternalLinkAction,
+  createActionV2,
+  createExternalLinkActionV2,
+  createInternalLinkActionV2,
 } from "~/actions";
 import { NavigationSection, RecentSearchesSection } from "~/actions/sections";
 import Desktop from "~/utils/Desktop";
@@ -36,7 +37,7 @@ import {
   settingsPath,
 } from "~/utils/routeHelpers";
 
-export const navigateToHome = createInternalLinkAction({
+export const navigateToHome = createAction({
   name: ({ t }) => t("Home"),
   analyticsName: "Navigate to home",
   section: NavigationSection,
@@ -47,7 +48,7 @@ export const navigateToHome = createInternalLinkAction({
 });
 
 export const navigateToRecentSearchQuery = (searchQuery: SearchQuery) =>
-  createInternalLinkAction({
+  createAction({
     section: RecentSearchesSection,
     name: searchQuery.query,
     analyticsName: "Navigate to recent search query",
@@ -55,7 +56,7 @@ export const navigateToRecentSearchQuery = (searchQuery: SearchQuery) =>
     to: searchPath({ query: searchQuery.query }),
   });
 
-export const navigateToDrafts = createInternalLinkAction({
+export const navigateToDrafts = createAction({
   name: ({ t }) => t("Drafts"),
   analyticsName: "Navigate to drafts",
   section: NavigationSection,
@@ -64,7 +65,7 @@ export const navigateToDrafts = createInternalLinkAction({
   visible: ({ location }) => location.pathname !== draftsPath(),
 });
 
-export const navigateToSearch = createInternalLinkAction({
+export const navigateToSearch = createAction({
   name: ({ t }) => t("Search"),
   analyticsName: "Navigate to search",
   section: NavigationSection,
@@ -73,7 +74,7 @@ export const navigateToSearch = createInternalLinkAction({
   visible: ({ location }) => location.pathname !== searchPath(),
 });
 
-export const navigateToArchive = createInternalLinkAction({
+export const navigateToArchive = createAction({
   name: ({ t }) => t("Archive"),
   analyticsName: "Navigate to archive",
   section: NavigationSection,
@@ -83,7 +84,7 @@ export const navigateToArchive = createInternalLinkAction({
   visible: ({ location }) => location.pathname !== archivePath(),
 });
 
-export const navigateToTrash = createInternalLinkAction({
+export const navigateToTrash = createAction({
   name: ({ t }) => t("Trash"),
   analyticsName: "Navigate to trash",
   section: NavigationSection,
@@ -92,7 +93,7 @@ export const navigateToTrash = createInternalLinkAction({
   visible: ({ location }) => location.pathname !== trashPath(),
 });
 
-export const navigateToSettings = createInternalLinkAction({
+export const navigateToSettings = createAction({
   name: ({ t }) => t("Settings"),
   analyticsName: "Navigate to settings",
   section: NavigationSection,
@@ -102,7 +103,7 @@ export const navigateToSettings = createInternalLinkAction({
   to: settingsPath(),
 });
 
-export const navigateToWorkspaceSettings = createInternalLinkAction({
+export const navigateToWorkspaceSettings = createInternalLinkActionV2({
   name: ({ t }) => t("Settings"),
   analyticsName: "Navigate to workspace settings",
   section: NavigationSection,
@@ -111,7 +112,7 @@ export const navigateToWorkspaceSettings = createInternalLinkAction({
   to: settingsPath("details"),
 });
 
-export const navigateToProfileSettings = createInternalLinkAction({
+export const navigateToProfileSettings = createInternalLinkActionV2({
   name: ({ t }) => t("Profile"),
   analyticsName: "Navigate to profile settings",
   section: NavigationSection,
@@ -120,7 +121,7 @@ export const navigateToProfileSettings = createInternalLinkAction({
   to: settingsPath(),
 });
 
-export const navigateToTemplateSettings = createInternalLinkAction({
+export const navigateToTemplateSettings = createAction({
   name: ({ t }) => t("Templates"),
   analyticsName: "Navigate to template settings",
   section: NavigationSection,
@@ -129,7 +130,7 @@ export const navigateToTemplateSettings = createInternalLinkAction({
   to: settingsPath("templates"),
 });
 
-export const navigateToNotificationSettings = createInternalLinkAction({
+export const navigateToNotificationSettings = createInternalLinkActionV2({
   name: ({ t, isMenu }) =>
     isMenu ? t("Notification settings") : t("Notifications"),
   analyticsName: "Navigate to notification settings",
@@ -139,7 +140,7 @@ export const navigateToNotificationSettings = createInternalLinkAction({
   to: settingsPath("notifications"),
 });
 
-export const navigateToAccountPreferences = createInternalLinkAction({
+export const navigateToAccountPreferences = createInternalLinkActionV2({
   name: ({ t }) => t("Preferences"),
   analyticsName: "Navigate to account preferences",
   section: NavigationSection,
@@ -148,7 +149,7 @@ export const navigateToAccountPreferences = createInternalLinkAction({
   to: settingsPath("preferences"),
 });
 
-export const openDocumentation = createExternalLinkAction({
+export const openDocumentation = createExternalLinkActionV2({
   name: ({ t }) => t("Documentation"),
   analyticsName: "Open documentation",
   section: NavigationSection,
@@ -158,7 +159,7 @@ export const openDocumentation = createExternalLinkAction({
   target: "_blank",
 });
 
-export const openAPIDocumentation = createExternalLinkAction({
+export const openAPIDocumentation = createExternalLinkActionV2({
   name: ({ t }) => t("API documentation"),
   analyticsName: "Open API documentation",
   section: NavigationSection,
@@ -176,7 +177,7 @@ export const toggleSidebar = createAction({
   perform: () => stores.ui.toggleCollapsedSidebar(),
 });
 
-export const openFeedbackUrl = createExternalLinkAction({
+export const openFeedbackUrl = createExternalLinkActionV2({
   name: ({ t }) => t("Send us feedback"),
   analyticsName: "Open feedback",
   section: NavigationSection,
@@ -186,7 +187,7 @@ export const openFeedbackUrl = createExternalLinkAction({
   target: "_blank",
 });
 
-export const openBugReportUrl = createExternalLinkAction({
+export const openBugReportUrl = createExternalLinkActionV2({
   name: ({ t }) => t("Report a bug"),
   analyticsName: "Open bug report",
   section: NavigationSection,
@@ -196,7 +197,7 @@ export const openBugReportUrl = createExternalLinkAction({
   target: "_blank",
 });
 
-export const openChangelog = createExternalLinkAction({
+export const openChangelog = createExternalLinkActionV2({
   name: ({ t }) => t("Changelog"),
   analyticsName: "Open changelog",
   section: NavigationSection,
@@ -206,7 +207,7 @@ export const openChangelog = createExternalLinkAction({
   target: "_blank",
 });
 
-export const openKeyboardShortcuts = createAction({
+export const openKeyboardShortcuts = createActionV2({
   name: ({ t }) => t("Keyboard shortcuts"),
   analyticsName: "Open keyboard shortcuts",
   section: NavigationSection,
@@ -221,7 +222,7 @@ export const openKeyboardShortcuts = createAction({
   },
 });
 
-export const downloadApp = createExternalLinkAction({
+export const downloadApp = createAction({
   name: ({ t }) =>
     t("Download {{ platform }} app", {
       platform: isMac() ? "macOS" : "Windows",
@@ -231,11 +232,13 @@ export const downloadApp = createExternalLinkAction({
   iconInContextMenu: false,
   icon: <BrowserIcon />,
   visible: () => !Desktop.isElectron() && isMac() && isCloudHosted,
-  url: "https://desktop.getoutline.com",
-  target: "_blank",
+  to: {
+    url: "https://desktop.getoutline.com",
+    target: "_blank",
+  },
 });
 
-export const logout = createAction({
+export const logout = createActionV2({
   name: ({ t }) => t("Log out"),
   analyticsName: "Log out",
   section: NavigationSection,

app/actions/definitions/notifications.tsx

@@ -1,5 +1,5 @@
 import { ArchiveIcon, MarkAsReadIcon } from "outline-icons";
-import { createAction } from "..";
+import { createAction, createActionV2 } from "..";
 import { NotificationSection } from "../sections";
 
 export const markNotificationsAsRead = createAction({
@@ -12,7 +12,7 @@ export const markNotificationsAsRead = createAction({
   visible: ({ stores }) => stores.notifications.approximateUnreadCount > 0,
 });
 
-export const markNotificationsAsArchived = createAction({
+export const markNotificationsAsArchived = createActionV2({
   name: ({ t }) => t("Archive all notifications"),
   analyticsName: "Mark notifications as archived",
   section: NotificationSection,

app/actions/definitions/revisions.tsx

@@ -3,7 +3,7 @@ import { LinkIcon, RestoreIcon, TrashIcon } from "outline-icons";
 import { matchPath } from "react-router-dom";
 import { toast } from "sonner";
 import stores from "~/stores";
-import { createAction } from "~/actions";
+import { createAction, createActionV2 } from "~/actions";
 import { RevisionSection } from "~/actions/sections";
 import history from "~/utils/history";
 import {
@@ -11,7 +11,7 @@ import {
   matchDocumentHistory,
 } from "~/utils/routeHelpers";
 
-export const restoreRevision = createAction({
+export const restoreRevision = createActionV2({
   name: ({ t }) => t("Restore"),
   analyticsName: "Restore revision",
   icon: <RestoreIcon />,
@@ -73,7 +73,7 @@ export const deleteRevision = createAction({
   },
 });
 
-export const copyLinkToRevision = createAction({
+export const copyLinkToRevision = createActionV2({
   name: ({ t }) => t("Copy link"),
   analyticsName: "Copy link to revision",
   icon: <LinkIcon />,

app/actions/definitions/settings.tsx

@@ -1,9 +1,9 @@
 import { SunIcon, MoonIcon, BrowserIcon } from "outline-icons";
 import { Theme } from "~/stores/UiStore";
-import { createAction, createActionWithChildren } from "~/actions";
+import { createActionV2, createActionV2WithChildren } from "~/actions";
 import { SettingsSection } from "~/actions/sections";
 
-export const changeToDarkTheme = createAction({
+export const changeToDarkTheme = createActionV2({
   name: ({ t }) => t("Dark"),
   analyticsName: "Change to dark theme",
   icon: <MoonIcon />,
@@ -14,7 +14,7 @@ export const changeToDarkTheme = createAction({
   perform: ({ stores }) => stores.ui.setTheme(Theme.Dark),
 });
 
-export const changeToLightTheme = createAction({
+export const changeToLightTheme = createActionV2({
   name: ({ t }) => t("Light"),
   analyticsName: "Change to light theme",
   icon: <SunIcon />,
@@ -25,7 +25,7 @@ export const changeToLightTheme = createAction({
   perform: ({ stores }) => stores.ui.setTheme(Theme.Light),
 });
 
-export const changeToSystemTheme = createAction({
+export const changeToSystemTheme = createActionV2({
   name: ({ t }) => t("System"),
   analyticsName: "Change to system theme",
   icon: <BrowserIcon />,
@@ -36,7 +36,7 @@ export const changeToSystemTheme = createAction({
   perform: ({ stores }) => stores.ui.setTheme(Theme.System),
 });
 
-export const changeTheme = createActionWithChildren({
+export const changeTheme = createActionV2WithChildren({
   name: ({ t, isMenu }) => (isMenu ? t("Appearance") : t("Change theme")),
   analyticsName: "Change theme",
   placeholder: ({ t }) => t("Change theme to"),

app/actions/definitions/shares.tsx

@@ -1,13 +1,13 @@
 import copy from "copy-to-clipboard";
 import Share from "~/models/Share";
-import { createAction, createInternalLinkAction } from "..";
+import { createActionV2, createInternalLinkActionV2 } from "..";
 import { ArrowIcon, CopyIcon, TrashIcon } from "outline-icons";
 import { ShareSection } from "../sections";
 import env from "~/env";
 import { toast } from "sonner";
 
 export const copyShareUrlFactory = ({ share }: { share: Share }) =>
-  createAction({
+  createActionV2({
     name: ({ t }) => t("Copy link"),
     analyticsName: "Copy share link",
     section: ShareSection,
@@ -22,7 +22,7 @@ export const copyShareUrlFactory = ({ share }: { share: Share }) =>
   });
 
 export const goToShareSourceFactory = ({ share }: { share: Share }) =>
-  createInternalLinkAction({
+  createInternalLinkActionV2({
     name: ({ t }) =>
       share.collectionId ? t("Go to collection") : t("Go to document"),
     analyticsName: "Go to share source",
@@ -41,7 +41,7 @@ export const revokeShareFactory = ({
   share: Share;
   can: Record<string, boolean>;
 }) =>
-  createAction({
+  createActionV2({
     name: ({ t }) => t("Revoke link"),
     analyticsName: "Revoke share",
     section: ShareSection,

app/actions/definitions/teams.tsx

@@ -6,17 +6,17 @@ import { LoginDialog } from "~/scenes/Login/components/LoginDialog";
 import TeamNew from "~/scenes/TeamNew";
 import TeamLogo from "~/components/TeamLogo";
 import {
-  createAction,
-  createActionWithChildren,
-  createExternalLinkAction,
+  createActionV2,
+  createActionV2WithChildren,
+  createExternalLinkActionV2,
 } from "~/actions";
-import { ActionContext, ExternalLinkAction } from "~/types";
+import { ActionContext, ExternalLinkActionV2 } from "~/types";
 import Desktop from "~/utils/Desktop";
 import { TeamSection } from "../sections";
 
 export const switchTeamsList = ({ stores }: { stores: RootStore }) =>
-  stores.auth.availableTeams?.map<ExternalLinkAction>((session) =>
-    createExternalLinkAction({
+  stores.auth.availableTeams?.map<ExternalLinkActionV2>((session) =>
+    createExternalLinkActionV2({
       id: `switch-${session.id}`,
       name: session.name,
       analyticsName: "Switch workspace",
@@ -41,7 +41,7 @@ export const switchTeamsList = ({ stores }: { stores: RootStore }) =>
     })
   ) ?? [];
 
-export const switchTeam = createActionWithChildren({
+export const switchTeam = createActionV2WithChildren({
   name: ({ t }) => t("Switch workspace"),
   placeholder: ({ t }) => t("Select a workspace"),
   analyticsName: "Switch workspace",
@@ -52,7 +52,7 @@ export const switchTeam = createActionWithChildren({
   children: switchTeamsList,
 });
 
-export const createTeam = createAction({
+export const createTeam = createActionV2({
   name: ({ t }) => `${t("New workspace")}…`,
   analyticsName: "New workspace",
   keywords: "create change switch workspace organization team",
@@ -74,7 +74,7 @@ export const createTeam = createAction({
   },
 });
 
-export const desktopLoginTeam = createAction({
+export const desktopLoginTeam = createActionV2({
   name: ({ t }) => t("Login to workspace"),
   analyticsName: "Login to workspace",
   keywords: "change switch workspace organization team",

app/actions/definitions/users.tsx

@@ -8,7 +8,7 @@ import {
   UserChangeRoleDialog,
   UserDeleteDialog,
 } from "~/components/UserDialogs";
-import { createAction } from "~/actions";
+import { createAction, createActionV2 } from "~/actions";
 import { UserSection } from "~/actions/sections";
 
 export const inviteUser = createAction({
@@ -22,14 +22,13 @@ export const inviteUser = createAction({
   perform: ({ t }) => {
     stores.dialogs.openModal({
       title: t("Invite to workspace"),
-      width: "500px",
       content: <Invite onSubmit={stores.dialogs.closeAllModals} />,
     });
   },
 });
 
 export const updateUserRoleActionFactory = (user: User, role: UserRole) =>
-  createAction({
+  createActionV2({
     name: ({ t }) =>
       UserRoleHelper.isRoleHigher(role, user!.role)
         ? `${t("Promote to {{ role }}", {
@@ -64,7 +63,7 @@ export const updateUserRoleActionFactory = (user: User, role: UserRole) =>
   });
 
 export const deleteUserActionFactory = (userId: string) =>
-  createAction({
+  createActionV2({
     name: ({ t }) => `${t("Delete user")}…`,
     analyticsName: "Delete user",
     keywords: "leave",

app/actions/index.ts

@@ -1,17 +1,23 @@
 import { LocationDescriptor } from "history";
+import flattenDeep from "lodash/flattenDeep";
 import { toast } from "sonner";
 import { Optional } from "utility-types";
 import { v4 as uuidv4 } from "uuid";
 import {
-  ActionContext,
   Action,
-  ActionGroup,
-  ActionSeparator as TActionSeparator,
-  ActionVariant,
-  ActionWithChildren,
-  ExternalLinkAction,
-  InternalLinkAction,
+  ActionContext,
+  ActionV2,
+  ActionV2Group,
+  ActionV2Separator as TActionV2Separator,
+  ActionV2Variant,
+  ActionV2WithChildren,
+  ExternalLinkActionV2,
+  InternalLinkActionV2,
+  MenuExternalLink,
+  MenuInternalLink,
   MenuItem,
+  MenuItemButton,
+  MenuItemWithChildren,
 } from "~/types";
 import Analytics from "~/utils/Analytics";
 import history from "~/utils/history";
@@ -21,13 +27,161 @@ export function resolve<T>(value: any, context: ActionContext): T {
   return typeof value === "function" ? value(context) : value;
 }
 
-export const ActionSeparator: TActionSeparator = {
+export function createAction(definition: Optional<Action, "id">): Action {
+  return {
+    ...definition,
+    perform: definition.perform
+      ? (context) => {
+          // We must use the specific analytics name here as the action name is
+          // translated and potentially contains user strings.
+          if (definition.analyticsName) {
+            Analytics.track("perform_action", definition.analyticsName, {
+              context: context.isButton
+                ? "button"
+                : context.isCommandBar
+                  ? "commandbar"
+                  : "contextmenu",
+            });
+          }
+          return definition.perform?.(context);
+        }
+      : undefined,
+    id: definition.id ?? uuidv4(),
+  };
+}
+
+export function actionToMenuItem(
+  action: Action,
+  context: ActionContext
+): MenuItemButton | MenuExternalLink | MenuInternalLink | MenuItemWithChildren {
+  const resolvedIcon = resolve<React.ReactElement<any>>(action.icon, context);
+  const resolvedChildren = resolve<Action[]>(action.children, context);
+  const visible = action.visible ? action.visible(context) : true;
+  const title = resolve<string>(action.name, context);
+  const icon =
+    resolvedIcon && action.iconInContextMenu !== false
+      ? resolvedIcon
+      : undefined;
+
+  if (resolvedChildren) {
+    const items = resolvedChildren
+      .map((a) => actionToMenuItem(a, context))
+      .filter(Boolean)
+      .filter((a) => a.visible);
+
+    return {
+      type: "submenu",
+      title,
+      icon,
+      items,
+      visible: visible && items.length > 0,
+    };
+  }
+
+  if (action.to) {
+    return typeof action.to === "string"
+      ? {
+          type: "route",
+          title,
+          icon,
+          visible,
+          to: action.to,
+          selected: action.selected?.(context),
+        }
+      : {
+          type: "link",
+          title,
+          icon,
+          visible,
+          href: action.to,
+          selected: action.selected?.(context),
+        };
+  }
+
+  return {
+    type: "button",
+    title,
+    icon,
+    visible,
+    dangerous: action.dangerous,
+    onClick: () => performAction(action, context),
+    selected: action.selected?.(context),
+  };
+}
+
+export function actionToKBar(
+  action: Action,
+  context: ActionContext
+): KbarAction[] {
+  if (typeof action.visible === "function" && !action.visible(context)) {
+    return [];
+  }
+
+  const resolvedIcon = resolve<React.ReactElement>(action.icon, context);
+  const resolvedChildren = resolve<Action[]>(action.children, context);
+  const resolvedSection = resolve<string>(action.section, context);
+  const resolvedName = resolve<string>(action.name, context);
+  const resolvedPlaceholder = resolve<string>(action.placeholder, context);
+  const children = resolvedChildren
+    ? flattenDeep(resolvedChildren.map((a) => actionToKBar(a, context))).filter(
+        (a) => !!a
+      )
+    : [];
+
+  const sectionPriority =
+    typeof action.section !== "string" && "priority" in action.section
+      ? ((action.section.priority as number) ?? 0)
+      : 0;
+
+  return [
+    {
+      id: action.id,
+      name: resolvedName,
+      analyticsName: action.analyticsName,
+      section: resolvedSection,
+      placeholder: resolvedPlaceholder,
+      keywords: action.keywords ?? "",
+      shortcut: action.shortcut || [],
+      icon: resolvedIcon,
+      priority: (1 + (action.priority ?? 0)) * (1 + (sectionPriority ?? 0)),
+      perform:
+        action.perform || action.to
+          ? () => performAction(action, context)
+          : undefined,
+    },
+  ].concat(
+    // @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.
+    children.map((child) => ({ ...child, parent: child.parent ?? action.id }))
+  );
+}
+
+export async function performAction(action: Action, context: ActionContext) {
+  const result = action.perform
+    ? action.perform(context)
+    : action.to
+      ? typeof action.to === "string"
+        ? history.push(action.to)
+        : window.open(action.to.url, action.to.target)
+      : undefined;
+
+  if (result instanceof Promise) {
+    return result.catch((err: Error) => {
+      toast.error(err.message);
+    });
+  }
+
+  return result;
+}
+
+/** Actions V2 */
+
+export const ActionV2Separator: TActionV2Separator = {
   type: "action_separator",
 };
 
-export function createAction(
-  definition: Optional<Omit<Action, "type" | "variant">, "id">
-): Action {
+export function createActionV2(
+  definition: Optional<Omit<ActionV2, "type" | "variant">, "id">
+): ActionV2 {
   return {
     ...definition,
     type: "action",
@@ -52,9 +206,9 @@ export function createAction(
   };
 }
 
-export function createInternalLinkAction(
-  definition: Optional<Omit<InternalLinkAction, "type" | "variant">, "id">
-): InternalLinkAction {
+export function createInternalLinkActionV2(
+  definition: Optional<Omit<InternalLinkActionV2, "type" | "variant">, "id">
+): InternalLinkActionV2 {
   return {
     ...definition,
     type: "action",
@@ -63,9 +217,9 @@ export function createInternalLinkAction(
   };
 }
 
-export function createExternalLinkAction(
-  definition: Optional<Omit<ExternalLinkAction, "type" | "variant">, "id">
-): ExternalLinkAction {
+export function createExternalLinkActionV2(
+  definition: Optional<Omit<ExternalLinkActionV2, "type" | "variant">, "id">
+): ExternalLinkActionV2 {
   return {
     ...definition,
     type: "action",
@@ -74,9 +228,9 @@ export function createExternalLinkAction(
   };
 }
 
-export function createActionWithChildren(
-  definition: Optional<Omit<ActionWithChildren, "type" | "variant">, "id">
-): ActionWithChildren {
+export function createActionV2WithChildren(
+  definition: Optional<Omit<ActionV2WithChildren, "type" | "variant">, "id">
+): ActionV2WithChildren {
   return {
     ...definition,
     type: "action",
@@ -85,9 +239,9 @@ export function createActionWithChildren(
   };
 }
 
-export function createActionGroup(
-  definition: Omit<ActionGroup, "type">
-): ActionGroup {
+export function createActionV2Group(
+  definition: Omit<ActionV2Group, "type">
+): ActionV2Group {
   return {
     ...definition,
     type: "action_group",
@@ -95,8 +249,8 @@ export function createActionGroup(
 }
 
 export function createRootMenuAction(
-  actions: (ActionVariant | ActionGroup | TActionSeparator)[]
-): ActionWithChildren {
+  actions: (ActionV2Variant | ActionV2Group | TActionV2Separator)[]
+): ActionV2WithChildren {
   return {
     id: uuidv4(),
     type: "action",
@@ -107,8 +261,8 @@ export function createRootMenuAction(
   };
 }
 
-export function actionToMenuItem(
-  action: ActionVariant | ActionGroup | TActionSeparator,
+export function actionV2ToMenuItem(
+  action: ActionV2Variant | ActionV2Group | TActionV2Separator,
   context: ActionContext
 ): MenuItem {
   switch (action.type) {
@@ -132,7 +286,7 @@ export function actionToMenuItem(
             tooltip: resolve<React.ReactChild>(action.tooltip, context),
             selected: resolve<boolean>(action.selected, context),
             dangerous: action.dangerous,
-            onClick: () => performAction(action, context),
+            onClick: () => performActionV2(action, context),
           };
 
         case "internal_link": {
@@ -161,10 +315,10 @@ export function actionToMenuItem(
 
         case "action_with_children": {
           const children = resolve<
-            (ActionVariant | ActionGroup | TActionSeparator)[]
+            (ActionV2Variant | ActionV2Group | TActionV2Separator)[]
           >(action.children, context);
           const subMenuItems = children.map((a) =>
-            actionToMenuItem(a, context)
+            actionV2ToMenuItem(a, context)
           );
           return {
             type: "submenu",
@@ -183,7 +337,7 @@ export function actionToMenuItem(
 
     case "action_group": {
       const groupItems = action.actions.map((a) =>
-        actionToMenuItem(a, context)
+        actionV2ToMenuItem(a, context)
       );
       return {
         type: "group",
@@ -198,8 +352,8 @@ export function actionToMenuItem(
   }
 }
 
-export function actionToKBar(
-  action: ActionVariant,
+export function actionV2ToKBar(
+  action: ActionV2Variant,
   context: ActionContext
 ): KbarAction[] {
   const visible = resolve<boolean>(action.visible, context);
@@ -231,18 +385,18 @@ export function actionToKBar(
           shortcut: action.shortcut,
           icon,
           priority,
-          perform: () => performAction(action, context),
+          perform: () => performActionV2(action, context),
         },
       ];
     }
 
     case "action_with_children": {
-      const resolvedChildren = resolve<ActionVariant[]>(
+      const resolvedChildren = resolve<ActionV2Variant[]>(
         action.children,
         context
       );
       const children = resolvedChildren
-        .map((a) => actionToKBar(a, context))
+        .map((a) => actionV2ToKBar(a, context))
         .flat()
         .filter(Boolean);
 
@@ -268,8 +422,8 @@ export function actionToKBar(
   }
 }
 
-export async function performAction(
-  action: Exclude<ActionVariant, ActionWithChildren>,
+export async function performActionV2(
+  action: Exclude<ActionV2Variant, ActionV2WithChildren>,
   context: ActionContext
 ) {
   const perform =

app/actions/sections.ts

@@ -38,8 +38,6 @@ export const NotificationSection = ({ t }: ActionContext) => t("Notification");
 
 export const GroupSection = ({ t }: ActionContext) => t("Groups");
 
-export const EmojiSecion = ({ t }: ActionContext) => t("Emoji");
-
 export const UserSection = ({ t }: ActionContext) => t("People");
 
 UserSection.priority = 0.5;

app/components/ActionButton.tsx

@@ -1,10 +1,10 @@
 /* oxlint-disable react/prop-types */
 import * as React from "react";
 import Tooltip, { Props as TooltipProps } from "~/components/Tooltip";
-import { performAction, resolve } from "~/actions";
+import { performAction, performActionV2, resolve } from "~/actions";
 import useIsMounted from "~/hooks/useIsMounted";
+import { Action, ActionV2Variant, ActionV2WithChildren } from "~/types";
 import useActionContext from "~/hooks/useActionContext";
-import { ActionVariant, ActionWithChildren } from "~/types";
 
 export type Props = React.HTMLAttributes<HTMLButtonElement> & {
   /** Show the button in a disabled state */
@@ -12,7 +12,7 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
   /** Hide the button entirely if action is not applicable */
   hideOnActionDisabled?: boolean;
   /** Action to use on button */
-  action?: Exclude<ActionVariant, ActionWithChildren>;
+  action?: Action | Exclude<ActionV2Variant, ActionV2WithChildren>;
   /** If tooltip props are provided the button will be wrapped in a tooltip */
   tooltip?: Omit<TooltipProps, "children">;
 };
@@ -30,20 +30,20 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
     });
     const isMounted = useIsMounted();
     const [executing, setExecuting] = React.useState(false);
+    const disabled = rest.disabled;
 
     if (!actionContext || !action) {
       return <button {...rest} ref={ref} />;
     }
 
-    const actionIsDisabled =
-      action.visible && !resolve<boolean>(action.visible, actionContext);
-
-    if (actionIsDisabled && hideOnActionDisabled) {
+    if (
+      action.visible &&
+      !resolve<boolean>(action.visible, actionContext) &&
+      hideOnActionDisabled
+    ) {
       return null;
     }
 
-    const disabled = rest.disabled || actionIsDisabled;
-
     const label =
       rest["aria-label"] ??
       (typeof action.name === "function"
@@ -61,7 +61,10 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
             ? (ev) => {
                 ev.preventDefault();
                 ev.stopPropagation();
-                const response = performAction(action, actionContext);
+                const response =
+                  "variant" in action
+                    ? performActionV2(action, actionContext)
+                    : performAction(action, actionContext);
                 if (response?.finally) {
                   setExecuting(true);
                   void response.finally(

app/components/AuthenticatedLayout.tsx

@@ -13,6 +13,7 @@ import ErrorSuspended from "~/scenes/Errors/ErrorSuspended";
 import Layout from "~/components/Layout";
 import RegisterKeyDown from "~/components/RegisterKeyDown";
 import Sidebar from "~/components/Sidebar";
+import SettingsSidebar from "~/components/Sidebar/Settings";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import { usePostLoginPath } from "~/hooks/useLastVisitedPath";
 import usePolicy from "~/hooks/usePolicy";
@@ -29,7 +30,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 +37,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;
@@ -131,7 +130,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,15 +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 initial =
-    model?.initial || (model?.name ? model.name[0] : "").toUpperCase();
 
-  const content = (
+  return (
     <Relative
       style={style}
       $variant={variant}
@@ -73,19 +66,13 @@ function Avatar(props: Props) {
         <Image onError={handleError} src={src} {...rest} />
       ) : model ? (
         <Initials color={model.color} {...rest}>
-          {initial}
+          {model.initial}
         </Initials>
       ) : (
         <Initials {...rest} />
       )}
     </Relative>
   );
-
-  return showTooltip ? (
-    <Tooltip content={props.alt || model?.name || ""}>{content}</Tooltip>
-  ) : (
-    content
-  );
 }
 
 Avatar.defaultProps = {

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

@@ -6,17 +6,17 @@ import { s, ellipsis } from "@shared/styles";
 import Flex from "~/components/Flex";
 import BreadcrumbMenu from "~/menus/BreadcrumbMenu";
 import { undraggableOnDesktop } from "~/styles";
-import { InternalLinkAction, MenuInternalLink } from "~/types";
-import { actionToMenuItem } from "~/actions";
+import { InternalLinkActionV2, MenuInternalLink } from "~/types";
+import { actionV2ToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import { useComputed } from "~/hooks/useComputed";
 
 type TopLevelAction =
-  | InternalLinkAction
-  | { type: "menu"; actions: InternalLinkAction[] };
+  | InternalLinkActionV2
+  | { type: "menu"; actions: InternalLinkActionV2[] };
 
 type Props = React.PropsWithChildren<{
-  actions: InternalLinkAction[];
+  actions: InternalLinkActionV2[];
   max?: number;
   highlightFirstItem?: boolean;
 }>;
@@ -46,7 +46,7 @@ function Breadcrumb(
     const menuActions = topLevelActions.splice(
       halfMax,
       totalVisibleActions - max
-    ) as InternalLinkAction[];
+    ) as InternalLinkActionV2[];
 
     topLevelActions.splice(halfMax, 0, {
       type: "menu",
@@ -60,7 +60,10 @@ function Breadcrumb(
         return <BreadcrumbMenu key="menu" actions={action.actions} />;
       }
 
-      const item = actionToMenuItem(action, actionContext) as MenuInternalLink;
+      const item = actionV2ToMenuItem(
+        action,
+        actionContext
+      ) as MenuInternalLink;
 
       return (
         <>

app/components/BulkSelectionToolbar.tsx

@@ -1,108 +0,0 @@
-import { observer } from "mobx-react";
-import * as React from "react";
-import { useTranslation } from "react-i18next";
-import styled from "styled-components";
-import { depths, s } from "@shared/styles";
-import {
-  MenuHeader,
-  MenuSeparator,
-} from "~/components/primitives/components/Menu";
-import { Portal } from "~/components/Portal";
-import { toMobileMenuItems } from "~/components/Menu/transformer";
-import { actionToMenuItem } from "~/actions";
-import { useBulkDocumentMenuAction } from "~/hooks/useBulkDocumentMenuAction";
-import useActionContext from "~/hooks/useActionContext";
-import useStores from "~/hooks/useStores";
-import { ActionVariant } from "~/types";
-import NudeButton from "./NudeButton";
-import { CrossIcon } from "outline-icons";
-
-function BulkSelectionToolbar() {
-  const { t } = useTranslation();
-  const { documents, ui } = useStores();
-  const selectedCount = documents.selectedDocumentIds.length;
-  const selectedDocuments = documents.selectedDocuments;
-  const sidebarWidth = ui.sidebarWidth;
-
-  const handleClearSelection = React.useCallback(() => {
-    documents.clearSelection();
-  }, [documents]);
-
-  const rootAction = useBulkDocumentMenuAction({
-    documents: selectedDocuments,
-  });
-
-  const actionContext = useActionContext({
-    isMenu: true,
-  });
-
-  const menuItems = React.useMemo(() => {
-    if (!rootAction.children || selectedCount === 0) {
-      return [];
-    }
-
-    return (rootAction.children as ActionVariant[]).map((childAction) =>
-      actionToMenuItem(childAction, actionContext)
-    );
-  }, [rootAction.children, selectedCount, actionContext]);
-
-  const content = toMobileMenuItems(menuItems, handleClearSelection, () => {});
-
-  if (selectedCount === 0) {
-    return null;
-  }
-
-  return (
-    <Portal>
-      <Wrapper $sidebarWidth={sidebarWidth}>
-        <MenuContainer>
-          <Header>
-            <MenuHeader>
-              {t("{{ count }} selected", { count: selectedCount })}
-            </MenuHeader>
-            <ClearButton
-              onClick={handleClearSelection}
-              tooltip={{
-                content: t("Clear selection"),
-              }}
-            >
-              <CrossIcon size={18} />
-            </ClearButton>
-          </Header>
-          <MenuSeparator />
-          {content}
-        </MenuContainer>
-      </Wrapper>
-    </Portal>
-  );
-}
-
-const ClearButton = styled(NudeButton)`
-  &:hover {
-    color: ${s("text")};
-    background: ${s("sidebarControlHoverBackground")};
-  }
-`;
-
-const Header = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-`;
-
-const Wrapper = styled.div<{ $sidebarWidth: number }>`
-  position: fixed;
-  bottom: 24px;
-  left: ${(props) => props.$sidebarWidth + 16}px;
-  z-index: ${depths.menu};
-`;
-
-const MenuContainer = styled.div`
-  min-width: 180px;
-  background: ${s("menuBackground")};
-  box-shadow: ${s("menuShadow")};
-  border-radius: 6px;
-  padding: 6px;
-`;
-
-export default observer(BulkSelectionToolbar);

app/components/Button.tsx

@@ -34,7 +34,6 @@ const RealButton = styled(ActionButton)<RealProps>`
   cursor: var(--pointer);
   user-select: none;
   appearance: none !important;
-  transition: background 200ms ease-out;
   ${undraggableOnDesktop()}
 
   &::-moz-focus-inner {
@@ -45,7 +44,6 @@ const RealButton = styled(ActionButton)<RealProps>`
   &:hover:not(:disabled),
   &[aria-expanded="true"] {
     background: ${(props) => darken(0.05, props.theme.accent)};
-    transition: background 0s;
   }
 
   &:disabled {
@@ -80,7 +78,6 @@ const RealButton = styled(ActionButton)<RealProps>`
       box-shadow: rgba(0, 0, 0, 0.07) 0px 1px 2px, ${
         props.theme.buttonNeutralBorder
       } 0 0 0 1px inset;
-      transition: background 0s;
     }
 
     &:focus-visible {
@@ -106,7 +103,6 @@ const RealButton = styled(ActionButton)<RealProps>`
       &:hover:not(:disabled),
       &[aria-expanded="true"] {
         background: ${darken(0.05, props.theme.danger)};
-        transition: background 0s;
       }
 
       &:disabled {

app/components/Collection/CollectionForm.tsx

@@ -67,13 +67,7 @@ export const CollectionForm = observer(function CollectionForm_({
   const [hasOpenedIconPicker, setHasOpenedIconPicker] = useBoolean(false);
 
   const iconColor = useIconColor(collection);
-  const fallbackIcon = (
-    <Icon
-      value="collection"
-      initial={collection?.initial ?? "?"}
-      color={iconColor}
-    />
-  );
+  const fallbackIcon = <Icon value="collection" color={iconColor} />;
 
   const {
     register,

app/components/CollectionBreadcrumb.tsx

@@ -5,7 +5,7 @@ import Collection from "~/models/Collection";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
 import { archivePath, collectionPath } from "~/utils/routeHelpers";
 import Breadcrumb from "./Breadcrumb";
-import { createInternalLinkAction } from "~/actions";
+import { createInternalLinkActionV2 } from "~/actions";
 import { ActiveCollectionSection } from "~/actions/sections";
 
 type Props = {
@@ -17,14 +17,14 @@ export const CollectionBreadcrumb: React.FC<Props> = ({ collection }) => {
 
   const actions = React.useMemo(
     () => [
-      createInternalLinkAction({
+      createInternalLinkActionV2({
         name: t("Archive"),
         section: ActiveCollectionSection,
         icon: <ArchiveIcon />,
         visible: collection.isArchived,
         to: archivePath(),
       }),
-      createInternalLinkAction({
+      createInternalLinkActionV2({
         name: collection.name,
         section: ActiveCollectionSection,
         icon: <CollectionIcon collection={collection} expanded />,

app/components/ColorButton.tsx

@@ -1,63 +0,0 @@
-import * as React from "react";
-import styled from "styled-components";
-import NudeButton from "./NudeButton";
-import { hover, s } from "@shared/styles";
-
-type Props = React.HTMLAttributes<HTMLButtonElement> & {
-  /** The current color value in hex format. If no color is passed a radial gradient will be shown */
-  color?: string;
-  /** Whether the button is currently active/selected */
-  active?: boolean;
-  /** The size of the button in pixels */
-  size?: number;
-};
-
-export const ColorButton = React.forwardRef(
-  (
-    { color, active = false, size = 24, ...rest }: Props,
-    ref: React.Ref<HTMLButtonElement>
-  ) => (
-    <ColorButtonInternal
-      $active={active}
-      $size={size}
-      {...rest}
-      style={{ "--color": color, ...rest.style } as React.CSSProperties}
-      ref={ref}
-    >
-      <Selected />
-    </ColorButtonInternal>
-  )
-);
-
-const Selected = styled.span`
-  width: 10px;
-  height: 5px;
-  border-left: 2px solid white;
-  border-bottom: 2px solid white;
-  transform: translateY(-25%) rotate(-45deg);
-`;
-
-const ColorButtonInternal = styled(NudeButton)<{
-  $active: boolean;
-  $size: number;
-}>`
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-  width: ${({ $size }) => $size}px;
-  height: ${({ $size }) => $size}px;
-  border-radius: 50%;
-  background: var(
-    --color,
-    linear-gradient(135deg, #ff5858 0%, #fbcc34 50%, #00c6ff 100%)
-  );
-
-  &: ${hover} {
-    outline: 2px solid ${s("menuBackground")} !important;
-    box-shadow: 0px 0px 3px 3px var(--color);
-  }
-
-  & ${Selected} {
-    display: ${({ $active }) => ($active ? "block" : "none")};
-  }
-`;

app/components/CommandBar/useRecentDocumentActions.tsx

@@ -1,7 +1,7 @@
 import { DocumentIcon } from "outline-icons";
 import { useMemo } from "react";
 import Icon from "@shared/components/Icon";
-import { createInternalLinkAction } from "~/actions";
+import { createAction } from "~/actions";
 import { RecentSection } from "~/actions/sections";
 import useStores from "~/hooks/useStores";
 import { documentPath } from "~/utils/routeHelpers";
@@ -15,16 +15,12 @@ const useRecentDocumentActions = (count = 6) => {
         .filter((document) => document.id !== ui.activeDocumentId)
         .slice(0, count)
         .map((item) =>
-          createInternalLinkAction({
+          createAction({
             name: item.titleWithDefault,
             analyticsName: "Recently viewed document",
             section: RecentSection,
             icon: item.icon ? (
-              <Icon
-                value={item.icon}
-                initial={item.initial}
-                color={item.color ?? undefined}
-              />
+              <Icon value={item.icon} color={item.color ?? undefined} />
             ) : (
               <DocumentIcon />
             ),

app/components/CommandBar/useSettingsAction.tsx

@@ -1,6 +1,6 @@
 import { SettingsIcon } from "outline-icons";
 import { useMemo } from "react";
-import { createActionWithChildren, createInternalLinkAction } from "~/actions";
+import { createAction } from "~/actions";
 import { NavigationSection } from "~/actions/sections";
 import useSettingsConfig from "~/hooks/useSettingsConfig";
 
@@ -10,20 +10,20 @@ const useSettingsAction = () => {
     () =>
       config.map((item) => {
         const Icon = item.icon;
-        return createInternalLinkAction({
+        return {
           id: item.path,
           name: item.name,
           icon: <Icon />,
           section: NavigationSection,
           to: item.path,
-        });
+        };
       }),
     [config]
   );
 
   const navigateToSettings = useMemo(
     () =>
-      createActionWithChildren({
+      createAction({
         id: "settings",
         name: ({ t }) => t("Settings"),
         section: NavigationSection,

app/components/CommandBar/useTemplatesAction.tsx

@@ -1,13 +1,14 @@
 import { NewDocumentIcon, ShapesIcon } from "outline-icons";
 import { useEffect, useMemo } from "react";
 import Icon from "@shared/components/Icon";
-import { createActionWithChildren, createInternalLinkAction } from "~/actions";
+import { createAction } from "~/actions";
 import {
   ActiveCollectionSection,
   DocumentSection,
   TeamSection,
 } from "~/actions/sections";
 import useStores from "~/hooks/useStores";
+import history from "~/utils/history";
 import { newDocumentPath } from "~/utils/routeHelpers";
 
 const useTemplatesAction = () => {
@@ -20,18 +21,14 @@ const useTemplatesAction = () => {
   const actions = useMemo(
     () =>
       documents.templatesAlphabetical.map((template) =>
-        createInternalLinkAction({
+        createAction({
           name: template.titleWithDefault,
           analyticsName: "New document",
           section: template.isWorkspaceTemplate
             ? TeamSection
             : ActiveCollectionSection,
           icon: template.icon ? (
-            <Icon
-              value={template.icon}
-              initial={template.initial}
-              color={template.color ?? undefined}
-            />
+            <Icon value={template.icon} color={template.color ?? undefined} />
           ) : (
             <NewDocumentIcon />
           ),
@@ -50,20 +47,15 @@ const useTemplatesAction = () => {
               template.isWorkspaceTemplate
             );
           },
-          to: ({ activeCollectionId, sidebarContext }) => {
-            const [pathname, search] = newDocumentPath(
-              template.collectionId ?? activeCollectionId,
-              {
+          perform: ({ activeCollectionId, sidebarContext }) =>
+            history.push(
+              newDocumentPath(template.collectionId ?? activeCollectionId, {
                 templateId: template.id,
+              }),
+              {
+                sidebarContext,
               }
-            ).split("?");
-
-            return {
-              pathname,
-              search,
-              state: { sidebarContext },
-            };
-          },
+            ),
         })
       ),
     [documents.templatesAlphabetical]
@@ -71,7 +63,7 @@ const useTemplatesAction = () => {
 
   const newFromTemplate = useMemo(
     () =>
-      createActionWithChildren({
+      createAction({
         id: "templates",
         name: ({ t }) => t("New from template"),
         placeholder: ({ t }) => t("Choose a template"),
@@ -86,7 +78,7 @@ const useTemplatesAction = () => {
             stores.policies.abilities(currentTeamId).createDocument
           );
         },
-        children: actions,
+        children: () => actions,
       }),
     [actions]
   );

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,27 @@
+import { MoreIcon } from "outline-icons";
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import { MenuButton } from "reakit/Menu";
+import NudeButton from "~/components/NudeButton";
+
+type Props = React.ComponentProps<typeof MenuButton> & {
+  className?: string;
+};
+
+export default function OverflowMenuButton({ className, ...rest }: Props) {
+  const { t } = useTranslation();
+
+  return (
+    <MenuButton {...rest}>
+      {(props) => (
+        <NudeButton
+          className={className}
+          aria-label={t("More options")}
+          {...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({
+    isMenu: 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/DocumentBreadcrumb.tsx

@@ -12,7 +12,7 @@ import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
 import { archivePath, settingsPath, trashPath } from "~/utils/routeHelpers";
-import { createInternalLinkAction } from "~/actions";
+import { createInternalLinkActionV2 } from "~/actions";
 import { ActiveDocumentSection } from "~/actions/sections";
 
 type Props = {
@@ -53,28 +53,28 @@ function DocumentBreadcrumb(
     }
 
     const outputActions = [
-      createInternalLinkAction({
+      createInternalLinkActionV2({
         name: t("Trash"),
         section: ActiveDocumentSection,
         icon: <TrashIcon />,
         visible: document.isDeleted,
         to: trashPath(),
       }),
-      createInternalLinkAction({
+      createInternalLinkActionV2({
         name: t("Archive"),
         section: ActiveDocumentSection,
         icon: <ArchiveIcon />,
         visible: document.isArchived,
         to: archivePath(),
       }),
-      createInternalLinkAction({
+      createInternalLinkActionV2({
         name: t("Templates"),
         section: ActiveDocumentSection,
         icon: <ShapesIcon />,
         visible: document.template,
         to: settingsPath("templates"),
       }),
-      createInternalLinkAction({
+      createInternalLinkActionV2({
         name: collection?.name,
         section: ActiveDocumentSection,
         icon: collection ? (
@@ -88,7 +88,7 @@ function DocumentBreadcrumb(
             }
           : "",
       }),
-      createInternalLinkAction({
+      createInternalLinkActionV2({
         name: t("Deleted Collection"),
         section: ActiveDocumentSection,
         visible: document.isCollectionDeleted,
@@ -96,15 +96,10 @@ function DocumentBreadcrumb(
       }),
       ...path.map((node) => {
         const title = node.title || t("Untitled");
-        return createInternalLinkAction({
+        return createInternalLinkActionV2({
           name: node.icon ? (
             <>
-              <StyledIcon
-                value={node.icon}
-                color={node.color}
-                initial={node.title.charAt(0).toUpperCase()}
-              />{" "}
-              {title}
+              <StyledIcon value={node.icon} color={node.color} /> {title}
             </>
           ) : (
             title

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,14 +177,29 @@ 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,
-  initial,
   color,
+  initial,
 }: {
   icon: string;
-  initial: string;
   color?: string;
+  initial?: string;
 }) => {
   const theme = useTheme();
   const iconType = determineIconType(icon)!;

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";
@@ -18,7 +17,6 @@ import breakpoint from "styled-components-breakpoint";
 import Icon from "@shared/components/Icon";
 import { NavigationNode } from "@shared/types";
 import { isModKey } from "@shared/utils/keyboard";
-import { ancestors, descendants, flattenTree } from "@shared/utils/tree";
 import DocumentExplorerNode from "~/components/DocumentExplorerNode";
 import DocumentExplorerSearchResult from "~/components/DocumentExplorerSearchResult";
 import Flex from "~/components/Flex";
@@ -28,6 +26,8 @@ import InputSearch from "~/components/InputSearch";
 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
@@ -268,9 +261,7 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
         title = doc?.title ?? node.title;
 
         if (icon) {
-          renderedIcon = (
-            <Icon value={icon} initial={node.title} color={color} />
-          );
+          renderedIcon = <Icon value={icon} color={color} />;
         } else if (doc?.isStarred) {
           renderedIcon = <StarredIcon color={theme.yellow} />;
         } else {

app/components/DocumentListItem.tsx

@@ -94,7 +94,7 @@ function DocumentListItem(
     currentContext: locationSidebarContext,
   });
 
-  const contextMenuAction = useDocumentMenuAction({ documentId: document.id });
+  const contextMenuAction = useDocumentMenuAction({ document });
 
   return (
     <ActionContextProvider

app/components/DocumentTasks.tsx

@@ -7,7 +7,6 @@ import Document from "~/models/Document";
 import CircularProgressBar from "~/components/CircularProgressBar";
 import usePrevious from "~/hooks/usePrevious";
 import { bounceIn } from "~/styles/animations";
-import Flex from "./Flex";
 
 type Props = {
   document: Document;
@@ -40,9 +39,8 @@ function DocumentTasks({ document }: Props) {
   const done = completed === total;
   const previousDone = usePrevious(done);
   const message = getMessage(t, total, completed);
-
   return (
-    <Flex align="center" style={{ padding: "0 1px" }} gap={2}>
+    <>
       {completed === total ? (
         <Done
           color={theme.accent}
@@ -52,8 +50,8 @@ function DocumentTasks({ document }: Props) {
       ) : (
         <CircularProgressBar percentage={tasksPercentage} />
       )}
-      {message}
-    </Flex>
+      &nbsp;{message}
+    </>
   );
 }
 

app/components/EditableTitle.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { toast } from "sonner";
 import styled from "styled-components";
-import { s, ellipsis } from "@shared/styles";
+import { s, truncateMultiline } 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,
@@ -42,54 +41,30 @@ function EditableTitle(
     setValue(title);
   }, [title]);
 
-  const handleChange = React.useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => {
-      setValue(event.target.value);
-    },
-    []
-  );
+  const handleChange = React.useCallback((event) => {
+    setValue(event.target.value);
+  }, []);
 
-  const handleDoubleClick = React.useCallback(
-    (event: React.MouseEvent<HTMLSpanElement>) => {
-      if (event.altKey) {
-        return;
-      }
-      event.preventDefault();
-      event.stopPropagation();
-      setIsEditing(true);
-    },
-    []
-  );
+  const handleDoubleClick = React.useCallback((event) => {
+    event.preventDefault();
+    event.stopPropagation();
+    setIsEditing(true);
+  }, []);
 
-  const stopPropagation = React.useCallback(
-    (event: React.MouseEvent<HTMLSpanElement>) => {
-      event.preventDefault();
-      event.stopPropagation();
-    },
-    []
-  );
+  const stopPropagation = React.useCallback((event) => {
+    event.preventDefault();
+    event.stopPropagation();
+  }, []);
 
-  const handleFocus = React.useCallback(
-    (event: React.FocusEvent<HTMLInputElement>) => {
-      event.target.select();
-    },
-    []
-  );
+  const handleFocus = React.useCallback((event) => {
+    event.target.select();
+  }, []);
 
   const handleSave = React.useCallback(
-    async (
-      ev:
-        | React.FocusEvent<HTMLInputElement>
-        | React.KeyboardEvent<HTMLInputElement>
-        | React.FormEvent<HTMLFormElement>
-    ) => {
+    async (ev) => {
       ev.preventDefault();
       ev.stopPropagation();
 
-      if (isSubmitting) {
-        return;
-      }
-
       const trimmedValue = value.trim();
 
       if (trimmedValue === originalValue || trimmedValue.length === 0) {
@@ -99,26 +74,22 @@ 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(
-    async (ev: React.KeyboardEvent<HTMLInputElement>) => {
+    async (ev) => {
       if (ev.nativeEvent.isComposing) {
         return;
       }
@@ -168,8 +139,8 @@ function EditableTitle(
   );
 }
 
-const Text = styled.div`
-  ${ellipsis()}
+const Text = styled.span`
+  ${truncateMultiline(3)}
 `;
 
 const Input = styled.input`

app/components/Editor.tsx

@@ -21,7 +21,6 @@ import useEmbeds from "~/hooks/useEmbeds";
 import useStores from "~/hooks/useStores";
 import { uploadFile, uploadFileFromUrl } from "~/utils/files";
 import lazyWithRetry from "~/utils/lazyWithRetry";
-import useShare from "@shared/hooks/useShare";
 
 const LazyLoadedEditor = lazyWithRetry(() => import("~/editor"));
 
@@ -34,6 +33,7 @@ export type Props = Optional<
   | "dictionary"
   | "extensions"
 > & {
+  shareId?: string | undefined;
   embedsDisabled?: boolean;
   onSynced?: () => Promise<void>;
   onPublish?: (event: React.MouseEvent) => void;
@@ -41,9 +41,9 @@ export type Props = Optional<
 };
 
 function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
-  const { id, onChange, onCreateCommentMark, onDeleteCommentMark } = props;
+  const { id, shareId, onChange, onCreateCommentMark, onDeleteCommentMark } =
+    props;
   const { comments } = useStores();
-  const { shareId } = useShare();
   const dictionary = useDictionary();
   const embeds = useEmbeds(!shareId);
   const localRef = React.useRef<SharedEditor>();
@@ -202,7 +202,6 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
             style={props.style}
             editorStyle={props.editorStyle}
             commenting={!!props.onClickCommentMark}
-            lang={props.lang}
           >
             <div className="ProseMirror">
               {paragraphs.map((paragraph, index) => (

app/components/EmojiCreateDialog.tsx

@@ -1,227 +0,0 @@
-import * as React from "react";
-import { useDropzone } from "react-dropzone";
-import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
-import styled from "styled-components";
-import { s } from "@shared/styles";
-import { AttachmentPreset } from "@shared/types";
-import { getDataTransferFiles } from "@shared/utils/files";
-import ConfirmationDialog from "~/components/ConfirmationDialog";
-import Flex from "~/components/Flex";
-import Input from "~/components/Input";
-import Text from "~/components/Text";
-import useStores from "~/hooks/useStores";
-import { uploadFile } from "~/utils/files";
-import { compressImage } from "~/utils/compressImage";
-import { generateEmojiNameFromFilename } from "~/utils/emoji";
-import { AttachmentValidation, EmojiValidation } from "@shared/validations";
-import { bytesToHumanReadable } from "@shared/utils/files";
-
-type Props = {
-  onSubmit: () => void;
-};
-
-export function EmojiCreateDialog({ onSubmit }: Props) {
-  const { t } = useTranslation();
-  const { emojis } = useStores();
-  const [name, setName] = React.useState("");
-  const [file, setFile] = React.useState<File | null>(null);
-  const [isUploading, setIsUploading] = React.useState(false);
-
-  const handleFileSelection = React.useCallback(
-    (file: File) => {
-      const isValidType = AttachmentValidation.emojiContentTypes.includes(
-        file.type
-      );
-
-      if (!isValidType) {
-        toast.error(
-          t("File type not supported. Please use PNG, JPG, GIF, or WebP.")
-        );
-        return;
-      }
-
-      // Validate file size
-      if (file.size > AttachmentValidation.emojiMaxFileSize) {
-        toast.error(
-          t("File size too large. Maximum size is {{ size }}.", {
-            size: bytesToHumanReadable(AttachmentValidation.emojiMaxFileSize),
-          })
-        );
-        return;
-      }
-
-      setFile(file);
-
-      // Auto-populate name field if it's empty
-      setName((currentName) => {
-        if (!currentName.trim()) {
-          const generatedName = generateEmojiNameFromFilename(file.name);
-          return generatedName || currentName;
-        }
-        return currentName;
-      });
-    },
-    [t]
-  );
-
-  const onDrop = React.useCallback(
-    (acceptedFiles: File[]) => {
-      if (acceptedFiles.length > 0) {
-        handleFileSelection(acceptedFiles[0]);
-      }
-    },
-    [handleFileSelection]
-  );
-
-  // Handle paste events
-  React.useEffect(() => {
-    const handlePaste = (event: ClipboardEvent) => {
-      const files = getDataTransferFiles(event);
-      if (files.length > 0) {
-        event.preventDefault();
-        handleFileSelection(files[0]);
-      }
-    };
-
-    document.addEventListener("paste", handlePaste);
-    return () => document.removeEventListener("paste", handlePaste);
-  }, [handleFileSelection]);
-
-  const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDropAccepted: onDrop,
-    accept: AttachmentValidation.emojiContentTypes,
-    maxSize: AttachmentValidation.emojiMaxFileSize,
-    maxFiles: 1,
-  });
-
-  const handleSubmit = async () => {
-    if (!name.trim()) {
-      toast.error(t("Please enter a name for the emoji"));
-      return;
-    }
-
-    if (!file) {
-      toast.error(t("Please select an image file"));
-      return;
-    }
-
-    setIsUploading(true);
-    try {
-      const compressed = await compressImage(file, {
-        maxHeight: 64,
-        maxWidth: 64,
-      });
-
-      const attachment = await uploadFile(compressed, {
-        name: file.name,
-        preset: AttachmentPreset.Emoji,
-      });
-
-      await emojis.create({
-        name: name.trim(),
-        attachmentId: attachment.id,
-      });
-
-      toast.success(t("Emoji created successfully"));
-      onSubmit();
-    } finally {
-      setIsUploading(false);
-    }
-  };
-
-  const handleNameChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const { value } = event.target;
-    setName(value);
-  };
-
-  const isValidName = EmojiValidation.allowedNameCharacters.test(name);
-  const isValid = name.trim().length > 0 && file && isValidName;
-
-  return (
-    <ConfirmationDialog
-      onSubmit={handleSubmit}
-      disabled={!isValid || isUploading}
-      savingText={isUploading ? `${t("Uploading")}…` : undefined}
-      submitText={t("Add emoji")}
-    >
-      <Text as="p" type="secondary">
-        {t(
-          "The emoji name should be unique and contain only lowercase letters, numbers, and underscores."
-        )}
-      </Text>
-
-      <Input
-        label={t("Name")}
-        value={name}
-        onChange={handleNameChange}
-        placeholder="my_custom_emoji"
-        autoFocus
-        required
-        error={
-          !isValidName
-            ? t(
-                "name can only contain lowercase letters, numbers, and underscores."
-              )
-            : undefined
-        }
-      />
-
-      <DropZone {...getRootProps()}>
-        <input {...getInputProps()} />
-        <Flex column align="center" gap={8}>
-          {file ? (
-            <>
-              <PreviewImage src={URL.createObjectURL(file)} alt="Preview" />
-              <Text size="medium">{file.name}</Text>
-              <Text size="medium" type="secondary">
-                {t("Click or drag to replace")}
-              </Text>
-            </>
-          ) : (
-            <>
-              <Text size="medium">
-                {isDragActive
-                  ? t("Drop the image here")
-                  : t("Click, drop, or paste an image here")}
-              </Text>
-              <Text size="medium" type="secondary">
-                {t("PNG, JPG, GIF, or WebP up to {{ size }}", {
-                  size: bytesToHumanReadable(
-                    AttachmentValidation.emojiMaxFileSize
-                  ),
-                })}
-              </Text>
-            </>
-          )}
-        </Flex>
-      </DropZone>
-
-      {name.trim() && isValidName && (
-        <Text type="secondary" style={{ marginTop: "8px" }}>
-          {t("This emoji will be available as")} <code>:{name}:</code>
-        </Text>
-      )}
-    </ConfirmationDialog>
-  );
-}
-
-const DropZone = styled.div`
-  border: 2px dashed ${s("inputBorder")};
-  border-radius: 8px;
-  padding: 24px;
-  text-align: center;
-  cursor: var(--pointer);
-  transition: border-color 0.2s;
-
-  &:hover {
-    border-color: ${s("inputBorderFocused")};
-  }
-`;
-
-const PreviewImage = styled.img`
-  width: 64px;
-  height: 64px;
-  object-fit: contain;
-  border-radius: 4px;
-`;

app/components/ErrorBoundary.tsx

@@ -46,22 +46,20 @@ class ErrorBoundary extends React.Component<Props> {
 
   componentDidCatch(error: Error) {
     this.error = error;
-    this.trackError();
 
     if (
       this.props.reloadOnChunkMissing &&
       error.message &&
-      error.message.match(/dynamically imported module/) &&
-      !this.isRepeatedError
+      error.message.match(/dynamically imported module/)
     ) {
       // If the editor bundle fails to load then reload the entire window. This
       // can happen if a deploy happens between the user loading the initial JS
       // bundle and the async-loaded editor JS bundle as the hash will change.
-      // Don't reload if this is a repeated error to avoid infinite reload loops.
       window.location.reload();
       return;
     }
 
+    this.trackError();
     Logger.error("ErrorBoundary", error);
   }
 

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,64 +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>
-        {!collection && (
-          <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,8 +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";
-import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
 
 type Props = {
   /** The users to display */
@@ -23,8 +21,6 @@ type Props = {
       model: User;
     }
   >;
-  /** Whether to show tooltips on hover, defaults to true */
-  showTooltip?: boolean;
 };
 
 function Facepile({
@@ -33,7 +29,6 @@ function Facepile({
   size = AvatarSize.Large,
   limit = 8,
   renderAvatar = Avatar,
-  showTooltip = true,
   ...rest
 }: Props) {
   const { t } = useTranslation();
@@ -56,7 +51,6 @@ function Facepile({
           <Component
             key={model.id}
             {...{
-              showTooltip,
               model,
               size,
               style: {
@@ -69,9 +63,7 @@ function Facepile({
           />
         );
       })}
-      <VisuallyHidden>
-        <FacepileClip size={size} />
-      </VisuallyHidden>
+      <FacepileClip size={size} />
     </Avatars>
   );
 }
@@ -109,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

@@ -10,7 +10,6 @@ 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";
-import { MenuIconWrapper } from "./primitives/components/Menu";
 
 interface TFilterOption extends PaginatedItem {
   key: string;
@@ -56,11 +55,7 @@ const FilterOptions = ({
     (option) => (
       <MenuButton
         key={option.key}
-        icon={
-          option.icon ? (
-            <MenuIconWrapper aria-hidden>{option.icon}</MenuIconWrapper>
-          ) : undefined
-        }
+        icon={option.icon}
         label={option.label}
         onClick={() => {
           onSelect(option.key);
@@ -82,45 +77,30 @@ const FilterOptions = ({
   const filteredOptions = React.useMemo(() => {
     const normalizedQuery = deburr(query.toLowerCase());
 
-    const filtered = query
-      ? options.filter((option) =>
-          deburr(option.label).toLowerCase().includes(normalizedQuery)
-        )
+    return query
+      ? options
+          .filter((option) =>
+            deburr(option.label).toLowerCase().includes(normalizedQuery)
+          )
+          // sort options starting with query first
+          .sort((a, b) => {
+            const aStartsWith = deburr(a.label)
+              .toLowerCase()
+              .startsWith(normalizedQuery);
+            const bStartsWith = deburr(b.label)
+              .toLowerCase()
+              .startsWith(normalizedQuery);
+
+            if (aStartsWith && !bStartsWith) {
+              return -1;
+            }
+            if (!aStartsWith && bStartsWith) {
+              return 1;
+            }
+            return 0;
+          })
       : options;
-
-    return filtered.sort((a, b) => {
-      const aSelected = selectedKeys.includes(a.key);
-      const bSelected = selectedKeys.includes(b.key);
-
-      // Selected items come first
-      if (aSelected && !bSelected) {
-        return -1;
-      }
-      if (!aSelected && bSelected) {
-        return 1;
-      }
-
-      // If both have the same selection state and there's a query,
-      // sort options starting with query first
-      if (query) {
-        const aStartsWith = deburr(a.label)
-          .toLowerCase()
-          .startsWith(normalizedQuery);
-        const bStartsWith = deburr(b.label)
-          .toLowerCase()
-          .startsWith(normalizedQuery);
-
-        if (aStartsWith && !bStartsWith) {
-          return -1;
-        }
-        if (!aStartsWith && bStartsWith) {
-          return 1;
-        }
-      }
-
-      return 0;
-    });
-  }, [options, query, selectedKeys]);
+  }, [options, query]);
 
   const handleKeyDown = React.useCallback(
     (ev: React.KeyboardEvent) => {
@@ -128,10 +108,6 @@ const FilterOptions = ({
         return;
       }
 
-      // Stop all keyboard events from propagating to prevent Radix UI menu
-      // from handling them and potentially moving focus
-      ev.stopPropagation();
-
       switch (ev.key) {
         case "Escape":
           setOpen(false);

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";
@@ -117,31 +116,12 @@ const HoverPreviewDesktop = observer(
         <Position top={cardTop} left={cardLeft} aria-hidden>
           {isVisible ? (
             <Animate
-              initial={{
-                opacity: 0,
-                y: -20,
-                filter: "blur(5px)",
-                pointerEvents: "none",
-              }}
+              initial={{ opacity: 0, y: -20, pointerEvents: "none" }}
               animate={{
                 opacity: 1,
                 y: 0,
-                filter: "blur(0px)",
                 transitionEnd: { pointerEvents: "auto" },
               }}
-              transition={{
-                y: {
-                  type: "spring",
-                  stiffness: 400,
-                  damping: 25,
-                },
-                opacity: {
-                  duration: 0.2,
-                },
-                filter: {
-                  duration: 0.2,
-                },
-              }}
             >
               {data.type === UnfurlResourceType.Mention ? (
                 <HoverPreviewMention
@@ -152,14 +132,6 @@ const HoverPreviewDesktop = observer(
                   lastActive={data.lastActive}
                   email={data.email}
                 />
-              ) : data.type === UnfurlResourceType.Group ? (
-                <HoverPreviewGroup
-                  ref={cardRef}
-                  name={data.name}
-                  description={data.description}
-                  memberCount={data.memberCount}
-                  users={data.users}
-                />
               ) : data.type === UnfurlResourceType.Document ? (
                 <HoverPreviewDocument
                   ref={cardRef}
@@ -323,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,70 +0,0 @@
-import * as React from "react";
-import { useTranslation } from "react-i18next";
-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, description, memberCount, users }: Props,
-  ref: React.Ref<HTMLDivElement>
-) {
-  const { t } = useTranslation();
-
-  return (
-    <Preview as="div">
-      <Card fadeOut={false} ref={ref}>
-        <CardContent>
-          <ErrorBoundary showTitle={false} reloadOnChunkMissing={false}>
-            <Flex column gap={2} align="start">
-              <Flex
-                justify="space-between"
-                gap={4}
-                style={{ width: "100%" }}
-                auto
-              >
-                <Flex column align="start">
-                  <Title>{name}</Title>
-                  <Info>
-                    {t("{{ count }} members", { count: memberCount })}
-                  </Info>
-                </Flex>
-                {users.length > 0 && (
-                  <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}
-                  />
-                )}
-              </Flex>
-              {description && <Description>{description}</Description>}
-            </Flex>
-          </ErrorBoundary>
-        </CardContent>
-      </Card>
-    </Preview>
-  );
-});
-
-export default HoverPreviewGroup;

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/IconPicker/components/ColorPicker.tsx

@@ -1,11 +1,17 @@
+import { BackIcon } from "outline-icons";
 import * as React from "react";
-import debounce from "lodash/debounce";
 import styled from "styled-components";
-import { s } from "@shared/styles";
+import { breakpoints, s, hover } from "@shared/styles";
 import { colorPalette } from "@shared/utils/collections";
+import { validateColorHex } from "@shared/utils/color";
 import Flex from "~/components/Flex";
-import { SwatchButton } from "~/components/SwatchButton";
-import { ColorButton } from "~/components/ColorButton";
+import NudeButton from "~/components/NudeButton";
+import Text from "~/components/Text";
+
+enum Panel {
+  Builtin,
+  Hex,
+}
 
 type Props = {
   width: number;
@@ -13,82 +19,200 @@ type Props = {
   onSelect: (color: string) => void;
 };
 
-const ColorPicker = ({ activeColor, onSelect }: Props) => {
-  const [selectedColor, setSelectedColor] = React.useState(activeColor);
-  const isBuiltInColor = colorPalette.includes(selectedColor);
-  const color = isBuiltInColor ? undefined : selectedColor;
+const ColorPicker = ({ width, activeColor, onSelect }: Props) => {
+  const [localValue, setLocalValue] = React.useState(activeColor);
 
-  const debouncedOnSelect = React.useMemo(
-    () =>
-      debounce((color: string) => {
-        onSelect(color);
-      }, 250),
-    [onSelect]
+  const [panel, setPanel] = React.useState(
+    colorPalette.includes(activeColor) ? Panel.Builtin : Panel.Hex
   );
 
-  React.useEffect(
-    () => () => {
-      debouncedOnSelect.cancel();
-    },
-    [debouncedOnSelect]
-  );
+  const handleSwitcherClick = React.useCallback(() => {
+    setPanel(panel === Panel.Builtin ? Panel.Hex : Panel.Builtin);
+  }, [panel, setPanel]);
+
+  const isLargeMobile = width > breakpoints.mobileLarge + 12; // 12px for the Container padding
 
   React.useEffect(() => {
-    setSelectedColor(activeColor);
+    setLocalValue(activeColor);
+    setPanel(colorPalette.includes(activeColor) ? Panel.Builtin : Panel.Hex);
   }, [activeColor]);
 
-  const handleSelect = (color: string) => {
-    setSelectedColor(color);
-    debouncedOnSelect(color);
-  };
-
-  return (
-    <BuiltinColors activeColor={selectedColor} onClick={handleSelect}>
-      <Divider />
-      <SwatchButton
-        color={color}
-        active={!isBuiltInColor}
-        onChange={handleSelect}
-        pickerInModal
+  return isLargeMobile ? (
+    <Container justify="space-between">
+      <LargeMobileBuiltinColors activeColor={activeColor} onClick={onSelect} />
+      <LargeMobileCustomColor
+        value={localValue}
+        setLocalValue={setLocalValue}
+        onValidHex={onSelect}
       />
-    </BuiltinColors>
+    </Container>
+  ) : (
+    <Container gap={12}>
+      <PanelSwitcher align="center">
+        <SwitcherButton panel={panel} onClick={handleSwitcherClick}>
+          {panel === Panel.Builtin ? "#" : <BackIcon />}
+        </SwitcherButton>
+      </PanelSwitcher>
+      {panel === Panel.Builtin ? (
+        <BuiltinColors activeColor={activeColor} onClick={onSelect} />
+      ) : (
+        <CustomColor
+          value={localValue}
+          setLocalValue={setLocalValue}
+          onValidHex={onSelect}
+        />
+      )}
+    </Container>
   );
 };
 
-const Divider = styled.div`
-  width: 1px;
-  height: 24px;
-  background-color: ${s("inputBorder")};
-`;
-
 const BuiltinColors = ({
   activeColor,
   onClick,
   className,
-  children,
 }: {
   activeColor: string;
   onClick: (color: string) => void;
   className?: string;
-  children?: React.ReactNode;
 }) => (
-  <Container className={className} justify="space-between" align="center" auto>
+  <Flex className={className} justify="space-between" align="center" auto>
     {colorPalette.map((color) => (
       <ColorButton
         key={color}
-        color={color}
-        active={color === activeColor}
+        $color={color}
+        $active={color === activeColor}
         onClick={() => onClick(color)}
-      />
+      >
+        <Selected />
+      </ColorButton>
     ))}
-    {children}
-  </Container>
+  </Flex>
 );
 
+const CustomColor = ({
+  value,
+  setLocalValue,
+  onValidHex,
+  className,
+}: {
+  value: string;
+  setLocalValue: (value: string) => void;
+  onValidHex: (color: string) => void;
+  className?: string;
+}) => {
+  const hasHexChars = React.useCallback(
+    (color: string) => /(^#[0-9A-F]{1,6}$)/i.test(color),
+    []
+  );
+
+  const handleInputChange = React.useCallback(
+    (ev: React.ChangeEvent<HTMLInputElement>) => {
+      const val = ev.target.value;
+
+      if (val === "" || val === "#") {
+        setLocalValue("#");
+        return;
+      }
+
+      const uppercasedVal = val.toUpperCase();
+
+      if (hasHexChars(uppercasedVal)) {
+        setLocalValue(uppercasedVal);
+      }
+
+      if (validateColorHex(uppercasedVal)) {
+        onValidHex(uppercasedVal);
+      }
+    },
+    [setLocalValue, hasHexChars, onValidHex]
+  );
+
+  return (
+    <Flex className={className} align="center" gap={8}>
+      <Text type="tertiary" size="small">
+        HEX
+      </Text>
+      <CustomColorInput
+        maxLength={7}
+        value={value}
+        onChange={handleInputChange}
+        autoFocus
+      />
+    </Flex>
+  );
+};
+
 const Container = styled(Flex)`
   height: 48px;
   padding: 8px 12px;
   border-bottom: 1px solid ${s("inputBorder")};
 `;
 
+const Selected = styled.span`
+  width: 10px;
+  height: 5px;
+  border-left: 2px solid white;
+  border-bottom: 2px solid white;
+  transform: translateY(-25%) rotate(-45deg);
+`;
+
+const ColorButton = styled(NudeButton)<{ $color: string; $active: boolean }>`
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  background-color: ${({ $color }) => $color};
+
+  &: ${hover} {
+    outline: 2px solid ${s("menuBackground")} !important;
+    box-shadow: ${({ $color }) => `0px 0px 3px 3px ${$color}`};
+  }
+
+  & ${Selected} {
+    display: ${({ $active }) => ($active ? "block" : "none")};
+  }
+`;
+
+const PanelSwitcher = styled(Flex)`
+  width: 40px;
+  border-right: 1px solid ${s("inputBorder")};
+`;
+
+const SwitcherButton = styled(NudeButton)<{ panel: Panel }>`
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 14px;
+  border: 1px solid ${s("inputBorder")};
+  transition: all 100ms ease-in-out;
+
+  &: ${hover} {
+    border-color: ${s("inputBorderFocused")};
+  }
+`;
+
+const LargeMobileBuiltinColors = styled(BuiltinColors)`
+  max-width: 400px;
+  padding-right: 8px;
+`;
+
+const LargeMobileCustomColor = styled(CustomColor)`
+  padding-left: 8px;
+  border-left: 1px solid ${s("inputBorder")};
+  width: 120px;
+`;
+
+const CustomColorInput = styled.input.attrs(() => ({
+  type: "text",
+  autocomplete: "off",
+}))`
+  font-size: 14px;
+  color: ${s("textSecondary")};
+  background: transparent;
+  border: 0;
+  outline: 0;
+`;
+
 export default ColorPicker;

app/components/IconPicker/components/Components.tsx

@@ -1,12 +0,0 @@
-import Flex from "@shared/components/Flex";
-import styled from "styled-components";
-import InputSearch from "~/components/InputSearch";
-
-export const UserInputContainer = styled(Flex)`
-  height: 48px;
-  padding: 6px 12px 0px;
-`;
-
-export const StyledInputSearch = styled(InputSearch)`
-  flex-grow: 1;
-`;

app/components/IconPicker/components/CustomEmojiPanel.tsx

@@ -1,170 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import Flex from "~/components/Flex";
-import useStores from "~/hooks/useStores";
-import GridTemplate, { DataNode, EmojiNode } from "./GridTemplate";
-import { IconType } from "@shared/types";
-import { DisplayCategory } from "../utils";
-import { StyledInputSearch, UserInputContainer } from "./Components";
-import { useIconState } from "../useIconState";
-import Emoji from "~/models/Emoji";
-
-const GRID_HEIGHT = 410;
-
-type Props = {
-  panelWidth: number;
-  height?: number;
-  query: string;
-  panelActive: boolean;
-  onEmojiChange: (emoji: string) => void;
-  onQueryChange: (query: string) => void;
-};
-
-const CustomEmojiPanel = ({
-  query,
-  panelActive,
-  panelWidth,
-  height = GRID_HEIGHT,
-  onEmojiChange,
-  onQueryChange,
-}: Props) => {
-  const { t } = useTranslation();
-  const searchRef = React.useRef<HTMLInputElement | null>(null);
-  const scrollableRef = React.useRef<HTMLDivElement | null>(null);
-  const [searchData, setSearchData] = useState<DataNode[]>([]);
-  const [freqEmojis, setFreqEmojis] = useState<EmojiNode[]>([]);
-  const { getFrequentIcons, incrementIconCount } = useIconState(
-    IconType.Custom
-  );
-
-  const { emojis } = useStores();
-
-  const handleFilter = React.useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => {
-      onQueryChange(event.target.value);
-    },
-    [onQueryChange]
-  );
-
-  useEffect(() => {
-    if (query.trim()) {
-      const initialData = emojis.findByQuery(query);
-      if (initialData.length) {
-        setSearchData([
-          {
-            category: DisplayCategory.Search,
-            icons: initialData?.map(toIcon),
-          },
-        ]);
-      }
-
-      emojis
-        .fetchAll({
-          query,
-        })
-        .then((data) => {
-          if (data.length) {
-            const iconMap = new Map([
-              ...initialData.map((emoji): [string, EmojiNode] => [
-                emoji.name,
-                toIcon(emoji),
-              ]),
-              ...data.map((emoji): [string, EmojiNode] => [
-                emoji.name,
-                toIcon(emoji),
-              ]),
-            ]);
-
-            setSearchData([
-              {
-                category: DisplayCategory.Search,
-                icons: Array.from(iconMap.values()),
-              },
-            ]);
-            return;
-          }
-
-          setSearchData([]);
-        });
-    } else {
-      setSearchData([]);
-    }
-  }, [query, emojis]);
-
-  useEffect(() => {
-    getFrequentIcons().forEach((id) => {
-      emojis
-        .fetch(id)
-        .then((emoji) => {
-          setFreqEmojis((prev) => {
-            if (prev.some((item) => item.id === id)) {
-              return prev;
-            }
-            return [...prev, toIcon(emoji)];
-          });
-        })
-        .catch(() => {
-          // ignore
-        });
-    });
-  }, [getFrequentIcons, emojis]);
-
-  const handleEmojiSelection = React.useCallback(
-    ({ id }: { id: string }) => {
-      onEmojiChange(id);
-      incrementIconCount(id);
-    },
-    [onEmojiChange, incrementIconCount]
-  );
-
-  const templateData: DataNode[] = React.useMemo(
-    () => [
-      {
-        category: DisplayCategory.Frequent,
-        icons: freqEmojis,
-      },
-      {
-        category: DisplayCategory.All,
-        icons: emojis.orderedData.map(toIcon),
-      },
-    ],
-    [emojis.orderedData, freqEmojis]
-  );
-
-  React.useLayoutEffect(() => {
-    if (!panelActive) {
-      return;
-    }
-    scrollableRef.current?.scroll({ top: 0 });
-    requestAnimationFrame(() => searchRef.current?.focus());
-  }, [panelActive]);
-
-  return (
-    <Flex column>
-      <UserInputContainer align="center" gap={12}>
-        <StyledInputSearch
-          ref={searchRef}
-          value={query}
-          placeholder={`${t("Search")}…`}
-          onChange={handleFilter}
-        />
-      </UserInputContainer>
-      <GridTemplate
-        ref={scrollableRef}
-        width={panelWidth}
-        height={height - 48}
-        data={searchData.length ? searchData : templateData}
-        onIconSelect={handleEmojiSelection}
-      />
-    </Flex>
-  );
-};
-
-const toIcon = (emoji: Emoji): EmojiNode => ({
-  type: IconType.Custom,
-  id: emoji.id,
-  value: emoji.id,
-  name: emoji.name,
-});
-
-export default CustomEmojiPanel;

app/components/IconPicker/components/EmojiPanel.tsx

@@ -1,17 +1,77 @@
 import concat from "lodash/concat";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import styled from "styled-components";
 import { EmojiCategory, EmojiSkinTone, IconType } from "@shared/types";
 import { getEmojis, getEmojisWithCategory, search } from "@shared/utils/emoji";
 import Flex from "~/components/Flex";
-import { DisplayCategory } from "../utils";
+import InputSearch from "~/components/InputSearch";
+import usePersistedState from "~/hooks/usePersistedState";
+import {
+  FREQUENTLY_USED_COUNT,
+  DisplayCategory,
+  emojiSkinToneKey,
+  emojisFreqKey,
+  lastEmojiKey,
+  sortFrequencies,
+} from "../utils";
 import GridTemplate, { DataNode } from "./GridTemplate";
 import SkinTonePicker from "./SkinTonePicker";
-import { StyledInputSearch, UserInputContainer } from "./Components";
-import { useIconState } from "../useIconState";
 
 const GRID_HEIGHT = 410;
 
+const useEmojiState = () => {
+  const [emojiSkinTone, setEmojiSkinTone] = usePersistedState<EmojiSkinTone>(
+    emojiSkinToneKey,
+    EmojiSkinTone.Default
+  );
+  const [emojisFreq, setEmojisFreq] = usePersistedState<Record<string, number>>(
+    emojisFreqKey,
+    {}
+  );
+  const [lastEmoji, setLastEmoji] = usePersistedState<string | undefined>(
+    lastEmojiKey,
+    undefined
+  );
+
+  const incrementEmojiCount = React.useCallback(
+    (emoji: string) => {
+      emojisFreq[emoji] = (emojisFreq[emoji] ?? 0) + 1;
+      setEmojisFreq({ ...emojisFreq });
+      setLastEmoji(emoji);
+    },
+    [emojisFreq, setEmojisFreq, setLastEmoji]
+  );
+
+  const getFreqEmojis = React.useCallback(() => {
+    const freqs = Object.entries(emojisFreq);
+
+    if (freqs.length > FREQUENTLY_USED_COUNT.Track) {
+      sortFrequencies(freqs).splice(FREQUENTLY_USED_COUNT.Track);
+      setEmojisFreq(Object.fromEntries(freqs));
+    }
+
+    const emojis = sortFrequencies(freqs)
+      .slice(0, FREQUENTLY_USED_COUNT.Get)
+      .map(([emoji, _]) => emoji);
+
+    const isLastPresent = emojis.includes(lastEmoji ?? "");
+    if (lastEmoji && !isLastPresent) {
+      emojis.pop();
+      emojis.push(lastEmoji);
+    }
+
+    return emojis;
+  }, [emojisFreq, setEmojisFreq, lastEmoji]);
+
+  return {
+    emojiSkinTone,
+    setEmojiSkinTone,
+    incrementEmojiCount,
+    getFreqEmojis,
+  };
+};
+
 type Props = {
   panelWidth: number;
   query: string;
@@ -37,14 +97,11 @@ const EmojiPanel = ({
   const {
     emojiSkinTone: skinTone,
     setEmojiSkinTone,
-    incrementIconCount,
-    getFrequentIcons,
-  } = useIconState(IconType.Emoji);
+    incrementEmojiCount,
+    getFreqEmojis,
+  } = useEmojiState();
 
-  const freqEmojis = React.useMemo(
-    () => getFrequentIcons(),
-    [getFrequentIcons]
-  );
+  const freqEmojis = React.useMemo(() => getFreqEmojis(), [getFreqEmojis]);
 
   const handleFilter = React.useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -63,9 +120,9 @@ const EmojiPanel = ({
   const handleEmojiSelection = React.useCallback(
     ({ id, value }: { id: string; value: string }) => {
       onEmojiChange(value);
-      incrementIconCount(id);
+      incrementEmojiCount(id);
     },
-    [onEmojiChange, incrementIconCount]
+    [onEmojiChange, incrementEmojiCount]
   );
 
   const isSearch = query !== "";
@@ -138,7 +195,7 @@ const getAllEmojis = ({
 }): DataNode[] => {
   const emojisWithCategory = getEmojisWithCategory({ skinTone });
 
-  const getFrequentIcons = (): DataNode => {
+  const getFrequentEmojis = (): DataNode => {
     const emojis = getEmojis({ ids: freqEmojis, skinTone });
     return {
       category: DisplayCategory.Frequent,
@@ -163,7 +220,7 @@ const getAllEmojis = ({
   };
 
   return concat(
-    getFrequentIcons(),
+    getFrequentEmojis(),
     getCategoryData(EmojiCategory.People),
     getCategoryData(EmojiCategory.Nature),
     getCategoryData(EmojiCategory.Foods),
@@ -175,4 +232,13 @@ const getAllEmojis = ({
   );
 };
 
+const UserInputContainer = styled(Flex)`
+  height: 48px;
+  padding: 6px 12px 0px;
+`;
+
+const StyledInputSearch = styled(InputSearch)`
+  flex-grow: 1;
+`;
+
 export default EmojiPanel;

app/components/IconPicker/components/GridTemplate.tsx

@@ -9,7 +9,6 @@ import Text from "~/components/Text";
 import { TRANSLATED_CATEGORIES } from "../utils";
 import Grid from "./Grid";
 import { IconButton } from "./IconButton";
-import { CustomEmoji } from "@shared/components/CustomEmoji";
 
 /**
  * icon/emoji size is 24px; and we add 4px padding on all sides,
@@ -24,11 +23,10 @@ type OutlineNode = {
   delay: number;
 };
 
-export type EmojiNode = {
-  type: IconType.Emoji | IconType.Custom;
+type EmojiNode = {
+  type: IconType.Emoji;
   id: string;
   value: string;
-  name?: string;
 };
 
 export type DataNode = {
@@ -88,11 +86,7 @@ const GridTemplate = (
             onClick={() => onIconSelect({ id: item.id, value: item.value })}
           >
             <Emoji width={24} height={24}>
-              {item.type === IconType.Custom ? (
-                <CustomEmoji value={item.value} title={item.name} />
-              ) : (
-                item.value
-              )}
+              {item.value}
             </Emoji>
           </IconButton>
         );

app/components/IconPicker/components/IconPanel.tsx

@@ -5,10 +5,16 @@ import { IconType } from "@shared/types";
 import { IconLibrary } from "@shared/utils/IconLibrary";
 import Flex from "~/components/Flex";
 import InputSearch from "~/components/InputSearch";
-import { DisplayCategory } from "../utils";
+import usePersistedState from "~/hooks/usePersistedState";
+import {
+  FREQUENTLY_USED_COUNT,
+  DisplayCategory,
+  iconsFreqKey,
+  lastIconKey,
+  sortFrequencies,
+} from "../utils";
 import ColorPicker from "./ColorPicker";
 import GridTemplate, { DataNode } from "./GridTemplate";
-import { useIconState } from "../useIconState";
 
 const IconNames = Object.keys(IconLibrary.mapping);
 const TotalIcons = IconNames.length;
@@ -19,6 +25,52 @@ const TotalIcons = IconNames.length;
  */
 const GRID_HEIGHT = 314;
 
+const useIconState = () => {
+  const [iconsFreq, setIconsFreq] = usePersistedState<Record<string, number>>(
+    iconsFreqKey,
+    {}
+  );
+  const [lastIcon, setLastIcon] = usePersistedState<string | undefined>(
+    lastIconKey,
+    undefined
+  );
+
+  const incrementIconCount = React.useCallback(
+    (icon: string) => {
+      iconsFreq[icon] = (iconsFreq[icon] ?? 0) + 1;
+      setIconsFreq({ ...iconsFreq });
+      setLastIcon(icon);
+    },
+    [iconsFreq, setIconsFreq, setLastIcon]
+  );
+
+  const getFreqIcons = React.useCallback(() => {
+    const freqs = Object.entries(iconsFreq);
+
+    if (freqs.length > FREQUENTLY_USED_COUNT.Track) {
+      sortFrequencies(freqs).splice(FREQUENTLY_USED_COUNT.Track);
+      setIconsFreq(Object.fromEntries(freqs));
+    }
+
+    const icons = sortFrequencies(freqs)
+      .slice(0, FREQUENTLY_USED_COUNT.Get)
+      .map(([icon, _]) => icon);
+
+    const isLastPresent = icons.includes(lastIcon ?? "");
+    if (lastIcon && !isLastPresent) {
+      icons.pop();
+      icons.push(lastIcon);
+    }
+
+    return icons;
+  }, [iconsFreq, setIconsFreq, lastIcon]);
+
+  return {
+    incrementIconCount,
+    getFreqIcons,
+  };
+};
+
 type Props = {
   panelWidth: number;
   initial: string;
@@ -45,9 +97,9 @@ const IconPanel = ({
   const searchRef = React.useRef<HTMLInputElement | null>(null);
   const scrollableRef = React.useRef<HTMLDivElement | null>(null);
 
-  const { incrementIconCount, getFrequentIcons } = useIconState(IconType.SVG);
+  const { incrementIconCount, getFreqIcons } = useIconState();
 
-  const freqIcons = React.useMemo(() => getFrequentIcons(), [getFrequentIcons]);
+  const freqIcons = React.useMemo(() => getFreqIcons(), [getFreqIcons]);
   const totalFreqIcons = freqIcons.length;
 
   const filteredIcons = React.useMemo(

app/components/IconPicker/index.tsx

@@ -21,13 +21,10 @@ import { Drawer, DrawerContent, DrawerTrigger } from "../primitives/Drawer";
 import EmojiPanel from "./components/EmojiPanel";
 import IconPanel from "./components/IconPanel";
 import { PopoverButton } from "./components/PopoverButton";
-import CustomEmojiPanel from "./components/CustomEmojiPanel";
-import useStores from "~/hooks/useStores";
 
 const TAB_NAMES = {
   Icon: "icon",
   Emoji: "emoji",
-  Custom: "custom",
 } as const;
 
 type TabName = (typeof TAB_NAMES)[keyof typeof TAB_NAMES];
@@ -38,7 +35,7 @@ type Props = {
   icon: string | null;
   color: string;
   size?: number;
-  initial: string;
+  initial?: string;
   className?: string;
   popoverPosition: "bottom-start" | "right";
   allowDelete?: boolean;
@@ -64,7 +61,7 @@ const IconPicker = ({
   children,
 }: Props) => {
   const { t } = useTranslation();
-  const { emojis } = useStores();
+
   const { width: windowWidth } = useWindowSize();
   const isMobile = useMobile();
 
@@ -171,12 +168,6 @@ const IconPicker = ({
     setActiveTab(defaultTab);
   }, [defaultTab]);
 
-  React.useEffect(() => {
-    if (open) {
-      void emojis.fetchAll();
-    }
-  }, [open]);
-
   if (isMobile) {
     return (
       <Drawer open={open} onOpenChange={setOpen}>
@@ -254,13 +245,6 @@ const Content = ({
           >
             {t("Emojis")}
           </StyledTab>
-          <StyledTab
-            value={TAB_NAMES["Custom"]}
-            aria-label={t("Custom Emojis")}
-            $active={activeTab === TAB_NAMES["Custom"]}
-          >
-            {t("Custom")}
-          </StyledTab>
         </Tabs.List>
         {allowDelete && (
           <RemoveButton onClick={onIconRemove}>{t("Remove")}</RemoveButton>
@@ -287,15 +271,6 @@ const Content = ({
           onQueryChange={onQueryChange}
         />
       </StyledTabContent>
-      <StyledTabContent value={TAB_NAMES["Custom"]}>
-        <CustomEmojiPanel
-          panelWidth={panelWidth}
-          query={query}
-          panelActive={open && activeTab === TAB_NAMES["Custom"]}
-          onEmojiChange={onIconChange}
-          onQueryChange={onQueryChange}
-        />
-      </StyledTabContent>
     </Tabs.Root>
   );
 };

app/components/IconPicker/useIconState.tsx

@@ -1,89 +0,0 @@
-import {
-  customEmojisFreqKey,
-  emojisFreqKey,
-  emojiSkinToneKey,
-  FREQUENTLY_USED_COUNT,
-  iconsFreqKey,
-  lastCustomEmojiKey,
-  lastEmojiKey,
-  lastIconKey,
-  sortFrequencies,
-} from "./utils";
-import usePersistedState from "~/hooks/usePersistedState";
-import { EmojiSkinTone, IconType } from "@shared/types";
-import React from "react";
-
-const lastIconKeys = {
-  [IconType.Custom]: lastCustomEmojiKey,
-  [IconType.Emoji]: lastEmojiKey,
-  [IconType.SVG]: lastIconKey,
-};
-
-const freqIconKeys = {
-  [IconType.Custom]: customEmojisFreqKey,
-  [IconType.Emoji]: emojisFreqKey,
-  [IconType.SVG]: iconsFreqKey,
-};
-
-const skinToneKeys = {
-  [IconType.Custom]: "",
-  [IconType.Emoji]: emojiSkinToneKey,
-  [IconType.SVG]: "",
-};
-
-export const useIconState = (type: IconType) => {
-  const [emojiSkinTone, setEmojiSkinTone] = usePersistedState<EmojiSkinTone>(
-    skinToneKeys[type],
-    EmojiSkinTone.Default
-  );
-
-  const [iconFreq, setIconFreq] = usePersistedState<Record<string, number>>(
-    freqIconKeys[type],
-    {}
-  );
-
-  const [lastIcon, setLastIcon] = usePersistedState<string | undefined>(
-    lastIconKeys[type],
-    undefined
-  );
-
-  const incrementIconCount = React.useCallback(
-    (emoji: string) => {
-      iconFreq[emoji] = (iconFreq[emoji] ?? 0) + 1;
-      setIconFreq({ ...iconFreq });
-      setLastIcon(emoji);
-    },
-    [iconFreq, setIconFreq, setLastIcon]
-  );
-
-  const getFrequentIcons = React.useCallback((): string[] => {
-    const freqs = Object.entries(iconFreq);
-
-    if (freqs.length > FREQUENTLY_USED_COUNT.Track) {
-      const trimmed = sortFrequencies(freqs).slice(
-        0,
-        FREQUENTLY_USED_COUNT.Track
-      );
-      setIconFreq(Object.fromEntries(trimmed));
-    }
-
-    const emojis = sortFrequencies(freqs)
-      .slice(0, FREQUENTLY_USED_COUNT.Get)
-      .map(([emoji, _]) => emoji);
-
-    const isLastPresent = emojis.includes(lastIcon ?? "");
-    if (lastIcon && !isLastPresent) {
-      emojis.pop();
-      emojis.push(lastIcon);
-    }
-
-    return emojis;
-  }, [iconFreq, lastIcon, setIconFreq]);
-
-  return {
-    emojiSkinTone,
-    setEmojiSkinTone,
-    incrementIconCount,
-    getFrequentIcons,
-  };
-};

app/components/IconPicker/utils.ts

@@ -18,7 +18,6 @@ export const TRANSLATED_CATEGORIES = {
   Objects: i18next.t("Objects"),
   Symbols: i18next.t("Symbols"),
   Flags: i18next.t("Flags"),
-  Custom: i18next.t("Custom"),
 };
 
 export const FREQUENTLY_USED_COUNT = {
@@ -33,8 +32,6 @@ const STORAGE_KEYS = {
   EmojisFrequency: "emojis-freq",
   LastIcon: "last-icon",
   LastEmoji: "last-emoji",
-  CustomEmojisFrequency: "custom-emojis-freq",
-  LastCustomEmoji: "last-custom-emoji",
 };
 
 const getStorageKey = (key: string) => `${STORAGE_KEYS.Base}.${key}`;
@@ -49,11 +46,5 @@ export const lastIconKey = getStorageKey(STORAGE_KEYS.LastIcon);
 
 export const lastEmojiKey = getStorageKey(STORAGE_KEYS.LastEmoji);
 
-export const customEmojisFreqKey = getStorageKey(
-  STORAGE_KEYS.CustomEmojisFrequency
-);
-
-export const lastCustomEmojiKey = getStorageKey(STORAGE_KEYS.LastCustomEmoji);
-
 export const sortFrequencies = (freqs: [string, number][]) =>
   freqs.sort((a, b) => (a[1] >= b[1] ? -1 : 1));

app/components/InputColor.tsx

@@ -1,41 +1,85 @@
 import * as React from "react";
+import { useTranslation } from "react-i18next";
 import styled from "styled-components";
+import { s } from "@shared/styles";
+import lazyWithRetry from "~/utils/lazyWithRetry";
+import DelayedMount from "./DelayedMount";
 import Input, { Props as InputProps } from "./Input";
+import NudeButton from "./NudeButton";
 import Relative from "./Sidebar/components/Relative";
-import { SwatchButton } from "./SwatchButton";
+import Text from "./Text";
+import { Popover, PopoverContent, PopoverTrigger } from "./primitives/Popover";
 
-/**
- * Props for the InputColor component.
- */
 type Props = Omit<InputProps, "onChange"> & {
-  /** The current color value in hex format */
   value: string | undefined;
-  /** Callback function invoked when the color value changes */
   onChange: (value: string) => void;
 };
 
-/**
- * A color input component that combines a text input with a color picker swatch button.
- * Automatically formats hex color values with a leading # character.
- */
-const InputColor: React.FC<Props> = ({ value, onChange, ...rest }: Props) => (
-  <Relative>
-    <Input
-      value={value}
-      onChange={(event) => onChange(event.target.value.replace(/^#?/, "#"))}
-      placeholder="#"
-      maxLength={7}
-      {...rest}
-    />
-    <PositionedSwatchButton color={value} onChange={onChange} size={22} />
-  </Relative>
-);
+const InputColor: React.FC<Props> = ({ value, onChange, ...rest }: Props) => {
+  const { t } = useTranslation();
 
-const PositionedSwatchButton = styled(SwatchButton)`
-  border: 1px solid ${(props) => props.theme.inputBorder};
+  return (
+    <Relative>
+      <Input
+        value={value}
+        onChange={(event) => onChange(event.target.value.replace(/^#?/, "#"))}
+        placeholder="#"
+        maxLength={7}
+        {...rest}
+      />
+      <Popover modal={true}>
+        <PopoverTrigger>
+          <SwatchButton aria-label={t("Show menu")} $background={value} />
+        </PopoverTrigger>
+        <StyledContent aria-label={t("Select a color")} align="end">
+          <React.Suspense
+            fallback={
+              <DelayedMount>
+                <Text>{t("Loading")}…</Text>
+              </DelayedMount>
+            }
+          >
+            <StyledColorPicker
+              disableAlpha
+              color={value}
+              onChange={(color) => onChange(color.hex)}
+            />
+          </React.Suspense>
+        </StyledContent>
+      </Popover>
+    </Relative>
+  );
+};
+
+const SwatchButton = styled(NudeButton)<{ $background: string | undefined }>`
+  background: ${(props) => props.$background};
+  border: 1px solid ${s("inputBorder")};
+  border-radius: 50%;
   position: absolute;
-  bottom: 21px;
+  bottom: 20px;
   right: 6px;
 `;
 
+const StyledContent = styled(PopoverContent)`
+  width: auto;
+  padding: 8px;
+`;
+
+const ColorPicker = lazyWithRetry(
+  () => import("react-color/lib/components/chrome/Chrome")
+);
+
+const StyledColorPicker = styled(ColorPicker)`
+  background: inherit !important;
+  box-shadow: none !important;
+  border: 0 !important;
+  border-radius: 0 !important;
+  user-select: none;
+
+  input {
+    user-select: text;
+    color: ${s("text")} !important;
+  }
+`;
+
 export default InputColor;

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";
@@ -50,7 +52,7 @@ export type Item = {
 
 export type Option = Item | Separator;
 
-type Props = Omit<React.HTMLAttributes<HTMLButtonElement>, "onChange"> & {
+type Props = {
   /* Options to display in the select menu. */
   options: Option[];
   /* Current chosen value. */
@@ -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

@@ -4,21 +4,21 @@ import { Helmet } from "react-helmet-async";
 import styled, { DefaultTheme } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import { s } from "@shared/styles";
+import { isModKey } from "@shared/utils/keyboard";
 import Flex from "~/components/Flex";
 import { LoadingIndicatorBar } from "~/components/LoadingIndicator";
 import SkipNavContent from "~/components/SkipNavContent";
 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 = {
-  /** Main content to render in the layout. */
   children?: React.ReactNode;
-  /** Page title to display in the browser tab. Defaults to app name if not provided. */
   title?: string;
-  /** Left sidebar content. */
   sidebar?: React.ReactNode;
-  /** Right sidebar content. */
   sidebarRight?: React.ReactNode;
 };
 
@@ -29,40 +29,50 @@ const Layout = React.forwardRef(function Layout_(
   const { ui } = useStores();
   const sidebarCollapsed = !sidebar || ui.sidebarIsClosed;
 
+  useAutoRefresh();
+
+  useKeyDown(".", (event) => {
+    if (isModKey(event)) {
+      ui.toggleCollapsedSidebar();
+    }
+  });
+
   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/Lightbox.tsx

@@ -1,21 +1,12 @@
+import { useEditor } from "~/editor/components/EditorContext";
 import { observer } from "mobx-react";
 import * as Dialog from "@radix-ui/react-dialog";
+import { findChildren } from "@shared/editor/queries/findChildren";
+import findIndex from "lodash/findIndex";
 import styled, { css, Keyframes, keyframes } from "styled-components";
-import {
-  ComponentProps,
-  createContext,
-  forwardRef,
-  HTMLAttributes,
-  ReactNode,
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { isInternalUrl } from "@shared/utils/urls";
-import { Error as ImageError } from "@shared/editor/components/Image";
+import { forwardRef, useEffect, useMemo, useRef, useState } from "react";
+import { sanitizeUrl } from "@shared/utils/urls";
+import { Error } from "@shared/editor/components/Image";
 import {
   BackIcon,
   CloseIcon,
@@ -23,14 +14,12 @@ import {
   DownloadIcon,
   LinkIcon,
   NextIcon,
-  ZoomInIcon,
-  ZoomOutIcon,
-  EditIcon,
 } from "outline-icons";
 import { depths, extraArea, s } from "@shared/styles";
 import NudeButton from "./NudeButton";
 import useIdle from "~/hooks/useIdle";
 import { Second } from "@shared/utils/time";
+import { downloadImageNode } from "@shared/editor/nodes/Image";
 import * as VisuallyHidden from "@radix-ui/react-visually-hidden";
 import { useTranslation } from "react-i18next";
 import Tooltip from "~/components/Tooltip";
@@ -40,21 +29,6 @@ import Button from "./Button";
 import CopyToClipboard from "./CopyToClipboard";
 import { Separator } from "./Actions";
 import useSwipe from "~/hooks/useSwipe";
-import { toast } from "sonner";
-import { findIndex } from "lodash";
-import { LightboxImage } from "@shared/editor/lib/Lightbox";
-import {
-  TransformWrapper,
-  TransformComponent,
-  useTransformEffect,
-  ReactZoomPanPinchRef,
-} from "react-zoom-pan-pinch";
-import { transparentize } from "polished";
-import { mergeRefs } from "react-merge-refs";
-import { useEditor } from "~/editor/components/EditorContext";
-import { NodeSelection } from "prosemirror-state";
-import { ImageSource } from "@shared/editor/lib/FileHelper";
-import Desktop from "~/utils/Desktop";
 
 export enum LightboxStatus {
   READY_TO_OPEN,
@@ -69,9 +43,6 @@ export enum ImageStatus {
   LOADING,
   ERROR,
   LOADED,
-  MIN_ZOOM,
-  MAX_ZOOM,
-  ZOOMED,
 }
 type Status = {
   lightbox: LightboxStatus | null;
@@ -89,153 +60,46 @@ type Animation = {
 const ANIMATION_DURATION = 0.3 * Second.ms;
 
 type Props = {
-  /** List of allowed images */
-  images: LightboxImage[];
-  /** The currently active image in the document */
-  activeImage: LightboxImage;
-  /** Callback triggered when the active image is updated */
-  onUpdate: (activeImage: LightboxImage | null) => void;
-  /** Callback triggered when Lightbox closes */
-  onClose: () => void;
+  /** Callback triggered when the active image position is updated */
+  onUpdate: (pos: number | null) => void;
+  /** The position of the currently active image in the document */
+  activePos: number | null;
 };
 
-const ZoomPanPinchContext = createContext({ isImagePanning: false });
-type ZoomablePannablePinchableProps = {
-  children: ReactNode;
-  panningDisabled: boolean;
-  disabled: boolean;
-  onClose?: () => void;
-};
-
-const ZoomablePannablePinchable = forwardRef<
-  ReactZoomPanPinchRef,
-  ZoomablePannablePinchableProps
->(({ children, panningDisabled, disabled, onClose }, ref) => {
-  const { isPanning, ...panningHandlers } = usePanning();
-  const wrapperRef = useRef<ReactZoomPanPinchRef>(null);
-  const scale = wrapperRef.current?.instance.transformState.scale ?? 1;
-
-  const wrapperProps = useMemo(
-    () =>
-      ({
-        onClick: (event) => {
-          if (scale > 1) {
-            return;
-          }
-          if (event.defaultPrevented) {
-            return;
-          }
-          if (
-            ["IMG", "INPUT", "BUTTON", "A"].includes(
-              (event.target as Element).tagName
-            )
-          ) {
-            return;
-          }
-          onClose?.();
-        },
-      }) satisfies HTMLAttributes<HTMLDivElement>,
-    [onClose, scale]
-  );
-
-  return (
-    <ZoomPanPinchContext.Provider value={{ isImagePanning: isPanning }}>
-      <TransformWrapper
-        ref={mergeRefs([ref, wrapperRef])}
-        disabled={disabled}
-        doubleClick={{ disabled: true }}
-        minScale={1}
-        maxScale={8}
-        panning={{
-          disabled: panningDisabled,
-        }}
-        {...panningHandlers}
-      >
-        <TransformComponent
-          wrapperStyle={{
-            width: "100%",
-            height: "100%",
-            cursor: isPanning ? "grabbing" : scale > 1 ? "grab" : "zoom-out",
-          }}
-          contentStyle={{
-            width: "100%",
-            height: "100%",
-            padding: "56px",
-            justifyContent: "center",
-            alignItems: "center",
-          }}
-          wrapperProps={wrapperProps}
-        >
-          {children}
-        </TransformComponent>
-      </TransformWrapper>
-    </ZoomPanPinchContext.Provider>
-  );
-});
-
-function usePanning() {
-  const [isPanning, setPanning] = useState(false);
-  const dragged = useRef(false);
-
-  const onPanningStart: ComponentProps<
-    typeof TransformWrapper
-  >["onPanningStart"] = (ref) => {
-    const zoomedIn = ref.state.scale > 1;
-    if (zoomedIn) {
-      setPanning(ref.instance.isPanning);
-    }
-  };
-
-  const onPanning: ComponentProps<
-    typeof TransformWrapper
-  >["onPanning"] = () => {
-    dragged.current = true;
-  };
-
-  const onPanningStop: ComponentProps<
-    typeof TransformWrapper
-  >["onPanningStop"] = (ref, event) => {
-    setPanning(ref.instance.isPanning);
-    if (dragged.current) {
-      dragged.current = false;
-    } else if (event.target instanceof HTMLImageElement) {
-      const zoomedOut = Math.abs(ref.state.scale - 1) < 0.001;
-      if (zoomedOut) {
-        ref.zoomIn();
-      } else {
-        ref.resetTransform();
-      }
-    }
-  };
-
-  return {
-    isPanning,
-    onPanningStart,
-    onPanning,
-    onPanningStop,
-  };
-}
-
-function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
+function Lightbox({ onUpdate, activePos }: Props) {
+  const { view } = useEditor();
   const isIdle = useIdle(3 * Second.ms);
   const { t } = useTranslation();
   const imgRef = useRef<HTMLImageElement | null>(null);
   const overlayRef = useRef<HTMLDivElement | null>(null);
-  const contentRef = useRef<HTMLDivElement | null>(null);
   const [status, setStatus] = useState<Status>({ lightbox: null, image: null });
+  const [imageElements] = useState(
+    view?.dom.querySelectorAll(".component-image img")
+  );
   const animation = useRef<Animation | null>(null);
   const finalImage = useRef<{
     center: { x: number; y: number };
     width: number;
     height: number;
   } | null>(null);
-  const zoomPanPinchRef = useRef<ReactZoomPanPinchRef>(null);
-  const editor = useEditor();
 
-  const currentImageIndex = findIndex(
-    images,
-    (img) => img.pos === activeImage.pos
+  const imageNodes = useMemo(
+    () =>
+      view
+        ? findChildren(
+            view.state.doc,
+            (child) => child.type === view.state.schema.nodes.image,
+            true
+          )
+        : [],
+    [view]
   );
+  const currentImageIndex = findIndex(
+    imageNodes,
+    (node) => node.pos === activePos
+  );
+  const currentImageNode =
+    currentImageIndex >= 0 ? imageNodes[currentImageIndex].node : undefined;
 
   // Debugging status changes
   // useEffect(() => {
@@ -244,21 +108,15 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
   //   );
   // }, [status]);
 
-  useEffect(
-    () => () => {
-      if (status.lightbox === LightboxStatus.CLOSED) {
-        onClose();
-      }
-    },
-    [status.lightbox]
-  );
+  useEffect(() => () => view.focus(), []);
 
   useEffect(() => {
-    setStatus({
-      lightbox: LightboxStatus.READY_TO_OPEN,
-      image: status.image,
-    });
-  }, []);
+    !!activePos &&
+      setStatus({
+        lightbox: LightboxStatus.READY_TO_OPEN,
+        image: status.image,
+      });
+  }, [!!activePos]);
 
   useEffect(() => {
     if (status.image === ImageStatus.LOADED) {
@@ -281,18 +139,6 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
     }
   }, [status.image, status.lightbox]);
 
-  useEffect(() => {
-    if (
-      status.lightbox === LightboxStatus.OPENED &&
-      status.image === ImageStatus.LOADED
-    ) {
-      setStatus({
-        lightbox: LightboxStatus.OPENED,
-        image: ImageStatus.MIN_ZOOM,
-      });
-    }
-  }, [status.lightbox, status.image]);
-
   useEffect(() => {
     if (status.lightbox === LightboxStatus.READY_TO_CLOSE) {
       setupFadeOut();
@@ -310,15 +156,6 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
     }
   }, [status.lightbox]);
 
-  useEffect(() => {
-    if (status.image === ImageStatus.MIN_ZOOM) {
-      // It was observed that focus went to `body` as the zoom out button was disabled
-      // upon clicking it. This stopped navigating to next/previous image using arrow keys.
-      // So focusing the content div here to restore the functionality.
-      contentRef.current?.focus();
-    }
-  }, [status.image]);
-
   const rememberImagePosition = () => {
     if (imgRef.current) {
       const lightboxImgDOMRect = imgRef.current.getBoundingClientRect();
@@ -342,10 +179,11 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
   const setupZoomIn = () => {
     if (imgRef.current) {
       // in editor
-      const editorImageEl = activeImage.getElement();
+      const editorImageEl = imageElements[currentImageIndex];
       if (!editorImageEl) {
         return;
       }
+
       const editorImgDOMRect = editorImageEl.getBoundingClientRect();
       const {
         top: editorImgTop,
@@ -432,13 +270,7 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
   };
 
   const setupZoomOut = () => {
-    if (
-      imgRef.current &&
-      !(
-        status.image === ImageStatus.ZOOMED ||
-        status.image === ImageStatus.MAX_ZOOM
-      )
-    ) {
+    if (imgRef.current) {
       // in lightbox
       const lightboxImgDOMRect = imgRef.current.getBoundingClientRect();
       const {
@@ -457,7 +289,7 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
       };
 
       // in editor
-      const editorImageEl = activeImage.getElement();
+      const editorImageEl = imageElements[currentImageIndex];
       let to;
       if (editorImageEl?.isConnected) {
         const editorImgDOMRect = editorImageEl.getBoundingClientRect();
@@ -532,31 +364,33 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
     }
   };
 
+  if (!activePos) {
+    return null;
+  }
+
   const prev = () => {
-    if (
-      status.lightbox === LightboxStatus.OPENED &&
-      (status.image === ImageStatus.MIN_ZOOM ||
-        status.image === ImageStatus.ERROR)
-    ) {
+    if (status.lightbox === LightboxStatus.OPENED) {
+      if (!activePos) {
+        return;
+      }
       const prevIndex = currentImageIndex - 1;
       if (prevIndex < 0) {
         return;
       }
-      onUpdate(images[prevIndex]);
+      onUpdate(imageNodes[prevIndex].pos);
     }
   };
 
   const next = () => {
-    if (
-      status.lightbox === LightboxStatus.OPENED &&
-      (status.image === ImageStatus.MIN_ZOOM ||
-        status.image === ImageStatus.ERROR)
-    ) {
-      const nextIndex = currentImageIndex + 1;
-      if (nextIndex >= images.length) {
+    if (status.lightbox === LightboxStatus.OPENED) {
+      if (!activePos) {
         return;
       }
-      onUpdate(images[nextIndex]);
+      const nextIndex = currentImageIndex + 1;
+      if (nextIndex >= imageNodes.length) {
+        return;
+      }
+      onUpdate(imageNodes[nextIndex].pos);
     }
   };
 
@@ -572,63 +406,12 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
     }
   };
 
-  const svgDataURLToBlob = (dataURL: string) => {
-    // Match the SVG data URL format
-    const match = dataURL.match(/^data:image\/svg\+xml,(.*)$/i);
-    if (!match) {
-      return;
+  const download = () => {
+    if (currentImageNode && status.lightbox === LightboxStatus.OPENED) {
+      void downloadImageNode(currentImageNode);
     }
-
-    const encodedSVGData = match[1];
-    const decodedSVGData = decodeURIComponent(encodedSVGData);
-
-    // Convert string to Uint8Array
-    const uint8 = new Uint8Array(decodedSVGData.length);
-    for (let i = 0; i < decodedSVGData.length; ++i) {
-      uint8[i] = decodedSVGData.charCodeAt(i);
-    }
-
-    // Create and return the Blob
-    return new Blob([uint8], { type: "image/svg+xml" });
   };
 
-  const downloadImage = async (src: string, saveAs: string) => {
-    let imageBlob;
-    if (isInternalUrl(src)) {
-      const image = await fetch(src);
-      imageBlob = await image.blob();
-    } else {
-      // Assuming it's a mermaid svg
-      imageBlob = svgDataURLToBlob(src);
-    }
-
-    if (!imageBlob) {
-      toast.error(t("Unable to download image"));
-      return;
-    }
-
-    const imageURL = URL.createObjectURL(imageBlob);
-    const name = saveAs || "image";
-    const extension = imageBlob.type.split(/\/|\+/g)[1];
-
-    // create a temporary link node and click it with our image data
-    const link = document.createElement("a");
-    link.href = imageURL;
-    link.download = `${name}.${extension}`;
-    document.body.appendChild(link);
-    link.click();
-
-    // cleanup
-    document.body.removeChild(link);
-    URL.revokeObjectURL(imageURL);
-  };
-
-  const handleDownload = useCallback(() => {
-    if (activeImage && status.lightbox === LightboxStatus.OPENED) {
-      void downloadImage(activeImage.src, activeImage.alt);
-    }
-  }, [activeImage, status.lightbox]);
-
   const handleKeyDown = (ev: React.KeyboardEvent<HTMLDivElement>) => {
     ev.preventDefault();
     switch (ev.key) {
@@ -676,19 +459,14 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
     }
   };
 
-  const handleEditDiagram = () => {
-    const { state, dispatch } = editor.view;
+  if (!currentImageNode) {
+    return null;
+  }
 
-    // Select the node at the position
-    const tr = state.tr.setSelection(
-      NodeSelection.create(state.doc, activeImage.pos)
-    );
-    dispatch(tr);
-    editor.commands.editDiagram();
-  };
+  const src = sanitizeUrl(currentImageNode.attrs.src) ?? "";
 
   return (
-    <Dialog.Root open={true}>
+    <Dialog.Root open={!!activePos}>
       <Dialog.Portal>
         <StyledOverlay
           ref={overlayRef}
@@ -696,7 +474,7 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
           onAnimationStart={handleFadeStart}
           onAnimationEnd={handleFadeEnd}
         />
-        <StyledContent onKeyDown={handleKeyDown} ref={contentRef}>
+        <StyledContent onKeyDown={handleKeyDown}>
           <VisuallyHidden.Root>
             <Dialog.Title>{t("Lightbox")}</Dialog.Title>
             <Dialog.Description>
@@ -704,52 +482,10 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
             </Dialog.Description>
           </VisuallyHidden.Root>
           <Actions animation={animation.current}>
-            <Tooltip content={t("Zoom in")} placement="bottom">
-              <ActionButton
-                tabIndex={-1}
-                disabled={
-                  status.image === ImageStatus.MAX_ZOOM ||
-                  status.image === ImageStatus.ERROR
-                }
-                onClick={() => {
-                  if (zoomPanPinchRef.current) {
-                    zoomPanPinchRef.current.zoomIn();
-                  }
-                }}
-                aria-label={t("Zoom in")}
-                size={32}
-                icon={<ZoomInIcon />}
-                borderOnHover
-                neutral
-              />
-            </Tooltip>
-            <Tooltip content={t("Zoom out")} placement="bottom">
-              <ActionButton
-                tabIndex={-1}
-                disabled={
-                  !(
-                    status.image === ImageStatus.ZOOMED ||
-                    status.image === ImageStatus.MAX_ZOOM
-                  )
-                }
-                onClick={() => {
-                  if (zoomPanPinchRef.current) {
-                    zoomPanPinchRef.current.zoomOut();
-                  }
-                }}
-                aria-label={t("Zoom out")}
-                size={32}
-                icon={<ZoomOutIcon />}
-                borderOnHover
-                neutral
-              />
-            </Tooltip>
-            <Separator />
             <Tooltip content={t("Copy link")} placement="bottom">
               <CopyToClipboard text={imgRef.current?.src ?? ""}>
-                <ActionButton
+                <Button
                   tabIndex={-1}
-                  disabled={status.image === ImageStatus.ERROR}
                   aria-label={t("Copy link")}
                   size={32}
                   icon={<LinkIcon />}
@@ -759,10 +495,9 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
               </CopyToClipboard>
             </Tooltip>
             <Tooltip content={t("Download")} placement="bottom">
-              <ActionButton
+              <Button
                 tabIndex={-1}
-                disabled={status.image === ImageStatus.ERROR}
-                onClick={handleDownload}
+                onClick={download}
                 aria-label={t("Download")}
                 size={32}
                 icon={<DownloadIcon />}
@@ -770,25 +505,10 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
                 neutral
               />
             </Tooltip>
-            {activeImage.source === ImageSource.DiagramsNet &&
-              !Desktop.isElectron() && (
-                <Tooltip content={t("Edit diagram")} placement="bottom">
-                  <ActionButton
-                    tabIndex={-1}
-                    disabled={status.image === ImageStatus.ERROR}
-                    onClick={handleEditDiagram}
-                    aria-label={t("Edit diagram")}
-                    size={32}
-                    icon={<EditIcon />}
-                    borderOnHover
-                    neutral
-                  />
-                </Tooltip>
-              )}
             <Separator />
             <Dialog.Close asChild>
               <Tooltip content={t("Close")} shortcut="Esc" placement="bottom">
-                <ActionButton
+                <Button
                   tabIndex={-1}
                   onClick={close}
                   aria-label={t("Close")}
@@ -800,87 +520,49 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
               </Tooltip>
             </Dialog.Close>
           </Actions>
-          {currentImageIndex > 0 &&
-            !(
-              status.image === ImageStatus.ZOOMED ||
-              status.image === ImageStatus.MAX_ZOOM
-            ) && (
-              <Nav dir="left" $hidden={isIdle} animation={animation.current}>
-                <NavButton onClick={prev} size={32} aria-label={t("Previous")}>
-                  <BackIcon size={32} />
-                </NavButton>
-              </Nav>
-            )}
-          <ZoomablePannablePinchable
-            panningDisabled={
-              !(
-                status.image === ImageStatus.ZOOMED ||
-                status.image === ImageStatus.MAX_ZOOM
-              )
+          {currentImageIndex > 0 && (
+            <Nav dir="left" $hidden={isIdle} animation={animation.current}>
+              <NavButton onClick={prev} size={32} aria-label={t("Previous")}>
+                <BackIcon size={32} />
+              </NavButton>
+            </Nav>
+          )}
+          <Image
+            ref={imgRef}
+            src={src}
+            alt={currentImageNode.attrs.alt ?? ""}
+            onLoading={() =>
+              setStatus({
+                lightbox: status.lightbox,
+                image: ImageStatus.LOADING,
+              })
             }
-            disabled={status.image === ImageStatus.ERROR}
-            ref={zoomPanPinchRef}
-            onClose={close}
-          >
-            <Image
-              ref={imgRef}
-              src={activeImage.src}
-              alt={activeImage.alt}
-              onLoading={() =>
-                setStatus({
-                  lightbox: status.lightbox,
-                  image: ImageStatus.LOADING,
-                })
-              }
-              onLoad={() =>
-                setStatus({
-                  lightbox: status.lightbox,
-                  image: ImageStatus.LOADED,
-                })
-              }
-              onError={() =>
-                setStatus({
-                  lightbox: status.lightbox,
-                  image: ImageStatus.ERROR,
-                })
-              }
-              onSwipeRight={prev}
-              onSwipeLeft={next}
-              onSwipeUp={close}
-              onSwipeDown={close}
-              status={status}
-              animation={animation.current}
-              onMinZoom={() => {
-                setStatus({
-                  lightbox: status.lightbox,
-                  image: ImageStatus.MIN_ZOOM,
-                });
-              }}
-              onZoom={() =>
-                setStatus({
-                  lightbox: status.lightbox,
-                  image: ImageStatus.ZOOMED,
-                })
-              }
-              onMaxZoom={() =>
-                setStatus({
-                  lightbox: status.lightbox,
-                  image: ImageStatus.MAX_ZOOM,
-                })
-              }
-            />
-          </ZoomablePannablePinchable>
-          {currentImageIndex < images.length - 1 &&
-            !(
-              status.image === ImageStatus.ZOOMED ||
-              status.image === ImageStatus.MAX_ZOOM
-            ) && (
-              <Nav dir="right" $hidden={isIdle} animation={animation.current}>
-                <NavButton onClick={next} size={32} aria-label={t("Next")}>
-                  <NextIcon size={32} />
-                </NavButton>
-              </Nav>
-            )}
+            onLoad={() =>
+              setStatus({
+                lightbox: status.lightbox,
+                image: ImageStatus.LOADED,
+              })
+            }
+            onError={() =>
+              setStatus({
+                lightbox: status.lightbox,
+                image: ImageStatus.ERROR,
+              })
+            }
+            onSwipeRight={prev}
+            onSwipeLeft={next}
+            onSwipeUp={close}
+            onSwipeDown={close}
+            status={status}
+            animation={animation.current}
+          />
+          {currentImageIndex < imageNodes.length - 1 && (
+            <Nav dir="right" $hidden={isIdle} animation={animation.current}>
+              <NavButton onClick={next} size={32} aria-label={t("Next")}>
+                <NextIcon size={32} />
+              </NavButton>
+            </Nav>
+          )}
         </StyledContent>
       </Dialog.Portal>
     </Dialog.Root>
@@ -899,9 +581,6 @@ type ImageProps = {
   onSwipeDown: () => void;
   status: Status;
   animation: Animation | null;
-  onMinZoom: () => void;
-  onZoom: () => void;
-  onMaxZoom: () => void;
 };
 
 const Image = forwardRef<HTMLImageElement, ImageProps>(function _Image(
@@ -917,9 +596,6 @@ const Image = forwardRef<HTMLImageElement, ImageProps>(function _Image(
     onSwipeDown,
     status,
     animation,
-    onMinZoom,
-    onZoom,
-    onMaxZoom,
   }: ImageProps,
   ref
 ) {
@@ -932,25 +608,6 @@ const Image = forwardRef<HTMLImageElement, ImageProps>(function _Image(
     onSwipeDown,
   });
 
-  const { isImagePanning } = useContext(ZoomPanPinchContext);
-
-  useTransformEffect(({ state, instance }) => {
-    const minScale = instance.props.minScale ?? 1;
-    const maxScale = instance.props.maxScale ?? 8;
-    const { scale } = state;
-    if (scale === minScale && status.image === ImageStatus.ZOOMED) {
-      onMinZoom();
-    } else if (scale === maxScale && status.image === ImageStatus.ZOOMED) {
-      onMaxZoom();
-    } else if (
-      scale > minScale &&
-      scale < maxScale &&
-      status.image !== ImageStatus.ZOOMED
-    ) {
-      onZoom();
-    }
-  });
-
   const [hidden, setHidden] = useState(
     status.image === null || status.image === ImageStatus.LOADING
   );
@@ -985,15 +642,9 @@ const Image = forwardRef<HTMLImageElement, ImageProps>(function _Image(
           onError={onError}
           onLoad={onLoad}
           $hidden={hidden}
-          $zoomedIn={
-            status.image === ImageStatus.ZOOMED ||
-            status.image === ImageStatus.MAX_ZOOM
-          }
-          $zoomedOut={status.image === ImageStatus.MIN_ZOOM}
-          $panning={isImagePanning}
         />
         <Caption>
-          {status.image === ImageStatus.MIN_ZOOM &&
+          {status.image === ImageStatus.LOADED &&
           status.lightbox === LightboxStatus.OPENED ? (
             <Fade>{alt}</Fade>
           ) : null}
@@ -1049,25 +700,12 @@ const StyledOverlay = styled(Dialog.Overlay)<{
 
 const StyledImg = styled.img<{
   $hidden: boolean;
-  $zoomedIn: boolean;
-  $zoomedOut: boolean;
-  $panning: boolean;
   animation: Animation | null;
 }>`
   visibility: ${(props) => (props.$hidden ? "hidden" : "visible")};
-  pointer-events: auto !important;
   max-width: 100%;
   min-height: 0;
   object-fit: contain;
-  cursor: ${(props) =>
-    props.$panning
-      ? "grabbing"
-      : props.$zoomedOut
-        ? "zoom-in"
-        : props.$zoomedIn
-          ? "zoom-out"
-          : "default"};
-
   ${(props) =>
     props.animation?.zoomIn
       ? css`
@@ -1079,12 +717,7 @@ const StyledImg = styled.img<{
             animation: ${props.animation.zoomOut.apply()}
               ${props.animation.zoomOut.duration}ms;
           `
-        : props.animation?.fadeOut
-          ? css`
-              animation: ${props.animation.fadeOut.apply()}
-                ${props.animation.fadeOut.duration}ms;
-            `
-          : ""}
+        : ""}
 `;
 
 const StyledContent = styled(Dialog.Content)`
@@ -1095,10 +728,7 @@ const StyledContent = styled(Dialog.Content)`
   justify-content: center;
   align-items: center;
   outline: none;
-`;
-
-const ActionButton = styled(Button)`
-  background: transparent;
+  padding: 56px;
 `;
 
 const Actions = styled.div<{
@@ -1111,10 +741,6 @@ const Actions = styled.div<{
   display: flex;
   align-items: center;
   gap: 8px;
-  z-index: ${depths.modal};
-  background: ${(props) => transparentize(0.2, props.theme.background)};
-  backdrop-filter: blur(4px);
-  border-radius: 6px;
 
   ${(props) =>
     props.animation === null
@@ -1142,7 +768,6 @@ const Nav = styled.div<{
   position: absolute;
   ${(props) => (props.dir === "left" ? "left: 0;" : "right: 0;")}
   transition: opacity 500ms ease-in-out;
-  z-index: ${depths.modal};
   ${(props) => props.$hidden && "opacity: 0;"}
   ${(props) =>
     props.animation === null
@@ -1162,7 +787,7 @@ const Nav = styled.div<{
           : ""}
 `;
 
-const StyledError = styled(ImageError)<{
+const StyledError = styled(Error)<{
   animation: Animation | null;
 }>`
   ${(props) =>

app/components/Menu/ContextMenu.tsx

@@ -1,8 +1,8 @@
 import * as React from "react";
-import { actionToMenuItem } from "~/actions";
+import { actionV2ToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import useMobile from "~/hooks/useMobile";
-import { ActionVariant, ActionWithChildren } from "~/types";
+import { ActionV2Variant, ActionV2WithChildren } from "~/types";
 import { toMenuItems } from "./transformer";
 import { observer } from "mobx-react";
 import { useComputed } from "~/hooks/useComputed";
@@ -11,7 +11,7 @@ import { MenuProvider } from "~/components/primitives/Menu/MenuContext";
 
 type Props = {
   /** Root action with children representing the menu items */
-  action?: ActionWithChildren;
+  action: ActionV2WithChildren;
   /** Trigger for the menu */
   children: React.ReactNode;
   /** ARIA label for the menu */
@@ -30,13 +30,15 @@ export const ContextMenu = observer(
       isMenu: true,
     });
 
-    const menuItems = useComputed(
-      () =>
-        ((action?.children as ActionVariant[]) ?? []).map((childAction) =>
-          actionToMenuItem(childAction, actionContext)
-        ),
-      [action?.children, actionContext]
-    );
+    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) => {
@@ -46,7 +48,7 @@ export const ContextMenu = observer(
           onClose?.();
         }
       },
-      [open, onOpen, onClose]
+      [onOpen, onClose]
     );
 
     const enablePointerEvents = React.useCallback(() => {
@@ -66,7 +68,7 @@ export const ContextMenu = observer(
       []
     );
 
-    if (isMobile || !action || menuItems.length === 0) {
+    if (isMobile) {
       return <>{children}</>;
     }
 

app/components/Menu/DropdownMenu.tsx

@@ -10,12 +10,12 @@ import {
 } from "~/components/primitives/Drawer";
 import { Menu, MenuContent, MenuTrigger } from "~/components/primitives/Menu";
 import { MenuProvider } from "~/components/primitives/Menu/MenuContext";
-import { actionToMenuItem } from "~/actions";
+import { actionV2ToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import useMobile from "~/hooks/useMobile";
 import {
-  ActionVariant,
-  ActionWithChildren,
+  ActionV2Variant,
+  ActionV2WithChildren,
   MenuItem,
   MenuItemWithChildren,
 } from "~/types";
@@ -25,7 +25,7 @@ import { useComputed } from "~/hooks/useComputed";
 
 type Props = {
   /** Root action with children representing the menu items */
-  action: ActionWithChildren;
+  action: ActionV2WithChildren;
   /** Trigger for the menu */
   children: React.ReactNode;
   /** Alignment w.r.t trigger - defaults to start */
@@ -69,8 +69,8 @@ export const DropdownMenu = observer(
           return [];
         }
 
-        return (action.children as ActionVariant[]).map((childAction) =>
-          actionToMenuItem(childAction, actionContext)
+        return (action.children as ActionV2Variant[]).map((childAction) =>
+          actionV2ToMenuItem(childAction, actionContext)
         );
       }, [open, action.children, actionContext]);
 

app/components/Menu/transformer.tsx

@@ -11,12 +11,9 @@ import {
 } from "~/components/primitives/Menu";
 import * as Components from "~/components/primitives/components/Menu";
 import { MenuItem } from "~/types";
-import { MouseSafeArea } from "~/components/MouseSafeArea";
-import { createRef } from "react";
 
 export function toMenuItems(items: MenuItem[]) {
   const filteredItems = filterMenuItems(items);
-  const parentRef = createRef<HTMLDivElement>();
 
   if (!filteredItems.length) {
     return null;
@@ -91,10 +88,7 @@ export function toMenuItems(items: MenuItem[]) {
               icon={icon}
               disabled={item.disabled}
             />
-            <SubMenuContent ref={parentRef}>
-              <MouseSafeArea parentRef={parentRef} />
-              {submenuItems}
-            </SubMenuContent>
+            <SubMenuContent>{submenuItems}</SubMenuContent>
           </SubMenu>
         );
       }
@@ -166,7 +160,7 @@ export function toMobileMenuItems(
             <Components.MenuLabel>{item.title}</Components.MenuLabel>
             {item.selected !== undefined && (
               <Components.SelectedIconWrapper aria-hidden>
-                {item.selected ? <CheckmarkIcon size={18} /> : null}
+                {item.selected ? <CheckmarkIcon /> : null}
               </Components.SelectedIconWrapper>
             )}
           </Components.MenuButton>

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} topShadow>
+                <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%;
@@ -213,20 +205,16 @@ const Header = styled(Flex)`
   justify-content: space-between;
   font-weight: 600;
   padding: 24px 24px 12px;
-  flex-shrink: 0;
 `;
 
-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;
@@ -249,4 +237,8 @@ const Wrapper = styled.div<{
   }
 `;
 
+const SmallContent = styled(Scrollable)`
+  padding: 8px 24px 24px;
+`;
+
 export default observer(Modal);

app/components/NavLink.tsx

@@ -12,11 +12,17 @@ type Props = React.ComponentProps<typeof NavLink> & {
       | null,
     location: LocationDescriptorObject
   ) => React.ReactNode;
-  /** If true, the tab will only be active if the path matches exactly */
+  /**
+   * If true, the tab will only be active if the path matches exactly.
+   */
   exact?: boolean;
-  /** CSS properties to apply to the link when it is active */
+  /**
+   * CSS properties to apply to the link when it is active.
+   */
   activeStyle?: React.CSSProperties;
-  /** The path to match against the current location */
+  /**
+   * The path to match against the current location.
+   */
   to: LocationDescriptor;
 };
 

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/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/InputClientType.tsx

@@ -1,37 +0,0 @@
-import * as React from "react";
-import { useTranslation } from "react-i18next";
-import { InputSelect } from "../InputSelect";
-
-/**
- * An input that allows a choice of OAuth client type.
- */
-export const InputClientType = React.forwardRef(
-  (
-    props: Omit<React.ComponentProps<typeof InputSelect>, "options" | "label">,
-    ref: React.Ref<HTMLButtonElement>
-  ) => {
-    const { t } = useTranslation();
-    return (
-      <InputSelect
-        {...props}
-        label={t("Client type")}
-        ref={ref}
-        style={{ marginBottom: "1em" }}
-        options={[
-          {
-            type: "item",
-            label: t("Confidential"),
-            value: "confidential",
-            description: t("Suitable for server-side applications"),
-          },
-          {
-            type: "item",
-            label: t("Public"),
-            value: "public",
-            description: t("Suitable for client-side or mobile applications"),
-          },
-        ]}
-      />
-    );
-  }
-);

app/components/OAuthClient/OAuthClientForm.tsx

@@ -10,8 +10,6 @@ import Flex from "~/components/Flex";
 import Input, { LabelText } from "~/components/Input";
 import isCloudHosted from "~/utils/isCloudHosted";
 import Switch from "../Switch";
-import EventBoundary from "@shared/components/EventBoundary";
-import { InputClientType } from "./InputClientType";
 
 export interface FormData {
   name: string;
@@ -21,7 +19,6 @@ export interface FormData {
   avatarUrl: string;
   redirectUris: string[];
   published: boolean;
-  clientType: "confidential" | "public";
 }
 
 export const OAuthClientForm = observer(function OAuthClientForm_({
@@ -49,7 +46,6 @@ export const OAuthClientForm = observer(function OAuthClientForm_({
       avatarUrl: oauthClient?.avatarUrl ?? "",
       redirectUris: oauthClient?.redirectUris ?? [],
       published: oauthClient?.published ?? false,
-      clientType: oauthClient?.clientType ?? "confidential",
     },
   });
 
@@ -66,33 +62,20 @@ export const OAuthClientForm = observer(function OAuthClientForm_({
             control={control}
             name="avatarUrl"
             render={({ field }) => (
-              <EventBoundary>
-                <ImageInput
-                  alt={t("OAuth client icon")}
-                  onSuccess={(url) => field.onChange(url)}
-                  onError={(err) => setError("avatarUrl", { message: err })}
-                  model={{
-                    id: oauthClient?.id,
-                    avatarUrl: field.value,
-                    initial: getValues().name[0],
-                  }}
-                  borderRadius={0}
-                />
-              </EventBoundary>
+              <ImageInput
+                alt={t("OAuth client icon")}
+                onSuccess={(url) => field.onChange(url)}
+                onError={(err) => setError("avatarUrl", { message: err })}
+                model={{
+                  id: oauthClient?.id,
+                  avatarUrl: field.value,
+                  initial: getValues().name[0],
+                }}
+                borderRadius={0}
+              />
             )}
           />
         </label>
-        <Controller
-          control={control}
-          name="clientType"
-          render={({ field }) => (
-            <InputClientType
-              value={field.value}
-              onChange={field.onChange}
-              ref={field.ref}
-            />
-          )}
-        />
         <Input
           type="text"
           label={t("Name")}

app/components/ReadingTime.tsx

@@ -1,42 +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);
-
-  const readingTimeMinutes = stats.total.readingTime;
-  const hours = Math.floor(readingTimeMinutes / 60);
-  const minutes = readingTimeMinutes % 60;
-
-  let readingTimeText;
-  if (hours > 0) {
-    if (minutes > 0) {
-      readingTimeText = t(`{{ hours }}h {{ minutes }}m read`, {
-        hours,
-        minutes,
-      });
-    } else {
-      readingTimeText = t(`{{ hours }}h read`, { hours });
-    }
-  } else {
-    readingTimeText = t(`{{ minutes }}m read`, { minutes: readingTimeMinutes });
-  }
-
-  return (
-    <>
-      <EyeIcon size={18} />
-      {readingTimeText}
-    </>
-  );
-};
-
-export default ReadingTime;

app/components/SearchPopover.tsx

@@ -48,11 +48,6 @@ function SearchPopover({ shareId, className }: Props) {
     }
   }, [searchResults, query]);
 
-  // Clear search results when the query changes to prevent stale results
-  React.useEffect(() => {
-    setSearchResults(undefined);
-  }, [query]);
-
   const performSearch = React.useCallback(
     async ({ query: searchQuery, ...options }) => {
       if (searchQuery?.length > 0) {
@@ -63,7 +58,7 @@ function SearchPopover({ shareId, className }: Props) {
         });
 
         if (response.length) {
-          setSearchResults((state) => [...(state ?? []), ...response]);
+          setSearchResults(response);
         }
 
         return response;

app/components/Sharing/Collection/AccessControlList.tsx

@@ -23,7 +23,6 @@ import { Separator } from "../components";
 import { ListItem } from "../components/ListItem";
 import { Placeholder } from "../components/Placeholder";
 import { PublicAccess } from "./PublicAccess";
-import Flex from "@shared/components/Flex";
 
 type Props = {
   /** Collection to which team members are supposed to be invited */
@@ -78,12 +77,9 @@ export const AccessControlList = observer(
     }, [fetchMemberships, fetchGroupMemberships]);
 
     const containerRef = React.useRef<HTMLDivElement | null>(null);
-    const publicAccessRef = React.useRef<HTMLDivElement | null>(null);
-    const publicAccessHeight = publicAccessRef.current?.clientHeight || 0;
     const { maxHeight, calcMaxHeight } = useMaxHeight({
       elementRef: containerRef,
       maxViewportPercentage: 70,
-      margin: 24,
     });
 
     React.useEffect(() => {
@@ -115,177 +111,162 @@ export const AccessControlList = observer(
     );
 
     return (
-      <Wrapper>
-        <ScrollableContainer
-          ref={containerRef}
-          hiddenScrollbars
-          style={{
-            maxHeight: maxHeight ? maxHeight - publicAccessHeight : undefined,
-          }}
-        >
-          {showLoading ? (
-            <Placeholder count={2} />
-          ) : (
-            <>
-              <ListItem
-                image={
-                  <Squircle color={theme.accent} size={AvatarSize.Medium}>
-                    <UserIcon color={theme.accentText} size={16} />
-                  </Squircle>
-                }
-                title={t("All members")}
-                subtitle={t("Everyone in the workspace")}
-                actions={
-                  <div style={{ marginRight: -8 }}>
-                    <InputSelectPermission
-                      onChange={(
-                        value: CollectionPermission | typeof EmptySelectValue
-                      ) => {
-                        void collection.save({
-                          permission: value === EmptySelectValue ? null : value,
-                        });
-                      }}
-                      disabled={!can.update}
-                      value={collection?.permission}
-                      hideLabel
-                      nude
-                      shrink
+      <ScrollableContainer
+        ref={containerRef}
+        hiddenScrollbars
+        style={{ maxHeight }}
+      >
+        {showLoading ? (
+          <Placeholder count={2} />
+        ) : (
+          <>
+            <ListItem
+              image={
+                <Squircle color={theme.accent} size={AvatarSize.Medium}>
+                  <UserIcon color={theme.accentText} size={16} />
+                </Squircle>
+              }
+              title={t("All members")}
+              subtitle={t("Everyone in the workspace")}
+              actions={
+                <div style={{ marginRight: -8 }}>
+                  <InputSelectPermission
+                    onChange={(
+                      value: CollectionPermission | typeof EmptySelectValue
+                    ) => {
+                      void collection.save({
+                        permission: value === EmptySelectValue ? null : value,
+                      });
+                    }}
+                    disabled={!can.update}
+                    value={collection?.permission}
+                    hideLabel
+                    nude
+                    shrink
+                  />
+                </div>
+              }
+            />
+            {groupMembershipsInCollection
+              .filter((membership) => membership.group)
+              .sort((a, b) =>
+                (
+                  (invitedInSession.includes(a.group.id) ? "_" : "") +
+                  a.group.name
+                ).localeCompare(b.group.name)
+              )
+              .map((membership) => (
+                <ListItem
+                  key={membership.id}
+                  image={
+                    <GroupAvatar
+                      group={membership.group}
+                      backgroundColor={theme.modalBackground}
                     />
-                  </div>
-                }
-              />
-              {groupMembershipsInCollection
-                .filter((membership) => membership.group)
-                .sort((a, b) =>
-                  (
-                    (invitedInSession.includes(a.group.id) ? "_" : "") +
-                    a.group.name
-                  ).localeCompare(b.group.name)
-                )
-                .map((membership) => (
-                  <ListItem
-                    key={membership.id}
-                    image={
-                      <GroupAvatar
-                        group={membership.group}
-                        backgroundColor={theme.modalBackground}
-                      />
-                    }
-                    title={membership.group.name}
-                    subtitle={t("{{ count }} member", {
-                      count: membership.group.memberCount,
-                    })}
-                    actions={
-                      <div style={{ marginRight: -8 }}>
-                        <InputMemberPermissionSelect
-                          permissions={permissions}
-                          onChange={async (
-                            permission:
-                              | CollectionPermission
-                              | typeof EmptySelectValue
-                          ) => {
-                            try {
-                              if (permission === EmptySelectValue) {
-                                await groupMemberships.delete({
-                                  collectionId: collection.id,
-                                  groupId: membership.groupId,
-                                });
-                              } else {
-                                await groupMemberships.create({
-                                  collectionId: collection.id,
-                                  groupId: membership.groupId,
-                                  permission,
-                                });
-                              }
-                            } catch (err) {
-                              toast.error(err.message);
-                              return false;
+                  }
+                  title={membership.group.name}
+                  subtitle={t("{{ count }} member", {
+                    count: membership.group.memberCount,
+                  })}
+                  actions={
+                    <div style={{ marginRight: -8 }}>
+                      <InputMemberPermissionSelect
+                        permissions={permissions}
+                        onChange={async (
+                          permission:
+                            | CollectionPermission
+                            | typeof EmptySelectValue
+                        ) => {
+                          try {
+                            if (permission === EmptySelectValue) {
+                              await groupMemberships.delete({
+                                collectionId: collection.id,
+                                groupId: membership.groupId,
+                              });
+                            } else {
+                              await groupMemberships.create({
+                                collectionId: collection.id,
+                                groupId: membership.groupId,
+                                permission,
+                              });
                             }
-                            return true;
-                          }}
-                          disabled={!can.update}
-                          value={membership.permission}
-                        />
-                      </div>
-                    }
-                  />
-                ))}
-              {membershipsInCollection
-                .filter((membership) => membership.user)
-                .sort((a, b) =>
-                  (
-                    (invitedInSession.includes(a.user.id) ? "_" : "") +
-                    a.user.name
-                  ).localeCompare(b.user.name)
-                )
-                .map((membership) => (
-                  <ListItem
-                    key={membership.id}
-                    image={
-                      <Avatar
-                        model={membership.user}
-                        size={AvatarSize.Medium}
+                          } catch (err) {
+                            toast.error(err.message);
+                            return false;
+                          }
+                          return true;
+                        }}
+                        disabled={!can.update}
+                        value={membership.permission}
                       />
-                    }
-                    title={membership.user.name}
-                    subtitle={membership.user.email}
-                    actions={
-                      <div style={{ marginRight: -8 }}>
-                        <InputMemberPermissionSelect
-                          permissions={permissions}
-                          onChange={async (
-                            permission:
-                              | CollectionPermission
-                              | typeof EmptySelectValue
-                          ) => {
-                            try {
-                              if (permission === EmptySelectValue) {
-                                await memberships.delete({
-                                  collectionId: collection.id,
-                                  userId: membership.userId,
-                                });
-                              } else {
-                                await memberships.create({
-                                  collectionId: collection.id,
-                                  userId: membership.userId,
-                                  permission,
-                                });
-                              }
-                            } catch (err) {
-                              toast.error(err.message);
-                              return false;
+                    </div>
+                  }
+                />
+              ))}
+            {membershipsInCollection
+              .filter((membership) => membership.user)
+              .sort((a, b) =>
+                (
+                  (invitedInSession.includes(a.user.id) ? "_" : "") +
+                  a.user.name
+                ).localeCompare(b.user.name)
+              )
+              .map((membership) => (
+                <ListItem
+                  key={membership.id}
+                  image={
+                    <Avatar model={membership.user} size={AvatarSize.Medium} />
+                  }
+                  title={membership.user.name}
+                  subtitle={membership.user.email}
+                  actions={
+                    <div style={{ marginRight: -8 }}>
+                      <InputMemberPermissionSelect
+                        permissions={permissions}
+                        onChange={async (
+                          permission:
+                            | CollectionPermission
+                            | typeof EmptySelectValue
+                        ) => {
+                          try {
+                            if (permission === EmptySelectValue) {
+                              await memberships.delete({
+                                collectionId: collection.id,
+                                userId: membership.userId,
+                              });
+                            } else {
+                              await memberships.create({
+                                collectionId: collection.id,
+                                userId: membership.userId,
+                                permission,
+                              });
                             }
-                            return true;
-                          }}
-                          disabled={!can.update}
-                          value={membership.permission}
-                        />
-                      </div>
-                    }
-                  />
-                ))}
-            </>
-          )}
-        </ScrollableContainer>
+                          } catch (err) {
+                            toast.error(err.message);
+                            return false;
+                          }
+                          return true;
+                        }}
+                        disabled={!can.update}
+                        value={membership.permission}
+                      />
+                    </div>
+                  }
+                />
+              ))}
+          </>
+        )}
         {team.sharing && can.share && collection.sharing && visible && (
           <Sticky>
             {collection.members.length ? <Separator /> : null}
-            <PublicAccess
-              ref={publicAccessRef}
-              collection={collection}
-              share={share}
-            />
+            <PublicAccess collection={collection} share={share} />
           </Sticky>
         )}
-      </Wrapper>
+      </ScrollableContainer>
     );
   }
 );
 
-const Wrapper = styled(Flex)`
-  flex-direction: column;
-`;
-
 const ScrollableContainer = styled(Scrollable)`
   padding: 12px 24px;
   margin: -12px -24px;

app/components/Sharing/Collection/PublicAccess.tsx

@@ -2,7 +2,7 @@ import debounce from "lodash/debounce";
 import isEmpty from "lodash/isEmpty";
 import { observer } from "mobx-react";
 import { CopyIcon, GlobeIcon, InfoIcon, QuestionMarkIcon } from "outline-icons";
-import * as React from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import styled, { useTheme } from "styled-components";
@@ -31,24 +31,21 @@ type Props = {
   share: Share | null | undefined;
 };
 
-function InnerPublicAccess(
-  { collection, share }: Props,
-  ref: React.RefObject<HTMLDivElement>
-) {
+function InnerPublicAccess({ collection, share }: Props) {
   const { t } = useTranslation();
   const theme = useTheme();
-  const [validationError, setValidationError] = React.useState("");
-  const [urlId, setUrlId] = React.useState(share?.urlId);
-  const inputRef = React.useRef<HTMLInputElement>(null);
+  const [validationError, setValidationError] = useState("");
+  const [urlId, setUrlId] = useState(share?.urlId);
+  const inputRef = useRef<HTMLInputElement>(null);
   const can = usePolicy(share);
   const collectionAbilities = usePolicy(collection);
   const canPublish = can.update && collectionAbilities.share;
 
-  React.useEffect(() => {
+  useEffect(() => {
     setUrlId(share?.urlId);
   }, [share?.urlId]);
 
-  const handleIndexingChanged = React.useCallback(
+  const handleIndexingChanged = useCallback(
     async (checked: boolean) => {
       try {
         await share?.save({
@@ -61,7 +58,7 @@ function InnerPublicAccess(
     [share]
   );
 
-  const handleShowLastModifiedChanged = React.useCallback(
+  const handleShowLastModifiedChanged = useCallback(
     async (checked: boolean) => {
       try {
         await share?.save({
@@ -74,20 +71,7 @@ function InnerPublicAccess(
     [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(
+  const handlePublishedChange = useCallback(
     async (checked: boolean) => {
       try {
         await share?.save({
@@ -100,7 +84,7 @@ function InnerPublicAccess(
     [share]
   );
 
-  const handleUrlChange = React.useMemo(
+  const handleUrlChange = useMemo(
     () =>
       debounce(async (ev) => {
         if (!share) {
@@ -131,7 +115,7 @@ function InnerPublicAccess(
     [t, share]
   );
 
-  const handleCopied = React.useCallback(() => {
+  const handleCopied = useCallback(() => {
     toast.success(t("Public link copied to clipboard"));
   }, [t]);
 
@@ -146,7 +130,7 @@ function InnerPublicAccess(
   );
 
   return (
-    <Wrapper ref={ref}>
+    <Wrapper>
       <ListItem
         title={t("Web")}
         subtitle={<>{t("Allow anyone with the link to access")}</>}
@@ -220,31 +204,6 @@ function InnerPublicAccess(
                 />
               }
             />
-            <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}
@@ -305,4 +264,4 @@ const StyledInfoIcon = styled(InfoIcon)`
   flex-shrink: 0;
 `;
 
-export const PublicAccess = observer(React.forwardRef(InnerPublicAccess));
+export const PublicAccess = observer(InnerPublicAccess);

app/components/Sharing/Document/AccessControlList.tsx

@@ -67,11 +67,9 @@ export const AccessControlList = observer(
     const documentId = document.id;
 
     const containerRef = React.useRef<HTMLDivElement | null>(null);
-    const publicAccessRef = React.useRef<HTMLDivElement | null>(null);
-    const publicAccessHeight = publicAccessRef.current?.clientHeight || 0;
     const { maxHeight, calcMaxHeight } = useMaxHeight({
       elementRef: containerRef,
-      maxViewportPercentage: 45,
+      maxViewportPercentage: 65,
       margin: 24,
     });
 
@@ -111,106 +109,101 @@ export const AccessControlList = observer(
     });
 
     return (
-      <Wrapper>
-        <ScrollableContainer
-          ref={containerRef}
-          hiddenScrollbars
-          style={{
-            maxHeight: maxHeight ? maxHeight - publicAccessHeight : undefined,
-          }}
-        >
-          {showLoading ? (
-            <Placeholder />
-          ) : (
-            <>
-              {collection && canCollection.readDocument ? (
-                <>
-                  {collection.permission ? (
-                    <ListItem
-                      image={
-                        <Squircle color={theme.accent} size={AvatarSize.Medium}>
-                          <UserIcon color={theme.accentText} size={16} />
-                        </Squircle>
-                      }
-                      title={t("All members")}
-                      subtitle={t("Everyone in the workspace")}
-                      actions={
-                        <AccessTooltip>
-                          {collection?.permission ===
-                          CollectionPermission.ReadWrite
-                            ? t("Can edit")
-                            : t("Can view")}
-                        </AccessTooltip>
-                      }
-                    />
-                  ) : usersInCollection ? (
-                    <ListItem
-                      image={<CollectionSquircle collection={collection} />}
-                      title={collection.name}
-                      subtitle={t("Everyone in the collection")}
-                      actions={<AccessTooltip>{t("Can view")}</AccessTooltip>}
-                    />
-                  ) : (
-                    <ListItem
-                      image={<Avatar model={user} />}
-                      title={user.name}
-                      subtitle={t("You have full access")}
-                      actions={<AccessTooltip>{t("Can edit")}</AccessTooltip>}
-                    />
-                  )}
-                  <DocumentMemberList
-                    document={document}
-                    invitedInSession={invitedInSession}
-                  />
-                </>
-              ) : document.isDraft ? (
-                <>
-                  <ListItem
-                    image={<Avatar model={document.createdBy} />}
-                    title={document.createdBy?.name}
-                    actions={
-                      <AccessTooltip content={t("Created the document")}>
-                        {t("Can edit")}
-                      </AccessTooltip>
-                    }
-                  />
-                  <DocumentMemberList
-                    document={document}
-                    invitedInSession={invitedInSession}
-                  />
-                </>
-              ) : (
-                <>
-                  <DocumentMemberList
-                    document={document}
-                    invitedInSession={invitedInSession}
-                  />
+      <ScrollableContainer
+        ref={containerRef}
+        hiddenScrollbars
+        style={{ maxHeight }}
+      >
+        {showLoading ? (
+          <Placeholder />
+        ) : (
+          <>
+            {collection && canCollection.readDocument ? (
+              <>
+                {collection.permission ? (
                   <ListItem
                     image={
                       <Squircle color={theme.accent} size={AvatarSize.Medium}>
-                        <MoreIcon color={theme.accentText} size={16} />
+                        <UserIcon color={theme.accentText} size={16} />
                       </Squircle>
                     }
-                    title={t("Other people")}
-                    subtitle={t("Other workspace members may have access")}
+                    title={t("All members")}
+                    subtitle={t("Everyone in the workspace")}
                     actions={
-                      <AccessTooltip
-                        content={t(
-                          "This document may be shared with more workspace members through a parent document or collection you do not have access to"
-                        )}
-                      />
+                      <AccessTooltip>
+                        {collection?.permission ===
+                        CollectionPermission.ReadWrite
+                          ? t("Can edit")
+                          : t("Can view")}
+                      </AccessTooltip>
                     }
                   />
-                </>
-              )}
-            </>
-          )}
-        </ScrollableContainer>
+                ) : usersInCollection ? (
+                  <ListItem
+                    image={<CollectionSquircle collection={collection} />}
+                    title={collection.name}
+                    subtitle={t("Everyone in the collection")}
+                    actions={<AccessTooltip>{t("Can view")}</AccessTooltip>}
+                  />
+                ) : (
+                  <ListItem
+                    image={<Avatar model={user} />}
+                    title={user.name}
+                    subtitle={t("You have full access")}
+                    actions={<AccessTooltip>{t("Can edit")}</AccessTooltip>}
+                  />
+                )}
+                <DocumentMemberList
+                  document={document}
+                  invitedInSession={invitedInSession}
+                />
+              </>
+            ) : document.isDraft ? (
+              <>
+                <ListItem
+                  image={<Avatar model={document.createdBy} />}
+                  title={document.createdBy?.name}
+                  actions={
+                    <AccessTooltip content={t("Created the document")}>
+                      {t("Can edit")}
+                    </AccessTooltip>
+                  }
+                />
+                <DocumentMemberList
+                  document={document}
+                  invitedInSession={invitedInSession}
+                />
+              </>
+            ) : (
+              <>
+                <DocumentMemberList
+                  document={document}
+                  invitedInSession={invitedInSession}
+                />
+                <ListItem
+                  image={
+                    <Squircle color={theme.accent} size={AvatarSize.Medium}>
+                      <MoreIcon color={theme.accentText} size={16} />
+                    </Squircle>
+                  }
+                  title={t("Other people")}
+                  subtitle={t("Other workspace members may have access")}
+                  actions={
+                    <AccessTooltip
+                      content={t(
+                        "This document may be shared with more workspace members through a parent document or collection you do not have access to"
+                      )}
+                    />
+                  }
+                />
+              </>
+            )}
+          </>
+        )}
         {team.sharing && can.share && !collectionSharingDisabled && visible && (
           <Sticky>
             {document.members.length ? <Separator /> : null}
             <PublicAccess
-              ref={publicAccessRef}
               document={document}
               share={share}
               sharedParent={sharedParent}
@@ -218,7 +211,7 @@ export const AccessControlList = observer(
             />
           </Sticky>
         )}
-      </Wrapper>
+      </ScrollableContainer>
     );
   }
 );
@@ -283,14 +276,10 @@ function useUsersInCollection(collection?: Collection) {
     : false;
 }
 
-const Wrapper = styled(Flex)`
-  flex-direction: column;
-`;
-
 const Sticky = styled.div`
   background: ${s("menuBackground")};
   position: sticky;
-  bottom: 0;
+  bottom: -12px;
 `;
 
 const ScrollableContainer = styled(Scrollable)`

app/components/Sharing/Document/PublicAccess.tsx

@@ -37,10 +37,7 @@ type Props = {
   onRequestClose?: () => void;
 };
 
-function PublicAccess(
-  { document, share, sharedParent }: Props,
-  ref: React.RefObject<HTMLDivElement>
-) {
+function PublicAccess({ document, share, sharedParent }: Props) {
   const { t } = useTranslation();
   const theme = useTheme();
   const [validationError, setValidationError] = React.useState("");
@@ -80,19 +77,6 @@ function PublicAccess(
     [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 {
@@ -156,7 +140,7 @@ function PublicAccess(
   );
 
   return (
-    <Wrapper ref={ref}>
+    <Wrapper>
       <ListItem
         title={t("Web")}
         subtitle={
@@ -257,31 +241,6 @@ function PublicAccess(
                 />
               }
             />
-            <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}
-                />
-              }
-            />
           </>
         )}
 
@@ -356,4 +315,4 @@ const StyledLink = styled(Link)`
   text-decoration: underline;
 `;
 
-export default observer(React.forwardRef(PublicAccess));
+export default observer(PublicAccess);

app/components/Sharing/components/index.tsx

@@ -14,7 +14,7 @@ export const Wrapper = styled.div`
 
 export const Separator = styled.div`
   border-top: 1px dashed ${s("divider")};
-  margin: 0 0 8px 0;
+  margin: 8px 0;
 `;
 
 export const HeaderInput = styled(Flex)`