wip

When signing in with an authentication method, remove any other
UserAuthentication records for the same provider to prevent expired
tokens from causing premature logout.

This fix applies to both:
- Existing users signing in again
- Invited users accepting their invitation

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

.dockerignore

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

.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/auto_close_prs.yml

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

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

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

.github/workflows/ci.yml

@@ -18,44 +18,61 @@ env:
   SMTP_USERNAME: localhost
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.x, 22.x]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: "yarn"
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile --prefer-offline
-
-  lint:
-    needs: build
+  setup:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v5
+      - name: Enable Corepack
+        run: corepack enable
+      - name: Use Node.js 22.x
+        uses: actions/setup-node@v5
         with:
           node-version: 22.x
           cache: "yarn"
-      - run: yarn install --frozen-lockfile --prefer-offline
+      - 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
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: yarn install --immutable
+
+  lint:
+    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"
+      - 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@v4
-      - uses: actions/setup-node@v4
+      - 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:
@@ -65,7 +82,7 @@ jobs:
       server: ${{ steps.filter.outputs.server }}
       app: ${{ steps.filter.outputs.app }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -85,23 +102,29 @@ 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:
       matrix:
         test-group: [app, shared]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - 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:
@@ -124,29 +147,41 @@ jobs:
         shard: [1, 2, 3, 4]
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - 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@v4
-      - uses: actions/setup-node@v4
+      - 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

.github/workflows/codeql-analysis.yml

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

.github/workflows/docker.yml

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

.github/workflows/lint.yml

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

.github/workflows/stale.yml

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

.gitignore

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

.jestconfig.json

@@ -1,6 +1,7 @@
 {
   "workerIdleMemoryLimit": "0.75",
   "maxWorkers": "50%",
+  "transformIgnorePatterns": ["node_modules/(?!(franc|trigram-utils)/)"],
   "projects": [
     {
       "displayName": "server",
@@ -9,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"
@@ -20,8 +24,7 @@
       "moduleNameMapper": {
         "^~/(.*)$": "<rootDir>/app/$1",
         "^@shared/(.*)$": "<rootDir>/shared/$1",
-        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js",
-        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js"
+        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js"
       },
       "modulePaths": ["<rootDir>/app"],
       "setupFiles": ["<rootDir>/__mocks__/window.js"],
@@ -48,8 +51,7 @@
       "moduleNameMapper": {
         "^~/(.*)$": "<rootDir>/app/$1",
         "^@shared/(.*)$": "<rootDir>/shared/$1",
-        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js",
-        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js"
+        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js"
       },
       "setupFiles": ["<rootDir>/__mocks__/window.js"],
       "testEnvironment": "jsdom",

.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

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

CLAUDE.md

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

Dockerfile

@@ -6,7 +6,7 @@ ARG APP_PATH
 WORKDIR $APP_PATH
 
 # ---
-FROM node:22-slim AS runner
+FROM node:22.21.0-slim AS runner
 
 LABEL org.opencontainers.image.source="https://github.com/outline/outline"
 
@@ -16,26 +16,26 @@ ENV NODE_ENV=production
 
 # Create a non-root user compatible with Debian and BusyBox based images
 RUN addgroup --gid 1001 nodejs && \
-  adduser --uid 1001 --ingroup nodejs nodejs && \
-  mkdir -p /var/lib/outline && \
-  chown -R nodejs:nodejs /var/lib/outline
+    adduser --uid 1001 --ingroup nodejs nodejs && \
+    mkdir -p /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 \
-  && rm -rf /var/lib/apt/lists/*
+    && apt-get install -y wget \
+    && rm -rf /var/lib/apt/lists/*
 
 ENV FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data
 RUN mkdir -p "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
-  chown -R nodejs:nodejs "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
-  chmod 1777 "$FILE_STORAGE_LOCAL_ROOT_DIR"
+    chown -R nodejs:nodejs "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
+    chmod 1777 "$FILE_STORAGE_LOCAL_ROOT_DIR"
 
 VOLUME /var/lib/outline/data
 
@@ -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

@@ -1,24 +1,23 @@
 ARG APP_PATH=/opt/outline
-FROM node:22 AS deps
+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 0.87.4
-                      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-09-18
+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.json

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

app/.oxlintrc.json

@@ -5,6 +5,13 @@
     {
       "files": ["**/*.{jsx,tsx}"],
       "rules": {
+        "no-restricted-globals": [
+          "error",
+          {
+            "name": "crypto",
+            "message": "Do not use, does not work in environments without SSL."
+          }
+        ],
         "no-restricted-imports": [
           "error",
           {

app/actions/definitions/apiKeys.tsx

@@ -1,9 +1,9 @@
 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, createActionV2 } from "..";
+import { createAction } from "..";
 import { SettingsSection } from "../sections";
 
 export const createApiKey = createAction({
@@ -26,7 +26,7 @@ export const createApiKey = createAction({
 });
 
 export const revokeApiKeyFactory = ({ apiKey }: { apiKey: ApiKey }) =>
-  createActionV2({
+  createAction({
     name: ({ t, isMenu }) =>
       isMenu
         ? apiKey.isExpired

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";
@@ -29,9 +29,8 @@ import DynamicCollectionIcon from "~/components/Icons/CollectionIcon";
 import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
 import {
   createAction,
-  createActionV2,
-  createActionV2WithChildren,
-  createInternalLinkActionV2,
+  createActionWithChildren,
+  createInternalLinkAction,
 } from "~/actions";
 import { ActiveCollectionSection, CollectionSection } from "~/actions/sections";
 import { setPersistedState } from "~/hooks/usePersistedState";
@@ -52,7 +51,7 @@ const SharePopover = lazyWithRetry(
   () => import("~/components/Sharing/Collection/SharePopover")
 );
 
-export const openCollection = createAction({
+export const openCollection = createActionWithChildren({
   name: ({ t }) => t("Open collection"),
   analyticsName: "Open collection",
   section: CollectionSection,
@@ -60,15 +59,17 @@ export const openCollection = createAction({
   icon: <CollectionIcon />,
   children: ({ stores }) => {
     const collections = stores.collections.orderedData;
-    return collections.map((collection) => ({
-      // Note: using url which includes the slug rather than id here to bust
-      // cache if the collection is renamed
-      id: collection.path,
-      name: collection.name,
-      icon: <ColorCollectionIcon collection={collection} />,
-      section: CollectionSection,
-      to: collection.path,
-    }));
+    return collections.map((collection) =>
+      createInternalLinkAction({
+        // Note: using url which includes the slug rather than id here to bust
+        // cache if the collection is renamed
+        id: collection.path,
+        name: collection.name,
+        icon: <ColorCollectionIcon collection={collection} />,
+        section: CollectionSection,
+        to: collection.path,
+      })
+    );
   },
 });
 
@@ -90,7 +91,7 @@ export const createCollection = createAction({
   },
 });
 
-export const editCollection = createActionV2({
+export const editCollection = createAction({
   name: ({ t, isMenu }) => (isMenu ? `${t("Edit")}…` : t("Edit collection")),
   analyticsName: "Edit collection",
   section: ActiveCollectionSection,
@@ -115,7 +116,7 @@ export const editCollection = createActionV2({
   },
 });
 
-export const editCollectionPermissions = createActionV2({
+export const editCollectionPermissions = createAction({
   name: ({ t, isMenu }) =>
     isMenu ? `${t("Permissions")}…` : t("Collection permissions"),
   analyticsName: "Collection permissions",
@@ -135,7 +136,6 @@ export const editCollectionPermissions = createActionV2({
 
     stores.dialogs.openModal({
       title: t("Share this collection"),
-      style: { marginBottom: -12 },
       content: (
         <SharePopover
           collection={collection}
@@ -147,7 +147,7 @@ export const editCollectionPermissions = createActionV2({
   },
 });
 
-export const importDocument = createActionV2({
+export const importDocument = createAction({
   name: ({ t }) => t("Import document"),
   analyticsName: "Import document",
   section: ActiveCollectionSection,
@@ -163,7 +163,7 @@ export const importDocument = createActionV2({
     const { documents } = stores;
     const input = document.createElement("input");
     input.type = "file";
-    input.accept = documents.importFileTypes.join(", ");
+    input.accept = documents.importFileTypesString;
 
     input.onchange = async (ev) => {
       const files = getEventFiles(ev);
@@ -188,7 +188,7 @@ export const importDocument = createActionV2({
   },
 });
 
-export const sortCollection = createActionV2WithChildren({
+export const sortCollection = createActionWithChildren({
   name: ({ t }) => t("Sort in sidebar"),
   section: ActiveCollectionSection,
   visible: ({ activeCollectionId, stores }) =>
@@ -210,7 +210,7 @@ export const sortCollection = createActionV2WithChildren({
     );
   },
   children: [
-    createActionV2({
+    createAction({
       name: ({ t }) => t("A-Z sort"),
       section: ActiveCollectionSection,
       selected: ({ activeCollectionId, stores }) => {
@@ -230,7 +230,7 @@ export const sortCollection = createActionV2WithChildren({
         });
       },
     }),
-    createActionV2({
+    createAction({
       name: ({ t }) => t("Z-A sort"),
       section: ActiveCollectionSection,
       selected: ({ activeCollectionId, stores }) => {
@@ -250,7 +250,7 @@ export const sortCollection = createActionV2WithChildren({
         });
       },
     }),
-    createActionV2({
+    createAction({
       name: ({ t }) => t("Manual sort"),
       section: ActiveCollectionSection,
       selected: ({ activeCollectionId, stores }) => {
@@ -270,7 +270,7 @@ export const sortCollection = createActionV2WithChildren({
   ],
 });
 
-export const searchInCollection = createInternalLinkActionV2({
+export const searchInCollection = createInternalLinkAction({
   name: ({ t }) => t("Search in collection"),
   analyticsName: "Search collection",
   section: ActiveCollectionSection,
@@ -301,7 +301,7 @@ export const searchInCollection = createInternalLinkActionV2({
   },
 });
 
-export const starCollection = createActionV2({
+export const starCollection = createAction({
   name: ({ t }) => t("Star"),
   analyticsName: "Star collection",
   section: ActiveCollectionSection,
@@ -328,7 +328,7 @@ export const starCollection = createActionV2({
   },
 });
 
-export const unstarCollection = createActionV2({
+export const unstarCollection = createAction({
   name: ({ t }) => t("Unstar"),
   analyticsName: "Unstar collection",
   section: ActiveCollectionSection,
@@ -354,7 +354,7 @@ export const unstarCollection = createActionV2({
   },
 });
 
-export const subscribeCollection = createActionV2({
+export const subscribeCollection = createAction({
   name: ({ t }) => t("Subscribe"),
   analyticsName: "Subscribe to collection",
   section: ActiveCollectionSection,
@@ -385,7 +385,7 @@ export const subscribeCollection = createActionV2({
   },
 });
 
-export const unsubscribeCollection = createActionV2({
+export const unsubscribeCollection = createAction({
   name: ({ t }) => t("Unsubscribe"),
   analyticsName: "Unsubscribe from collection",
   section: ActiveCollectionSection,
@@ -416,7 +416,7 @@ export const unsubscribeCollection = createActionV2({
   },
 });
 
-export const archiveCollection = createActionV2({
+export const archiveCollection = createAction({
   name: ({ t }) => `${t("Archive")}…`,
   analyticsName: "Archive collection",
   section: ActiveCollectionSection,
@@ -457,7 +457,7 @@ export const archiveCollection = createActionV2({
   },
 });
 
-export const restoreCollection = createActionV2({
+export const restoreCollection = createAction({
   name: ({ t }) => t("Restore"),
   analyticsName: "Restore collection",
   section: CollectionSection,
@@ -482,7 +482,7 @@ export const restoreCollection = createActionV2({
   },
 });
 
-export const deleteCollection = createActionV2({
+export const deleteCollection = createAction({
   name: ({ t }) => `${t("Delete")}…`,
   analyticsName: "Delete collection",
   section: ActiveCollectionSection,
@@ -516,7 +516,7 @@ export const deleteCollection = createActionV2({
   },
 });
 
-export const exportCollection = createActionV2({
+export const exportCollection = createAction({
   name: ({ t }) => `${t("Export")}…`,
   analyticsName: "Export collection",
   section: ActiveCollectionSection,
@@ -526,10 +526,7 @@ export const exportCollection = createActionV2({
       return false;
     }
 
-    return (
-      !!stores.policies.abilities(currentTeamId).createExport &&
-      !!stores.policies.abilities(activeCollectionId).export
-    );
+    return !!stores.policies.abilities(activeCollectionId).export;
   },
   perform: async ({ activeCollectionId, stores, t }) => {
     if (!activeCollectionId) {
@@ -552,7 +549,7 @@ export const exportCollection = createActionV2({
   },
 });
 
-export const createDocument = createInternalLinkActionV2({
+export const createDocument = createInternalLinkAction({
   name: ({ t }) => t("New document"),
   analyticsName: "New document",
   section: ActiveCollectionSection,
@@ -574,7 +571,7 @@ export const createDocument = createInternalLinkActionV2({
   },
 });
 
-export const createTemplate = createInternalLinkActionV2({
+export const createTemplate = createInternalLinkAction({
   name: ({ t }) => t("New template"),
   analyticsName: "New template",
   section: ActiveCollectionSection,

app/actions/definitions/comments.tsx

@@ -1,9 +1,9 @@
 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 { createActionV2 } from "..";
+import { createAction } from "..";
 import { ActiveDocumentSection } from "../sections";
 
 export const deleteCommentFactory = ({
@@ -13,7 +13,7 @@ export const deleteCommentFactory = ({
   comment: Comment;
   onDelete: () => void;
 }) =>
-  createActionV2({
+  createAction({
     name: ({ t }) => `${t("Delete")}…`,
     analyticsName: "Delete comment",
     section: ActiveDocumentSection,
@@ -39,7 +39,7 @@ export const resolveCommentFactory = ({
   comment: Comment;
   onResolve: () => void;
 }) =>
-  createActionV2({
+  createAction({
     name: ({ t }) => t("Mark as resolved"),
     analyticsName: "Resolve thread",
     section: ActiveDocumentSection,
@@ -61,7 +61,7 @@ export const unresolveCommentFactory = ({
   comment: Comment;
   onUnresolve: () => void;
 }) =>
-  createActionV2({
+  createAction({
     name: ({ t }) => t("Mark as unresolved"),
     analyticsName: "Unresolve thread",
     section: ActiveDocumentSection,
@@ -80,7 +80,7 @@ export const viewCommentReactionsFactory = ({
 }: {
   comment: Comment;
 }) =>
-  createActionV2({
+  createAction({
     name: ({ t }) => `${t("View reactions")}`,
     analyticsName: "View comment reactions",
     section: ActiveDocumentSection,

app/actions/definitions/developer.tsx

@@ -9,7 +9,7 @@ import {
   UserIcon,
 } from "outline-icons";
 import { toast } from "sonner";
-import { createAction } from "~/actions";
+import { createAction, createActionWithChildren } from "~/actions";
 import { DeveloperSection } from "~/actions/sections";
 import env from "~/env";
 import { client } from "~/utils/ApiClient";
@@ -17,9 +17,19 @@ 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 copyId = createAction({
+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"),
   icon: <CopyIcon />,
   keywords: "uuid",
@@ -176,7 +186,22 @@ export const toggleDebugLogging = createAction({
   },
 });
 
-export const toggleFeatureFlag = createAction({
+export const toggleDebugSafeArea = createAction({
+  name: () => "Toggle menu safe area debugging",
+  icon: <ToolsIcon />,
+  section: DeveloperSection,
+  visible: () => env.ENVIRONMENT === "development",
+  perform: ({ stores }) => {
+    stores.ui.toggleDebugSafeArea();
+    toast.message(
+      stores.ui.debugSafeArea
+        ? "Menu safe area debugging enabled"
+        : "Menu safe area debugging disabled"
+    );
+  },
+});
+
+export const toggleFeatureFlag = createActionWithChildren({
   name: "Toggle feature flag",
   icon: <BeakerIcon />,
   section: DeveloperSection,
@@ -200,15 +225,17 @@ export const toggleFeatureFlag = createAction({
   ),
 });
 
-export const developer = createAction({
+export const developer = createActionWithChildren({
   name: ({ t }) => t("Development"),
   keywords: "debug",
   icon: <ToolsIcon />,
   iconInContextMenu: false,
   section: DeveloperSection,
   children: [
+    goToDebug,
     copyId,
     toggleDebugLogging,
+    toggleDebugSafeArea,
     toggleFeatureFlag,
     createToast,
     createTestUsers,

app/actions/definitions/documents.tsx

@@ -35,13 +35,10 @@ 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 DocumentDelete from "~/scenes/DocumentDelete";
 import DocumentMove from "~/scenes/DocumentMove";
 import DocumentPermanentDelete from "~/scenes/DocumentPermanentDelete";
@@ -54,10 +51,9 @@ import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
 import DocumentTemplatizeDialog from "~/components/TemplatizeDialog";
 import {
   createAction,
-  createActionV2,
-  createActionV2Group,
-  createActionV2WithChildren,
-  createInternalLinkActionV2,
+  createActionGroup,
+  createActionWithChildren,
+  createInternalLinkAction,
 } from "~/actions";
 import {
   ActiveDocumentSection,
@@ -80,7 +76,7 @@ import {
 } from "~/utils/routeHelpers";
 import capitalize from "lodash/capitalize";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
-import { ActionV2, ActionV2Group, ActionV2Separator } from "~/types";
+import type { Action, ActionGroup, ActionSeparator } from "~/types";
 import lazyWithRetry from "~/utils/lazyWithRetry";
 
 const Insights = lazyWithRetry(
@@ -90,7 +86,7 @@ const SharePopover = lazyWithRetry(
   () => import("~/components/Sharing/Document/SharePopover")
 );
 
-export const openDocument = createAction({
+export const openDocument = createActionWithChildren({
   name: ({ t }) => t("Open document"),
   analyticsName: "Open document",
   section: DocumentSection,
@@ -104,23 +100,29 @@ export const openDocument = createAction({
     );
     const documents = stores.documents.orderedData;
 
-    return uniqBy([...documents, ...nodes], "id").map((item) => ({
-      // Note: using url which includes the slug rather than id here to bust
-      // cache if the document is renamed
-      id: item.url,
-      name: item.title,
-      icon: item.icon ? (
-        <Icon value={item.icon} color={item.color ?? undefined} />
-      ) : (
-        <DocumentIcon />
-      ),
-      section: DocumentSection,
-      to: item.url,
-    }));
+    return uniqBy([...documents, ...nodes], "id").map((item) =>
+      createInternalLinkAction({
+        // Note: using url which includes the slug rather than id here to bust
+        // cache if the document is renamed
+        id: item.url,
+        name: item.title,
+        icon: item.icon ? (
+          <Icon
+            value={item.icon}
+            initial={item.title}
+            color={item.color ?? undefined}
+          />
+        ) : (
+          <DocumentIcon />
+        ),
+        section: DocumentSection,
+        to: item.url,
+      })
+    );
   },
 });
 
-export const editDocument = createInternalLinkActionV2({
+export const editDocument = createInternalLinkAction({
   name: ({ t }) => t("Edit"),
   analyticsName: "Edit document",
   section: ActiveDocumentSection,
@@ -152,7 +154,7 @@ export const editDocument = createInternalLinkActionV2({
   },
 });
 
-export const createDocument = createAction({
+export const createDocument = createInternalLinkAction({
   name: ({ t }) => t("New document"),
   analyticsName: "New document",
   section: DocumentSection,
@@ -170,13 +172,18 @@ export const createDocument = createAction({
       !!currentTeamId && stores.policies.abilities(currentTeamId).createDocument
     );
   },
-  perform: ({ activeCollectionId, sidebarContext }) =>
-    history.push(newDocumentPath(activeCollectionId), {
-      sidebarContext,
-    }),
+  to: ({ activeCollectionId, sidebarContext }) => {
+    const [pathname, search] = newDocumentPath(activeCollectionId).split("?");
+
+    return {
+      pathname,
+      search,
+      state: { sidebarContext },
+    };
+  },
 });
 
-export const createDraftDocument = createAction({
+export const createDraftDocument = createInternalLinkAction({
   name: ({ t }) => t("New draft"),
   analyticsName: "New document",
   section: DocumentSection,
@@ -184,13 +191,13 @@ export const createDraftDocument = createAction({
   keywords: "create document",
   visible: ({ currentTeamId, stores }) =>
     !!currentTeamId && stores.policies.abilities(currentTeamId).createDocument,
-  perform: ({ sidebarContext }) =>
-    history.push(newDocumentPath(), {
-      sidebarContext,
-    }),
+  to: ({ sidebarContext }) => ({
+    pathname: newDocumentPath(),
+    state: { sidebarContext },
+  }),
 });
 
-export const createDocumentFromTemplate = createInternalLinkActionV2({
+export const createDocumentFromTemplate = createInternalLinkAction({
   name: ({ t }) => t("New from template"),
   analyticsName: "New document",
   section: DocumentSection,
@@ -237,7 +244,7 @@ export const createDocumentFromTemplate = createInternalLinkActionV2({
   },
 });
 
-export const createNestedDocument = createInternalLinkActionV2({
+export const createNestedDocument = createInternalLinkAction({
   name: ({ t }) => t("New nested document"),
   analyticsName: "New document",
   section: ActiveDocumentSection,
@@ -260,7 +267,7 @@ export const createNestedDocument = createInternalLinkActionV2({
   },
 });
 
-export const starDocument = createActionV2({
+export const starDocument = createAction({
   name: ({ t }) => t("Star"),
   analyticsName: "Star document",
   section: ActiveDocumentSection,
@@ -286,7 +293,7 @@ export const starDocument = createActionV2({
   },
 });
 
-export const unstarDocument = createActionV2({
+export const unstarDocument = createAction({
   name: ({ t }) => t("Unstar"),
   analyticsName: "Unstar document",
   section: ActiveDocumentSection,
@@ -312,7 +319,7 @@ export const unstarDocument = createActionV2({
   },
 });
 
-export const publishDocument = createActionV2({
+export const publishDocument = createAction({
   name: ({ t }) => t("Publish"),
   analyticsName: "Publish document",
   section: ActiveDocumentSection,
@@ -354,7 +361,7 @@ export const publishDocument = createActionV2({
   },
 });
 
-export const unpublishDocument = createActionV2({
+export const unpublishDocument = createAction({
   name: ({ t }) => t("Unpublish"),
   analyticsName: "Unpublish document",
   section: ActiveDocumentSection,
@@ -385,7 +392,7 @@ export const unpublishDocument = createActionV2({
   },
 });
 
-export const subscribeDocument = createActionV2({
+export const subscribeDocument = createAction({
   name: ({ t }) => t("Subscribe"),
   analyticsName: "Subscribe to document",
   section: ActiveDocumentSection,
@@ -431,7 +438,7 @@ export const subscribeDocument = createActionV2({
   },
 });
 
-export const unsubscribeDocument = createActionV2({
+export const unsubscribeDocument = createAction({
   name: ({ t }) => t("Unsubscribe"),
   analyticsName: "Unsubscribe from document",
   section: ActiveDocumentSection,
@@ -479,7 +486,7 @@ export const unsubscribeDocument = createActionV2({
   },
 });
 
-export const shareDocument = createActionV2({
+export const shareDocument = createAction({
   name: ({ t }) => `${t("Permissions")}…`,
   analyticsName: "Share document",
   section: ActiveDocumentSection,
@@ -499,7 +506,6 @@ export const shareDocument = createActionV2({
     }
 
     stores.dialogs.openModal({
-      style: { marginBottom: -12 },
       title: t("Share this document"),
       content: (
         <SharePopover
@@ -512,7 +518,7 @@ export const shareDocument = createActionV2({
   },
 });
 
-export const downloadDocumentAsHTML = createActionV2({
+export const downloadDocumentAsHTML = createAction({
   name: ({ t }) => t("HTML"),
   analyticsName: "Download document as HTML",
   section: ActiveDocumentSection,
@@ -531,7 +537,7 @@ export const downloadDocumentAsHTML = createActionV2({
   },
 });
 
-export const downloadDocumentAsPDF = createActionV2({
+export const downloadDocumentAsPDF = createAction({
   name: ({ t }) => t("PDF"),
   analyticsName: "Download document as PDF",
   section: ActiveDocumentSection,
@@ -557,7 +563,7 @@ export const downloadDocumentAsPDF = createActionV2({
   },
 });
 
-export const downloadDocumentAsMarkdown = createActionV2({
+export const downloadDocumentAsMarkdown = createAction({
   name: ({ t }) => t("Markdown"),
   analyticsName: "Download document as Markdown",
   section: ActiveDocumentSection,
@@ -576,7 +582,7 @@ export const downloadDocumentAsMarkdown = createActionV2({
   },
 });
 
-export const downloadDocument = createActionV2WithChildren({
+export const downloadDocument = createActionWithChildren({
   name: ({ t, isMenu }) => (isMenu ? t("Download") : t("Download document")),
   analyticsName: "Download document",
   section: ActiveDocumentSection,
@@ -591,7 +597,7 @@ export const downloadDocument = createActionV2WithChildren({
   ],
 });
 
-export const copyDocumentAsMarkdown = createActionV2({
+export const copyDocumentAsMarkdown = createAction({
   name: ({ t }) => t("Copy as Markdown"),
   section: ActiveDocumentSection,
   keywords: "clipboard",
@@ -604,16 +610,15 @@ export const copyDocumentAsMarkdown = createActionV2({
       ? stores.documents.get(activeDocumentId)
       : undefined;
     if (document) {
-      const { ProsemirrorHelper } = await import(
-        "~/models/helpers/ProsemirrorHelper"
-      );
+      const { ProsemirrorHelper } =
+        await import("~/models/helpers/ProsemirrorHelper");
       copy(ProsemirrorHelper.toMarkdown(document));
       toast.success(t("Markdown copied to clipboard"));
     }
   },
 });
 
-export const copyDocumentAsPlainText = createActionV2({
+export const copyDocumentAsPlainText = createAction({
   name: ({ t }) => t("Copy as text"),
   section: ActiveDocumentSection,
   keywords: "clipboard",
@@ -626,16 +631,15 @@ export const copyDocumentAsPlainText = createActionV2({
       ? 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"));
     }
   },
 });
 
-export const copyDocumentShareLink = createActionV2({
+export const copyDocumentShareLink = createAction({
   name: ({ t }) => t("Copy public link"),
   section: ActiveDocumentSection,
   keywords: "clipboard share",
@@ -656,7 +660,7 @@ export const copyDocumentShareLink = createActionV2({
   },
 });
 
-export const copyDocumentLink = createActionV2({
+export const copyDocumentLink = createAction({
   name: ({ t }) => t("Copy link"),
   section: ActiveDocumentSection,
   keywords: "clipboard",
@@ -674,7 +678,7 @@ export const copyDocumentLink = createActionV2({
   },
 });
 
-export const copyDocument = createActionV2WithChildren({
+export const copyDocument = createActionWithChildren({
   name: ({ t }) => t("Copy"),
   analyticsName: "Copy document",
   section: ActiveDocumentSection,
@@ -688,7 +692,7 @@ export const copyDocument = createActionV2WithChildren({
   ],
 });
 
-export const duplicateDocument = createActionV2({
+export const duplicateDocument = createAction({
   name: ({ t, isMenu }) => (isMenu ? t("Duplicate") : t("Duplicate document")),
   analyticsName: "Duplicate document",
   section: ActiveDocumentSection,
@@ -723,7 +727,7 @@ export const duplicateDocument = createActionV2({
  * Pin a document to a collection. Pinned documents will be displayed at the top
  * of the collection for all collection members to see.
  */
-export const pinDocumentToCollection = createActionV2({
+export const pinDocumentToCollection = createAction({
   name: ({ activeDocumentId = "", t, stores }) => {
     const selectedDocument = stores.documents.get(activeDocumentId);
     const collectionName = selectedDocument
@@ -768,7 +772,7 @@ export const pinDocumentToCollection = createActionV2({
  * Pin a document to team home. Pinned documents will be displayed at the top
  * of the home screen for all team members to see.
  */
-export const pinDocumentToHome = createActionV2({
+export const pinDocumentToHome = createAction({
   name: ({ t }) => t("Pin to home"),
   analyticsName: "Pin document to home",
   section: ActiveDocumentSection,
@@ -800,7 +804,7 @@ export const pinDocumentToHome = createActionV2({
   },
 });
 
-export const pinDocument = createActionV2WithChildren({
+export const pinDocument = createActionWithChildren({
   name: ({ t }) => t("Pin"),
   analyticsName: "Pin document",
   section: ActiveDocumentSection,
@@ -808,7 +812,7 @@ export const pinDocument = createActionV2WithChildren({
   children: [pinDocumentToCollection, pinDocumentToHome],
 });
 
-export const searchInDocument = createInternalLinkActionV2({
+export const searchInDocument = createInternalLinkAction({
   name: ({ t }) => t("Search in document"),
   analyticsName: "Search document",
   section: ActiveDocumentSection,
@@ -838,7 +842,7 @@ export const searchInDocument = createInternalLinkActionV2({
   },
 });
 
-export const printDocument = createActionV2({
+export const printDocument = createAction({
   name: ({ t, isMenu }) => (isMenu ? t("Print") : t("Print document")),
   analyticsName: "Print document",
   section: ActiveDocumentSection,
@@ -849,7 +853,7 @@ export const printDocument = createActionV2({
   },
 });
 
-export const importDocument = createActionV2({
+export const importDocument = createAction({
   name: ({ t }) => t("Import document"),
   analyticsName: "Import document",
   section: DocumentSection,
@@ -870,7 +874,7 @@ export const importDocument = createActionV2({
     const { documents } = stores;
     const input = document.createElement("input");
     input.type = "file";
-    input.accept = documents.importFileTypes.join(", ");
+    input.accept = documents.importFileTypesString;
 
     input.onchange = async (ev) => {
       const files = getEventFiles(ev);
@@ -895,7 +899,7 @@ export const importDocument = createActionV2({
   },
 });
 
-export const createTemplateFromDocument = createActionV2({
+export const createTemplateFromDocument = createAction({
   name: ({ t }) => t("Templatize"),
   analyticsName: "Templatize document",
   section: ActiveDocumentSection,
@@ -946,7 +950,7 @@ export const openRandomDocument = createAction({
 });
 
 export const searchDocumentsForQuery = (query: string) =>
-  createAction({
+  createInternalLinkAction({
     id: "search",
     name: ({ t }) =>
       t(`Search documents for "{{searchQuery}}"`, { searchQuery: query }),
@@ -957,7 +961,7 @@ export const searchDocumentsForQuery = (query: string) =>
     visible: ({ location }) => location.pathname !== searchPath(),
   });
 
-export const moveTemplateToWorkspace = createActionV2({
+export const moveTemplateToWorkspace = createAction({
   name: ({ t }) => t("Move to workspace"),
   analyticsName: "Move template to workspace",
   section: DocumentSection,
@@ -987,7 +991,7 @@ export const moveTemplateToWorkspace = createActionV2({
   },
 });
 
-export const moveDocumentToCollection = createActionV2({
+export const moveDocumentToCollection = createAction({
   name: ({ activeDocumentId, stores, t }) => {
     if (!activeDocumentId) {
       return t("Move");
@@ -1024,7 +1028,7 @@ export const moveDocumentToCollection = createActionV2({
   },
 });
 
-export const moveDocument = createActionV2({
+export const moveDocument = createAction({
   name: ({ t }) => t("Move"),
   analyticsName: "Move document",
   section: ActiveDocumentSection,
@@ -1043,7 +1047,7 @@ export const moveDocument = createActionV2({
   perform: moveDocumentToCollection.perform,
 });
 
-export const moveTemplate = createActionV2WithChildren({
+export const moveTemplate = createActionWithChildren({
   name: ({ t }) => t("Move"),
   analyticsName: "Move document",
   section: ActiveDocumentSection,
@@ -1062,7 +1066,7 @@ export const moveTemplate = createActionV2WithChildren({
   children: [moveTemplateToWorkspace, moveDocumentToCollection],
 });
 
-export const archiveDocument = createActionV2({
+export const archiveDocument = createAction({
   name: ({ t }) => `${t("Archive")}…`,
   analyticsName: "Archive document",
   section: ActiveDocumentSection,
@@ -1102,7 +1106,7 @@ export const archiveDocument = createActionV2({
   },
 });
 
-export const restoreDocument = createActionV2({
+export const restoreDocument = createAction({
   name: ({ t }) => `${t("Restore")}`,
   analyticsName: "Restore document",
   section: ActiveDocumentSection,
@@ -1142,7 +1146,7 @@ export const restoreDocument = createActionV2({
   },
 });
 
-export const restoreDocumentToCollection = createActionV2WithChildren({
+export const restoreDocumentToCollection = createActionWithChildren({
   name: ({ t }) => `${t("Restore")}…`,
   analyticsName: "Restore document",
   section: ActiveDocumentSection,
@@ -1177,7 +1181,7 @@ export const restoreDocumentToCollection = createActionV2WithChildren({
 
     const actions = collections.orderedData.map((collection) => {
       const can = policies.abilities(collection.id);
-      return createActionV2({
+      return createAction({
         name: collection.name,
         section: ActiveDocumentSection,
         icon: <CollectionIcon collection={collection} />,
@@ -1193,11 +1197,11 @@ export const restoreDocumentToCollection = createActionV2WithChildren({
       });
     });
 
-    return [createActionV2Group({ name: t("Choose a collection"), actions })];
+    return [createActionGroup({ name: t("Choose a collection"), actions })];
   },
 });
 
-export const deleteDocument = createActionV2({
+export const deleteDocument = createAction({
   name: ({ t }) => `${t("Delete")}…`,
   analyticsName: "Delete document",
   section: ActiveDocumentSection,
@@ -1231,7 +1235,7 @@ export const deleteDocument = createActionV2({
   },
 });
 
-export const permanentlyDeleteDocument = createActionV2({
+export const permanentlyDeleteDocument = createAction({
   name: ({ t }) => t("Permanently delete"),
   analyticsName: "Permanently delete document",
   section: ActiveDocumentSection,
@@ -1286,7 +1290,7 @@ export const permanentlyDeleteDocumentsInTrash = createAction({
   },
 });
 
-export const openDocumentComments = createActionV2({
+export const openDocumentComments = createAction({
   name: ({ t }) => t("Comments"),
   analyticsName: "Open comments",
   section: ActiveDocumentSection,
@@ -1309,7 +1313,7 @@ export const openDocumentComments = createActionV2({
   },
 });
 
-export const openDocumentHistory = createInternalLinkActionV2({
+export const openDocumentHistory = createInternalLinkAction({
   name: ({ t }) => t("History"),
   analyticsName: "Open document history",
   section: ActiveDocumentSection,
@@ -1336,7 +1340,7 @@ export const openDocumentHistory = createInternalLinkActionV2({
   },
 });
 
-export const openDocumentInsights = createActionV2({
+export const openDocumentInsights = createAction({
   name: ({ t }) => t("Insights"),
   analyticsName: "Open document insights",
   section: ActiveDocumentSection,
@@ -1369,7 +1373,7 @@ export const openDocumentInsights = createActionV2({
   },
 });
 
-export const leaveDocument = createActionV2({
+export const leaveDocument = createAction({
   name: ({ t }) => t("Leave document"),
   analyticsName: "Leave document",
   section: ActiveDocumentSection,
@@ -1408,9 +1412,9 @@ export const leaveDocument = createActionV2({
 export const applyTemplateFactory = ({
   actions,
 }: {
-  actions: (ActionV2 | ActionV2Group | ActionV2Separator)[];
+  actions: (Action | ActionGroup | ActionSeparator)[];
 }) =>
-  createActionV2WithChildren({
+  createActionWithChildren({
     name: ({ t }) => t("Apply template"),
     analyticsName: "Apply template",
     section: ActiveDocumentSection,

app/actions/definitions/emojis.tsx

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

app/actions/definitions/integrations.tsx

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

app/actions/definitions/navigation.tsx

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

app/actions/definitions/notifications.tsx

@@ -1,6 +1,7 @@
-import { ArchiveIcon, MarkAsReadIcon } from "outline-icons";
-import { createAction, createActionV2 } from "..";
+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"),
@@ -12,7 +13,7 @@ export const markNotificationsAsRead = createAction({
   visible: ({ stores }) => stores.notifications.approximateUnreadCount > 0,
 });
 
-export const markNotificationsAsArchived = createActionV2({
+export const markNotificationsAsArchived = createAction({
   name: ({ t }) => t("Archive all notifications"),
   analyticsName: "Mark notifications as archived",
   section: NotificationSection,
@@ -22,6 +23,36 @@ export const markNotificationsAsArchived = createActionV2({
   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,17 +1,20 @@
 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, createActionV2 } 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 = createActionV2({
+export const restoreRevision = createAction({
   name: ({ t }) => t("Restore"),
   analyticsName: "Restore revision",
   icon: <RestoreIcon />,
@@ -73,37 +76,105 @@ export const deleteRevision = createAction({
   },
 });
 
-export const copyLinkToRevision = createActionV2({
-  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

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

app/actions/definitions/shares.tsx

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

app/actions/definitions/teams.tsx

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

app/actions/definitions/users.tsx

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

app/actions/index.ts

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

app/actions/sections.ts

@@ -1,4 +1,4 @@
-import { ActionContext } from "~/types";
+import type { ActionContext } from "~/types";
 
 export const CollectionSection = ({ t }: ActionContext) => t("Collection");
 
@@ -38,6 +38,8 @@ export const NotificationSection = ({ t }: ActionContext) => t("Notification");
 
 export const GroupSection = ({ t }: ActionContext) => t("Groups");
 
+export const EmojiSecion = ({ t }: ActionContext) => t("Emoji");
+
 export const UserSection = ({ t }: ActionContext) => t("People");
 
 UserSection.priority = 0.5;

app/components/ActionButton.tsx

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

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

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

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

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

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

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"));
 
@@ -67,7 +68,13 @@ export const CollectionForm = observer(function CollectionForm_({
   const [hasOpenedIconPicker, setHasOpenedIconPicker] = useBoolean(false);
 
   const iconColor = useIconColor(collection);
-  const fallbackIcon = <Icon value="collection" color={iconColor} />;
+  const fallbackIcon = (
+    <Icon
+      value="collection"
+      initial={collection?.initial ?? "?"}
+      color={iconColor}
+    />
+  );
 
   const {
     register,
@@ -134,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")}
@@ -158,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 && (
@@ -216,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}
@@ -229,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,11 +1,11 @@
 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";
-import { createInternalLinkActionV2 } from "~/actions";
+import { createInternalLinkAction } from "~/actions";
 import { ActiveCollectionSection } from "~/actions/sections";
 
 type Props = {
@@ -17,18 +17,18 @@ export const CollectionBreadcrumb: React.FC<Props> = ({ collection }) => {
 
   const actions = React.useMemo(
     () => [
-      createInternalLinkActionV2({
+      createInternalLinkAction({
         name: t("Archive"),
         section: ActiveCollectionSection,
         icon: <ArchiveIcon />,
         visible: collection.isArchived,
         to: archivePath(),
       }),
-      createInternalLinkActionV2({
+      createInternalLinkAction({
         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/ColorButton.tsx

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

app/components/CommandBar/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/CommandBar/useRecentDocumentActions.tsx

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

app/components/CommandBar/useSettingsAction.tsx

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

app/components/CommandBar/useTemplatesAction.tsx

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

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

@@ -32,6 +32,8 @@ function Dialogs() {
           }}
           title={modal.title}
           style={modal.style}
+          width={modal.width}
+          height={modal.height}
         >
           {modal.content}
         </Modal>

app/components/DocumentBreadcrumb.tsx

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

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";
@@ -187,12 +187,12 @@ function DocumentCard(props: Props) {
 
 const DocumentSquircle = ({
   icon,
-  color,
   initial,
+  color,
 }: {
   icon: string;
+  initial: string;
   color?: string;
-  initial?: string;
 }) => {
   const theme = useTheme();
   const iconType = determineIconType(icon)!;

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

@@ -16,8 +16,9 @@ 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";
 import DocumentExplorerSearchResult from "~/components/DocumentExplorerSearchResult";
 import Flex from "~/components/Flex";
@@ -27,7 +28,6 @@ import InputSearch from "~/components/InputSearch";
 import Text from "~/components/Text";
 import useMobile from "~/hooks/useMobile";
 import useStores from "~/hooks/useStores";
-import { ancestors, descendants, flattenTree } from "~/utils/tree";
 
 type Props = {
   /** Action taken upon submission of selected item, could be publish, move etc. */
@@ -268,7 +268,9 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
         title = doc?.title ?? node.title;
 
         if (icon) {
-          renderedIcon = <Icon value={icon} color={color} />;
+          renderedIcon = (
+            <Icon value={icon} initial={node.title} color={color} />
+          );
         } else if (doc?.isStarred) {
           renderedIcon = <StarredIcon color={theme.yellow} />;
         } else {

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,12 +1,13 @@
-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";
+import Flex from "./Flex";
 
 type Props = {
   document: Document;
@@ -41,7 +42,7 @@ function DocumentTasks({ document }: Props) {
   const message = getMessage(t, total, completed);
 
   return (
-    <>
+    <Flex align="center" style={{ padding: "0 1px" }} gap={2} shrink={false}>
       {completed === total ? (
         <Done
           color={theme.accent}
@@ -51,8 +52,8 @@ function DocumentTasks({ document }: Props) {
       ) : (
         <CircularProgressBar percentage={tasksPercentage} />
       )}
-      &nbsp;{message}
-    </>
+      {message}
+    </Flex>
   );
 }
 

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

@@ -1,7 +1,8 @@
 import * as React from "react";
 import { toast } from "sonner";
 import styled from "styled-components";
-import { s, truncateMultiline } from "@shared/styles";
+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. */
@@ -32,6 +33,7 @@ function EditableTitle(
   const [isEditing, setIsEditing] = React.useState(rest.isEditing || false);
   const [originalValue, setOriginalValue] = React.useState(title);
   const [value, setValue] = React.useState(title);
+  const [isSubmitting, setIsSubmitting] = React.useState(false);
 
   React.useImperativeHandle(ref, () => ({
     setIsEditing,
@@ -41,30 +43,54 @@ function EditableTitle(
     setValue(title);
   }, [title]);
 
-  const handleChange = React.useCallback((event) => {
-    setValue(event.target.value);
-  }, []);
+  const handleChange = React.useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      setValue(event.target.value);
+    },
+    []
+  );
 
-  const handleDoubleClick = React.useCallback((event) => {
-    event.preventDefault();
-    event.stopPropagation();
-    setIsEditing(true);
-  }, []);
+  const handleDoubleClick = React.useCallback(
+    (event: React.MouseEvent<HTMLSpanElement>) => {
+      if (event.altKey) {
+        return;
+      }
+      event.preventDefault();
+      event.stopPropagation();
+      setIsEditing(true);
+    },
+    []
+  );
 
-  const stopPropagation = React.useCallback((event) => {
-    event.preventDefault();
-    event.stopPropagation();
-  }, []);
+  const stopPropagation = React.useCallback(
+    (event: React.MouseEvent<HTMLSpanElement>) => {
+      event.preventDefault();
+      event.stopPropagation();
+    },
+    []
+  );
 
-  const handleFocus = React.useCallback((event) => {
-    event.target.select();
-  }, []);
+  const handleFocus = React.useCallback(
+    (event: React.FocusEvent<HTMLInputElement>) => {
+      event.target.select();
+    },
+    []
+  );
 
   const handleSave = React.useCallback(
-    async (ev) => {
+    async (
+      ev:
+        | React.FocusEvent<HTMLInputElement>
+        | React.KeyboardEvent<HTMLInputElement>
+        | React.FormEvent<HTMLFormElement>
+    ) => {
       ev.preventDefault();
       ev.stopPropagation();
 
+      if (isSubmitting) {
+        return;
+      }
+
       const trimmedValue = value.trim();
 
       if (trimmedValue === originalValue || trimmedValue.length === 0) {
@@ -74,22 +100,26 @@ function EditableTitle(
         return;
       }
 
+      setIsSubmitting(true);
       try {
         await onSubmit(trimmedValue);
         setOriginalValue(trimmedValue);
+        setIsEditing(false);
       } catch (error) {
-        setValue(originalValue);
+        setValue(value);
+        setIsEditing(true);
+
         toast.error(error.message);
         throw error;
       } finally {
-        setIsEditing(false);
+        setIsSubmitting(false);
       }
     },
-    [originalValue, value, onCancel, onSubmit]
+    [originalValue, value, onCancel, onSubmit, isSubmitting]
   );
 
   const handleKeyDown = React.useCallback(
-    async (ev) => {
+    async (ev: React.KeyboardEvent<HTMLInputElement>) => {
       if (ev.nativeEvent.isComposing) {
         return;
       }
@@ -112,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}
@@ -126,7 +157,7 @@ function EditableTitle(
             autoFocus
             {...rest}
           />
-        </form>
+        </EventBoundary>
       ) : (
         <Text
           onDoubleClick={canUpdate ? handleDoubleClick : undefined}
@@ -139,8 +170,8 @@ function EditableTitle(
   );
 }
 
-const Text = styled.span`
-  ${truncateMultiline(3)}
+const Text = styled.div`
+  ${ellipsis()}
 `;
 
 const Input = styled.input`

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

@@ -0,0 +1,233 @@
+import * as React from "react";
+import { useDropzone } from "react-dropzone";
+import { useTranslation } from "react-i18next";
+import { toast } from "sonner";
+import styled from "styled-components";
+import { s } from "@shared/styles";
+import { AttachmentPreset } from "@shared/types";
+import { getDataTransferFiles } from "@shared/utils/files";
+import ConfirmationDialog from "~/components/ConfirmationDialog";
+import Input, { LabelText } from "~/components/Input";
+import Text from "~/components/Text";
+import useStores from "~/hooks/useStores";
+import { uploadFile } from "~/utils/files";
+import { compressImage } from "~/utils/compressImage";
+import { generateEmojiNameFromFilename } from "~/utils/emoji";
+import { AttachmentValidation, EmojiValidation } from "@shared/validations";
+import { bytesToHumanReadable } from "@shared/utils/files";
+import { VStack } from "./primitives/VStack";
+
+type Props = {
+  onSubmit: () => void;
+};
+
+export function EmojiCreateDialog({ onSubmit }: Props) {
+  const { t } = useTranslation();
+  const { emojis } = useStores();
+  const [name, setName] = React.useState("");
+  const [file, setFile] = React.useState<File | null>(null);
+  const [isUploading, setIsUploading] = React.useState(false);
+
+  const handleFileSelection = React.useCallback(
+    (file: File) => {
+      const isValidType = AttachmentValidation.emojiContentTypes.includes(
+        file.type
+      );
+
+      if (!isValidType) {
+        toast.error(
+          t("File type not supported. Please use PNG, JPG, GIF, or WebP.")
+        );
+        return;
+      }
+
+      // Validate file size
+      if (file.size > AttachmentValidation.emojiMaxFileSize) {
+        toast.error(
+          t("File size too large. Maximum size is {{ size }}.", {
+            size: bytesToHumanReadable(AttachmentValidation.emojiMaxFileSize),
+          })
+        );
+        return;
+      }
+
+      setFile(file);
+
+      // Auto-populate name field if it's empty
+      setName((currentName) => {
+        if (!currentName.trim()) {
+          const generatedName = generateEmojiNameFromFilename(file.name);
+          return generatedName || currentName;
+        }
+        return currentName;
+      });
+    },
+    [t]
+  );
+
+  const onDrop = React.useCallback(
+    (acceptedFiles: File[]) => {
+      if (acceptedFiles.length > 0) {
+        handleFileSelection(acceptedFiles[0]);
+      }
+    },
+    [handleFileSelection]
+  );
+
+  // Handle paste events
+  React.useEffect(() => {
+    const handlePaste = (event: ClipboardEvent) => {
+      const files = getDataTransferFiles(event);
+      if (files.length > 0) {
+        event.preventDefault();
+        handleFileSelection(files[0]);
+      }
+    };
+
+    document.addEventListener("paste", handlePaste);
+    return () => document.removeEventListener("paste", handlePaste);
+  }, [handleFileSelection]);
+
+  const { getRootProps, getInputProps, isDragActive } = useDropzone({
+    onDropAccepted: onDrop,
+    accept: AttachmentValidation.emojiContentTypes,
+    maxSize: AttachmentValidation.emojiMaxFileSize,
+    maxFiles: 1,
+  });
+
+  const handleSubmit = async () => {
+    if (!name.trim()) {
+      toast.error(t("Please enter a name for the emoji"));
+      return;
+    }
+
+    if (!file) {
+      toast.error(t("Please select an image file"));
+      return;
+    }
+
+    setIsUploading(true);
+    try {
+      // 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(fileToUpload, {
+        name: file.name,
+        preset: AttachmentPreset.Emoji,
+      });
+
+      await emojis.create({
+        name: name.trim(),
+        attachmentId: attachment.id,
+      });
+
+      toast.success(t("Emoji created successfully"));
+      onSubmit();
+    } finally {
+      setIsUploading(false);
+    }
+  };
+
+  const handleNameChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const { value } = event.target;
+    setName(value);
+  };
+
+  const isValidName = EmojiValidation.allowedNameCharacters.test(name);
+  const isValid = name.trim().length > 0 && file && isValidName;
+
+  return (
+    <ConfirmationDialog
+      onSubmit={handleSubmit}
+      disabled={!isValid || isUploading}
+      savingText={isUploading ? `${t("Uploading")}…` : undefined}
+      submitText={t("Add emoji")}
+    >
+      <Text as="p" type="secondary">
+        {t(
+          "Square images with transparent backgrounds work best. If your image is too large, we’ll try to resize it for you."
+        )}
+      </Text>
+
+      <LabelText as="label">{t("Upload an image")}</LabelText>
+      <DropZone {...getRootProps()}>
+        <input {...getInputProps()} />
+        <VStack>
+          {file ? (
+            <>
+              <PreviewImage src={URL.createObjectURL(file)} alt="Preview" />
+              <Text size="medium">{file.name}</Text>
+              <Text size="medium" type="secondary">
+                {t("Click or drag to replace")}
+              </Text>
+            </>
+          ) : (
+            <>
+              <Text size="medium">
+                {isDragActive
+                  ? t("Drop the image here")
+                  : t("Click, drop, or paste an image here")}
+              </Text>
+              <Text size="medium" type="secondary">
+                {t("PNG, JPG, GIF, or WebP up to {{ size }}", {
+                  size: bytesToHumanReadable(
+                    AttachmentValidation.emojiMaxFileSize
+                  ),
+                })}
+              </Text>
+            </>
+          )}
+        </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>
+        </Text>
+      )}
+    </ConfirmationDialog>
+  );
+}
+
+const DropZone = styled.div`
+  border: 2px dashed ${s("inputBorder")};
+  border-radius: 8px;
+  padding: 24px;
+  text-align: center;
+  cursor: var(--pointer);
+  transition: border-color 0.2s;
+  margin-bottom: 1em;
+
+  &:hover {
+    border-color: ${s("inputBorderFocused")};
+  }
+`;
+
+const PreviewImage = styled.img`
+  width: 64px;
+  height: 64px;
+  object-fit: contain;
+  border-radius: 4px;
+`;

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

app/components/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,7 +4,7 @@ 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";
@@ -13,6 +13,8 @@ import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";
 import history from "~/utils/history";
 import { settingsPath } from "~/utils/routeHelpers";
+import usePolicy from "~/hooks/usePolicy";
+import useCurrentTeam from "~/hooks/useCurrentTeam";
 
 type Props = {
   collection?: Collection;
@@ -25,7 +27,10 @@ function ExportDialog({ collection, onSubmit }: Props) {
   );
   const [includeAttachments, setIncludeAttachments] =
     React.useState<boolean>(true);
+  const [includePrivate, setIncludePrivate] = React.useState<boolean>(true);
   const user = useCurrentUser();
+  const team = useCurrentTeam();
+  const can = usePolicy(team);
   const { collections } = useStores();
   const { t } = useTranslation();
   const appName = env.APP_NAME;
@@ -44,23 +49,36 @@ function ExportDialog({ collection, onSubmit }: Props) {
     []
   );
 
+  const handleIncludePrivateChange = React.useCallback(
+    (ev: React.ChangeEvent<HTMLInputElement>) => {
+      setIncludePrivate(ev.target.checked);
+    },
+    []
+  );
+
   const handleSubmit = async () => {
+    const options = can.createExport
+      ? {
+          description: t(`Your file will be available in {{ location }} soon`, {
+            location: `"${t("Settings")} > ${t("Export")}"`,
+          }),
+          action: {
+            label: t("View"),
+            onClick: () => {
+              history.push(settingsPath("export"));
+            },
+          },
+        }
+      : {
+          description: t(`A link to your file will be sent through email soon`),
+        };
+
     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"));
-          },
-        },
-      });
+      toast.success(t("Export started"), options);
     } else {
-      await collections.export(format, includeAttachments);
-      toast.success(t("Export started"));
+      await collections.export({ format, includeAttachments, includePrivate });
+      toast.success(t("Export started"), options);
     }
     onSubmit();
   };
@@ -123,37 +141,64 @@ function ExportDialog({ collection, onSubmit }: Props) {
               <Text as="p" size="small" weight="bold">
                 {item.title}
               </Text>
-              <Text size="small">{item.description}</Text>
+              <Text size="small" type="secondary">
+                {item.description}
+              </Text>
             </div>
           </Option>
         ))}
       </Flex>
-      <hr />
-      <Option>
-        <input
-          type="checkbox"
-          name="includeAttachments"
-          checked={includeAttachments}
-          onChange={handleIncludeAttachmentsChange}
-        />
-        <div>
-          <Text as="p" size="small" weight="bold">
-            {t("Include attachments")}
-          </Text>
-          <Text size="small">
-            {t("Including uploaded images and files in the exported data")}.
-          </Text>{" "}
-        </div>
-      </Option>
+      <HR />
+      <Flex gap={12} column>
+        <Option>
+          <input
+            type="checkbox"
+            name="includeAttachments"
+            checked={includeAttachments}
+            onChange={handleIncludeAttachmentsChange}
+          />
+          <div>
+            <Text as="p" size="small" weight="bold">
+              {t("Include attachments")}
+            </Text>
+            <Text size="small" type="secondary">
+              {t("Including uploaded images and files in the exported data")}.
+            </Text>{" "}
+          </div>
+        </Option>
+        {!collection && (
+          <Option>
+            <input
+              type="checkbox"
+              name="includePrivate"
+              checked={includePrivate}
+              onChange={handleIncludePrivateChange}
+            />
+            <div>
+              <Text as="p" size="small" weight="bold">
+                {t("Include private collections")}
+              </Text>
+            </div>
+          </Option>
+        )}
+      </Flex>
     </ConfirmationDialog>
   );
 }
 
+const HR = styled.hr`
+  margin: 16px 0;
+`;
+
 const Option = styled.label`
   display: flex;
-  align-items: center;
+  align-items: start;
   gap: 16px;
 
+  input {
+    margin-top: 4px;
+  }
+
   p {
     margin: 0;
   }

app/components/Facepile.tsx

@@ -2,9 +2,11 @@ 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";
+import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
 
 type Props = {
   /** The users to display */
@@ -21,6 +23,8 @@ type Props = {
       model: User;
     }
   >;
+  /** Whether to show tooltips on hover, defaults to true */
+  showTooltip?: boolean;
 };
 
 function Facepile({
@@ -29,6 +33,7 @@ function Facepile({
   size = AvatarSize.Large,
   limit = 8,
   renderAvatar = Avatar,
+  showTooltip = true,
   ...rest
 }: Props) {
   const { t } = useTranslation();
@@ -51,6 +56,7 @@ function Facepile({
           <Component
             key={model.id}
             {...{
+              showTooltip,
               model,
               size,
               style: {
@@ -63,7 +69,9 @@ function Facepile({
           />
         );
       })}
-      <FacepileClip size={size} />
+      <VisuallyHidden>
+        <FacepileClip size={size} />
+      </VisuallyHidden>
     </Avatars>
   );
 }
@@ -101,6 +109,11 @@ const Avatars = styled(Flex)`
   align-items: center;
   flex-direction: row-reverse;
   cursor: var(--pointer);
+
+  *:hover {
+    clip-path: none !important;
+    box-shadow: 0 0 0 2px ${s("background")};
+  }
 `;
 
 export default observer(Facepile);

app/components/FilterOptions.tsx

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

app/components/HoverPreview/HoverPreview.tsx

@@ -13,6 +13,7 @@ import useStores from "~/hooks/useStores";
 import LoadingIndicator from "../LoadingIndicator";
 import { CARD_MARGIN } from "./Components";
 import HoverPreviewDocument from "./HoverPreviewDocument";
+import HoverPreviewGroup from "./HoverPreviewGroup";
 import HoverPreviewIssue from "./HoverPreviewIssue";
 import HoverPreviewLink from "./HoverPreviewLink";
 import HoverPreviewMention from "./HoverPreviewMention";
@@ -116,12 +117,31 @@ const HoverPreviewDesktop = observer(
         <Position top={cardTop} left={cardLeft} aria-hidden>
           {isVisible ? (
             <Animate
-              initial={{ opacity: 0, y: -20, pointerEvents: "none" }}
+              initial={{
+                opacity: 0,
+                y: -20,
+                filter: "blur(5px)",
+                pointerEvents: "none",
+              }}
               animate={{
                 opacity: 1,
                 y: 0,
+                filter: "blur(0px)",
                 transitionEnd: { pointerEvents: "auto" },
               }}
+              transition={{
+                y: {
+                  type: "spring",
+                  stiffness: 400,
+                  damping: 25,
+                },
+                opacity: {
+                  duration: 0.2,
+                },
+                filter: {
+                  duration: 0.2,
+                },
+              }}
             >
               {data.type === UnfurlResourceType.Mention ? (
                 <HoverPreviewMention
@@ -132,6 +152,14 @@ const HoverPreviewDesktop = observer(
                   lastActive={data.lastActive}
                   email={data.email}
                 />
+              ) : data.type === UnfurlResourceType.Group ? (
+                <HoverPreviewGroup
+                  ref={cardRef}
+                  name={data.name}
+                  description={data.description}
+                  memberCount={data.memberCount}
+                  users={data.users}
+                />
               ) : data.type === UnfurlResourceType.Document ? (
                 <HoverPreviewDocument
                   ref={cardRef}
@@ -295,10 +323,10 @@ const Pointer = styled.div<{ top: number; left: number; direction: Direction }>`
 
   &:before {
     border: 8px solid transparent;
-    ${({ direction, theme }) =>
+    ${({ direction }) =>
       direction === Direction.UP
-        ? `border-bottom-color: ${theme.menuBorder || "rgba(0, 0, 0, 0.1)"}`
-        : `border-top-color: ${theme.menuBorder || "rgba(0, 0, 0, 0.1)"}`};
+        ? `border-bottom-color: rgba(0, 0, 0, 0.1)`
+        : `border-top-color: rgba(0, 0, 0, 0.1)`};
     ${({ direction }) =>
       direction === Direction.UP ? "right: -1px" : "left: -1px"};
   }

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

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

app/components/HoverPreview/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,13 +1,13 @@
 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(
-  { avatarUrl, name, lastActive, color, email }: Props,
+const HoverPreviewMention = React.forwardRef(function HoverPreviewMention_(
+  { avatarUrl, name, lastActive, color }: Props,
   ref: React.Ref<HTMLDivElement>
 ) {
   return (
@@ -25,7 +25,6 @@ const HoverPreviewMention = React.forwardRef(function _HoverPreviewMention(
             />
             <Flex column gap={2} justify="center">
               <Title>{name}</Title>
-              {email && <Info>{email}</Info>}
               <Info>{lastActive}</Info>
             </Flex>
           </Flex>

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

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

app/components/IconPicker/components/Components.tsx

@@ -0,0 +1,13 @@
+import styled from "styled-components";
+import InputSearch from "~/components/InputSearch";
+import { HStack } from "~/components/primitives/HStack";
+
+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/EmojiPanel.tsx

@@ -1,77 +1,28 @@
 import concat from "lodash/concat";
+import { PlusIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import styled from "styled-components";
-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 InputSearch from "~/components/InputSearch";
-import usePersistedState from "~/hooks/usePersistedState";
-import {
-  FREQUENTLY_USED_COUNT,
-  DisplayCategory,
-  emojiSkinToneKey,
-  emojisFreqKey,
-  lastEmojiKey,
-  sortFrequencies,
-} from "../utils";
-import GridTemplate, { DataNode } from "./GridTemplate";
+import { EmojiCreateDialog } from "~/components/EmojiCreateDialog";
+import { DisplayCategory } from "../utils";
+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;
 
-const useEmojiState = () => {
-  const [emojiSkinTone, setEmojiSkinTone] = usePersistedState<EmojiSkinTone>(
-    emojiSkinToneKey,
-    EmojiSkinTone.Default
-  );
-  const [emojisFreq, setEmojisFreq] = usePersistedState<Record<string, number>>(
-    emojisFreqKey,
-    {}
-  );
-  const [lastEmoji, setLastEmoji] = usePersistedState<string | undefined>(
-    lastEmojiKey,
-    undefined
-  );
-
-  const incrementEmojiCount = React.useCallback(
-    (emoji: string) => {
-      emojisFreq[emoji] = (emojisFreq[emoji] ?? 0) + 1;
-      setEmojisFreq({ ...emojisFreq });
-      setLastEmoji(emoji);
-    },
-    [emojisFreq, setEmojisFreq, setLastEmoji]
-  );
-
-  const getFreqEmojis = React.useCallback(() => {
-    const freqs = Object.entries(emojisFreq);
-
-    if (freqs.length > FREQUENTLY_USED_COUNT.Track) {
-      sortFrequencies(freqs).splice(FREQUENTLY_USED_COUNT.Track);
-      setEmojisFreq(Object.fromEntries(freqs));
-    }
-
-    const emojis = sortFrequencies(freqs)
-      .slice(0, FREQUENTLY_USED_COUNT.Get)
-      .map(([emoji, _]) => emoji);
-
-    const isLastPresent = emojis.includes(lastEmoji ?? "");
-    if (lastEmoji && !isLastPresent) {
-      emojis.pop();
-      emojis.push(lastEmoji);
-    }
-
-    return emojis;
-  }, [emojisFreq, setEmojisFreq, lastEmoji]);
-
-  return {
-    emojiSkinTone,
-    setEmojiSkinTone,
-    incrementEmojiCount,
-    getFreqEmojis,
-  };
-};
-
 type Props = {
   panelWidth: number;
   query: string;
@@ -90,18 +41,36 @@ 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,
     setEmojiSkinTone,
-    incrementEmojiCount,
-    getFreqEmojis,
-  } = useEmojiState();
+    incrementIconCount,
+    getFrequentIcons,
+  } = useIconState(IconType.Emoji);
 
-  const freqEmojis = React.useMemo(() => getFreqEmojis(), [getFreqEmojis]);
+  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>) => {
@@ -117,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);
-      incrementEmojiCount(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, incrementEmojiCount]
+    [
+      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(() => {
@@ -146,7 +160,7 @@ const EmojiPanel = ({
 
   return (
     <Flex column>
-      <UserInputContainer align="center" gap={12}>
+      <UserInputContainer>
         <StyledInputSearch
           ref={searchRef}
           value={query}
@@ -154,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}
@@ -161,6 +183,11 @@ const EmojiPanel = ({
         height={height - 48}
         data={templateData}
         onIconSelect={handleEmojiSelection}
+        empty={
+          <IconButton onClick={handleUploadClick}>
+            <PlusIcon />
+          </IconButton>
+        }
       />
     </Flex>
   );
@@ -169,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,
     },
   ];
 };
@@ -189,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 getFrequentEmojis = (): DataNode => {
+  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,
     };
   };
 
@@ -219,8 +270,8 @@ const getAllEmojis = ({
     };
   };
 
-  return concat(
-    getFrequentEmojis(),
+  const allData = concat(
+    getFrequentIcons(),
     getCategoryData(EmojiCategory.People),
     getCategoryData(EmojiCategory.Nature),
     getCategoryData(EmojiCategory.Foods),
@@ -230,15 +281,22 @@ const getAllEmojis = ({
     getCategoryData(EmojiCategory.Symbols),
     getCategoryData(EmojiCategory.Flags)
   );
+
+  if (customEmojis.length) {
+    allData.push({
+      category: "Custom",
+      icons: customEmojis,
+    });
+  }
+
+  return allData;
 };
 
-const UserInputContainer = styled(Flex)`
-  height: 48px;
-  padding: 6px 12px 0px;
-`;
-
-const StyledInputSearch = styled(InputSearch)`
-  flex-grow: 1;
-`;
+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

@@ -9,6 +9,7 @@ import Text from "~/components/Text";
 import { TRANSLATED_CATEGORIES } from "../utils";
 import Grid from "./Grid";
 import { IconButton } from "./IconButton";
+import { CustomEmoji } from "@shared/components/CustomEmoji";
 
 /**
  * icon/emoji size is 24px; and we add 4px padding on all sides,
@@ -23,10 +24,11 @@ type OutlineNode = {
   delay: number;
 };
 
-type EmojiNode = {
-  type: IconType.Emoji;
+export type EmojiNode = {
+  type: IconType.Emoji | IconType.Custom;
   id: string;
   value: string;
+  name?: string;
 };
 
 export type DataNode = {
@@ -35,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
@@ -50,10 +58,6 @@ const GridTemplate = (
 
   const gridItems = compact(
     data.flatMap((node) => {
-      if (node.icons.length === 0) {
-        return [];
-      }
-
       const category = (
         <CategoryName
           key={node.category}
@@ -65,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 (
@@ -86,7 +97,11 @@ const GridTemplate = (
             onClick={() => onIconSelect({ id: item.id, value: item.value })}
           >
             <Emoji width={24} height={24}>
-              {item.value}
+              {item.type === IconType.Custom ? (
+                <CustomEmoji value={item.value} title={item.name} />
+              ) : (
+                item.value
+              )}
             </Emoji>
           </IconButton>
         );

app/components/IconPicker/components/IconPanel.tsx

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

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,6 +21,7 @@ import { Drawer, DrawerContent, DrawerTrigger } from "../primitives/Drawer";
 import EmojiPanel from "./components/EmojiPanel";
 import IconPanel from "./components/IconPanel";
 import { PopoverButton } from "./components/PopoverButton";
+import useStores from "~/hooks/useStores";
 
 const TAB_NAMES = {
   Icon: "icon",
@@ -35,7 +36,7 @@ type Props = {
   icon: string | null;
   color: string;
   size?: number;
-  initial?: string;
+  initial: string;
   className?: string;
   popoverPosition: "bottom-start" | "right";
   allowDelete?: boolean;
@@ -61,7 +62,7 @@ const IconPicker = ({
   children,
 }: Props) => {
   const { t } = useTranslation();
-
+  const { emojis } = useStores();
   const { width: windowWidth } = useWindowSize();
   const isMobile = useMobile();
 
@@ -168,6 +169,12 @@ const IconPicker = ({
     setActiveTab(defaultTab);
   }, [defaultTab]);
 
+  React.useEffect(() => {
+    if (open) {
+      void emojis.fetchAll();
+    }
+  }, [open, emojis]);
+
   if (isMobile) {
     return (
       <Drawer open={open} onOpenChange={setOpen}>

app/components/IconPicker/useIconState.tsx

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

app/components/IconPicker/utils.ts

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