Improve comment explaining tunnel agent usage for proxy scenarios

Co-authored-by: tommoor <380914+tommoor@users.noreply.github.com>

.dockerignore

@@ -15,3 +15,4 @@ crowdin.yml
 build
 docker-compose.yml
 node_modules
+.yarn

.env.sample

@@ -61,6 +61,11 @@ DATABASE_CONNECTION_POOL_MAX=
 # DOCS: https://docs.getoutline.com/s/hosting/doc/redis-LGM4BFXYp4
 REDIS_URL=redis://redis:6379
 
+# To enable horizontal scaling of the collaboration service you must provide a Redis URL, it may
+# be the same as above, or a different server.
+# DOCS: https://docs.getoutline.com/s/hosting/doc/horizontal-scaling-hkfU5Stao7
+REDIS_COLLABORATION_URL=
+
 
 # ––––––––––––––––––––––––––––––––––––––
 # –––––––––––  FILE STORAGE  –––––––––––

.env.test

@@ -12,6 +12,7 @@ GOOGLE_CLIENT_SECRET=123
 
 SLACK_CLIENT_ID=123
 SLACK_CLIENT_SECRET=123
+SLACK_VERIFICATION_TOKEN=test-token-123
 
 GITHUB_CLIENT_ID=123;
 GITHUB_CLIENT_SECRET=123;
@@ -29,3 +30,11 @@ RATE_LIMITER_ENABLED=false
 
 FILE_STORAGE=local
 FILE_STORAGE_LOCAL_ROOT_DIR=/tmp
+
+URL=http://localhost:3000
+COLLABORATION_URL=
+REDIS_URL=redis://localhost:6379
+UTILS_SECRET=test-utils-secret
+
+DEBUG=
+LOG_LEVEL=error

.github/workflows/ci.yml

@@ -18,44 +18,61 @@ env:
   SMTP_USERNAME: localhost
 
 jobs:
-  build:
+  setup:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.x, 22.x]
-
     steps:
       - uses: actions/checkout@v5
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Enable Corepack
+        run: corepack enable
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v5
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 22.x
           cache: "yarn"
+      - name: Cache node_modules
+        id: cache-node-modules
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
       - name: Install dependencies
-        run: yarn install --frozen-lockfile --prefer-offline
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: yarn install --immutable
 
   lint:
-    needs: build
+    needs: setup
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+      - name: Enable Corepack
+        run: corepack enable
       - uses: actions/setup-node@v5
         with:
           node-version: 22.x
           cache: "yarn"
-      - run: yarn install --frozen-lockfile --prefer-offline
+      - name: Restore node_modules
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
       - run: yarn lint --quiet
 
   types:
-    needs: build
+    needs: setup
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+      - name: Enable Corepack
+        run: corepack enable
       - uses: actions/setup-node@v5
         with:
           node-version: 22.x
           cache: "yarn"
-      - run: yarn install --frozen-lockfile --prefer-offline
+      - name: Restore node_modules
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
       - run: yarn tsc
 
   changes:
@@ -85,7 +102,7 @@ jobs:
               - 'yarn.lock'
 
   test:
-    needs: [build, changes]
+    needs: [setup, changes]
     if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.config == 'true' }}
     runs-on: ubuntu-latest
     strategy:
@@ -93,15 +110,21 @@ jobs:
         test-group: [app, shared]
     steps:
       - uses: actions/checkout@v5
+      - name: Enable Corepack
+        run: corepack enable
       - uses: actions/setup-node@v5
         with:
           node-version: 22.x
           cache: "yarn"
-      - run: yarn install --frozen-lockfile --prefer-offline
+      - name: Restore node_modules
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
       - run: yarn test:${{ matrix.test-group }}
 
   test-server:
-    needs: [build, changes]
+    needs: [setup, changes]
     if: ${{ needs.changes.outputs.server == 'true' || needs.changes.outputs.config == 'true' }}
     runs-on: ubuntu-latest
     services:
@@ -125,28 +148,40 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
+      - name: Enable Corepack
+        run: corepack enable
       - uses: actions/setup-node@v5
         with:
           node-version: 22.x
           cache: "yarn"
-      - run: yarn install --frozen-lockfile --prefer-offline
+      - name: Restore node_modules
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
       - run: yarn sequelize db:migrate
       - name: Run server tests
         run: |
-          TESTFILES=$(find . -name "*.test.ts" -path "*/server/*" | sort | split -n -d -l $(($(find . -name "*.test.ts" -path "*/server/*" | wc -l)/${{ matrix.shard }})) - | sed -n "${{ matrix.shard }}p")
+          TESTFILES=$(find . -name "*.test.ts" -path "*/server/*" | sort | awk "NR % 4 == (${{ matrix.shard }} - 1)")
           yarn test --maxWorkers=2 $TESTFILES
 
   bundle-size:
-    needs: [build, types, changes]
+    needs: [setup, types, changes]
     if: ${{ needs.changes.outputs.app == 'true' && github.repository == 'outline/outline' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+      - name: Enable Corepack
+        run: corepack enable
       - uses: actions/setup-node@v5
         with:
           node-version: 22.x
           cache: "yarn"
-      - run: yarn install --frozen-lockfile --prefer-offline
+      - name: Restore node_modules
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
       - name: Set environment to production
         run: echo "NODE_ENV=production" >> $GITHUB_ENV
       - run: yarn vite:build

.gitignore

@@ -14,3 +14,10 @@ data/*
 *.pem
 *.key
 *.cert
+
+# Yarn Berry
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks

.jestconfig.json

@@ -10,7 +10,10 @@
         "^@server/(.*)$": "<rootDir>/server/$1",
         "^@shared/(.*)$": "<rootDir>/shared/$1"
       },
-      "setupFiles": ["<rootDir>/__mocks__/console.js"],
+      "setupFiles": [
+        "<rootDir>/__mocks__/console.js",
+        "<rootDir>/server/test/setupMocks.js"
+      ],
       "setupFilesAfterEnv": ["<rootDir>/server/test/setup.ts"],
       "globalTeardown": "<rootDir>/server/test/globalTeardown.js",
       "testEnvironment": "node"

.oxlintrc.json

@@ -86,6 +86,7 @@
         "@typescript-eslint/no-require-imports": "off",
         "import/no-named-as-default": "off",
         "import/no-named-as-default-member": "off",
+        "typescript/consistent-type-imports": "error",
         "no-unused-vars": [
           "error",
           {
@@ -94,7 +95,8 @@
             "args": "after-used",
             "ignoreRestSiblings": true
           }
-        ]
+        ],
+        "react/rules-of-hooks": "error"
       },
       "plugins": ["eslint", "oxc", "react", "typescript", "import"]
     }

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+npmMinimalAgeGate: 86400

AGENTS.md

@@ -30,10 +30,12 @@ You're an expert in the following areas:
 
 ## General Guidelines
 
+- Critical – Do not create new markdown (.md) files.
 - Use early returns for readability.
 - Emphasize type safety and static analysis.
 - Follow consistent Prettier formatting.
 - Do not replace smart quotes ("") or ('') with simple quotes ("").
+- Do not add translation strings manually; they will be extracted automatically from the codebase.
 
 ## Dependencies and Upgrading
 
@@ -62,8 +64,8 @@ yarn install
 2. Public static methods
 3. Public variables
 4. Public methods
-6. Protected variables & methods
-8. Private variables & methods
+5. Protected variables & methods
+6. Private variables & methods
 
 ### Exports
 
@@ -77,7 +79,7 @@ yarn install
 - 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.
+- Do not import React unless it is used directly.
 - Use styled-components for component styling.
 - Ensure high accessibility (a11y) standards using ARIA roles and semantic HTML.
 
@@ -141,20 +143,21 @@ yarn sequelize migration:create --name=add-field-to-table
 - Run tests with Jest:
 
 ```bash
-# Run all tests
+# Run a specific test file (preferred)
+yarn test path/to/test.spec.ts
+
+# Run every test (avoid)
 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
+# Run test suites (avoid)
+yarn test:app      # All frontend tests
+yarn test:server   # All backend tests
+yarn test:shared   # All shared code tests
 ```
 
 - Write unit tests for utilities and business logic in a collocated .test.ts file.
-- Mock external dependencies appropriately in __mocks__ folder.
+- Do not create new test directories
+- Mock external dependencies appropriately in **mocks** folder.
 - Aim for high code coverage but focus on critical paths.
 
 ## Code Quality

CLAUDE.md

@@ -0,0 +1 @@
+AGENTS.md

Dockerfile

@@ -18,15 +18,15 @@ ENV NODE_ENV=production
 RUN addgroup --gid 1001 nodejs && \
     adduser --uid 1001 --ingroup nodejs nodejs && \
     mkdir -p /var/lib/outline && \
-    chown -R nodejs:nodejs /var/lib/outline
+    chown -R nodejs:nodejs /var/lib/outline && \
+    chown -R nodejs:nodejs $APP_PATH
 
 COPY --from=base --chown=nodejs:nodejs $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
-COPY --from=base $APP_PATH/node_modules ./node_modules
-COPY --from=base $APP_PATH/package.json ./package.json
-
+COPY --from=base --chown=nodejs:nodejs $APP_PATH/server ./server
+COPY --from=base --chown=nodejs:nodejs $APP_PATH/public ./public
+COPY --from=base --chown=nodejs:nodejs $APP_PATH/.sequelizerc ./.sequelizerc
+COPY --from=base --chown=nodejs:nodejs $APP_PATH/node_modules ./node_modules
+COPY --from=base --chown=nodejs:nodejs $APP_PATH/package.json ./package.json
 # Install wget to healthcheck the server
 RUN  apt-get update \
     && apt-get install -y wget \
@@ -44,4 +44,4 @@ USER nodejs
 HEALTHCHECK --interval=1m CMD wget -qO- "http://localhost:${PORT:-3000}/_health" | grep -q "OK" || exit 1
 
 EXPOSE 3000
-CMD ["yarn", "start"]
+CMD ["node", "build/server/index.js"]

Dockerfile.base

@@ -3,22 +3,21 @@ FROM node:22.21.0 AS deps
 
 ARG APP_PATH
 WORKDIR $APP_PATH
-COPY ./package.json ./yarn.lock ./
+COPY ./package.json ./yarn.lock ./.yarnrc.yml ./
 COPY ./patches ./patches
 
 RUN apt-get update && apt-get install -y cmake
 ENV NODE_OPTIONS="--max-old-space-size=24000"
 
-RUN yarn install --no-optional --frozen-lockfile --network-timeout 1000000 && \
+RUN corepack enable
+RUN yarn install --immutable --network-timeout 1000000 && \
   yarn cache clean
 
 COPY . .
 ARG CDN_URL
 RUN yarn build
 
-RUN rm -rf node_modules
-
-RUN yarn install --production=true --frozen-lockfile --network-timeout 1000000 && \
+RUN yarn workspaces focus --production && \
   yarn cache clean
 
 ENV PORT=3000

LICENSE

@@ -3,8 +3,8 @@ Business Source License 1.1
 Parameters
 
 Licensor:             General Outline, Inc.
-Licensed Work:        Outline 1.1.0
-                      The Licensed Work is (c) 2025 General Outline, Inc.
+Licensed Work:        Outline 1.2.0
+                      The Licensed Work is (c) 2026 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
                       Service.
@@ -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:          2030-01-06
 
 Change License:       Apache License, Version 2.0
 

Makefile

@@ -1,7 +1,7 @@
 up:
 	docker compose up -d redis postgres
 	yarn install-local-ssl
-	yarn install --pure-lockfile
+	yarn install --immutable
 	yarn dev:watch
 
 build:

app/actions/definitions/apiKeys.tsx

@@ -1,6 +1,6 @@
 import { PlusIcon, TrashIcon } from "outline-icons";
 import stores from "~/stores";
-import ApiKey from "~/models/ApiKey";
+import type ApiKey from "~/models/ApiKey";
 import ApiKeyNew from "~/scenes/ApiKeyNew";
 import ApiKeyRevokeDialog from "~/scenes/Settings/components/ApiKeyRevokeDialog";
 import { createAction } from "..";

app/actions/definitions/collections.tsx

@@ -20,7 +20,7 @@ import {
   UnsubscribeIcon,
 } from "outline-icons";
 import { toast } from "sonner";
-import Collection from "~/models/Collection";
+import type Collection from "~/models/Collection";
 import { CollectionEdit } from "~/components/Collection/CollectionEdit";
 import { CollectionNew } from "~/components/Collection/CollectionNew";
 import CollectionDeleteDialog from "~/components/CollectionDeleteDialog";
@@ -136,7 +136,6 @@ export const editCollectionPermissions = createAction({
 
     stores.dialogs.openModal({
       title: t("Share this collection"),
-      style: { marginBottom: -12 },
       content: (
         <SharePopover
           collection={collection}

app/actions/definitions/comments.tsx

@@ -1,6 +1,6 @@
 import { DoneIcon, SmileyIcon, TrashIcon } from "outline-icons";
 import { toast } from "sonner";
-import Comment from "~/models/Comment";
+import type Comment from "~/models/Comment";
 import CommentDeleteDialog from "~/components/CommentDeleteDialog";
 import ViewReactionsDialog from "~/components/Reactions/ViewReactionsDialog";
 import { createAction } from "..";

app/actions/definitions/developer.tsx

@@ -17,7 +17,17 @@ import { Feature, FeatureFlags } from "~/utils/FeatureFlags";
 import Logger from "~/utils/Logger";
 import { deleteAllDatabases } from "~/utils/developer";
 import history from "~/utils/history";
-import { homePath } from "~/utils/routeHelpers";
+import { homePath, debugPath } from "~/utils/routeHelpers";
+
+export const goToDebug = createAction({
+  name: "Go to debug screen",
+  icon: <BeakerIcon />,
+  section: DeveloperSection,
+  visible: () => env.ENVIRONMENT === "development",
+  perform: () => {
+    history.push(debugPath());
+  },
+});
 
 export const copyId = createActionWithChildren({
   name: ({ t }) => t("Copy ID"),
@@ -222,6 +232,7 @@ export const developer = createActionWithChildren({
   iconInContextMenu: false,
   section: DeveloperSection,
   children: [
+    goToDebug,
     copyId,
     toggleDebugLogging,
     toggleDebugSafeArea,

app/actions/definitions/documents.tsx

@@ -35,13 +35,11 @@ import {
 } from "outline-icons";
 import { toast } from "sonner";
 import Icon from "@shared/components/Icon";
-import {
-  ExportContentType,
-  TeamPreference,
-  NavigationNode,
-} from "@shared/types";
+import type { NavigationNode } from "@shared/types";
+import { ExportContentType, TeamPreference } from "@shared/types";
 import { getEventFiles } from "@shared/utils/files";
-import UserMembership from "~/models/UserMembership";
+import type UserMembership from "~/models/UserMembership";
+import { client } from "~/utils/ApiClient";
 import DocumentDelete from "~/scenes/DocumentDelete";
 import DocumentMove from "~/scenes/DocumentMove";
 import DocumentPermanentDelete from "~/scenes/DocumentPermanentDelete";
@@ -49,6 +47,7 @@ import DocumentPublish from "~/scenes/DocumentPublish";
 import DeleteDocumentsInTrash from "~/scenes/Trash/components/DeleteDocumentsInTrash";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import DocumentCopy from "~/components/DocumentCopy";
+import { DocumentDownload } from "~/components/DocumentDownload";
 import MarkdownIcon from "~/components/Icons/MarkdownIcon";
 import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
 import DocumentTemplatizeDialog from "~/components/TemplatizeDialog";
@@ -63,7 +62,6 @@ import {
   DocumentSection,
   TrashSection,
 } from "~/actions/sections";
-import env from "~/env";
 import { setPersistedState } from "~/hooks/usePersistedState";
 import history from "~/utils/history";
 import {
@@ -79,8 +77,9 @@ import {
 } from "~/utils/routeHelpers";
 import capitalize from "lodash/capitalize";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
-import { Action, ActionGroup, ActionSeparator } from "~/types";
+import type { Action, ActionGroup, ActionSeparator } from "~/types";
 import lazyWithRetry from "~/utils/lazyWithRetry";
+import env from "~/env";
 
 const Insights = lazyWithRetry(
   () => import("~/scenes/Document/components/Insights")
@@ -509,7 +508,6 @@ export const shareDocument = createAction({
     }
 
     stores.dialogs.openModal({
-      style: { marginBottom: -12 },
       title: t("Share this document"),
       content: (
         <SharePopover
@@ -522,13 +520,40 @@ export const shareDocument = createAction({
   },
 });
 
-export const downloadDocumentAsHTML = createAction({
-  name: ({ t }) => t("HTML"),
-  analyticsName: "Download document as HTML",
+export const downloadDocument = createAction({
+  name: ({ t, isMenu }) => (isMenu ? t("Download") : t("Download document")),
+  analyticsName: "Download document",
   section: ActiveDocumentSection,
-  keywords: "html export",
   icon: <DownloadIcon />,
-  iconInContextMenu: false,
+  keywords: "export md markdown html",
+  visible: ({ activeDocumentId, stores }) =>
+    !!activeDocumentId && stores.policies.abilities(activeDocumentId).download,
+  perform: ({ activeDocumentId, t, stores }) => {
+    if (!activeDocumentId) {
+      return;
+    }
+
+    const document = stores.documents.get(activeDocumentId);
+    invariant(document, "Document must exist");
+
+    stores.dialogs.openModal({
+      title: t("Download document"),
+      content: (
+        <DocumentDownload
+          document={document}
+          onSubmit={stores.dialogs.closeAllModals}
+        />
+      ),
+    });
+  },
+});
+
+export const downloadDocumentAsMarkdown = createAction({
+  name: ({ t }) => t("Downloas as Markdown"),
+  analyticsName: "Download document as Markdown",
+  section: ActiveDocumentSection,
+  keywords: "md markdown export",
+  icon: <DownloadIcon />,
   visible: ({ activeDocumentId, stores }) =>
     !!activeDocumentId && stores.policies.abilities(activeDocumentId).download,
   perform: async ({ activeDocumentId, stores }) => {
@@ -537,70 +562,59 @@ export const downloadDocumentAsHTML = createAction({
     }
 
     const document = stores.documents.get(activeDocumentId);
-    await document?.download(ExportContentType.Html);
+    await document?.download({
+      contentType: ExportContentType.Markdown,
+      includeChildDocuments: false,
+    });
+  },
+});
+
+export const downloadDocumentAsHTML = createAction({
+  name: ({ t }) => t("Download as HTML"),
+  analyticsName: "Download document as HTML",
+  section: ActiveDocumentSection,
+  keywords: "xml html export",
+  icon: <DownloadIcon />,
+  visible: ({ activeDocumentId, stores }) =>
+    !!activeDocumentId && stores.policies.abilities(activeDocumentId).download,
+  perform: async ({ activeDocumentId, stores }) => {
+    if (!activeDocumentId) {
+      return;
+    }
+
+    const document = stores.documents.get(activeDocumentId);
+    await document?.download({
+      contentType: ExportContentType.Html,
+      includeChildDocuments: false,
+    });
   },
 });
 
 export const downloadDocumentAsPDF = createAction({
-  name: ({ t }) => t("PDF"),
+  name: ({ t }) => t("Download as PDF"),
   analyticsName: "Download document as PDF",
   section: ActiveDocumentSection,
-  keywords: "export",
+  keywords: "pdf export",
   icon: <DownloadIcon />,
-  iconInContextMenu: false,
   visible: ({ activeDocumentId, stores }) =>
     !!(
       activeDocumentId &&
       stores.policies.abilities(activeDocumentId).download &&
       env.PDF_EXPORT_ENABLED
     ),
-  perform: ({ activeDocumentId, t, stores }) => {
-    if (!activeDocumentId) {
-      return;
-    }
-
-    const id = toast.loading(`${t("Exporting")}…`);
-    const document = stores.documents.get(activeDocumentId);
-    return document
-      ?.download(ExportContentType.Pdf)
-      .finally(() => id && toast.dismiss(id));
-  },
-});
-
-export const downloadDocumentAsMarkdown = createAction({
-  name: ({ t }) => t("Markdown"),
-  analyticsName: "Download document as Markdown",
-  section: ActiveDocumentSection,
-  keywords: "md markdown export",
-  icon: <DownloadIcon />,
-  iconInContextMenu: false,
-  visible: ({ activeDocumentId, stores }) =>
-    !!activeDocumentId && stores.policies.abilities(activeDocumentId).download,
   perform: async ({ activeDocumentId, stores }) => {
     if (!activeDocumentId) {
       return;
     }
 
     const document = stores.documents.get(activeDocumentId);
-    await document?.download(ExportContentType.Markdown);
+    await document?.download({
+      contentType: ExportContentType.Pdf,
+      includeChildDocuments: false,
+    });
   },
 });
 
-export const downloadDocument = createActionWithChildren({
-  name: ({ t, isMenu }) => (isMenu ? t("Download") : t("Download document")),
-  analyticsName: "Download document",
-  section: ActiveDocumentSection,
-  icon: <DownloadIcon />,
-  keywords: "export",
-  visible: ({ activeDocumentId, stores }) =>
-    !!activeDocumentId && stores.policies.abilities(activeDocumentId).download,
-  children: [
-    downloadDocumentAsHTML,
-    downloadDocumentAsPDF,
-    downloadDocumentAsMarkdown,
-  ],
-});
-
 export const copyDocumentAsMarkdown = createAction({
   name: ({ t }) => t("Copy as Markdown"),
   section: ActiveDocumentSection,
@@ -614,10 +628,11 @@ export const copyDocumentAsMarkdown = createAction({
       ? stores.documents.get(activeDocumentId)
       : undefined;
     if (document) {
-      const { ProsemirrorHelper } = await import(
-        "~/models/helpers/ProsemirrorHelper"
-      );
-      copy(ProsemirrorHelper.toMarkdown(document));
+      const res = await client.post("/documents.export", {
+        id: document.id,
+        signedUrls: 3600 * 24 * 30, // 30 days
+      });
+      copy(res.data);
       toast.success(t("Markdown copied to clipboard"));
     }
   },
@@ -636,9 +651,8 @@ export const copyDocumentAsPlainText = createAction({
       ? stores.documents.get(activeDocumentId)
       : undefined;
     if (document) {
-      const { ProsemirrorHelper } = await import(
-        "~/models/helpers/ProsemirrorHelper"
-      );
+      const { ProsemirrorHelper } =
+        await import("~/models/helpers/ProsemirrorHelper");
       copy(ProsemirrorHelper.toPlainText(document));
       toast.success(t("Text copied to clipboard"));
     }
@@ -1446,6 +1460,9 @@ export const rootDocumentActions = [
   deleteDocument,
   importDocument,
   downloadDocument,
+  downloadDocumentAsMarkdown,
+  downloadDocumentAsHTML,
+  downloadDocumentAsPDF,
   copyDocumentLink,
   copyDocumentShareLink,
   copyDocumentAsMarkdown,

app/actions/definitions/integrations.tsx

@@ -2,9 +2,9 @@ import { TrashIcon } from "outline-icons";
 import stores from "~/stores";
 import { createAction } from "..";
 import { SettingsSection } from "../sections";
-import Integration from "~/models/Integration";
+import type Integration from "~/models/Integration";
 import { DisconnectAnalyticsDialog } from "~/scenes/Settings/components/DisconnectAnalyticsDialog";
-import { IntegrationType } from "@shared/types";
+import type { IntegrationType } from "@shared/types";
 import { settingsPath } from "@shared/utils/routeHelpers";
 import history from "~/utils/history";
 

app/actions/definitions/navigation.tsx

@@ -17,7 +17,7 @@ import {
 import { UrlHelper } from "@shared/utils/UrlHelper";
 import { isMac } from "@shared/utils/browser";
 import stores from "~/stores";
-import SearchQuery from "~/models/SearchQuery";
+import type SearchQuery from "~/models/SearchQuery";
 import KeyboardShortcuts from "~/scenes/KeyboardShortcuts";
 import {
   createAction,
@@ -224,13 +224,13 @@ export const openKeyboardShortcuts = createAction({
 export const downloadApp = createExternalLinkAction({
   name: ({ t }) =>
     t("Download {{ platform }} app", {
-      platform: isMac() ? "macOS" : "Windows",
+      platform: isMac ? "macOS" : "Windows",
     }),
   analyticsName: "Download app",
   section: NavigationSection,
   iconInContextMenu: false,
   icon: <BrowserIcon />,
-  visible: () => !Desktop.isElectron() && isMac() && isCloudHosted,
+  visible: () => !Desktop.isElectron() && isMac && isCloudHosted,
   url: "https://desktop.getoutline.com",
   target: "_blank",
 });

app/actions/definitions/notifications.tsx

@@ -1,6 +1,7 @@
-import { ArchiveIcon, MarkAsReadIcon } from "outline-icons";
+import { ArchiveIcon, CheckmarkIcon, MarkAsReadIcon } from "outline-icons";
 import { createAction } from "..";
 import { NotificationSection } from "../sections";
+import type Notification from "~/models/Notification";
 
 export const markNotificationsAsRead = createAction({
   name: ({ t }) => t("Mark notifications as read"),
@@ -22,6 +23,36 @@ export const markNotificationsAsArchived = createAction({
   visible: ({ stores }) => stores.notifications.orderedData.length > 0,
 });
 
+export const notificationMarkRead = (notification: Notification) =>
+  createAction({
+    name: ({ t }) => t("Mark as read"),
+    analyticsName: "Mark notification read",
+    section: NotificationSection,
+    icon: <CheckmarkIcon />,
+    perform: () => notification.toggleRead(),
+    visible: () => !notification.viewedAt,
+  });
+
+export const notificationMarkUnread = (notification: Notification) =>
+  createAction({
+    name: ({ t }) => t("Mark as unread"),
+    analyticsName: "Mark notification unread",
+    section: NotificationSection,
+    icon: <CheckmarkIcon />,
+    perform: () => notification.toggleRead(),
+    visible: () => !!notification.viewedAt,
+  });
+
+export const notificationArchive = (notification: Notification) =>
+  createAction({
+    name: ({ t }) => t("Archive"),
+    analyticsName: "Mark notification as archived",
+    section: NotificationSection,
+    icon: <ArchiveIcon />,
+    perform: () => notification.archive(),
+    visible: () => !notification.archivedAt,
+  });
+
 export const rootNotificationActions = [
   markNotificationsAsRead,
   markNotificationsAsArchived,

app/actions/definitions/revisions.tsx

@@ -1,14 +1,17 @@
 import copy from "copy-to-clipboard";
-import { LinkIcon, RestoreIcon, TrashIcon } from "outline-icons";
+import { LinkIcon, RestoreIcon, TrashIcon, DownloadIcon } from "outline-icons";
 import { matchPath } from "react-router-dom";
 import { toast } from "sonner";
+import { ExportContentType } from "@shared/types";
 import stores from "~/stores";
-import { createAction } from "~/actions";
+import { createAction, createActionWithChildren } from "~/actions";
 import { RevisionSection } from "~/actions/sections";
+import env from "~/env";
 import history from "~/utils/history";
 import {
   documentHistoryPath,
   matchDocumentHistory,
+  urlify,
 } from "~/utils/routeHelpers";
 
 export const restoreRevision = createAction({
@@ -73,37 +76,105 @@ export const deleteRevision = createAction({
   },
 });
 
-export const copyLinkToRevision = createAction({
-  name: ({ t }) => t("Copy link"),
-  analyticsName: "Copy link to revision",
-  icon: <LinkIcon />,
-  section: RevisionSection,
-  perform: async ({ activeDocumentId, t }) => {
-    if (!activeDocumentId) {
-      return;
-    }
+export const copyLinkToRevision = (revisionId: string) =>
+  createAction({
+    name: ({ t }) => t("Copy link"),
+    analyticsName: "Copy link to revision",
+    icon: <LinkIcon />,
+    section: RevisionSection,
+    perform: async ({ activeDocumentId, t }) => {
+      if (!activeDocumentId) {
+        return;
+      }
 
-    const match = matchPath<{ revisionId: string }>(location.pathname, {
-      path: matchDocumentHistory,
-    });
-    const revisionId = match?.params.revisionId;
-    const document = stores.documents.get(activeDocumentId);
-    if (!document) {
-      return;
-    }
+      const document = stores.documents.get(activeDocumentId);
+      if (!document) {
+        return;
+      }
 
-    const url = `${window.location.origin}${documentHistoryPath(
-      document,
-      revisionId
-    )}`;
+      const url = urlify(documentHistoryPath(document, revisionId));
 
-    copy(url, {
-      format: "text/plain",
-      onCopy: () => {
-        toast.message(t("Link copied"));
-      },
-    });
-  },
-});
+      copy(url, {
+        format: "text/plain",
+        onCopy: () => {
+          toast.message(t("Link copied"));
+        },
+      });
+    },
+  });
+
+export const downloadRevisionAsHTML = (revisionId: string) =>
+  createAction({
+    name: ({ t }) => t("HTML"),
+    analyticsName: "Download revision as HTML",
+    section: RevisionSection,
+    keywords: "html export",
+    icon: <DownloadIcon />,
+    iconInContextMenu: false,
+    visible: ({ activeDocumentId }) =>
+      !!activeDocumentId &&
+      stores.policies.abilities(activeDocumentId).download,
+    perform: async () => {
+      const revision = stores.revisions.get(revisionId);
+      await revision?.download(ExportContentType.Html);
+    },
+  });
+
+export const downloadRevisionAsPDF = (revisionId: string) =>
+  createAction({
+    name: ({ t }) => t("PDF"),
+    analyticsName: "Download revision as PDF",
+    section: RevisionSection,
+    keywords: "export",
+    icon: <DownloadIcon />,
+    iconInContextMenu: false,
+    visible: ({ activeDocumentId }) =>
+      !!(
+        activeDocumentId &&
+        stores.policies.abilities(activeDocumentId).download &&
+        env.PDF_EXPORT_ENABLED
+      ),
+    perform: ({ t }) => {
+      const id = toast.loading(`${t("Exporting")}…`);
+      const revision = stores.revisions.get(revisionId);
+      return revision
+        ?.download(ExportContentType.Pdf)
+        .finally(() => id && toast.dismiss(id));
+    },
+  });
+
+export const downloadRevisionAsMarkdown = (revisionId: string) =>
+  createAction({
+    name: ({ t }) => t("Markdown"),
+    analyticsName: "Download revision as Markdown",
+    section: RevisionSection,
+    keywords: "md markdown export",
+    icon: <DownloadIcon />,
+    iconInContextMenu: false,
+    visible: ({ activeDocumentId }) =>
+      !!activeDocumentId &&
+      stores.policies.abilities(activeDocumentId).download,
+    perform: async () => {
+      const revision = stores.revisions.get(revisionId);
+      await revision?.download(ExportContentType.Markdown);
+    },
+  });
+
+export const downloadRevision = (revisionId: string) =>
+  createActionWithChildren({
+    name: ({ t, isMenu }) => (isMenu ? t("Download") : t("Download revision")),
+    analyticsName: "Download revision",
+    section: RevisionSection,
+    icon: <DownloadIcon />,
+    keywords: "export",
+    visible: ({ activeDocumentId }) =>
+      !!activeDocumentId &&
+      stores.policies.abilities(activeDocumentId).download,
+    children: [
+      downloadRevisionAsHTML(revisionId),
+      downloadRevisionAsPDF(revisionId),
+      downloadRevisionAsMarkdown(revisionId),
+    ],
+  });
 
 export const rootRevisionActions = [];

app/actions/definitions/settings.tsx

@@ -25,6 +25,21 @@ export const changeToLightTheme = createAction({
   perform: ({ stores }) => stores.ui.setTheme(Theme.Light),
 });
 
+export const toggleTheme = createAction({
+  name: ({ t }) => t("Toggle theme"),
+  analyticsName: "Change theme",
+  iconInContextMenu: false,
+  icon: ({ stores }) =>
+    stores.ui.resolvedTheme === "light" ? <MoonIcon /> : <SunIcon />,
+  keywords: "theme light day",
+  section: SettingsSection,
+  shortcut: ["Meta+Shift+l"],
+  perform: ({ stores }) =>
+    stores.ui.setTheme(
+      stores.ui.resolvedTheme === "light" ? Theme.Dark : Theme.Light
+    ),
+});
+
 export const changeToSystemTheme = createAction({
   name: ({ t }) => t("System"),
   analyticsName: "Change to system theme",
@@ -47,4 +62,4 @@ export const changeTheme = createActionWithChildren({
   children: [changeToLightTheme, changeToDarkTheme, changeToSystemTheme],
 });
 
-export const rootSettingsActions = [changeTheme];
+export const rootSettingsActions = [changeTheme, toggleTheme];

app/actions/definitions/shares.tsx

@@ -1,5 +1,5 @@
 import copy from "copy-to-clipboard";
-import Share from "~/models/Share";
+import type Share from "~/models/Share";
 import { createAction, createInternalLinkAction } from "..";
 import { ArrowIcon, CopyIcon, TrashIcon } from "outline-icons";
 import { ShareSection } from "../sections";

app/actions/definitions/teams.tsx

@@ -1,7 +1,7 @@
 import { ArrowIcon, PlusIcon } from "outline-icons";
 import styled from "styled-components";
 import { stringToColor } from "@shared/utils/color";
-import RootStore from "~/stores/RootStore";
+import type RootStore from "~/stores/RootStore";
 import { LoginDialog } from "~/scenes/Login/components/LoginDialog";
 import TeamNew from "~/scenes/TeamNew";
 import TeamLogo from "~/components/TeamLogo";
@@ -10,7 +10,7 @@ import {
   createActionWithChildren,
   createExternalLinkAction,
 } from "~/actions";
-import { ActionContext, ExternalLinkAction } from "~/types";
+import type { ActionContext, ExternalLinkAction } from "~/types";
 import Desktop from "~/utils/Desktop";
 import { TeamSection } from "../sections";
 

app/actions/definitions/users.tsx

@@ -1,8 +1,8 @@
 import { PlusIcon } from "outline-icons";
-import { UserRole } from "@shared/types";
+import type { UserRole } from "@shared/types";
 import { UserRoleHelper } from "@shared/utils/UserRoleHelper";
 import stores from "~/stores";
-import User from "~/models/User";
+import type User from "~/models/User";
 import Invite from "~/scenes/Invite";
 import {
   UserChangeRoleDialog,

app/actions/index.ts

@@ -1,8 +1,8 @@
-import { LocationDescriptor } from "history";
+import type { LocationDescriptor } from "history";
 import { toast } from "sonner";
-import { Optional } from "utility-types";
+import type { Optional } from "utility-types";
 import { v4 as uuidv4 } from "uuid";
-import {
+import type {
   ActionContext,
   Action,
   ActionGroup,
@@ -15,7 +15,7 @@ import {
 } from "~/types";
 import Analytics from "~/utils/Analytics";
 import history from "~/utils/history";
-import { Action as KbarAction } from "kbar";
+import type { Action as KbarAction } from "kbar";
 
 export function resolve<T>(value: any, context: ActionContext): T {
   return typeof value === "function" ? value(context) : value;

app/actions/sections.ts

@@ -1,4 +1,4 @@
-import { ActionContext } from "~/types";
+import type { ActionContext } from "~/types";
 
 export const CollectionSection = ({ t }: ActionContext) => t("Collection");
 

app/components/ActionButton.tsx

@@ -1,10 +1,11 @@
 /* oxlint-disable react/prop-types */
 import * as React from "react";
-import Tooltip, { Props as TooltipProps } from "~/components/Tooltip";
+import type { Props as TooltipProps } from "~/components/Tooltip";
+import Tooltip from "~/components/Tooltip";
 import { performAction, resolve } from "~/actions";
 import useIsMounted from "~/hooks/useIsMounted";
 import useActionContext from "~/hooks/useActionContext";
-import { ActionVariant, ActionWithChildren } from "~/types";
+import type { ActionVariant, ActionWithChildren } from "~/types";
 
 export type Props = React.HTMLAttributes<HTMLButtonElement> & {
   /** Show the button in a disabled state */
@@ -21,7 +22,7 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  * Button that can be used to trigger an action definition.
  */
 const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
-  function _ActionButton(
+  function ActionButton_(
     { action, tooltip, hideOnActionDisabled, ...rest }: Props,
     ref: React.Ref<HTMLButtonElement>
   ) {

app/components/Analytics.tsx

@@ -2,7 +2,8 @@
 /* global ga */
 import escape from "lodash/escape";
 import * as React from "react";
-import { IntegrationService, PublicEnv } from "@shared/types";
+import type { PublicEnv } from "@shared/types";
+import { IntegrationService } from "@shared/types";
 import env from "~/env";
 
 type Props = {

app/components/AuthenticatedLayout.tsx

@@ -32,7 +32,7 @@ import { PortalContext } from "./Portal";
 import CommandBar from "./CommandBar";
 
 const DocumentComments = lazyWithRetry(
-  () => import("~/scenes/Document/components/Comments")
+  () => import("~/scenes/Document/components/Comments/Comments")
 );
 const DocumentHistory = lazyWithRetry(
   () => import("~/scenes/Document/components/History")

app/components/Avatar/AvatarWithPresence.tsx

@@ -3,7 +3,7 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled, { css } from "styled-components";
 import { s } from "@shared/styles";
-import User from "~/models/User";
+import type User from "~/models/User";
 import Tooltip from "~/components/Tooltip";
 import Avatar, { AvatarSize } from "./Avatar";
 

app/components/Avatar/GroupAvatar.tsx

@@ -1,7 +1,7 @@
 import { GroupIcon } from "outline-icons";
 import { useTheme } from "styled-components";
 import Squircle from "@shared/components/Squircle";
-import Group from "~/models/Group";
+import type Group from "~/models/Group";
 import { AvatarSize } from "../Avatar/Avatar";
 
 type Props = {

app/components/Avatar/index.ts

@@ -1,4 +1,5 @@
-import Avatar, { IAvatar, AvatarSize, AvatarVariant } from "./Avatar";
+import type { IAvatar } from "./Avatar";
+import Avatar, { AvatarSize, AvatarVariant } from "./Avatar";
 import AvatarWithPresence from "./AvatarWithPresence";
 import { GroupAvatar } from "./GroupAvatar";
 

app/components/Badge.ts

@@ -2,8 +2,8 @@ import { transparentize } from "polished";
 import styled from "styled-components";
 
 const Badge = styled.span<{ yellow?: boolean; primary?: boolean }>`
-  margin-left: 10px;
-  padding: 1px 5px 2px;
+  padding: 1.5px 5.5px;
+  margin: 0 2px;
   background-color: ${({ yellow, primary, theme }) =>
     yellow ? theme.yellow : primary ? theme.accent : "transparent"};
   color: ${({ primary, yellow, theme }) =>
@@ -17,10 +17,11 @@ const Badge = styled.span<{ yellow?: boolean; primary?: boolean }>`
       primary || yellow
         ? "transparent"
         : transparentize(0.4, theme.textTertiary)};
-  border-radius: 10px;
+  border-radius: 8px;
   font-size: 12px;
   font-weight: 500;
   user-select: none;
+  white-space: nowrap;
 `;
 
 export default Badge;

app/components/Breadcrumb.tsx

@@ -6,7 +6,7 @@ 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 type { InternalLinkAction, MenuInternalLink } from "~/types";
 import { actionToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import { useComputed } from "~/hooks/useComputed";

app/components/Button.tsx

@@ -1,12 +1,11 @@
-import { LocationDescriptor } from "history";
+import type { LocationDescriptor } from "history";
 import { DisclosureIcon } from "outline-icons";
 import { darken, lighten, transparentize } from "polished";
 import * as React from "react";
 import styled from "styled-components";
 import { s } from "@shared/styles";
-import ActionButton, {
-  Props as ActionButtonProps,
-} from "~/components/ActionButton";
+import type { Props as ActionButtonProps } from "~/components/ActionButton";
+import ActionButton from "~/components/ActionButton";
 import { undraggableOnDesktop } from "~/styles";
 
 type RealProps = {

app/components/CenteredContent.tsx

@@ -1,6 +1,7 @@
 import * as React from "react";
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
+import { EditorStyleHelper } from "@shared/editor/styles/EditorStyleHelper";
 
 type Props = {
   children?: React.ReactNode;
@@ -26,7 +27,7 @@ const Content = styled.div<ContentProps>`
   margin: 0 auto;
 
   ${breakpoint("desktopLarge")`
-    max-width: ${(props: ContentProps) => props.$maxWidth ?? "52em"};
+    max-width: ${(props: ContentProps) => props.$maxWidth ?? EditorStyleHelper.documentWidth};
   `};
 `;
 

app/components/Collaborators.tsx

@@ -5,7 +5,7 @@ import uniq from "lodash/uniq";
 import { observer } from "mobx-react";
 import { useState, useMemo, useEffect, useCallback } from "react";
 import { useTranslation } from "react-i18next";
-import Document from "~/models/Document";
+import type Document from "~/models/Document";
 import { AvatarSize, AvatarWithPresence } from "~/components/Avatar";
 import DocumentViews from "~/components/DocumentViews";
 import Facepile from "~/components/Facepile";

app/components/Collection/CollectionEdit.tsx

@@ -2,7 +2,8 @@ import { observer } from "mobx-react";
 import { useCallback } from "react";
 import { toast } from "sonner";
 import useStores from "~/hooks/useStores";
-import { CollectionForm, FormData } from "./CollectionForm";
+import type { FormData } from "./CollectionForm";
+import { CollectionForm } from "./CollectionForm";
 
 type Props = {
   collectionId: string;

app/components/Collection/CollectionForm.tsx

@@ -6,13 +6,13 @@ import { Trans, useTranslation } from "react-i18next";
 import styled from "styled-components";
 import Icon from "@shared/components/Icon";
 import { randomElement } from "@shared/random";
-import { CollectionPermission, TeamPreference } from "@shared/types";
+import type { CollectionPermission } from "@shared/types";
+import { TeamPreference } from "@shared/types";
 import { IconLibrary } from "@shared/utils/IconLibrary";
 import { colorPalette } from "@shared/utils/collections";
 import { CollectionValidation } from "@shared/validations";
-import Collection from "~/models/Collection";
+import type Collection from "~/models/Collection";
 import Button from "~/components/Button";
-import Flex from "~/components/Flex";
 import Input from "~/components/Input";
 import { InputSelectPermission } from "~/components/InputSelectPermission";
 import { createLazyComponent } from "~/components/LazyLoad";
@@ -22,6 +22,7 @@ import useBoolean from "~/hooks/useBoolean";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import useStores from "~/hooks/useStores";
 import { EmptySelectValue } from "~/types";
+import { HStack } from "../primitives/HStack";
 
 const IconPicker = createLazyComponent(() => import("~/components/IconPicker"));
 
@@ -140,7 +141,7 @@ export const CollectionForm = observer(function CollectionForm_({
           Collections are used to group documents and choose permissions
         </Trans>
       </Text>
-      <Flex gap={8}>
+      <HStack>
         <Input
           type="text"
           placeholder={t("Name")}
@@ -164,7 +165,7 @@ export const CollectionForm = observer(function CollectionForm_({
           autoFocus
           flex
         />
-      </Flex>
+      </HStack>
 
       {/* Following controls are available in create flow, but moved elsewhere for edit */}
       {!collection && (
@@ -222,7 +223,7 @@ export const CollectionForm = observer(function CollectionForm_({
         />
       )}
 
-      <Flex justify="flex-end">
+      <HStack justify="flex-end">
         <Button
           type="submit"
           disabled={formState.isSubmitting || !formState.isValid}
@@ -235,7 +236,7 @@ export const CollectionForm = observer(function CollectionForm_({
               ? `${t("Creating")}…`
               : t("Create")}
         </Button>
-      </Flex>
+      </HStack>
     </form>
   );
 });

app/components/Collection/CollectionNew.tsx

@@ -4,7 +4,8 @@ import { useCallback } from "react";
 import { toast } from "sonner";
 import useStores from "~/hooks/useStores";
 import history from "~/utils/history";
-import { CollectionForm, FormData } from "./CollectionForm";
+import type { FormData } from "./CollectionForm";
+import { CollectionForm } from "./CollectionForm";
 
 type Props = {
   onSubmit: () => void;

app/components/CollectionBreadcrumb.tsx

@@ -1,7 +1,7 @@
 import { ArchiveIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import Collection from "~/models/Collection";
+import type Collection from "~/models/Collection";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
 import { archivePath, collectionPath } from "~/utils/routeHelpers";
 import Breadcrumb from "./Breadcrumb";
@@ -28,7 +28,7 @@ export const CollectionBreadcrumb: React.FC<Props> = ({ collection }) => {
         name: collection.name,
         section: ActiveCollectionSection,
         icon: <CollectionIcon collection={collection} expanded />,
-        to: collectionPath(collection.path),
+        to: collectionPath(collection),
       }),
     ],
     [collection, t]

app/components/CollectionDeleteDialog.tsx

@@ -2,7 +2,7 @@ import { observer } from "mobx-react";
 import { useTranslation, Trans } from "react-i18next";
 import { useHistory } from "react-router-dom";
 import { toast } from "sonner";
-import Collection from "~/models/Collection";
+import type Collection from "~/models/Collection";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import Text from "~/components/Text";
 import useCurrentTeam from "~/hooks/useCurrentTeam";

app/components/CommandBar/CommandBarItem.tsx

@@ -1,4 +1,4 @@
-import { ActionImpl } from "kbar";
+import type { ActionImpl } from "kbar";
 import { ArrowIcon, BackIcon } from "outline-icons";
 import * as React from "react";
 import styled, { css, useTheme } from "styled-components";
@@ -7,6 +7,7 @@ import { normalizeKeyDisplay } from "@shared/utils/keyboard";
 import Flex from "~/components/Flex";
 import Key from "~/components/Key";
 import Text from "~/components/Text";
+import { HStack } from "../primitives/HStack";
 
 type Props = {
   action: ActionImpl;
@@ -35,7 +36,7 @@ function CommandBarItem(
 
   return (
     <Item active={active} ref={ref}>
-      <Content align="center" gap={8}>
+      <Content>
         <Icon>
           {action.icon ? (
             // @ts-expect-error no icon on ActionImpl
@@ -100,7 +101,7 @@ const Ancestor = styled.span`
   color: ${s("textSecondary")};
 `;
 
-const Content = styled(Flex)`
+const Content = styled(HStack)`
   ${ellipsis()}
   flex-shrink: 1;
 `;

app/components/CommentDeleteDialog.tsx

@@ -1,7 +1,7 @@
 import { observer } from "mobx-react";
 import { useTranslation, Trans } from "react-i18next";
 import { toast } from "sonner";
-import Comment from "~/models/Comment";
+import type Comment from "~/models/Comment";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import Text from "~/components/Text";
 import useStores from "~/hooks/useStores";

app/components/ConfirmMoveDialog.tsx

@@ -1,7 +1,8 @@
 import { observer } from "mobx-react";
 import { Trans, useTranslation } from "react-i18next";
 import { toast } from "sonner";
-import { CollectionPermission, NavigationNode } from "@shared/types";
+import type { NavigationNode } from "@shared/types";
+import { CollectionPermission } from "@shared/types";
 import type Collection from "~/models/Collection";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import useStores from "~/hooks/useStores";

app/components/ContentEditable.tsx

@@ -31,7 +31,7 @@ export type RefHandle = {
  * Defines a content editable component with the same interface as a native
  * HTMLInputElement (or, as close as we can get).
  */
-const ContentEditable = React.forwardRef(function _ContentEditable(
+const ContentEditable = React.forwardRef(function ContentEditable_(
   {
     disabled,
     onChange,

app/components/DefaultCollectionInputSelect.tsx

@@ -3,7 +3,8 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
-import { InputSelect, Option } from "~/components/InputSelect";
+import type { Option } from "~/components/InputSelect";
+import { InputSelect } from "~/components/InputSelect";
 import useStores from "~/hooks/useStores";
 
 type DefaultCollectionInputSelectProps = {

app/components/DocumentBreadcrumb.tsx

@@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import Icon from "@shared/components/Icon";
 import type { NavigationNode } from "@shared/types";
-import Document from "~/models/Document";
+import type Document from "~/models/Document";
 import Breadcrumb from "~/components/Breadcrumb";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
 import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";

app/components/DocumentCard.tsx

@@ -13,8 +13,8 @@ import Squircle from "@shared/components/Squircle";
 import { s, hover, ellipsis } from "@shared/styles";
 import { IconType } from "@shared/types";
 import { determineIconType } from "@shared/utils/icon";
-import Document from "~/models/Document";
-import Pin from "~/models/Pin";
+import type Document from "~/models/Document";
+import type Pin from "~/models/Pin";
 import Flex from "~/components/Flex";
 import NudeButton from "~/components/NudeButton";
 import Time from "~/components/Time";

app/components/DocumentContext.tsx

@@ -1,8 +1,9 @@
 import { action, computed, observable } from "mobx";
-import { createContext, useContext, useMemo, PropsWithChildren } from "react";
-import { Heading } from "@shared/utils/ProsemirrorHelper";
-import Document from "~/models/Document";
-import { Editor } from "~/editor";
+import type { PropsWithChildren } from "react";
+import { createContext, useContext, useMemo } from "react";
+import type { Heading } from "@shared/utils/ProsemirrorHelper";
+import type Document from "~/models/Document";
+import type { Editor } from "~/editor";
 
 class DocumentContext {
   /** The current document */

app/components/DocumentCopy.tsx

@@ -3,8 +3,8 @@ import * as React from "react";
 import { Trans, useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import styled from "styled-components";
-import { NavigationNode } from "@shared/types";
-import Document from "~/models/Document";
+import type { NavigationNode } from "@shared/types";
+import type Document from "~/models/Document";
 import { FlexContainer, Footer, StyledText } from "~/scenes/DocumentMove";
 import Button from "~/components/Button";
 import DocumentExplorer from "~/components/DocumentExplorer";
@@ -24,6 +24,7 @@ function DocumentCopy({ document, onSubmit }: Props) {
   const { policies } = useStores();
   const collectionTrees = useCollectionTrees();
   const [publish, setPublish] = React.useState<boolean>(!!document.publishedAt);
+  const [copying, setCopying] = React.useState<boolean>(false);
   const [recursive, setRecursive] = React.useState<boolean>(true);
   const [selectedPath, selectPath] = React.useState<NavigationNode | null>(
     null
@@ -51,6 +52,7 @@ function DocumentCopy({ document, onSubmit }: Props) {
     }
 
     try {
+      setCopying(true);
       const result = await document.duplicate({
         publish,
         recursive,
@@ -65,6 +67,8 @@ function DocumentCopy({ document, onSubmit }: Props) {
       onSubmit(result);
     } catch (_err) {
       toast.error(t("Couldn’t copy the document, try again?"));
+    } finally {
+      setCopying(false);
     }
   };
 
@@ -114,8 +118,8 @@ function DocumentCopy({ document, onSubmit }: Props) {
             t("Select a location to copy")
           )}
         </StyledText>
-        <Button disabled={!selectedPath} onClick={copy}>
-          {t("Copy")}
+        <Button disabled={!selectedPath || copying} onClick={copy}>
+          {copying ? `${t("Copying")}…` : t("Copy")}
         </Button>
       </Footer>
     </FlexContainer>

app/components/DocumentDownload.tsx

@@ -0,0 +1,185 @@
+import { observer } from "mobx-react";
+import { useCallback, useMemo, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
+import { toast } from "sonner";
+import styled from "styled-components";
+import { ExportContentType, NotificationEventType } from "@shared/types";
+import type Document from "~/models/Document";
+import ConfirmationDialog from "~/components/ConfirmationDialog";
+import Flex from "~/components/Flex";
+import Text from "~/components/Text";
+import env from "~/env";
+import useCurrentUser from "~/hooks/useCurrentUser";
+import useStores from "~/hooks/useStores";
+
+type Props = {
+  document: Document;
+  onSubmit: () => void;
+};
+
+export const DocumentDownload = observer(({ document, onSubmit }: Props) => {
+  const { t } = useTranslation();
+  const { ui } = useStores();
+  const user = useCurrentUser();
+  const hasChildDocuments = !!document.childDocuments.length;
+
+  const [contentType, setContentType] = useState<ExportContentType>(
+    ExportContentType.Markdown
+  );
+  const [includeChildDocuments, setIncludeChildDocuments] =
+    useState<boolean>(hasChildDocuments);
+
+  const handleContentTypeChange = useCallback(
+    (ev: React.ChangeEvent<HTMLInputElement>) => {
+      setContentType(ev.target.value as ExportContentType);
+    },
+    []
+  );
+
+  const handleIncludeChildDocumentsChange = useCallback(
+    (ev: React.ChangeEvent<HTMLInputElement>) => {
+      setIncludeChildDocuments(ev.target.checked);
+    },
+    []
+  );
+
+  const handleSubmit = useCallback(async () => {
+    const response = await document.download({
+      contentType,
+      includeChildDocuments,
+    });
+
+    if (includeChildDocuments && response?.data?.fileOperation) {
+      const fileOperationId = response.data.fileOperation.id;
+      const toastId = `export-${fileOperationId}`;
+
+      const timeoutId = setTimeout(() => {
+        toast.success(t("Export started"), {
+          id: toastId,
+          description: t("A link to your file will be sent through email soon"),
+          duration: 3000,
+        });
+        ui.exportToasts.delete(fileOperationId);
+      }, 6000);
+
+      ui.registerExportToast(fileOperationId, toastId, timeoutId);
+
+      toast.loading(t("Export started"), {
+        id: toastId,
+        description: `${t("Preparing your download")}…`,
+        duration: Infinity,
+      });
+    }
+
+    onSubmit();
+  }, [t, ui, document, contentType, includeChildDocuments, onSubmit]);
+
+  const items = useMemo(() => {
+    const radioItems = [
+      {
+        title: "Markdown",
+        description: t(
+          "A file containing the selected documents in Markdown format."
+        ),
+        value: ExportContentType.Markdown,
+      },
+      {
+        title: "HTML",
+        description: t(
+          "A file containing the selected documents in HTML format."
+        ),
+        value: ExportContentType.Html,
+      },
+    ];
+
+    if (env.PDF_EXPORT_ENABLED) {
+      radioItems.push({
+        title: "PDF",
+        description: t(
+          "A file containing the selected documents in PDF format."
+        ),
+        value: ExportContentType.Pdf,
+      });
+    }
+
+    return radioItems;
+  }, [t]);
+
+  return (
+    <ConfirmationDialog
+      onSubmit={handleSubmit}
+      submitText={includeChildDocuments ? t("Export") : t("Download")}
+    >
+      <Flex gap={12} column>
+        {items.map((item) => (
+          <Option key={item.value}>
+            <StyledInput
+              type="radio"
+              name="format"
+              value={item.value}
+              checked={contentType === item.value}
+              onChange={handleContentTypeChange}
+            />
+            <div>
+              <Text as="p" size="small" weight="bold">
+                {item.title}
+              </Text>
+              {item.description ? (
+                <Text size="small" type="secondary">
+                  {item.description}
+                </Text>
+              ) : null}
+            </div>
+          </Option>
+        ))}
+      </Flex>
+      {hasChildDocuments && (
+        <>
+          <hr style={{ margin: "16px 0 " }} />
+          <Option>
+            <StyledInput
+              type="checkbox"
+              name="includeChildDocuments"
+              checked={includeChildDocuments}
+              onChange={handleIncludeChildDocumentsChange}
+            />
+            <Flex column gap={4}>
+              <Text as="p" size="small" weight="bold">
+                {t("Include child documents")}
+              </Text>
+              <Text as="p" size="small" type="secondary">
+                <Trans
+                  defaults="When selected, exporting the document <em>{{documentName}}</em> may take some time."
+                  values={{
+                    documentName: document.titleWithDefault,
+                  }}
+                  components={{
+                    em: <strong />,
+                  }}
+                />{" "}
+                {user.subscribedToEventType(
+                  NotificationEventType.ExportCompleted
+                ) && t("You will receive an email when it's complete.")}
+              </Text>
+            </Flex>
+          </Option>
+        </>
+      )}
+    </ConfirmationDialog>
+  );
+});
+
+const Option = styled.label`
+  display: flex;
+  align-items: baseline;
+  gap: 16px;
+
+  p {
+    margin: 0;
+  }
+`;
+
+const StyledInput = styled.input`
+  position: relative;
+  top: 1.5px;
+`;

app/components/DocumentExplorer.tsx

@@ -16,7 +16,7 @@ import scrollIntoView from "scroll-into-view-if-needed";
 import styled, { useTheme } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import Icon from "@shared/components/Icon";
-import { NavigationNode } from "@shared/types";
+import type { NavigationNode } from "@shared/types";
 import { isModKey } from "@shared/utils/keyboard";
 import { ancestors, descendants, flattenTree } from "@shared/utils/tree";
 import DocumentExplorerNode from "~/components/DocumentExplorerNode";

app/components/DocumentListItem.tsx

@@ -6,12 +6,13 @@ import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
-import styled, { css } from "styled-components";
+import { DocumentIcon } from "outline-icons";
+import styled, { css, useTheme } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import EventBoundary from "@shared/components/EventBoundary";
 import Icon from "@shared/components/Icon";
 import { s, hover } from "@shared/styles";
-import Document from "~/models/Document";
+import type Document from "~/models/Document";
 import Badge from "~/components/Badge";
 import DocumentMeta from "~/components/DocumentMeta";
 import Flex from "~/components/Flex";
@@ -54,6 +55,7 @@ function DocumentListItem(
 ) {
   const { t } = useTranslation();
   const user = useCurrentUser();
+  const theme = useTheme();
   const { userMemberships, groupMemberships } = useStores();
   const locationSidebarContext = useLocationSidebarContext();
   const [menuOpen, handleMenuOpen, handleMenuClose] = useBoolean();
@@ -127,56 +129,58 @@ function DocumentListItem(
           {...rest}
           {...rovingTabIndex}
         >
-          <Content>
-            <Heading dir={document.dir}>
-              {document.icon && (
-                <>
-                  <Icon
-                    value={document.icon}
-                    color={document.color ?? undefined}
-                    initial={document.initial}
-                  />
-                  &nbsp;
-                </>
+          <Flex gap={4} auto>
+            <IconWrapper>
+              {document.icon ? (
+                <Icon
+                  value={document.icon}
+                  color={document.color ?? undefined}
+                  initial={document.initial}
+                />
+              ) : (
+                <DocumentIcon
+                  outline={document.isDraft}
+                  color={theme.textSecondary}
+                />
               )}
-              <Title
-                text={document.titleWithDefault}
-                highlight={highlight}
-                dir={document.dir}
-              />
-              {document.isBadgedNew && document.createdBy?.id !== user.id && (
-                <Badge yellow>{t("New")}</Badge>
-              )}
-              {document.isDraft && showDraft && (
-                <Tooltip content={t("Only visible to you")} placement="top">
-                  <Badge>{t("Draft")}</Badge>
-                </Tooltip>
-              )}
-              {canStar && (
-                <StarPositioner>
-                  <StarButton document={document} />
-                </StarPositioner>
-              )}
-              {document.isTemplate && showTemplate && (
-                <Badge primary>{t("Template")}</Badge>
-              )}
-            </Heading>
+            </IconWrapper>
+            <Content>
+              <Heading dir={document.dir}>
+                <Title
+                  text={document.titleWithDefault}
+                  highlight={highlight}
+                  dir={document.dir}
+                />
+                {document.isBadgedNew && document.createdBy?.id !== user.id && (
+                  <Badge yellow>{t("New")}</Badge>
+                )}
+                {document.isDraft && showDraft && (
+                  <Tooltip content={t("Only visible to you")} placement="top">
+                    <Badge>{t("Draft")}</Badge>
+                  </Tooltip>
+                )}
+                {canStar && <StarButton document={document} />}
+                {document.isTemplate && showTemplate && (
+                  <Badge primary>{t("Template")}</Badge>
+                )}
+              </Heading>
 
-            {!queryIsInTitle && (
-              <ResultContext
-                text={context}
-                highlight={highlight ? SEARCH_RESULT_REGEX : undefined}
-                processResult={replaceResultMarks}
+              {!queryIsInTitle && (
+                <ResultContext
+                  text={context}
+                  highlight={highlight ? SEARCH_RESULT_REGEX : undefined}
+                  processResult={replaceResultMarks}
+                />
+              )}
+              <DocumentMeta
+                document={document}
+                showCollection={showCollection}
+                showPublished={showPublished}
+                showParentDocuments={showParentDocuments}
+                showLastViewed
               />
-            )}
-            <DocumentMeta
-              document={document}
-              showCollection={showCollection}
-              showPublished={showPublished}
-              showParentDocuments={showParentDocuments}
-              showLastViewed
-            />
-          </Content>
+            </Content>
+          </Flex>
           <Actions>
             <DocumentMenu
               document={document}
@@ -190,6 +194,14 @@ function DocumentListItem(
   );
 }
 
+const IconWrapper = styled.div`
+  flex-shrink: 0;
+  display: flex;
+  align-items: flex-start;
+  justify-content: flex-start;
+  width: 24px;
+`;
+
 const Content = styled.div`
   flex-grow: 1;
   flex-shrink: 1;
@@ -204,12 +216,9 @@ const Actions = styled(EventBoundary)`
   flex-grow: 0;
   color: ${s("textSecondary")};
 
-  ${NudeButton} {
-    &:
-      ${hover},
-      &[aria-expanded= "true"] {
-      background: ${s("sidebarControlHoverBackground")};
-    }
+  ${NudeButton}:${hover},
+  ${NudeButton}[aria-expanded= "true"] {
+    background: ${s("sidebarControlHoverBackground")};
   }
 
   ${breakpoint("tablet")`
@@ -285,18 +294,14 @@ const Heading = styled.span<{ rtl?: boolean }>`
   justify-content: ${(props) => (props.rtl ? "flex-end" : "flex-start")};
   align-items: center;
   margin-top: 0;
-  margin-bottom: 0.25em;
+  margin-bottom: 0.1em;
   white-space: nowrap;
   color: ${s("text")};
   font-family: ${s("fontFamily")};
   font-weight: 500;
-  font-size: 20px;
+  font-size: 18px;
   line-height: 1.2;
-`;
-
-const StarPositioner = styled(Flex)`
-  margin-left: 4px;
-  align-items: center;
+  gap: 4px;
 `;
 
 const Title = styled(Highlight)`

app/components/DocumentMeta.tsx

@@ -1,12 +1,12 @@
-import { LocationDescriptor } from "history";
+import type { LocationDescriptor } from "history";
 import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import styled from "styled-components";
 import { s, ellipsis } from "@shared/styles";
-import Document from "~/models/Document";
-import Revision from "~/models/Revision";
+import type Document from "~/models/Document";
+import type Revision from "~/models/Revision";
 import DocumentBreadcrumb from "~/components/DocumentBreadcrumb";
 import DocumentTasks from "~/components/DocumentTasks";
 import Flex from "~/components/Flex";
@@ -182,7 +182,7 @@ const DocumentMeta: React.FC<Props> = ({
         <span>
           &nbsp;{t("in")}&nbsp;
           <Strong>
-            <DocumentBreadcrumb document={document} onlyText />
+            <DocumentBreadcrumb document={document} maxDepth={1} onlyText />
           </Strong>
         </span>
       )}

app/components/DocumentTasks.tsx

@@ -1,9 +1,9 @@
-import { TFunction } from "i18next";
+import type { TFunction } from "i18next";
 import { observer } from "mobx-react";
 import { DoneIcon } from "outline-icons";
 import { useTranslation } from "react-i18next";
 import styled, { useTheme } from "styled-components";
-import Document from "~/models/Document";
+import type Document from "~/models/Document";
 import CircularProgressBar from "~/components/CircularProgressBar";
 import usePrevious from "~/hooks/usePrevious";
 import { bounceIn } from "~/styles/animations";
@@ -42,7 +42,7 @@ function DocumentTasks({ document }: Props) {
   const message = getMessage(t, total, completed);
 
   return (
-    <Flex align="center" style={{ padding: "0 1px" }} gap={2}>
+    <Flex align="center" style={{ padding: "0 1px" }} gap={2} shrink={false}>
       {completed === total ? (
         <Done
           color={theme.accent}

app/components/DocumentViews.tsx

@@ -4,8 +4,8 @@ import { observer } from "mobx-react";
 import { useMemo, useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { dateLocale, dateToRelative } from "@shared/utils/date";
-import Document from "~/models/Document";
-import User from "~/models/User";
+import type Document from "~/models/Document";
+import type User from "~/models/User";
 import { Avatar, AvatarSize } from "~/components/Avatar";
 import ListItem from "~/components/List/Item";
 import PaginatedList from "~/components/PaginatedList";

app/components/DocumentsLoader.tsx

@@ -1,6 +1,6 @@
 import { observer } from "mobx-react";
 import * as React from "react";
-import Collection from "~/models/Collection";
+import type Collection from "~/models/Collection";
 
 type Props = {
   enabled: boolean;

app/components/EditableTitle.tsx

@@ -2,6 +2,7 @@ import * as React from "react";
 import { toast } from "sonner";
 import styled from "styled-components";
 import { s, ellipsis } from "@shared/styles";
+import EventBoundary from "@shared/components/EventBoundary";
 
 type Props = Omit<React.HTMLAttributes<HTMLInputElement>, "onSubmit"> & {
   /** A callback when the title is submitted. */
@@ -141,11 +142,12 @@ function EditableTitle(
   return (
     <>
       {isEditing ? (
-        <form onSubmit={handleSave}>
+        <EventBoundary as="form" onSubmit={handleSave}>
           <Input
             dir="auto"
             type="text"
             lang=""
+            name="title"
             value={value}
             onClick={stopPropagation}
             onKeyDown={handleKeyDown}
@@ -155,7 +157,7 @@ function EditableTitle(
             autoFocus
             {...rest}
           />
-        </form>
+        </EventBoundary>
       ) : (
         <Text
           onDoubleClick={canUpdate ? handleDoubleClick : undefined}

app/components/Editor.tsx

@@ -3,8 +3,9 @@ import { observer } from "mobx-react";
 import { DOMParser as ProsemirrorDOMParser } from "prosemirror-model";
 import { TextSelection } from "prosemirror-state";
 import * as React from "react";
+import { toast } from "sonner";
 import { mergeRefs } from "react-merge-refs";
-import { Optional } from "utility-types";
+import type { Optional } from "utility-types";
 import insertFiles from "@shared/editor/commands/insertFiles";
 import EditorContainer from "@shared/editor/components/Styles";
 import { AttachmentPreset } from "@shared/types";
@@ -41,7 +42,14 @@ export type Props = Optional<
 };
 
 function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
-  const { id, onChange, onCreateCommentMark, onDeleteCommentMark } = props;
+  const {
+    id,
+    onChange,
+    onCreateCommentMark,
+    onDeleteCommentMark,
+    onFileUploadStart,
+    onFileUploadStop,
+  } = props;
   const { comments } = useStores();
   const { shareId } = useShare();
   const dictionary = useDictionary();
@@ -50,11 +58,27 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
   const preferences = useCurrentUser({ rejectOnEmpty: false })?.preferences;
   const previousCommentIds = React.useRef<string[]>();
 
+  // Upload progress tracking for delayed toast
+  const progressMap = React.useMemo(() => new Map<string, number>(), []);
+  const uploadState = React.useRef<{
+    toastId?: string | number;
+    timeoutId?: ReturnType<typeof setTimeout>;
+    progress: Map<string, number>;
+  }>({ progress: progressMap });
+
   const handleUploadFile = React.useCallback(
-    async (file: File | string) => {
+    async (
+      file: File | string,
+      uploadOptions?: {
+        id?: string;
+        onProgress?: (fractionComplete: number) => void;
+      }
+    ) => {
       const options = {
+        id: uploadOptions?.id,
         documentId: id,
         preset: AttachmentPreset.DocumentAttachment,
+        onProgress: uploadOptions?.onProgress,
       };
       const result =
         file instanceof File
@@ -67,6 +91,49 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
 
   const { handleClickLink } = useEditorClickHandlers({ shareId });
 
+  // Show toast only after uploads have been running for 2 seconds
+  const handleFileUploadStart = React.useCallback(() => {
+    uploadState.current.timeoutId = setTimeout(() => {
+      uploadState.current.toastId = toast.loading(
+        dictionary.uploadingWithProgress(0)
+      );
+    }, 2000);
+    onFileUploadStart?.();
+  }, [onFileUploadStart, dictionary.uploadingWithProgress]);
+
+  const handleFileUploadProgress = React.useCallback(
+    (fileId: string, fractionComplete: number) => {
+      uploadState.current.progress.set(fileId, fractionComplete);
+
+      // Calculate average progress across all files
+      const progressValues = Array.from(uploadState.current.progress.values());
+      const avgProgress =
+        progressValues.reduce((a, b) => a + b, 0) / progressValues.length;
+      const percent = Math.round(avgProgress * 100);
+
+      // Update toast if visible
+      if (uploadState.current.toastId) {
+        toast.loading(dictionary.uploadingWithProgress(percent), {
+          id: uploadState.current.toastId,
+        });
+      }
+    },
+    [dictionary.uploadingWithProgress]
+  );
+
+  const handleFileUploadStop = React.useCallback(() => {
+    if (uploadState.current.timeoutId) {
+      clearTimeout(uploadState.current.timeoutId);
+      uploadState.current.timeoutId = undefined;
+    }
+    if (uploadState.current.toastId) {
+      toast.dismiss(uploadState.current.toastId);
+      uploadState.current.toastId = undefined;
+    }
+    uploadState.current.progress.clear();
+    onFileUploadStop?.();
+  }, [onFileUploadStop]);
+
   const focusAtEnd = React.useCallback(() => {
     localRef?.current?.focusAtEnd();
   }, [localRef]);
@@ -113,16 +180,18 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
 
       return insertFiles(view, event, pos, files, {
         uploadFile: handleUploadFile,
-        onFileUploadStart: props.onFileUploadStart,
-        onFileUploadStop: props.onFileUploadStop,
+        onFileUploadStart: handleFileUploadStart,
+        onFileUploadStop: handleFileUploadStop,
+        onFileUploadProgress: handleFileUploadProgress,
         dictionary,
         isAttachment,
       });
     },
     [
       localRef,
-      props.onFileUploadStart,
-      props.onFileUploadStop,
+      handleFileUploadStart,
+      handleFileUploadStop,
+      handleFileUploadProgress,
       dictionary,
       handleUploadFile,
     ]
@@ -223,6 +292,9 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
             {...props}
             onClickLink={handleClickLink}
             onChange={handleChange}
+            onFileUploadStart={handleFileUploadStart}
+            onFileUploadStop={handleFileUploadStop}
+            onFileUploadProgress={handleFileUploadProgress}
             placeholder={props.placeholder || ""}
             defaultValue={props.defaultValue || ""}
           />

app/components/EmojiCreateDialog.tsx

@@ -7,8 +7,7 @@ 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 Input, { LabelText } from "~/components/Input";
 import Text from "~/components/Text";
 import useStores from "~/hooks/useStores";
 import { uploadFile } from "~/utils/files";
@@ -16,6 +15,7 @@ import { compressImage } from "~/utils/compressImage";
 import { generateEmojiNameFromFilename } from "~/utils/emoji";
 import { AttachmentValidation, EmojiValidation } from "@shared/validations";
 import { bytesToHumanReadable } from "@shared/utils/files";
+import { VStack } from "./primitives/VStack";
 
 type Props = {
   onSubmit: () => void;
@@ -108,12 +108,16 @@ export function EmojiCreateDialog({ onSubmit }: Props) {
 
     setIsUploading(true);
     try {
-      const compressed = await compressImage(file, {
-        maxHeight: 64,
-        maxWidth: 64,
-      });
+      // Skip compression for GIFs to preserve animation
+      const fileToUpload =
+        file.type === "image/gif"
+          ? file
+          : await compressImage(file, {
+              maxHeight: 64,
+              maxWidth: 64,
+            });
 
-      const attachment = await uploadFile(compressed, {
+      const attachment = await uploadFile(fileToUpload, {
         name: file.name,
         preset: AttachmentPreset.Emoji,
       });
@@ -147,29 +151,14 @@ export function EmojiCreateDialog({ onSubmit }: Props) {
     >
       <Text as="p" type="secondary">
         {t(
-          "The emoji name should be unique and contain only lowercase letters, numbers, and underscores."
+          "Square images with transparent backgrounds work best. If your image is too large, we’ll try to resize it for you."
         )}
       </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
-        }
-      />
-
+      <LabelText as="label">{t("Upload an image")}</LabelText>
       <DropZone {...getRootProps()}>
         <input {...getInputProps()} />
-        <Flex column align="center" gap={8}>
+        <VStack>
           {file ? (
             <>
               <PreviewImage src={URL.createObjectURL(file)} alt="Preview" />
@@ -194,9 +183,25 @@ export function EmojiCreateDialog({ onSubmit }: Props) {
               </Text>
             </>
           )}
-        </Flex>
+        </VStack>
       </DropZone>
 
+      <Input
+        label={t("Choose a name")}
+        value={name}
+        onChange={handleNameChange}
+        placeholder="my_custom_emoji"
+        autoFocus
+        required
+        error={
+          !isValidName
+            ? t(
+                "name can only contain lowercase letters, numbers, and underscores."
+              )
+            : undefined
+        }
+      />
+
       {name.trim() && isValidName && (
         <Text type="secondary" style={{ marginTop: "8px" }}>
           {t("This emoji will be available as")} <code>:{name}:</code>
@@ -213,6 +218,7 @@ const DropZone = styled.div`
   text-align: center;
   cursor: var(--pointer);
   transition: border-color 0.2s;
+  margin-bottom: 1em;
 
   &:hover {
     border-color: ${s("inputBorderFocused")};

app/components/ErrorBoundary.tsx

@@ -1,7 +1,8 @@
 import { observable } from "mobx";
 import { observer } from "mobx-react";
 import * as React from "react";
-import { withTranslation, Trans, WithTranslation } from "react-i18next";
+import type { WithTranslation } from "react-i18next";
+import { withTranslation, Trans } from "react-i18next";
 import styled from "styled-components";
 import { s } from "@shared/styles";
 import { UrlHelper } from "@shared/utils/UrlHelper";

app/components/EventListItem.tsx

@@ -12,8 +12,8 @@ import {
 import { useTranslation } from "react-i18next";
 import styled, { css } from "styled-components";
 import { s } from "@shared/styles";
-import Document from "~/models/Document";
-import Event from "~/models/Event";
+import type Document from "~/models/Document";
+import type Event from "~/models/Event";
 import Time from "~/components/Time";
 import Logger from "~/utils/Logger";
 import Text from "./Text";

app/components/ExportDialog.tsx

@@ -4,15 +4,13 @@ import { Trans, useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import styled from "styled-components";
 import { FileOperationFormat, NotificationEventType } from "@shared/types";
-import Collection from "~/models/Collection";
+import type Collection from "~/models/Collection";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import Flex from "~/components/Flex";
 import Text from "~/components/Text";
 import env from "~/env";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";
-import history from "~/utils/history";
-import { settingsPath } from "~/utils/routeHelpers";
 
 type Props = {
   collection?: Collection;
@@ -27,7 +25,7 @@ function ExportDialog({ collection, onSubmit }: Props) {
     React.useState<boolean>(true);
   const [includePrivate, setIncludePrivate] = React.useState<boolean>(true);
   const user = useCurrentUser();
-  const { collections } = useStores();
+  const { collections, ui } = useStores();
   const { t } = useTranslation();
   const appName = env.APP_NAME;
 
@@ -53,23 +51,40 @@ function ExportDialog({ collection, onSubmit }: Props) {
   );
 
   const handleSubmit = async () => {
+    let response;
+
     if (collection) {
-      await collection.export(format, includeAttachments);
-      toast.success(t("Export started"), {
-        description: t(`Your file will be available in {{ location }} soon`, {
-          location: `"${t("Settings")} > ${t("Export")}"`,
-        }),
-        action: {
-          label: t("View"),
-          onClick: () => {
-            history.push(settingsPath("export"));
-          },
-        },
-      });
+      response = await collection.export(format, includeAttachments);
     } else {
-      await collections.export({ format, includeAttachments, includePrivate });
-      toast.success(t("Export started"));
+      response = await collections.export({
+        format,
+        includeAttachments,
+        includePrivate,
+      });
     }
+
+    if (response?.data?.fileOperation) {
+      const fileOperationId = response.data.fileOperation.id;
+      const toastId = `export-${fileOperationId}`;
+
+      const timeoutId = setTimeout(() => {
+        toast.success(t("Export started"), {
+          id: toastId,
+          description: t("A link to your file will be sent through email soon"),
+          duration: 3000,
+        });
+        ui.exportToasts.delete(fileOperationId);
+      }, 6000);
+
+      ui.registerExportToast(fileOperationId, toastId, timeoutId);
+
+      toast.loading(t("Export started"), {
+        id: toastId,
+        description: `${t("Preparing your download")}…`,
+        duration: Infinity,
+      });
+    }
+
     onSubmit();
   };
 

app/components/Facepile.tsx

@@ -2,7 +2,7 @@ import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
-import User from "~/models/User";
+import type User from "~/models/User";
 import { Avatar, AvatarSize } from "~/components/Avatar";
 import Flex from "~/components/Flex";
 import { s } from "@shared/styles";

app/components/FilterOptions.tsx

@@ -7,7 +7,8 @@ import type { FetchPageParams } from "~/stores/base/Store";
 import Button, { Inner } from "~/components/Button";
 import Text from "~/components/Text";
 import Input, { NativeInput, Outline } from "./Input";
-import PaginatedList, { PaginatedItem } from "./PaginatedList";
+import type { PaginatedItem } from "./PaginatedList";
+import PaginatedList from "./PaginatedList";
 import { MenuProvider } from "./primitives/Menu/MenuContext";
 import { Menu, MenuContent, MenuTrigger, MenuButton } from "./primitives/Menu";
 import { MenuIconWrapper } from "./primitives/components/Menu";

app/components/HoverPreview/HoverPreviewDocument.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { richExtensions } from "@shared/editor/nodes";
-import { UnfurlResourceType, UnfurlResponse } from "@shared/types";
+import type { UnfurlResourceType, UnfurlResponse } from "@shared/types";
 import Editor from "~/components/Editor";
 import Flex from "~/components/Flex";
 import ErrorBoundary from "../ErrorBoundary";
@@ -15,7 +15,7 @@ import {
 
 type Props = Omit<UnfurlResponse[UnfurlResourceType.Document], "type">;
 
-const HoverPreviewDocument = React.forwardRef(function _HoverPreviewDocument(
+const HoverPreviewDocument = React.forwardRef(function HoverPreviewDocument_(
   { url, id, title, summary, lastActivityByViewer }: Props,
   ref: React.Ref<HTMLDivElement>
 ) {

app/components/HoverPreview/HoverPreviewGroup.tsx

@@ -1,8 +1,8 @@
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import { UnfurlResourceType, UnfurlResponse } from "@shared/types";
+import type { UnfurlResourceType, UnfurlResponse } from "@shared/types";
 import { MAX_AVATAR_DISPLAY } from "@shared/constants";
-import User from "~/models/User";
+import type User from "~/models/User";
 import Facepile from "~/components/Facepile";
 import Flex from "~/components/Flex";
 import {
@@ -17,7 +17,7 @@ import ErrorBoundary from "../ErrorBoundary";
 
 type Props = Omit<UnfurlResponse[UnfurlResourceType.Group], "type">;
 
-const HoverPreviewGroup = React.forwardRef(function _HoverPreviewGroup(
+const HoverPreviewGroup = React.forwardRef(function HoverPreviewGroup_(
   { name, description, memberCount, users }: Props,
   ref: React.Ref<HTMLDivElement>
 ) {

app/components/HoverPreview/HoverPreviewIssue.tsx

@@ -3,11 +3,8 @@ import { Trans } from "react-i18next";
 import styled from "styled-components";
 import { Backticks } from "@shared/components/Backticks";
 import { IssueStatusIcon } from "@shared/components/IssueStatusIcon";
-import {
-  IntegrationService,
-  UnfurlResourceType,
-  UnfurlResponse,
-} from "@shared/types";
+import type { UnfurlResourceType, UnfurlResponse } from "@shared/types";
+import { IntegrationService } from "@shared/types";
 import { Avatar } from "~/components/Avatar";
 import Flex from "~/components/Flex";
 import Text from "../Text";
@@ -24,7 +21,7 @@ import {
 
 type Props = Omit<UnfurlResponse[UnfurlResourceType.Issue], "type">;
 
-const HoverPreviewIssue = React.forwardRef(function _HoverPreviewIssue(
+const HoverPreviewIssue = React.forwardRef(function HoverPreviewIssue_(
   { url, id, title, description, author, labels, state, createdAt }: Props,
   ref: React.Ref<HTMLDivElement>
 ) {

app/components/HoverPreview/HoverPreviewLink.tsx

@@ -20,7 +20,7 @@ type Props = {
   description: string;
 };
 
-const HoverPreviewLink = React.forwardRef(function _HoverPreviewLink(
+const HoverPreviewLink = React.forwardRef(function HoverPreviewLink_(
   { url, thumbnailUrl, title, description }: Props,
   ref: React.Ref<HTMLDivElement>
 ) {

app/components/HoverPreview/HoverPreviewMention.tsx

@@ -1,12 +1,12 @@
 import * as React from "react";
-import { UnfurlResourceType, UnfurlResponse } from "@shared/types";
+import type { UnfurlResourceType, UnfurlResponse } from "@shared/types";
 import { Avatar, AvatarSize } from "~/components/Avatar";
 import Flex from "~/components/Flex";
 import { Preview, Title, Info, Card, CardContent } from "./Components";
 
 type Props = Omit<UnfurlResponse[UnfurlResourceType.Mention], "type">;
 
-const HoverPreviewMention = React.forwardRef(function _HoverPreviewMention(
+const HoverPreviewMention = React.forwardRef(function HoverPreviewMention_(
   { avatarUrl, name, lastActive, color }: Props,
   ref: React.Ref<HTMLDivElement>
 ) {

app/components/HoverPreview/HoverPreviewPullRequest.tsx

@@ -3,7 +3,7 @@ import { Trans } from "react-i18next";
 import styled from "styled-components";
 import { Backticks } from "@shared/components/Backticks";
 import { PullRequestIcon } from "@shared/components/PullRequestIcon";
-import { UnfurlResourceType, UnfurlResponse } from "@shared/types";
+import type { UnfurlResourceType, UnfurlResponse } from "@shared/types";
 import { Avatar } from "~/components/Avatar";
 import Flex from "~/components/Flex";
 import Text from "../Text";
@@ -20,7 +20,7 @@ import {
 type Props = Omit<UnfurlResponse[UnfurlResourceType.PR], "type">;
 
 const HoverPreviewPullRequest = React.forwardRef(
-  function _HoverPreviewPullRequest(
+  function HoverPreviewPullRequest_(
     { url, title, id, description, author, state, createdAt }: Props,
     ref: React.Ref<HTMLDivElement>
   ) {

app/components/IconPicker/components/Components.tsx

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

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,14 +1,25 @@
 import concat from "lodash/concat";
+import { PlusIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import { EmojiCategory, EmojiSkinTone, IconType } from "@shared/types";
+import type { EmojiSkinTone } from "@shared/types";
+import { EmojiCategory, IconType } from "@shared/types";
 import { getEmojis, getEmojisWithCategory, search } from "@shared/utils/emoji";
 import Flex from "~/components/Flex";
+import { EmojiCreateDialog } from "~/components/EmojiCreateDialog";
 import { DisplayCategory } from "../utils";
-import GridTemplate, { DataNode } from "./GridTemplate";
+import type { DataNode, EmojiNode } from "./GridTemplate";
+import GridTemplate from "./GridTemplate";
 import SkinTonePicker from "./SkinTonePicker";
 import { StyledInputSearch, UserInputContainer } from "./Components";
 import { useIconState } from "../useIconState";
+import useStores from "~/hooks/useStores";
+import type Emoji from "~/models/Emoji";
+import { useComputed } from "~/hooks/useComputed";
+import { MenuButton } from "./MenuButton";
+import useCurrentTeam from "~/hooks/useCurrentTeam";
+import usePolicy from "~/hooks/usePolicy";
+import { IconButton } from "./IconButton";
 
 const GRID_HEIGHT = 410;
 
@@ -30,9 +41,15 @@ const EmojiPanel = ({
   height = GRID_HEIGHT,
 }: Props) => {
   const { t } = useTranslation();
-
+  const { emojis, dialogs } = useStores();
+  const team = useCurrentTeam();
+  const can = usePolicy(team);
   const searchRef = React.useRef<HTMLInputElement | null>(null);
   const scrollableRef = React.useRef<HTMLDivElement | null>(null);
+  const customEmojis = useComputed(
+    () => emojis.orderedData.map(toIcon),
+    [emojis.orderedData]
+  );
 
   const {
     emojiSkinTone: skinTone,
@@ -41,11 +58,20 @@ const EmojiPanel = ({
     getFrequentIcons,
   } = useIconState(IconType.Emoji);
 
+  const {
+    incrementIconCount: incrementCustomIconCount,
+    getFrequentIcons: getFrequentCustomIcons,
+  } = useIconState(IconType.Custom);
+
   const freqEmojis = React.useMemo(
     () => getFrequentIcons(),
     [getFrequentIcons]
   );
 
+  const [freqCustomEmojis, setFreqCustomEmojis] = React.useState<EmojiNode[]>(
+    []
+  );
+
   const handleFilter = React.useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       onQueryChange(event.target.value);
@@ -60,23 +86,68 @@ const EmojiPanel = ({
     [setEmojiSkinTone]
   );
 
+  const handleUploadClick = React.useCallback(() => {
+    dialogs.openModal({
+      title: t("Upload emoji"),
+      content: <EmojiCreateDialog onSubmit={dialogs.closeAllModals} />,
+    });
+  }, [dialogs, t]);
+
   const handleEmojiSelection = React.useCallback(
     ({ id, value }: { id: string; value: string }) => {
       onEmojiChange(value);
-      incrementIconCount(id);
+
+      // Determine if this is a custom emoji by checking if it's in the custom emoji data
+      const isCustomEmoji =
+        customEmojis.some((emoji) => emoji.id === id) ||
+        freqCustomEmojis.some((emoji) => emoji.id === id);
+
+      if (isCustomEmoji) {
+        incrementCustomIconCount(id);
+      } else {
+        incrementIconCount(id);
+      }
     },
-    [onEmojiChange, incrementIconCount]
+    [
+      onEmojiChange,
+      incrementIconCount,
+      incrementCustomIconCount,
+      customEmojis,
+      freqCustomEmojis,
+    ]
   );
 
+  React.useEffect(() => {
+    // Load frequent custom emojis
+    getFrequentCustomIcons().forEach((id) => {
+      emojis
+        .fetch(id)
+        .then((emoji) => {
+          setFreqCustomEmojis((prev) => {
+            if (prev.some((item) => item.id === id)) {
+              return prev;
+            }
+            return [...prev, toIcon(emoji)];
+          });
+        })
+        .catch(() => {
+          // ignore
+        });
+    });
+  }, [emojis, getFrequentCustomIcons]);
+
   const isSearch = query !== "";
   const templateData: DataNode[] = isSearch
     ? getSearchResults({
         query,
         skinTone,
+        customEmojis,
       })
     : getAllEmojis({
         skinTone,
         freqEmojis,
+        customEmojis,
+        freqCustomEmojis,
       });
 
   React.useLayoutEffect(() => {
@@ -89,7 +160,7 @@ const EmojiPanel = ({
 
   return (
     <Flex column>
-      <UserInputContainer align="center" gap={12}>
+      <UserInputContainer>
         <StyledInputSearch
           ref={searchRef}
           value={query}
@@ -97,6 +168,14 @@ const EmojiPanel = ({
           onChange={handleFilter}
         />
         <SkinTonePicker skinTone={skinTone} onChange={handleSkinChange} />
+        {can.update && (
+          <MenuButton
+            onClick={handleUploadClick}
+            aria-label={t("Upload emoji")}
+          >
+            <PlusIcon />
+          </MenuButton>
+        )}
       </UserInputContainer>
       <GridTemplate
         ref={scrollableRef}
@@ -104,6 +183,11 @@ const EmojiPanel = ({
         height={height - 48}
         data={templateData}
         onIconSelect={handleEmojiSelection}
+        empty={
+          <IconButton onClick={handleUploadClick}>
+            <PlusIcon />
+          </IconButton>
+        }
       />
     </Flex>
   );
@@ -112,19 +196,32 @@ const EmojiPanel = ({
 const getSearchResults = ({
   query,
   skinTone,
+  customEmojis,
 }: {
   query: string;
   skinTone: EmojiSkinTone;
+  customEmojis: EmojiNode[];
 }): DataNode[] => {
   const emojis = search({ query, skinTone });
+
+  // Search custom emojis by name
+  const matchingCustomEmojis = customEmojis.filter((emoji) =>
+    emoji.name?.toLowerCase().includes(query.toLowerCase())
+  );
+
+  const allResults = [
+    ...matchingCustomEmojis,
+    ...emojis.map((emoji) => ({
+      type: IconType.Emoji as const,
+      id: emoji.id,
+      value: emoji.value,
+    })),
+  ];
+
   return [
     {
       category: DisplayCategory.Search,
-      icons: emojis.map((emoji) => ({
-        type: IconType.Emoji,
-        id: emoji.id,
-        value: emoji.value,
-      })),
+      icons: allResults,
     },
   ];
 };
@@ -132,21 +229,32 @@ const getSearchResults = ({
 const getAllEmojis = ({
   skinTone,
   freqEmojis,
+  customEmojis,
+  freqCustomEmojis,
 }: {
   skinTone: EmojiSkinTone;
   freqEmojis: string[];
+  customEmojis: EmojiNode[];
+  freqCustomEmojis: EmojiNode[];
 }): DataNode[] => {
   const emojisWithCategory = getEmojisWithCategory({ skinTone });
 
   const getFrequentIcons = (): DataNode => {
     const emojis = getEmojis({ ids: freqEmojis, skinTone });
-    return {
-      category: DisplayCategory.Frequent,
-      icons: emojis.map((emoji) => ({
-        type: IconType.Emoji,
+
+    // Combine frequent standard and custom emojis
+    const allFrequent = [
+      ...emojis.map((emoji) => ({
+        type: IconType.Emoji as const,
         id: emoji.id,
         value: emoji.value,
       })),
+      ...freqCustomEmojis,
+    ];
+
+    return {
+      category: DisplayCategory.Frequent,
+      icons: allFrequent,
     };
   };
 
@@ -162,7 +270,7 @@ const getAllEmojis = ({
     };
   };
 
-  return concat(
+  const allData = concat(
     getFrequentIcons(),
     getCategoryData(EmojiCategory.People),
     getCategoryData(EmojiCategory.Nature),
@@ -173,6 +281,22 @@ const getAllEmojis = ({
     getCategoryData(EmojiCategory.Symbols),
     getCategoryData(EmojiCategory.Flags)
   );
+
+  if (customEmojis.length) {
+    allData.push({
+      category: "Custom",
+      icons: customEmojis,
+    });
+  }
+
+  return allData;
 };
 
+const toIcon = (emoji: Emoji): EmojiNode => ({
+  type: IconType.Custom,
+  id: emoji.id,
+  value: emoji.id,
+  name: emoji.name,
+});
+
 export default EmojiPanel;

app/components/IconPicker/components/Grid.tsx

@@ -1,5 +1,6 @@
 import React from "react";
-import { FixedSizeList, ListChildComponentProps } from "react-window";
+import type { ListChildComponentProps } from "react-window";
+import { FixedSizeList } from "react-window";
 import styled from "styled-components";
 
 type Props = {

app/components/IconPicker/components/GridTemplate.tsx

@@ -37,14 +37,20 @@ export type DataNode = {
 };
 
 type Props = {
+  /** Width of the grid container */
   width: number;
+  /** Height of the grid container */
   height: number;
+  /** Data to be displayed in the grid */
   data: DataNode[];
+  /** Content to display when search results are empty */
+  empty?: React.ReactNode;
+  /** Callback when an icon is selected */
   onIconSelect: ({ id, value }: { id: string; value: string }) => void;
 };
 
 const GridTemplate = (
-  { width, height, data, onIconSelect }: Props,
+  { width, height, data, empty, onIconSelect }: Props,
   ref: React.Ref<HTMLDivElement>
 ) => {
   // 24px padding for the Grid Container
@@ -52,10 +58,6 @@ const GridTemplate = (
 
   const gridItems = compact(
     data.flatMap((node) => {
-      if (node.icons.length === 0) {
-        return [];
-      }
-
       const category = (
         <CategoryName
           key={node.category}
@@ -67,6 +69,13 @@ const GridTemplate = (
         </CategoryName>
       );
 
+      if (node.icons.length === 0) {
+        if (node.category !== "Search") {
+          return [];
+        }
+        return [[category], [empty]];
+      }
+
       const items = node.icons.map((item) => {
         if (item.type === IconType.SVG) {
           return (

app/components/IconPicker/components/IconPanel.tsx

@@ -7,7 +7,8 @@ import Flex from "~/components/Flex";
 import InputSearch from "~/components/InputSearch";
 import { DisplayCategory } from "../utils";
 import ColorPicker from "./ColorPicker";
-import GridTemplate, { DataNode } from "./GridTemplate";
+import type { DataNode } from "./GridTemplate";
+import GridTemplate from "./GridTemplate";
 import { useIconState } from "../useIconState";
 
 const IconNames = Object.keys(IconLibrary.mapping);

app/components/IconPicker/components/MenuButton.tsx

@@ -0,0 +1,19 @@
+import { hover, s } from "@shared/styles";
+import styled from "styled-components";
+import NudeButton from "~/components/NudeButton";
+
+export const MenuButton = styled(NudeButton)`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  width: 32px;
+  height: 32px;
+  color: ${s("textSecondary")};
+  border: 1px solid ${s("inputBorder")};
+  padding: 4px;
+
+  &: ${hover} {
+    border: 1px solid ${s("inputBorderFocused")};
+  }
+`;

app/components/IconPicker/components/SkinTonePicker.tsx

@@ -1,18 +1,17 @@
 import { useMemo, useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
-import { s, hover } from "@shared/styles";
 import { EmojiSkinTone } from "@shared/types";
 import { getEmojiVariants } from "@shared/utils/emoji";
 import { Emoji } from "~/components/Emoji";
 import Flex from "~/components/Flex";
-import NudeButton from "~/components/NudeButton";
 import {
   Popover,
   PopoverContent,
   PopoverTrigger,
 } from "~/components/primitives/Popover";
 import { IconButton } from "./IconButton";
+import { MenuButton } from "./MenuButton";
 
 const SkinTonePicker = ({
   skinTone,
@@ -57,9 +56,9 @@ const SkinTonePicker = ({
   return (
     <Popover open={open} onOpenChange={setOpen}>
       <PopoverTrigger>
-        <StyledMenuButton aria-label={t("Choose default skin tone")}>
+        <MenuButton aria-label={t("Choose default skin tone")}>
           {handEmojiVariants[skinTone]?.value}
-        </StyledMenuButton>
+        </MenuButton>
       </PopoverTrigger>
       <PopoverContent
         side="bottom"
@@ -79,15 +78,4 @@ const Emojis = styled(Flex)`
   padding: 0 8px;
 `;
 
-const StyledMenuButton = styled(NudeButton)`
-  width: 32px;
-  height: 32px;
-  border: 1px solid ${s("inputBorder")};
-  padding: 4px;
-
-  &: ${hover} {
-    border: 1px solid ${s("inputBorderFocused")};
-  }
-`;
-
 export default SkinTonePicker;

app/components/IconPicker/index.tsx

@@ -21,13 +21,11 @@ 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];
@@ -175,7 +173,7 @@ const IconPicker = ({
     if (open) {
       void emojis.fetchAll();
     }
-  }, [open]);
+  }, [open, emojis]);
 
   if (isMobile) {
     return (
@@ -254,13 +252,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 +278,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/Icons/CollectionIcon.tsx

@@ -3,7 +3,7 @@ import { CollectionIcon, PrivateCollectionIcon } from "outline-icons";
 import { getLuminance } from "polished";
 import Icon from "@shared/components/Icon";
 import { colorPalette } from "@shared/utils/collections";
-import Collection from "~/models/Collection";
+import type Collection from "~/models/Collection";
 import useStores from "~/hooks/useStores";
 
 type Props = {

app/components/Icons/ConnectedIcon.tsx

@@ -0,0 +1,19 @@
+import styled from "styled-components";
+
+export const ConnectedIcon = styled.div<{ color?: string }>`
+  width: 24px;
+  height: 24px;
+  position: relative;
+
+  &::after {
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 8px;
+    height: 8px;
+    background-color: ${(props) => props.color ?? props.theme.accent};
+    border-radius: 50%;
+    transform: translate(-50%, -50%);
+  }
+`;

app/components/Input.tsx

@@ -125,11 +125,10 @@ export const LabelText = styled.div`
   display: inline-block;
 `;
 
-export interface Props
-  extends Omit<
-    React.InputHTMLAttributes<HTMLInputElement | HTMLTextAreaElement>,
-    "prefix"
-  > {
+export interface Props extends Omit<
+  React.InputHTMLAttributes<HTMLInputElement | HTMLTextAreaElement>,
+  "prefix"
+> {
   type?: "text" | "email" | "checkbox" | "search" | "textarea" | "password";
   labelHidden?: boolean;
   label?: string;

app/components/InputColor.tsx

@@ -1,6 +1,7 @@
 import * as React from "react";
 import styled from "styled-components";
-import Input, { Props as InputProps } from "./Input";
+import type { Props as InputProps } from "./Input";
+import Input from "./Input";
 import Relative from "./Sidebar/components/Relative";
 import { SwatchButton } from "./SwatchButton";
 

app/components/InputMemberPermissionSelect.tsx

@@ -2,8 +2,10 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { s } from "@shared/styles";
-import { InputSelect, Option } from "~/components/InputSelect";
-import { EmptySelectValue, Permission } from "~/types";
+import type { Option } from "~/components/InputSelect";
+import { InputSelect } from "~/components/InputSelect";
+import type { Permission } from "~/types";
+import { EmptySelectValue } from "~/types";
 
 type Props = Pick<
   React.ComponentProps<typeof InputSelect>,

app/components/InputSearch.tsx

@@ -2,7 +2,8 @@ import { SearchIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { useTheme } from "styled-components";
-import Input, { Props as InputProps } from "~/components/Input";
+import type { Props as InputProps } from "~/components/Input";
+import Input from "~/components/Input";
 
 type Props = InputProps & {
   placeholder?: string;

app/components/InputSelectPermission.tsx

@@ -3,7 +3,8 @@ import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { s } from "@shared/styles";
 import { CollectionPermission } from "@shared/types";
-import { InputSelect, Option } from "~/components/InputSelect";
+import type { Option } from "~/components/InputSelect";
+import { InputSelect } from "~/components/InputSelect";
 import { EmptySelectValue } from "~/types";
 
 type Props = {

app/components/Layout.tsx

@@ -1,7 +1,8 @@
 import { observer } from "mobx-react";
 import * as React from "react";
 import { Helmet } from "react-helmet-async";
-import styled, { DefaultTheme } from "styled-components";
+import type { DefaultTheme } from "styled-components";
+import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import { s } from "@shared/styles";
 import Flex from "~/components/Flex";

app/components/Lightbox.tsx

@@ -1,12 +1,11 @@
 import { observer } from "mobx-react";
 import * as Dialog from "@radix-ui/react-dialog";
-import styled, { css, Keyframes, keyframes } from "styled-components";
+import type { Keyframes } from "styled-components";
+import styled, { css, keyframes } from "styled-components";
+import type { ComponentProps, HTMLAttributes, ReactNode } from "react";
 import {
-  ComponentProps,
   createContext,
   forwardRef,
-  HTMLAttributes,
-  ReactNode,
   useCallback,
   useContext,
   useEffect,
@@ -42,12 +41,12 @@ 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 type { LightboxImage } from "@shared/editor/lib/Lightbox";
+import type { ReactZoomPanPinchRef } from "react-zoom-pan-pinch";
 import {
   TransformWrapper,
   TransformComponent,
   useTransformEffect,
-  ReactZoomPanPinchRef,
 } from "react-zoom-pan-pinch";
 import { transparentize } from "polished";
 import { mergeRefs } from "react-merge-refs";
@@ -55,6 +54,7 @@ import { useEditor } from "~/editor/components/EditorContext";
 import { NodeSelection } from "prosemirror-state";
 import { ImageSource } from "@shared/editor/lib/FileHelper";
 import Desktop from "~/utils/Desktop";
+import { HStack } from "./primitives/HStack";
 
 export enum LightboxStatus {
   READY_TO_OPEN,
@@ -504,18 +504,16 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
         const toTx = to.center.x - final.center.x;
         const toTy = to.center.y - final.center.y;
 
-        const fromSx = from.width / final.width;
-        const fromSy = from.height / final.height;
-        const toSx = to.width / final.width;
-        const toSy = to.height / final.height;
+        const fromS = from.width / final.width;
+        const toS = to.width / final.width;
         return keyframes`
             from {
               translate: ${fromTx}px ${fromTy}px;
-              scale: ${fromSx} ${fromSy};
+              scale: ${fromS};
             }
             to {
               translate: ${toTx}px ${toTy}px;
-              scale: ${toSx} ${toSy};
+              scale: ${toS};
             }
         `;
       };
@@ -904,7 +902,7 @@ type ImageProps = {
   onMaxZoom: () => void;
 };
 
-const Image = forwardRef<HTMLImageElement, ImageProps>(function _Image(
+const Image = forwardRef<HTMLImageElement, ImageProps>(function Image_(
   {
     src,
     alt,
@@ -1101,16 +1099,13 @@ const ActionButton = styled(Button)`
   background: transparent;
 `;
 
-const Actions = styled.div<{
+const Actions = styled(HStack)<{
   animation: Animation | null;
 }>`
   position: absolute;
   top: 0;
   right: 0;
   margin: 16px 12px;
-  display: flex;
-  align-items: center;
-  gap: 8px;
   z-index: ${depths.modal};
   background: ${(props) => transparentize(0.2, props.theme.background)};
   backdrop-filter: blur(4px);

app/components/List/Item.tsx

@@ -2,7 +2,7 @@ import {
   useFocusEffect,
   useRovingTabIndex,
 } from "@getoutline/react-roving-tabindex";
-import { LocationDescriptor } from "history";
+import type { LocationDescriptor } from "history";
 import * as React from "react";
 import scrollIntoView from "scroll-into-view-if-needed";
 import styled, { useTheme } from "styled-components";

app/components/List/Placeholder.tsx

@@ -2,9 +2,8 @@ import times from "lodash/times";
 import styled from "styled-components";
 import Fade from "~/components/Fade";
 import Flex from "~/components/Flex";
-import PlaceholderText, {
-  Props as PlaceholderTextProps,
-} from "~/components/PlaceholderText";
+import type { Props as PlaceholderTextProps } from "~/components/PlaceholderText";
+import PlaceholderText from "~/components/PlaceholderText";
 
 type Props = {
   count?: number;

app/components/LocaleTime.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { locales } from "@shared/utils/date";
+import type { locales } from "@shared/utils/date";
 import Tooltip from "~/components/Tooltip";
 import { useLocaleTime } from "~/hooks/useLocaleTime";
 

app/components/Menu/ContextMenu.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import { actionToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import useMobile from "~/hooks/useMobile";
-import { ActionVariant, ActionWithChildren } from "~/types";
+import type { ActionVariant, ActionWithChildren } from "~/types";
 import { toMenuItems } from "./transformer";
 import { observer } from "mobx-react";
 import { useComputed } from "~/hooks/useComputed";

app/components/Menu/DropdownMenu.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as TooltipPrimitive from "@radix-ui/react-tooltip";
+import type * as TooltipPrimitive from "@radix-ui/react-tooltip";
 import styled from "styled-components";
 import Scrollable from "~/components/Scrollable";
 import {
@@ -13,7 +13,7 @@ import { MenuProvider } from "~/components/primitives/Menu/MenuContext";
 import { actionToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import useMobile from "~/hooks/useMobile";
-import {
+import type {
   ActionVariant,
   ActionWithChildren,
   MenuItem,

app/components/Menu/OverflowMenuButton.tsx

@@ -1,4 +1,4 @@
-import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+import type * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
 import { MoreIcon } from "outline-icons";
 import * as React from "react";
 import Button from "~/components/Button";

app/components/Menu/transformer.tsx

@@ -10,7 +10,7 @@ import {
   MenuGroup,
 } from "~/components/primitives/Menu";
 import * as Components from "~/components/primitives/components/Menu";
-import { MenuItem } from "~/types";
+import type { MenuItem } from "~/types";
 import { MouseSafeArea } from "~/components/MouseSafeArea";
 import { createRef } from "react";