use maxStateLength for text

Based on feedback, removed the validation behavior selection from the import dialog.
The backend still supports all three behaviors (Skip, Truncate, Abort) but now
defaults to Truncate behavior without exposing the option in the UI.

This makes the import dialog cleaner and simpler for users while still providing
the improved validation handling behind the scenes.

.babelrc

@@ -21,21 +21,13 @@
     [
       "transform-inline-environment-variables",
       {
-        "include": ["SOURCE_COMMIT", "SOURCE_VERSION"]
+        "include": [
+          "SOURCE_COMMIT",
+          "SOURCE_VERSION"
+        ]
       }
     ],
-    [
-      "module-resolver",
-      {
-        "root": ["./"],
-        "alias": {
-          "@server": "./server",
-          "@shared": "./shared",
-          "~": "./app",
-          "plugins": "./plugins"
-        }
-      }
-    ]
+    "tsconfig-paths-module-resolver"
   ],
   "env": {
     "production": {
@@ -47,10 +39,16 @@
           }
         ]
       ],
-      "ignore": ["**/__mocks__", "**/*.test.ts"]
+      "ignore": [
+        "**/__mocks__",
+        "**/*.test.ts"
+      ]
     },
     "development": {
-      "ignore": ["**/__mocks__", "**/*.test.ts"]
+      "ignore": [
+        "**/__mocks__",
+        "**/*.test.ts"
+      ]
     },
     "test": {
       "presets": [
@@ -67,4 +65,4 @@
       ]
     }
   }
-}
+}

.dockerignore

@@ -1,3 +1,4 @@
+__mocks__
 .git
 .vscode
 .github
@@ -5,21 +6,11 @@
 .DS_Store
 .env*
 .eslint*
-.oxlintrc*
 .log
-*.md
 Makefile
 Procfile
 app.json
 crowdin.yml
-lint-staged.config.mjs
 build
 docker-compose.yml
 node_modules
-.yarn
-**/*.test.ts
-**/*.test.tsx
-**/*.test.js
-**/*.test.jsx
-**/__tests__
-**/__mocks__

.env.sample

@@ -1,21 +1,5 @@
 NODE_ENV=production
 
-# –––––––––––––––––––––––––––––––––––––––––
-# –––––––––––  FILE-BASED SECRETS  ––––––––
-# –––––––––––––––––––––––––––––––––––––––––
-#
-# Any environment variable can be loaded from a file by appending _FILE to the
-# variable name and setting the value to the path of the file. This is useful
-# for Docker secrets and other file-based secret management systems.
-#
-# For example, instead of:
-#   SECRET_KEY=your_secret_key
-# You can use:
-#   SECRET_KEY_FILE=/run/secrets/outline_secret_key
-#
-# The file contents will be trimmed of leading/trailing whitespace. If both the
-# variable and the _FILE variant are set, the direct variable takes precedence.
-
 # This URL should point to the fully qualified, publicly accessible, URL. If using a
 # proxy this will be the proxy's URL.
 URL=
@@ -77,11 +61,6 @@ DATABASE_CONNECTION_POOL_MAX=
 # DOCS: https://docs.getoutline.com/s/hosting/doc/redis-LGM4BFXYp4
 REDIS_URL=redis://redis:6379
 
-# To enable horizontal scaling of the collaboration service you must provide a Redis URL, it may
-# be the same as above, or a different server.
-# DOCS: https://docs.getoutline.com/s/hosting/doc/horizontal-scaling-hkfU5Stao7
-REDIS_COLLABORATION_URL=
-
 
 # ––––––––––––––––––––––––––––––––––––––
 # –––––––––––  FILE STORAGE  –––––––––––
@@ -135,23 +114,14 @@ SSL_CERT=
 # false if you can be sure that SSL is terminated at an external loadbalancer.
 FORCE_HTTPS=true
 
-# When behind a reverse proxy, the header to use for the client IP.
-# The default value is "X-Forwarded-For", common values are "X-Real-IP"
-# and "X-Client-IP".
-# PROXY_IP_HEADER=
-
-# Whether to trust the X-Forwarded-* headers (e.g. X-Forwarded-For,
-# X-Forwarded-Proto) set by an upstream proxy. Set to false if not
-# running behind a proxy in production.
-# PROXY_HEADERS_TRUSTED=true
-
 
 # ––––––––––––––––––––––––––––––––––––––
 # ––––––––––  AUTHENTICATION  ––––––––––
 # ––––––––––––––––––––––––––––––––––––––
 
-# Third party signin credentials, at least ONE OF these is required for a 
-# working installation or you'll have no sign-in options.
+# Third party signin credentials, at least ONE OF EITHER Google, Slack,
+# Discord, or Microsoft is required for a working installation or you'll
+# have no sign-in options.
 
 # Slack sign-in provider
 # DOCS: https://docs.getoutline.com/s/hosting/doc/slack-sgMujR8J9J
@@ -223,32 +193,20 @@ RATE_LIMITER_ENABLED=true
 RATE_LIMITER_REQUESTS=1000
 RATE_LIMITER_DURATION_WINDOW=60
 
-# Multiplier applied to the hardcoded per-endpoint API rate limits. Use values
-# greater than 1 to make the limits more lenient (e.g. 2 doubles the allowed
-# requests), or less than 1 to make them stricter. Effective limits are rounded
-# to the nearest integer with a minimum of 1. Defaults to 1.
-RATE_LIMITER_MULTIPLIER=1
-
 
 # ––––––––––––––––––––––––––––––––––––––
 # –––––––––––  INTEGRATIONS  –––––––––––
 # ––––––––––––––––––––––––––––––––––––––
 
-# GitHub integration allows previewing issue and pull request links
+# The GitHub integration allows previewing issue and pull request links
 # DOCS: https://docs.getoutline.com/s/hosting/doc/github-GchT3NNxI9
 GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
-GITHUB_WEBHOOK_SECRET=
 GITHUB_APP_NAME=
 GITHUB_APP_ID=
 GITHUB_APP_PRIVATE_KEY=
 
-# The GitLab integration allows previewing issue and merge request links
-# DOCS: 
-GITLAB_CLIENT_ID=
-GITLAB_CLIENT_SECRET=
-
-# Linear integration allows previewing issue links as rich mentions
+# The Linear integration allows previewing issue links as rich mentions
 LINEAR_CLIENT_ID=
 LINEAR_CLIENT_SECRET=
 
@@ -259,10 +217,6 @@ SLACK_VERIFICATION_TOKEN=your_token
 SLACK_APP_ID=A0XXXXXXX
 SLACK_MESSAGE_ACTIONS=true
 
-# Figma integration allows previewing design files as rich mentions
-FIGMA_CLIENT_ID=
-FIGMA_CLIENT_SECRET=
-
 # For Dropbox integration, follow these instructions to get the key https://www.dropbox.com/developers/embedder#setup
 # and do not forget to whitelist your domain name in the app settings
 DROPBOX_APP_KEY=

.env.test

@@ -12,16 +12,10 @@ 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;
 GITHUB_APP_NAME=outline-test;
-GITHUB_APP_ID=123
-GITHUB_APP_PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA\n-----END RSA PRIVATE KEY-----"
-
-GITLAB_CLIENT_ID=123
-GITLAB_CLIENT_SECRET=123
 
 OIDC_CLIENT_ID=client-id
 OIDC_CLIENT_SECRET=client-secret
@@ -31,24 +25,7 @@ OIDC_USERINFO_URI=http://localhost/userinfo
 
 IFRAMELY_API_KEY=123
 
-NOTION_CLIENT_ID=123
-NOTION_CLIENT_SECRET=123
-
-LINEAR_CLIENT_ID=123
-LINEAR_CLIENT_SECRET=123
-
-FIGMA_CLIENT_ID=123
-FIGMA_CLIENT_SECRET=123
-
 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

.eslintignore

@@ -0,0 +1 @@
+server/migrations/*.js

.eslintrc

@@ -0,0 +1,190 @@
+{
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "sourceType": "module",
+    "extraFileExtensions": [
+      ".json"
+    ],
+    "project": "./tsconfig.json",
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:import/recommended",
+    "plugin:import/typescript",
+    "plugin:prettier/recommended"
+  ],
+  "plugins": [
+    "es",
+    "react",
+    "@typescript-eslint",
+    "eslint-plugin-import",
+    "eslint-plugin-node",
+    "eslint-plugin-react",
+    "eslint-plugin-lodash"
+  ],
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          {
+            "name": "reakit/Menu",
+            "importNames": [
+              "useMenuState"
+            ],
+            "message": "Do not use useMenuState from reakit/Menu. Use useMenuState instead."
+          }
+        ]
+      }
+    ],
+    "eqeqeq": 2,
+    "curly": 2,
+    "no-console": "error",
+    "arrow-body-style": [
+      "error",
+      "as-needed"
+    ],
+    "spaced-comment": "error",
+    "object-shorthand": "error",
+    "no-mixed-operators": "off",
+    "no-useless-escape": "off",
+    "no-shadow": "off",
+    "es/no-regexp-lookbehind-assertions": "error",
+    "react/react-in-jsx-scope": "off",
+    "react/self-closing-comp": [
+      "error",
+      {
+        "component": true,
+        "html": true
+      }
+    ],
+    "@typescript-eslint/no-shadow": [
+      "warn",
+      {
+        "allow": [
+          "transaction"
+        ],
+        "hoist": "all",
+        "ignoreTypeValueShadow": true
+      }
+    ],
+    "@typescript-eslint/no-require-imports": "off",
+    "@typescript-eslint/no-explicit-any": "warn",
+    "@typescript-eslint/no-floating-promises": "error",
+    "@typescript-eslint/await-thenable": "error",
+    "@typescript-eslint/no-misused-promises": [
+      "error",
+      {
+        "checksVoidReturn": false
+      }
+    ],
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      {
+        "argsIgnorePattern": "^_",
+        "caughtErrorsIgnorePattern": "^_",
+        "args": "after-used",
+        "ignoreRestSiblings": true
+      }
+    ],
+    "padding-line-between-statements": [
+      "error",
+      {
+        "blankLine": "always",
+        "prev": "*",
+        "next": "export"
+      }
+    ],
+    "lines-between-class-members": [
+      "error",
+      "always",
+      {
+        "exceptAfterSingleLine": true
+      }
+    ],
+    "lodash/import-scope": [
+      "error",
+      "method"
+    ],
+    "import/no-named-as-default": "off",
+    "import/no-named-as-default-member": "off",
+    "import/newline-after-import": 2,
+    "import/order": [
+      "error",
+      {
+        "alphabetize": {
+          "order": "asc"
+        },
+        "pathGroups": [
+          {
+            "pattern": "@shared/**",
+            "group": "external",
+            "position": "after"
+          },
+          {
+            "pattern": "@server/**",
+            "group": "external",
+            "position": "after"
+          },
+          {
+            "pattern": "~/stores",
+            "group": "external",
+            "position": "after"
+          },
+          {
+            "pattern": "~/stores/**",
+            "group": "external",
+            "position": "after"
+          },
+          {
+            "pattern": "~/models/**",
+            "group": "external",
+            "position": "after"
+          },
+          {
+            "pattern": "~/scenes/**",
+            "group": "external",
+            "position": "after"
+          },
+          {
+            "pattern": "~/components/**",
+            "group": "external",
+            "position": "after"
+          },
+          {
+            "pattern": "~/**",
+            "group": "external",
+            "position": "after"
+          }
+        ]
+      }
+    ],
+    "prettier/prettier": [
+      "error",
+      {
+        "printWidth": 80,
+        "trailingComma": "es5"
+      }
+    ]
+  },
+  "settings": {
+    "react": {
+      "createClass": "createReactClass",
+      "pragma": "React",
+      "version": "detect"
+    },
+    "import/parsers": {
+      "@typescript-eslint/parser": [
+        ".ts",
+        ".tsx"
+      ]
+    },
+    "import/resolver": {
+      "typescript": {}
+    }
+  }
+}

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -2,62 +2,62 @@ name: Bug report
 description: File a bug to help us improve
 labels: ["bug"]
 body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-        - label: I have searched the existing issues
-          required: true
-  - type: checkboxes
-    attributes:
-      label: This is not related to configuring Outline
-      description: I understand that questions related to configuring self-hosted Outline should be asked in the [community forum](https://github.com/outline/outline/discussions/categories/self-hosting).
-      options:
-        - label: The issue is not related to self-hosting config
-          required: true
-  - type: textarea
-    attributes:
-      label: Current Behavior
-      description: A concise description of what you're experiencing.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: A concise description of what you expected to happen.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Steps To Reproduce
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        1. In this environment...
-        1. With this config...
-        1. Run '...'
-        1. See error...
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Environment
-      description: |
-        examples:
-          - **Outline**: Outline 0.80.0
-          - **Browser**: Safari
-      value: |
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an issue already exists for the bug you encountered.
+    options:
+    - label: I have searched the existing issues
+      required: true
+- type: checkboxes
+  attributes:
+    label: This is not related to configuring Outline
+    description: I understand that questions related to configuring self-hosted Outline should be asked in the [community forum](https://github.com/outline/outline/discussions/categories/self-hosting).
+    options:
+    - label: The issue is not related to self-hosting config
+      required: true
+- type: textarea
+  attributes:
+    label: Current Behavior
+    description: A concise description of what you're experiencing.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: A concise description of what you expected to happen.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Steps To Reproduce
+    description: Steps to reproduce the behavior.
+    placeholder: |
+      1. In this environment...
+      1. With this config...
+      1. Run '...'
+      1. See error...
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Environment
+    description: |
+      examples:
+        - **Outline**: Outline 0.80.0
+        - **Browser**: Safari
+    value: |
         - Outline:
         - Browser:
-      render: markdown
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Anything else?
-      description: |
-        Links? References? Anything that will give us more context about the issue you are encountering!
+    render: markdown
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Anything else?
+    description: |
+      Links? References? Anything that will give us more context about the issue you are encountering!
 
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-    validations:
-      required: false
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: false

.github/actions/install/action.yml

@@ -1,16 +0,0 @@
-name: Install
-description: Set up Node.js, Corepack, and install dependencies with yarn cache
-runs:
-  using: composite
-  steps:
-    - name: Enable Corepack
-      shell: bash
-      run: corepack enable
-    - name: Use Node.js 24.x
-      uses: actions/setup-node@v5
-      with:
-        node-version: 24.x
-        cache: "yarn"
-    - name: Install dependencies
-      shell: bash
-      run: yarn install --immutable

.github/auto_assign.yml

@@ -2,9 +2,9 @@
 addReviewers: true
 
 # A list of reviewers to be added to pull requests (GitHub user name)
-reviewers:
+reviewers: 
   - tommoor
 
-# A list of keywords to be skipped the process that add reviewers if pull requests include it
+# A list of keywords to be skipped the process that add reviewers if pull requests include it 
 skipKeywords:
   - wip

.github/dependabot.yml

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

.github/workflows/auto_close_prs.yml

@@ -2,7 +2,7 @@ name: Auto Close Unsigned PRs
 
 on:
   schedule:
-    - cron: "0 0 * * *" # Run daily at midnight UTC
+    - cron: '0 0 * * *'  # Run daily at midnight UTC
 
 jobs:
   close-unsigned-prs:
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Close unsigned PRs
-        uses: actions/github-script@v8
+        uses: actions/github-script@v6
         with:
           script: |
             const now = new Date();
@@ -31,12 +31,6 @@ jobs:
 
               if (prAge < TWO_WEEKS) continue;
 
-              const hasSkipLabel = pr.labels.some(label =>
-                label.name === 'pinned'
-              );
-
-              if (hasSkipLabel) continue;
-
               const comments = await github.rest.issues.listComments({
                 owner: context.repo.owner,
                 repo: context.repo.repo,

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

@@ -40,21 +40,20 @@ jobs:
        github.event.pull_request.head.repo.full_name == github.repository)
     steps:
       - name: Checkout Branch
-        uses: actions/checkout@v5
+        uses: actions/checkout@v2
       - name: Compress Images
         id: calibre
-        uses: calibreapp/image-actions@3d5873ac3e7bf1a38b24d9778d8dc639d5706d8b  # main
+        uses: calibreapp/image-actions@main
         with:
           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.event_name != 'pull_request' &&
           steps.calibre.outputs.markdown != ''
-        uses: peter-evans/create-pull-request@18f7dc018cc2cd597073088f7c7591b9d1c02672  # v3
+        uses: peter-evans/create-pull-request@v3
         with:
           title: "chore: Auto Compress Images"
           branch-suffix: timestamp

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
+    branches: [ main ]
 
 env:
   NODE_ENV: test
@@ -18,23 +18,58 @@ env:
   SMTP_USERNAME: localhost
 
 jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20.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
+
+  lint:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20.x
+        cache: 'yarn'
+    - run: yarn install --frozen-lockfile
+    - run: yarn lint
+
+  types:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20.x
+        cache: 'yarn'
+    - run: yarn install --frozen-lockfile
+    - run: yarn tsc
+
   changes:
     runs-on: ubuntu-latest
     outputs:
-      config: ${{ steps.filter.outputs.config }}
       server: ${{ steps.filter.outputs.server }}
       app: ${{ steps.filter.outputs.app }}
-      deps: ${{ steps.filter.outputs.deps }}
     steps:
-      - uses: actions/checkout@v5
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50  # v2
+      - uses: actions/checkout@v4
+      - uses: dorny/paths-filter@v2
         id: filter
         with:
           filters: |
-            config:
-              - '.github/**'
-              - 'vite.config.ts'
-              - 'vitest.config.ts'
             server:
               - 'server/**'
               - 'shared/**'
@@ -45,49 +80,26 @@ jobs:
               - 'shared/**'
               - 'package.json'
               - 'yarn.lock'
-            deps:
-              - 'package.json'
-              - 'yarn.lock'
-              - '.yarnrc.yml'
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: ./.github/actions/install
-      - run: yarn lint --quiet
-
-  types:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: ./.github/actions/install
-      - run: yarn tsc
-
-  audit:
-    needs: changes
-    if: ${{ needs.changes.outputs.deps == 'true' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: ./.github/actions/install
-      - run: yarn npm audit --severity high --recursive --environment production
 
   test:
-    needs: changes
-    if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.config == 'true' }}
+    needs: [build, changes]
+    if: ${{ needs.changes.outputs.app == 'true' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         test-group: [app, shared]
     steps:
-      - uses: actions/checkout@v5
-      - uses: ./.github/actions/install
-      - run: yarn test:${{ matrix.test-group }}
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20.x
+        cache: 'yarn'
+    - run: yarn install --frozen-lockfile
+    - run: yarn test:${{ matrix.test-group }}
 
   test-server:
-    needs: changes
-    if: ${{ needs.changes.outputs.server == 'true' || needs.changes.outputs.config == 'true' }}
+    needs: [build, changes]
+    if: ${{ needs.changes.outputs.server == 'true' }}
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -103,31 +115,51 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+      
+      redis:
+        image: redis:5.0
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
 
     strategy:
       matrix:
-        shard: [1, 2, 3, 4]
-
+        shard: [1, 2, 3]
+    
     steps:
-      - uses: actions/checkout@v5
-      - uses: ./.github/actions/install
-      - run: yarn sequelize db:migrate
-      - name: Run server tests
-        run: yarn test:server --maxWorkers=2 --shard=${{ matrix.shard }}/4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20.x
+        cache: 'yarn'
+    - run: yarn install --frozen-lockfile
+    - 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")
+        yarn test --maxWorkers=2 $TESTFILES
 
   bundle-size:
-    needs: changes
-    if: ${{ (needs.changes.outputs.app == 'true' || needs.changes.outputs.config == 'true') && github.repository == 'outline/outline' }}
+    needs: [build, types, changes]
+    if: ${{ needs.changes.outputs.app == 'true' && github.repository == 'outline/outline' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
-      - uses: ./.github/actions/install
-      - name: Set environment to production
-        run: echo "NODE_ENV=production" >> $GITHUB_ENV
-      - run: yarn vite:build
-      - name: Send bundle stats to RelativeCI
-        uses: relative-ci/agent-action@38328454d6a23942175eba485fca4fbb807b1f03  # v2
-        with:
-          key: ${{ secrets.RELATIVE_CI_KEY }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          webpackStatsFile: ./build/app/webpack-stats.json
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20.x
+        cache: 'yarn'
+    - run: yarn install --frozen-lockfile
+    - name: Set environment to production
+      run: echo "NODE_ENV=production" >> $GITHUB_ENV
+    - run: yarn vite:build
+    - name: Send bundle stats to RelativeCI
+      uses: relative-ci/agent-action@v2
+      with:
+        key: ${{ secrets.RELATIVE_CI_KEY }}
+        token: ${{ secrets.GITHUB_TOKEN }}
+        webpackStatsFile: ./build/app/webpack-stats.json

.github/workflows/codeql-analysis.yml

@@ -13,12 +13,12 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [main]
+    branches: [ main ]
   schedule:
-    - cron: "28 15 * * 2"
+    - cron: '28 15 * * 2'
 
 jobs:
   analyze:
@@ -32,39 +32,39 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ["javascript"]
+        language: [ 'javascript' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
+    - name: Checkout repository
+      uses: actions/checkout@v2
 
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
 
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
 
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
 
-      #- run: |
-      #   make bootstrap
-      #   make release
+    #- run: |
+    #   make bootstrap
+    #   make release
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/docker.yml

@@ -1,10 +1,9 @@
-name: Publish build
+name: Docker
 
 on:
   push:
     tags:
       - "v*"
-  workflow_dispatch:
 
 env:
   IMAGE_NAME: outlinewiki/outline
@@ -12,17 +11,17 @@ env:
 
 jobs:
   build-arm:
-    runs-on: blacksmith-8vcpu-ubuntu-2404-arm
+    runs-on: ubicloud-standard-8-arm
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
-      - name: Setup Blacksmith Builder
-        uses: useblacksmith/setup-docker-builder@ab5c1da94f53f5cd75c1038092aa276dddfccbba  # v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Docker base meta
         id: base_meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.BASE_IMAGE_NAME }}
@@ -31,14 +30,14 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push base image
         id: base_build
-        uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8  # v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: Dockerfile.base
@@ -46,11 +45,13 @@ jobs:
           tags: ${{ env.BASE_IMAGE_NAME }}
           outputs: type=image,push-by-digest=true,name-canonical=true,push=true
           platforms: linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           pull: false
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.IMAGE_NAME }}
@@ -60,7 +61,7 @@ jobs:
 
       - name: Build and push
         id: build
-        uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8  # v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: Dockerfile
@@ -68,6 +69,8 @@ jobs:
           tags: ${{ env.IMAGE_NAME }}
           outputs: type=image,push-by-digest=true,name-canonical=true,push=true
           platforms: linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           pull: false
           build-args: |
             BASE_IMAGE=${{ env.BASE_IMAGE_NAME }}@${{ steps.base_build.outputs.digest }}
@@ -87,17 +90,17 @@ jobs:
           retention-days: 1
 
   build-amd:
-    runs-on: blacksmith-8vcpu-ubuntu-2404
+    runs-on: ubicloud-standard-8
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
-      - name: Setup Blacksmith Builder
-        uses: useblacksmith/setup-docker-builder@ab5c1da94f53f5cd75c1038092aa276dddfccbba  # v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Docker base meta
         id: base_meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.BASE_IMAGE_NAME }}
@@ -106,14 +109,14 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push base image
         id: base_build
-        uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8  # v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: Dockerfile.base
@@ -121,11 +124,13 @@ jobs:
           tags: ${{ env.BASE_IMAGE_NAME }}
           outputs: type=image,push-by-digest=true,name-canonical=true,push=true
           platforms: linux/amd64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           pull: false
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.IMAGE_NAME }}
@@ -135,7 +140,7 @@ jobs:
 
       - name: Build and push
         id: build
-        uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8  # v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: Dockerfile
@@ -143,6 +148,8 @@ jobs:
           tags: ${{ env.IMAGE_NAME }}
           outputs: type=image,push-by-digest=true,name-canonical=true,push=true
           platforms: linux/amd64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           pull: false
           build-args: |
             BASE_IMAGE=${{ env.BASE_IMAGE_NAME }}@${{ steps.base_build.outputs.digest }}
@@ -162,11 +169,10 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: blacksmith-8vcpu-ubuntu-2404
+    runs-on: ubicloud-standard-8
     needs:
       - build-amd
       - build-arm
-    environment: dockerhub
     steps:
       - name: Download digests
         uses: actions/download-artifact@v4
@@ -176,17 +182,17 @@ jobs:
           merge-multiple: true
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Setup Blacksmith Builder
-        uses: useblacksmith/setup-docker-builder@ab5c1da94f53f5cd75c1038092aa276dddfccbba  # v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.IMAGE_NAME }}
           tags: |
@@ -203,4 +209,4 @@ jobs:
 
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}

.github/workflows/lint.yml

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

.github/workflows/stale.yml

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

.github/workflows/update-node.yml

@@ -1,94 +0,0 @@
-name: Update Node.js LTS
-
-on:
-  schedule:
-    # Run every Monday at 9:00 UTC
-    - cron: "0 9 * * 1"
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  update-node:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - name: Check for Node.js LTS update
-        id: check
-        run: |
-          # Get current Node version from Dockerfile
-          CURRENT_VERSION=$(grep -oP 'FROM node:\K[0-9]+\.[0-9]+\.[0-9]+' Dockerfile.base)
-          echo "current=$CURRENT_VERSION" >> "$GITHUB_OUTPUT"
-          echo "Current Node.js version: $CURRENT_VERSION"
-
-          # Fetch the latest LTS release (any major version) from nodejs.org
-          LATEST_VERSION=$(curl -s https://nodejs.org/dist/index.json | \
-            jq -r '[.[] | select(.lts != false)][0].version' | \
-            sed 's/^v//')
-
-          if ! [[ "$LATEST_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            echo "::error::Failed to fetch a valid LTS version (got '$LATEST_VERSION')"
-            exit 1
-          fi
-
-          echo "latest=$LATEST_VERSION" >> "$GITHUB_OUTPUT"
-          echo "Latest Node.js LTS version: $LATEST_VERSION"
-
-          if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; then
-            echo "updated=false" >> "$GITHUB_OUTPUT"
-            echo "Already up to date."
-          else
-            echo "updated=true" >> "$GITHUB_OUTPUT"
-            echo "Update available: $CURRENT_VERSION -> $LATEST_VERSION"
-          fi
-
-      - name: Update Node.js version references
-        if: steps.check.outputs.updated == 'true'
-        env:
-          CURRENT: ${{ steps.check.outputs.current }}
-          LATEST: ${{ steps.check.outputs.latest }}
-        run: |
-          CURRENT_MAJOR=$(echo "$CURRENT" | cut -d. -f1)
-          LATEST_MAJOR=$(echo "$LATEST" | cut -d. -f1)
-
-          # Update Dockerfiles
-          sed -i "s/node:${CURRENT}-slim/node:${LATEST}-slim/g" Dockerfile
-          sed -i "s/node:${CURRENT} /node:${LATEST} /g" Dockerfile.base
-
-          # Update references that depend on major version
-          if [ "$CURRENT_MAJOR" != "$LATEST_MAJOR" ]; then
-            # .nvmrc
-            echo "$LATEST_MAJOR" > .nvmrc
-
-            # CI workflow: step name, node-version, and cache keys
-            sed -i "s/Use Node.js ${CURRENT_MAJOR}.x/Use Node.js ${LATEST_MAJOR}.x/g" .github/workflows/ci.yml
-            sed -i "s/node-version: ${CURRENT_MAJOR}.x/node-version: ${LATEST_MAJOR}.x/g" .github/workflows/ci.yml
-            # Update cache keys: replace node-modules-[optional old version] with new version
-            sed -i -E "s/node-modules-([0-9]+\.x-)?/node-modules-${LATEST_MAJOR}.x-/g" .github/workflows/ci.yml
-
-            # package.json engines field: append new major version
-            sed -i "s/\"node\": \"\(.*\)\"/\"node\": \"\1 || ${LATEST_MAJOR}\"/" package.json
-          fi
-
-          echo "Updated Node.js from $CURRENT to $LATEST"
-
-      - name: Create pull request
-        if: steps.check.outputs.updated == 'true'
-        uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676  # v7
-        with:
-          commit-message: "fix: Update Node.js to ${{ steps.check.outputs.latest }}"
-          title: "fix: Update Node.js to ${{ steps.check.outputs.latest }}"
-          body: |
-            Automated update of Node.js in Docker images.
-
-            - **Previous version:** ${{ steps.check.outputs.current }}
-            - **New version:** ${{ steps.check.outputs.latest }}
-
-            [Release notes](https://nodejs.org/en/blog/release/v${{ steps.check.outputs.latest }})
-          branch: automated/update-node-lts
-          delete-branch: true
-          labels: dependencies

.gitignore

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

.jestconfig.json

@@ -0,0 +1,66 @@
+{
+  "workerIdleMemoryLimit": "0.75",
+  "maxWorkers": "50%",
+  "projects": [
+    {
+      "displayName": "server",
+      "roots": ["<rootDir>/server", "<rootDir>/plugins"],
+      "moduleNameMapper": {
+        "^@server/(.*)$": "<rootDir>/server/$1",
+        "^@shared/(.*)$": "<rootDir>/shared/$1",
+        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
+      },
+      "setupFiles": ["<rootDir>/__mocks__/console.js"],
+      "setupFilesAfterEnv": ["<rootDir>/server/test/setup.ts"],
+      "globalSetup": "<rootDir>/server/test/globalSetup.js",
+      "globalTeardown": "<rootDir>/server/test/globalTeardown.js",
+      "testEnvironment": "node"
+    },
+    {
+      "displayName": "app",
+      "roots": ["<rootDir>/app"],
+      "moduleNameMapper": {
+        "^~/(.*)$": "<rootDir>/app/$1",
+        "^@shared/(.*)$": "<rootDir>/shared/$1",
+        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js",
+        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js",
+        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
+      },
+      "modulePaths": ["<rootDir>/app"],
+      "setupFiles": ["<rootDir>/__mocks__/window.js"],
+      "setupFilesAfterEnv": ["<rootDir>/app/test/setup.ts"],
+      "testEnvironment": "jsdom",
+      "testEnvironmentOptions": {
+        "url": "http://localhost"
+      }
+    },
+    {
+      "displayName": "shared-node",
+      "roots": ["<rootDir>/shared"],
+      "moduleNameMapper": {
+        "^@server/(.*)$": "<rootDir>/server/$1",
+        "^@shared/(.*)$": "<rootDir>/shared/$1",
+        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
+      },
+      "setupFiles": ["<rootDir>/__mocks__/console.js"],
+      "setupFilesAfterEnv": ["<rootDir>/shared/test/setup.ts"],
+      "testEnvironment": "node"
+    },
+    {
+      "displayName": "shared-jsdom",
+      "roots": ["<rootDir>/shared"],
+      "moduleNameMapper": {
+        "^~/(.*)$": "<rootDir>/app/$1",
+        "^@shared/(.*)$": "<rootDir>/shared/$1",
+        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js",
+        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.js",
+        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
+      },
+      "setupFiles": ["<rootDir>/__mocks__/window.js"],
+      "testEnvironment": "jsdom",
+      "testEnvironmentOptions": {
+        "url": "http://localhost"
+      }
+    }
+  ]
+}

.nvmrc

@@ -1 +0,0 @@
-24

.oxlintrc.json

@@ -1,128 +0,0 @@
-{
-  "$schema": "./node_modules/oxlint/configuration_schema.json",
-  "ignorePatterns": [
-    "build/**",
-    "node_modules/**",
-    "public/**",
-    "server/migrations/**",
-    "server/scripts/**",
-    "patches/**",
-    "*.d.ts"
-  ],
-  "rules": {
-    "for-direction": "error",
-    "no-async-promise-executor": "error",
-    "no-case-declarations": "error",
-    "no-class-assign": "error",
-    "no-compare-neg-zero": "error",
-    "no-cond-assign": "error",
-    "no-const-assign": "error",
-    "no-constant-binary-expression": "error",
-    "no-constant-condition": "error",
-    "no-control-regex": "error",
-    "no-debugger": "error",
-    "no-delete-var": "error",
-    "no-dupe-class-members": "error",
-    "no-dupe-else-if": "error",
-    "no-dupe-keys": "error",
-    "no-duplicate-case": "error",
-    "no-empty": "error",
-    "no-empty-character-class": "error",
-    "no-empty-pattern": "error",
-    "no-empty-static-block": "error",
-    "no-ex-assign": "error",
-    "no-explicit-any": "error",
-    "no-extra-boolean-cast": "error",
-    "no-fallthrough": "error",
-    "no-func-assign": "error",
-    "no-global-assign": "error",
-    "no-import-assign": "error",
-    "no-invalid-regexp": "error",
-    "no-irregular-whitespace": "error",
-    "no-loss-of-precision": "error",
-    "no-new-native-nonconstructor": "error",
-    "no-nonoctal-decimal-escape": "error",
-    "no-obj-calls": "error",
-    "no-prototype-builtins": "error",
-    "no-redeclare": "error",
-    "no-regex-spaces": "error",
-    "no-self-assign": "error",
-    "no-setter-return": "error",
-    "no-shadow-restricted-names": "error",
-    "no-sparse-arrays": "error",
-    "no-this-before-super": "error",
-    "no-unexpected-multiline": "error",
-    "no-unsafe-finally": "error",
-    "no-unsafe-negation": "error",
-    "no-unsafe-optional-chaining": "error",
-    "no-unused-labels": "error",
-    "no-unused-private-class-members": "error",
-    "no-unused-vars": "error",
-    "no-useless-backreference": "error",
-    "no-useless-catch": "error",
-    "no-useless-escape": "error",
-    "no-with": "error",
-    "require-yield": "error",
-    "use-isnan": "error",
-    "valid-typeof": "error"
-  },
-  "overrides": [
-    {
-      "files": ["**/*.{js,jsx,ts,tsx}"],
-      "rules": {
-        "eqeqeq": "error",
-        "curly": "error",
-        "no-console": "error",
-        "no-restricted-imports": [
-          "error",
-          {
-            "paths": [
-              {
-                "name": "prosemirror-tables",
-                "importNames": [
-                  "addRowBefore",
-                  "addRowAfter",
-                  "addColumnBefore",
-                  "addColumnAfter"
-                ],
-                "message": "Use the wrappers from shared/editor/commands/table instead, which respect the target index and place the cursor in the inserted cell."
-              }
-            ]
-          }
-        ],
-        "no-unused-expressions": "error",
-        "arrow-body-style": ["error", "as-needed"],
-        "react/react-in-jsx-scope": "off",
-        "typescript/await-thenable": "error",
-        "typescript/no-duplicate-type-constituents": "error",
-        "typescript/no-meaningless-void-operator": "error",
-        "typescript/require-array-sort-compare": "error",
-        "react/self-closing-comp": [
-          "error",
-          {
-            "component": true,
-            "html": true
-          }
-        ],
-        "@typescript-eslint/no-require-imports": "off",
-        "import/no-named-as-default": "off",
-        "import/no-named-as-default-member": "off",
-        "typescript/consistent-type-imports": "error",
-        "typescript/restrict-template-expressions": "error",
-        "typescript/no-floating-promises": "error",
-        "typescript/no-useless-default-assignment": "error",
-        "no-unused-vars": [
-          "error",
-          {
-            "argsIgnorePattern": "^_",
-            "caughtErrorsIgnorePattern": "^_",
-            "args": "after-used",
-            "ignoreRestSiblings": true
-          }
-        ],
-        "react/rules-of-hooks": "error"
-      },
-      "plugins": ["eslint", "oxc", "react", "typescript", "import"]
-    }
-  ]
-}

.prettierrc

@@ -1,4 +0,0 @@
-{
-  "printWidth": 80,
-  "trailingComma": "es5"
-}

.sequelizerc

@@ -1,11 +1,11 @@
-require("@dotenvx/dotenvx").config({
+require("dotenv").config({
   path: process.env.NODE_ENV === "test" ? ".env.test" : ".env",
 });
 
 var path = require('path');
 
 module.exports = {
-  'config': path.resolve('server/config', 'database.js'),
+  'config': path.resolve('server/config', 'database.json'),
   'migrations-path': path.resolve('server', 'migrations'),
   'models-path': path.resolve('server', 'models'),
 }

.yarnrc.yml

@@ -1,14 +0,0 @@
-nodeLinker: node-modules
-
-enableScripts: false
-
-npmMinimalAgeGate: 4320
-
-npmPreapprovedPackages:
-  - outline-icons
-
-# Build-time advisories that don't affect runtime request handling.
-# Re-evaluate when bumping the relevant dev/build dep.
-npmAuditIgnoreAdvisories:
-  - "1113517" # GHSA-mw96-cpmx-2vgc rollup <2.80.0 path traversal (workbox-build, build-time)
-  - "1113686" # GHSA-5c6j-r48x-rmvq serialize-javascript RCE (@rollup/plugin-terser, build-time)

AGENTS.md

@@ -1,208 +0,0 @@
-Outline is a fast, collaborative knowledge base built for teams. It's built with React and TypeScript in both frontend and backend, uses a real-time collaboration engine, and is designed for excellent performance and user experience. The backend is a Koa server with an RPC API and uses PostgreSQL and Redis. The application can be self-hosted or used as a cloud service.
-
-There is a web client which is fully responsive and works on mobile devices.
-
-**Monorepo Structure:**
-
-- **`app/`** - React web application with MobX state management
-- **`server/`** - Koa API server with Sequelize ORM and background workers
-- **`shared/`** - Shared TypeScript types, utilities, and editor components
-- **`plugins/`** - Plugin system for extending functionality
-- **`public/`** - Static assets served directly
-- **Various config files** - TypeScript, Vite, Vitest, 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
-```
-
-- When adding a `resolutions` entry to address a security advisory in a transitive dependency, target only the specific vulnerable descriptors using the `name@npm:<range>` syntax rather than overriding the package globally. Inspect `yarn.lock` to find the exact ranges requested by upstream packages and add one entry per vulnerable range, e.g.:
-
-```json
-"resolutions": {
-  "qs@npm:^6.5.2": "^6.14.2",
-  "qs@npm:^6.11.0": "^6.14.2",
-  "qs@npm:^6.14.0": "^6.14.2"
-}
-```
-
-This keeps overrides scoped to the affected dependents and avoids forcing unrelated consumers onto an incompatible version.
-
-## 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.
-- Always use named exports for new 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 Vitest:
-
-```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.
-- Always use `sanitizeUrl()` when setting `href` or `src` from user-controlled data in ProseMirror `toDOM` methods, regardless of whether it is imported via an alias or a relative path. Unlike React components, `toDOM` writes raw DOM and does not sanitize attribute values.
-- 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

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

Dockerfile

@@ -6,7 +6,7 @@ ARG APP_PATH
 WORKDIR $APP_PATH
 
 # ---
-FROM node:24.16.0-slim AS runner
+FROM node:20-slim AS runner
 
 LABEL org.opencontainers.image.source="https://github.com/outline/outline"
 
@@ -14,28 +14,29 @@ ARG APP_PATH
 WORKDIR $APP_PATH
 ENV NODE_ENV=production
 
-# Create a non-root user compatible with Debian and BusyBox based images
-RUN addgroup --gid 1001 nodejs && \
-    adduser --uid 1001 --ingroup nodejs nodejs && \
-    mkdir -p /var/lib/outline && \
-    chown -R nodejs:nodejs /var/lib/outline && \
-    chown -R nodejs:nodejs $APP_PATH
+COPY --from=base $APP_PATH/build ./build
+COPY --from=base $APP_PATH/server ./server
+COPY --from=base $APP_PATH/public ./public
+COPY --from=base $APP_PATH/.sequelizerc ./.sequelizerc
+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/build ./build
-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/*
+
+# Create a non-root user compatible with Debian and BusyBox based images
+RUN addgroup --gid 1001 nodejs && \
+  adduser --uid 1001 --ingroup nodejs nodejs && \
+  chown -R nodejs:nodejs $APP_PATH/build && \
+  mkdir -p /var/lib/outline && \
+  chown -R nodejs:nodejs /var/lib/outline
 
 ENV FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data
 RUN mkdir -p "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
-    chown -R nodejs:nodejs "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
-    chmod 1777 "$FILE_STORAGE_LOCAL_ROOT_DIR"
+  chown -R nodejs:nodejs "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
+  chmod 1777 "$FILE_STORAGE_LOCAL_ROOT_DIR"
 
 VOLUME /var/lib/outline/data
 
@@ -44,4 +45,4 @@ USER nodejs
 HEALTHCHECK --interval=1m CMD wget -qO- "http://localhost:${PORT:-3000}/_health" | grep -q "OK" || exit 1
 
 EXPOSE 3000
-CMD ["node", "build/server/index.js"]
+CMD ["yarn", "start"]

Dockerfile.base

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

LICENSE

@@ -3,8 +3,8 @@ Business Source License 1.1
 Parameters
 
 Licensor:             General Outline, Inc.
-Licensed Work:        Outline 1.8.1
-                      The Licensed Work is (c) 2026 General Outline, Inc.
+Licensed Work:        Outline 0.84.0
+                      The Licensed Work is (c) 2025 General Outline, Inc.
 Additional Use Grant: You may make use of the Licensed Work, provided that
                       you may not use the Licensed Work for a Document
                       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:          2030-06-06
+Change Date:          2029-05-11
 
 Change License:       Apache License, Version 2.0
 

Makefile

@@ -1,14 +1,14 @@
 up:
 	docker compose up -d redis postgres
 	yarn install-local-ssl
-	yarn install --immutable
+	yarn install --pure-lockfile
 	yarn dev:watch
 
 build:
 	docker compose build --pull outline
 
 test:
-	docker compose up -d postgres
+	docker compose up -d redis postgres
 	NODE_ENV=test yarn sequelize db:drop
 	NODE_ENV=test yarn sequelize db:create
 	NODE_ENV=test yarn sequelize db:migrate

README.md

@@ -1,9 +1,5 @@
 <p align="center">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="./public/logos/outline-logo-dark.png" height="29">
-    <source media="(prefers-color-scheme: light)" srcset="./public/logos/outline-logo-light.png" height="29">
-    <img src="./public/logos/outline-logo-light.png" height="29" alt="Outline" />
-  </picture>
+  <img src="https://user-images.githubusercontent.com/31465/34380645-bd67f474-eb0b-11e7-8d03-0151c1730654.png" height="29" />
 </p>
 <p align="center">
   <i>A fast, collaborative, knowledge base for your team built using React and Node.js.<br/>Try out Outline using our hosted version at <a href="https://www.getoutline.com">www.getoutline.com</a>.</i>
@@ -11,13 +7,14 @@
   <img width="1640" alt="screenshot" src="https://user-images.githubusercontent.com/380914/110356468-26374600-7fef-11eb-9f6a-f2cc2c8c6590.png">
 </p>
 <p align="center">
+  <a href="https://circleci.com/gh/outline/outline" rel="nofollow"><img src="https://circleci.com/gh/outline/outline.svg?style=shield"></a>
   <a href="http://www.typescriptlang.org" rel="nofollow"><img src="https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg" alt="TypeScript"></a>
   <a href="https://github.com/prettier/prettier"><img src="https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat" alt="Prettier"></a>
   <a href="https://github.com/styled-components/styled-components"><img src="https://img.shields.io/badge/style-%F0%9F%92%85%20styled--components-orange.svg" alt="Styled Components"></a>
   <a href="https://translate.getoutline.com/project/outline" alt="Localized"><img src="https://badges.crowdin.net/outline/localized.svg"></a>
 </p>
 
-This is the source code that runs [**Outline**](https://www.getoutline.com) and all the associated services. If you want to use Outline then you don't need to run this code, A hosted version of the app is offered at [getoutline.com](https://www.getoutline.com). You can also find documentation on using Outline in [our guide](https://docs.getoutline.com/s/guide).
+This is the source code that runs [**Outline**](https://www.getoutline.com) and all the associated services. If you want to use Outline then you don't need to run this code, we offer a hosted version of the app at [getoutline.com](https://www.getoutline.com). You can also find documentation on using Outline in [our guide](https://docs.getoutline.com/s/guide).
 
 If you'd like to run your own copy of Outline or contribute to development then this is the place for you.
 
@@ -27,23 +24,23 @@ Please see the [documentation](https://docs.getoutline.com/s/hosting/) for runni
 
 If you have questions or improvements for the docs please create a thread in [GitHub discussions](https://github.com/outline/outline/discussions).
 
-# Contributing
+# Development
 
-> **Note:** Please do not submit AI-generated pull requests. We receive a high volume of mass, low-quality PRs generated by AI tools like Claude, ChatGPT, and Copilot from contributors who are unfamiliar with the codebase. These PRs are almost never mergeable and waste maintainer time reviewing them. If you’d like to contribute, please take the time to understand the codebase and write your changes thoughtfully.
+There is a short guide for [setting up a development environment](https://docs.getoutline.com/s/hosting/doc/local-development-5hEhFRXow7) if you wish to contribute changes, fixes, and improvements to Outline.
 
-Before submitting a pull request _you must_ discuss with the core team by creating or commenting in an issue on [GitHub](https://www.github.com/outline/outline/issues) – we’d also love to hear from you in the [discussions](https://www.github.com/outline/outline/discussions). This way we can ensure that an approach is agreed on before code is written and that you have read these instructions. This will result in a much higher likelihood of your code being accepted.
+## Contributing
 
-If you’re looking for ways to get started, here’s a list of ways to help us improve Outline:
+Outline is built and maintained by a small team – we'd love your help to fix bugs and add features!
+
+Before submitting a pull request _please_ discuss with the core team by creating or commenting in an issue on [GitHub](https://www.github.com/outline/outline/issues) – we'd also love to hear from you in the [discussions](https://www.github.com/outline/outline/discussions). This way we can ensure that an approach is agreed on before code is written. This will result in a much higher likelihood of your code being accepted.
+
+If you’re looking for ways to get started, here's a list of ways to help us improve Outline:
 
 - [Translation](docs/TRANSLATION.md) into other languages
 - Issues with [`good first issue`](https://github.com/outline/outline/labels/good%20first%20issue) label
 - Performance improvements, both on server and frontend
 - Developer happiness and documentation
-- Bugs, quality fixes, and other issues listed on GitHub
-
-# Development
-
-There is a short guide for [setting up a development environment](https://docs.getoutline.com/s/hosting/doc/local-development-5hEhFRXow7) if you wish to contribute changes, fixes, and improvements to Outline.
+- Bugs and other issues listed on GitHub
 
 ## Architecture
 
@@ -54,14 +51,13 @@ please refer to the [architecture document](docs/ARCHITECTURE.md) first for a hi
 
 In development Outline outputs simple logging to the console, prefixed by categories. In production it outputs JSON logs, these can be easily parsed by your preferred log ingestion pipeline.
 
-HTTP logging is disabled by default, but can be enabled by setting the `DEBUG=http` environment variable. logging
-can be enabled for all categories by setting `DEBUG=*` or for specific categories such as `DEBUG=database` and `LOG_LEVEL=debug`, or `LOG_LEVEL=silly` for very verbose logging.
+HTTP logging is disabled by default, but can be enabled by setting the `DEBUG=http` environment variable.
 
 ## Tests
 
 We aim to have sufficient test coverage for critical parts of the application and aren't aiming for 100% unit test coverage. All API endpoints and anything authentication related should be thoroughly tested.
 
-To add new tests, write your tests with [Vitest](https://vitest.dev/) and add a file with `.test.ts` extension next to the tested code.
+To add new tests, write your tests with [Jest](https://facebook.github.io/jest/) and add a file with `.test.js` extension next to the tested code.
 
 ```shell
 # To run all tests
@@ -72,14 +68,14 @@ make watch
 ```
 
 Once the test database is created with `make test` you may individually run
-frontend and backend tests directly with vitest:
+frontend and backend tests directly.
 
 ```shell
 # To run backend tests
 yarn test:server
 
-# To run a specific backend test in watch mode
-yarn test path/to/file.test.ts --watch
+# To run a specific backend test
+yarn test:server myTestFile
 
 # To run frontend tests
 yarn test:app
@@ -90,15 +86,14 @@ yarn test:app
 Sequelize is used to create and run migrations, for example:
 
 ```shell
-yarn db:create-migration --name my-migration
-yarn db:migrate
-yarn db:rollback
+yarn sequelize migration:generate --name my-migration
+yarn sequelize db:migrate
 ```
 
-Or, to run migrations on test database:
+Or to run migrations on test database:
 
 ```shell
-yarn db:migrate --env test
+yarn sequelize db:migrate --env test
 ```
 
 # Activity

__mocks__/fileMock.js

@@ -1 +1 @@
-export default "";
+export default '';

__mocks__/localStorage.js

@@ -1,19 +1,19 @@
 const storage = {};
 
 export default {
-  setItem: function (key, value) {
-    storage[key] = value || "";
+  setItem: function(key, value) {
+    storage[key] = value || '';
   },
-  getItem: function (key) {
+  getItem: function(key) {
     return key in storage ? storage[key] : null;
   },
-  removeItem: function (key) {
+  removeItem: function(key) {
     delete storage[key];
   },
   get length() {
     return Object.keys(storage).length;
   },
-  key: function (i) {
+  key: function(i) {
     var keys = Object.keys(storage);
     return keys[i] || null;
   },

app.json

@@ -3,7 +3,13 @@
   "description": "Open source wiki and knowledge base for growing teams",
   "website": "https://www.getoutline.com/",
   "repository": "https://github.com/outline/outline",
-  "keywords": ["wiki", "team", "node", "markdown", "slack"],
+  "keywords": [
+    "wiki",
+    "team",
+    "node",
+    "markdown",
+    "slack"
+  ],
   "success_url": "/",
   "formation": {
     "web": {
@@ -21,23 +27,7 @@
     }
   ],
   "scripts": {
-    "postdeploy": "yarn sequelize db:migrate",
-    "pr-predeploy": "yarn sequelize db:migrate"
-  },
-  "environments": {
-    "review": {
-      "scripts": {
-        "postdeploy": "yarn sequelize db:migrate"
-      },
-      "addons": [
-        {
-          "plan": "heroku-redis:mini"
-        },
-        {
-          "plan": "heroku-postgresql:essential-0"
-        }
-      ]
-    }
+    "postdeploy": "yarn sequelize db:migrate"
   },
   "env": {
     "NODE_ENV": {
@@ -59,12 +49,8 @@
       "required": true
     },
     "URL": {
-      "description": "https://{your app name}.herokuapp.com, or the domain you are binding to. For review apps, this is auto-generated.",
-      "required": false
-    },
-    "HEROKU_APP_NAME": {
-      "description": "Automatically set by Heroku for review apps",
-      "required": false
+      "description": "https://{your app name}.herokuapp.com, or the domain you are binding to",
+      "required": true
     },
     "GOOGLE_CLIENT_ID": {
       "description": "See https://developers.google.com/identity/protocols/OAuth2 to create a new Google OAuth client. You must configure at least one of Slack or Google to control login.",
@@ -214,11 +200,6 @@
       "description": "Use a secure SMTP connection (optional)",
       "required": false
     },
-    "SMTP_DISABLE_STARTTLS": {
-      "value": "false",
-      "description": "Disable STARTTLS even if the server supports it (optional)",
-      "required": false
-    },
     "SMTP_TLS_CIPHERS": {
       "description": "Override SMTP cipher configuration (optional)",
       "required": false
@@ -241,4 +222,4 @@
       "required": false
     }
   }
-}
+}

app/.eslintrc

@@ -0,0 +1,17 @@
+{
+  "extends": [
+    "../.eslintrc",
+    "plugin:react/recommended",
+    "plugin:react-hooks/recommended"
+  ],
+  "plugins": [
+    "eslint-plugin-react-hooks"
+  ],
+  "rules": {
+    "react/react-in-jsx-scope": "off"
+  },
+  "env": {
+    "jest": true,
+    "browser": true
+  }
+}

app/.oxlintrc.json

@@ -1,35 +0,0 @@
-{
-  "extends": ["../.oxlintrc.json"],
-  "ignorePatterns": ["**/*.d.ts"],
-  "plugins": ["oxc", "eslint", "typescript", "react"],
-  "overrides": [
-    {
-      "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",
-          {
-            "patterns": [
-              {
-                "group": ["mime-types"],
-                "message": "Do not use the mime-types package in the browser."
-              }
-            ]
-          }
-        ]
-      },
-      "plugins": ["import"]
-    }
-  ],
-  "env": {
-    "jest": true,
-    "browser": true
-  }
-}

app/actions/definitions/apiKeys.tsx

@@ -1,11 +1,6 @@
-import copy from "copy-to-clipboard";
-import { CopyIcon, PlusIcon, TrashIcon } from "outline-icons";
-import { toast } from "sonner";
+import { PlusIcon } from "outline-icons";
 import stores from "~/stores";
-import env from "~/env";
-import type ApiKey from "~/models/ApiKey";
 import ApiKeyNew from "~/scenes/ApiKeyNew";
-import ApiKeyRevokeDialog from "~/scenes/Settings/components/ApiKeyRevokeDialog";
 import { createAction } from "..";
 import { SettingsSection } from "../sections";
 
@@ -27,53 +22,3 @@ export const createApiKey = createAction({
     });
   },
 });
-
-export const copyApiKeyFactory = ({ apiKey }: { apiKey: ApiKey }) =>
-  createAction({
-    name: ({ t }) => t("Copy"),
-    analyticsName: "Copy API key",
-    section: SettingsSection,
-    icon: <CopyIcon />,
-    visible: () => !!apiKey.value,
-    perform: ({ t }) => {
-      copy(apiKey.value, {
-        debug: env.ENVIRONMENT !== "production",
-        format: "text/plain",
-      });
-      toast.success(t("API key copied"));
-    },
-  });
-
-export const revokeApiKeyFactory = ({ apiKey }: { apiKey: ApiKey }) =>
-  createAction({
-    name: ({ t, isMenu }) =>
-      isMenu
-        ? apiKey.isExpired
-          ? t("Delete")
-          : `${t("Revoke")}…`
-        : t("Revoke API key"),
-    analyticsName: "Revoke API key",
-    section: SettingsSection,
-    icon: <TrashIcon />,
-    keywords: "revoke delete remove",
-    dangerous: true,
-    perform: async ({ t, event }) => {
-      event?.preventDefault();
-      event?.stopPropagation();
-
-      if (apiKey.isExpired) {
-        await apiKey.delete();
-        return;
-      }
-
-      stores.dialogs.openModal({
-        title: t("Revoke token"),
-        content: (
-          <ApiKeyRevokeDialog
-            onSubmit={stores.dialogs.closeAllModals}
-            apiKey={apiKey}
-          />
-        ),
-      });
-    },
-  });

app/actions/definitions/collections.tsx

@@ -1,13 +1,7 @@
 import {
-  SortAlphabeticalReverseIcon,
-  SortAlphabeticalIcon,
   ArchiveIcon,
   CollectionIcon,
   EditIcon,
-  ExportIcon,
-  ImportIcon,
-  SortManualIcon,
-  NewDocumentIcon,
   PadlockIcon,
   PlusIcon,
   RestoreIcon,
@@ -26,32 +20,19 @@ import { CollectionNew } from "~/components/Collection/CollectionNew";
 import CollectionDeleteDialog from "~/components/CollectionDeleteDialog";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import DynamicCollectionIcon from "~/components/Icons/CollectionIcon";
+import SharePopover from "~/components/Sharing/Collection/SharePopover";
 import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
-import {
-  createAction,
-  createInternalLinkAction,
-  createActionWithChildren,
-} from "~/actions";
+import { createAction } from "~/actions";
 import { ActiveCollectionSection, CollectionSection } from "~/actions/sections";
 import { setPersistedState } from "~/hooks/usePersistedState";
-import {
-  newDocumentPath,
-  newTemplatePath,
-  searchPath,
-} from "~/utils/routeHelpers";
-import ExportDialog from "~/components/ExportDialog";
-import { getEventFiles } from "@shared/utils/files";
 import history from "~/utils/history";
-import lazyWithRetry from "~/utils/lazyWithRetry";
+import { newTemplatePath, searchPath } from "~/utils/routeHelpers";
 
 const ColorCollectionIcon = ({ collection }: { collection: Collection }) => (
   <DynamicCollectionIcon collection={collection} />
 );
-const SharePopover = lazyWithRetry(
-  () => import("~/components/Sharing/Collection/SharePopover")
-);
 
-export const openCollection = createActionWithChildren({
+export const openCollection = createAction({
   name: ({ t }) => t("Open collection"),
   analyticsName: "Open collection",
   section: CollectionSection,
@@ -59,17 +40,15 @@ export const openCollection = createActionWithChildren({
   icon: <CollectionIcon />,
   children: ({ stores }) => {
     const collections = stores.collections.orderedData;
-    return collections.map((collection) =>
-      createInternalLinkAction({
-        // Note: using url which includes the slug rather than id here to bust
-        // cache if the collection is renamed
-        id: collection.path,
-        name: collection.name,
-        icon: <ColorCollectionIcon collection={collection} />,
-        section: CollectionSection,
-        to: collection.path,
-      })
-    );
+    return collections.map((collection) => ({
+      // Note: using url which includes the slug rather than id here to bust
+      // cache if the collection is renamed
+      id: collection.path,
+      name: collection.name,
+      icon: <ColorCollectionIcon collection={collection} />,
+      section: CollectionSection,
+      perform: () => history.push(collection.path),
+    }));
   },
 });
 
@@ -92,15 +71,16 @@ export const createCollection = createAction({
 });
 
 export const editCollection = createAction({
-  name: ({ t, isMenu }) => (isMenu ? `${t("Edit")}…` : t("Edit collection")),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? `${t("Edit")}…` : t("Edit collection"),
   analyticsName: "Edit collection",
   section: ActiveCollectionSection,
   icon: <EditIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.update),
-  perform: ({ t, getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  visible: ({ activeCollectionId, stores }) =>
+    !!activeCollectionId &&
+    stores.policies.abilities(activeCollectionId).update,
+  perform: ({ t, activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
       return;
     }
 
@@ -109,7 +89,7 @@ export const editCollection = createAction({
       content: (
         <CollectionEdit
           onSubmit={stores.dialogs.closeAllModals}
-          collectionId={collection.id}
+          collectionId={activeCollectionId}
         />
       ),
     });
@@ -117,21 +97,26 @@ export const editCollection = createAction({
 });
 
 export const editCollectionPermissions = createAction({
-  name: ({ t, isMenu }) =>
-    isMenu ? `${t("Permissions")}…` : t("Collection permissions"),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? `${t("Permissions")}…` : t("Collection permissions"),
   analyticsName: "Collection permissions",
   section: ActiveCollectionSection,
   icon: <PadlockIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.update),
-  perform: ({ t, getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
+  visible: ({ activeCollectionId, stores }) =>
+    !!activeCollectionId &&
+    stores.policies.abilities(activeCollectionId).update,
+  perform: ({ t, activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+    const collection = stores.collections.get(activeCollectionId);
     if (!collection) {
       return;
     }
 
     stores.dialogs.openModal({
       title: t("Share this collection"),
+      style: { marginBottom: -12 },
       content: (
         <SharePopover
           collection={collection}
@@ -143,152 +128,27 @@ export const editCollectionPermissions = createAction({
   },
 });
 
-export const importDocument = createAction({
-  name: ({ t }) => t("Import document"),
-  analyticsName: "Import document",
-  section: ActiveCollectionSection,
-  icon: <ImportIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some(
-      (policy) => policy.abilities.createDocument
-    ),
-  perform: ({ t, getActiveModel, stores }) => {
-    const { documents } = stores;
-    const collection = getActiveModel(Collection);
-    if (!collection) {
-      return;
-    }
-    const input = document.createElement("input");
-    input.type = "file";
-    input.accept = documents.importFileTypesString;
-
-    input.onchange = async (ev) => {
-      const files = getEventFiles(ev);
-      const file = files[0];
-      const toastId = toast.loading(`${t("Uploading")}…`);
-
-      try {
-        const document = await documents.import(file, null, collection.id, {
-          publish: true,
-        });
-        history.push(document.path);
-      } catch (err) {
-        toast.error(err.message);
-      } finally {
-        toast.dismiss(toastId);
-      }
-    };
-
-    input.click();
-  },
-});
-
-export const sortCollection = createActionWithChildren({
-  name: ({ t }) => t("Sort in sidebar"),
-  section: ActiveCollectionSection,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.update),
-  icon: ({ getActiveModel }) => {
-    const collection = getActiveModel(Collection);
-    const sortAlphabetical = collection?.sort.field === "title";
-    const sortDir = collection?.sort.direction;
-
-    return sortAlphabetical ? (
-      sortDir === "asc" ? (
-        <SortAlphabeticalIcon />
-      ) : (
-        <SortAlphabeticalReverseIcon />
-      )
-    ) : (
-      <SortManualIcon />
-    );
-  },
-  children: [
-    createAction({
-      name: ({ t }) => t("A-Z sort"),
-      section: ActiveCollectionSection,
-      selected: ({ getActiveModel }) => {
-        const collection = getActiveModel(Collection);
-        return (
-          collection?.sort.field === "title" &&
-          collection?.sort.direction === "asc"
-        );
-      },
-      perform: ({ getActiveModel }) => {
-        const collection = getActiveModel(Collection);
-        return collection?.save({
-          sort: {
-            field: "title",
-            direction: "asc",
-          },
-        });
-      },
-    }),
-    createAction({
-      name: ({ t }) => t("Z-A sort"),
-      section: ActiveCollectionSection,
-      selected: ({ getActiveModel }) => {
-        const collection = getActiveModel(Collection);
-        return (
-          collection?.sort.field === "title" &&
-          collection?.sort.direction === "desc"
-        );
-      },
-      perform: ({ getActiveModel }) => {
-        const collection = getActiveModel(Collection);
-        return collection?.save({
-          sort: {
-            field: "title",
-            direction: "desc",
-          },
-        });
-      },
-    }),
-    createAction({
-      name: ({ t }) => t("Manual sort"),
-      section: ActiveCollectionSection,
-      selected: ({ getActiveModel }) => {
-        const collection = getActiveModel(Collection);
-        return collection?.sort.field !== "title";
-      },
-      perform: ({ getActiveModel }) => {
-        const collection = getActiveModel(Collection);
-        return collection?.save({
-          sort: {
-            field: "index",
-            direction: "asc",
-          },
-        });
-      },
-    }),
-  ],
-});
-
-export const searchInCollection = createInternalLinkAction({
+export const searchInCollection = createAction({
   name: ({ t }) => t("Search in collection"),
   analyticsName: "Search collection",
   section: ActiveCollectionSection,
   icon: <SearchIcon />,
-  visible: ({ getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return false;
+    }
+
+    const collection = stores.collections.get(activeCollectionId);
+
     if (!collection?.isActive) {
       return false;
     }
 
-    return stores.policies.abilities(collection.id).readDocument;
+    return stores.policies.abilities(activeCollectionId).readDocument;
   },
-  to: ({ getActiveModel, sidebarContext }) => {
-    const collection = getActiveModel(Collection);
 
-    const [pathname, search] = searchPath({
-      collectionId: collection?.id,
-    }).split("?");
-
-    return {
-      pathname,
-      search,
-      state: { sidebarContext },
-    };
+  perform: ({ activeCollectionId }) => {
+    history.push(searchPath({ collectionId: activeCollectionId }));
   },
 });
 
@@ -298,22 +158,23 @@ export const starCollection = createAction({
   section: ActiveCollectionSection,
   icon: <StarredIcon />,
   keywords: "favorite bookmark",
-  visible: ({ getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
       return false;
     }
-
+    const collection = stores.collections.get(activeCollectionId);
     return (
-      !collection.isStarred && stores.policies.abilities(collection.id).star
+      !collection?.isStarred &&
+      stores.policies.abilities(activeCollectionId).star
     );
   },
-  perform: async ({ getActiveModel }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  perform: async ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
       return;
     }
-    await collection.star();
+
+    const collection = stores.collections.get(activeCollectionId);
+    await collection?.star();
     setPersistedState(getHeaderExpandedKey("starred"), true);
   },
 });
@@ -324,18 +185,22 @@ export const unstarCollection = createAction({
   section: ActiveCollectionSection,
   icon: <UnstarredIcon />,
   keywords: "unfavorite unbookmark",
-  visible: ({ getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
       return false;
     }
-
+    const collection = stores.collections.get(activeCollectionId);
     return (
-      !!collection.isStarred && stores.policies.abilities(collection.id).unstar
+      !!collection?.isStarred &&
+      stores.policies.abilities(activeCollectionId).unstar
     );
   },
-  perform: async ({ getActiveModel }) => {
-    const collection = getActiveModel(Collection);
+  perform: async ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+
+    const collection = stores.collections.get(activeCollectionId);
     await collection?.unstar();
   },
 });
@@ -345,25 +210,27 @@ export const subscribeCollection = createAction({
   analyticsName: "Subscribe to collection",
   section: ActiveCollectionSection,
   icon: <SubscribeIcon />,
-  visible: ({ getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
       return false;
     }
 
+    const collection = stores.collections.get(activeCollectionId);
+
     return (
-      !!collection.isActive &&
-      !collection.isSubscribed &&
-      stores.policies.abilities(collection.id).subscribe
+      !collection?.isSubscribed &&
+      stores.policies.abilities(activeCollectionId).subscribe
     );
   },
-  perform: async ({ getActiveModel, t }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  perform: async ({ activeCollectionId, stores, t }) => {
+    if (!activeCollectionId) {
       return;
     }
 
-    await collection.subscribe();
+    const collection = stores.collections.get(activeCollectionId);
+
+    await collection?.subscribe();
+
     toast.success(t("Subscribed to document notifications"));
   },
 });
@@ -373,25 +240,27 @@ export const unsubscribeCollection = createAction({
   analyticsName: "Unsubscribe from collection",
   section: ActiveCollectionSection,
   icon: <UnsubscribeIcon />,
-  visible: ({ getActiveModel, stores }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
       return false;
     }
 
+    const collection = stores.collections.get(activeCollectionId);
+
     return (
-      !!collection.isActive &&
-      !!collection.isSubscribed &&
-      stores.policies.abilities(collection.id).unsubscribe
+      !!collection?.isSubscribed &&
+      stores.policies.abilities(activeCollectionId).unsubscribe
     );
   },
-  perform: async ({ getActiveModel, t }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
+  perform: async ({ activeCollectionId, currentUserId, stores, t }) => {
+    if (!activeCollectionId || !currentUserId) {
       return;
     }
 
-    await collection.unsubscribe();
+    const collection = stores.collections.get(activeCollectionId);
+
+    await collection?.unsubscribe();
+
     toast.success(t("Unsubscribed from document notifications"));
   },
 });
@@ -399,17 +268,25 @@ export const unsubscribeCollection = createAction({
 export const archiveCollection = createAction({
   name: ({ t }) => `${t("Archive")}…`,
   analyticsName: "Archive collection",
-  section: ActiveCollectionSection,
+  section: CollectionSection,
   icon: <ArchiveIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.archive),
-  perform: async ({ getActiveModel, stores, t }) => {
-    const collection = getActiveModel(Collection);
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return false;
+    }
+    return !!stores.policies.abilities(activeCollectionId).archive;
+  },
+  perform: async ({ activeCollectionId, stores, t }) => {
+    const { dialogs, collections } = stores;
+    if (!activeCollectionId) {
+      return;
+    }
+    const collection = collections.get(activeCollectionId);
     if (!collection) {
       return;
     }
 
-    stores.dialogs.openModal({
+    dialogs.openModal({
       title: t("Archive collection"),
       content: (
         <ConfirmationDialog
@@ -434,10 +311,17 @@ export const restoreCollection = createAction({
   analyticsName: "Restore collection",
   section: CollectionSection,
   icon: <RestoreIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.restore),
-  perform: async ({ getActiveModel, t }) => {
-    const collection = getActiveModel(Collection);
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return false;
+    }
+    return !!stores.policies.abilities(activeCollectionId).restore;
+  },
+  perform: async ({ activeCollectionId, stores, t }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+    const collection = stores.collections.get(activeCollectionId);
     if (!collection) {
       return;
     }
@@ -453,10 +337,18 @@ export const deleteCollection = createAction({
   section: ActiveCollectionSection,
   dangerous: true,
   icon: <TrashIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.delete),
-  perform: ({ getActiveModel, t, stores }) => {
-    const collection = getActiveModel(Collection);
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return false;
+    }
+    return stores.policies.abilities(activeCollectionId).delete;
+  },
+  perform: ({ activeCollectionId, t, stores }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+
+    const collection = stores.collections.get(activeCollectionId);
     if (!collection) {
       return;
     }
@@ -473,66 +365,24 @@ export const deleteCollection = createAction({
   },
 });
 
-export const exportCollection = createAction({
-  name: ({ t }) => `${t("Export")}…`,
-  analyticsName: "Export collection",
-  section: ActiveCollectionSection,
-  icon: <ExportIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some((policy) => policy.abilities.export),
-  perform: async ({ getActiveModel, stores, t }) => {
-    const collection = getActiveModel(Collection);
-    if (!collection) {
-      return;
-    }
-
-    stores.dialogs.openModal({
-      title: t("Export collection"),
-      content: (
-        <ExportDialog
-          collection={collection}
-          onSubmit={stores.dialogs.closeAllModals}
-        />
-      ),
-    });
-  },
-});
-
-export const createDocument = createInternalLinkAction({
-  name: ({ t }) => t("New document"),
-  analyticsName: "New document",
-  section: ActiveCollectionSection,
-  icon: <NewDocumentIcon />,
-  keywords: "new create document",
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some(
-      (policy) => policy.abilities.createDocument
-    ),
-  to: ({ getActiveModel, sidebarContext }) => {
-    const collection = getActiveModel(Collection);
-    const [pathname, search] = newDocumentPath(collection?.id).split("?");
-
-    return {
-      pathname,
-      search,
-      state: { sidebarContext },
-    };
-  },
-});
-
-export const createTemplate = createInternalLinkAction({
+export const createTemplate = createAction({
   name: ({ t }) => t("New template"),
   analyticsName: "New template",
   section: ActiveCollectionSection,
   icon: <ShapesIcon />,
   keywords: "new create template",
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Collection).some(
-      (policy) => policy.abilities.createTemplate
+  visible: ({ activeCollectionId, stores }) =>
+    !!(
+      !!activeCollectionId &&
+      stores.policies.abilities(activeCollectionId).createDocument
     ),
-  to: ({ getActiveModel }) => {
-    const collection = getActiveModel(Collection);
-    return newTemplatePath(collection?.id);
+  perform: ({ activeCollectionId, event }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+    event?.preventDefault();
+    event?.stopPropagation();
+    history.push(newTemplatePath(activeCollectionId));
   },
 });
 

app/actions/definitions/comments.tsx

@@ -1,10 +1,12 @@
 import { DoneIcon, SmileyIcon, TrashIcon } from "outline-icons";
 import { toast } from "sonner";
-import type Comment from "~/models/Comment";
+import stores from "~/stores";
+import Comment from "~/models/Comment";
 import CommentDeleteDialog from "~/components/CommentDeleteDialog";
 import ViewReactionsDialog from "~/components/Reactions/ViewReactionsDialog";
+import history from "~/utils/history";
 import { createAction } from "..";
-import { ActiveDocumentSection } from "../sections";
+import { DocumentSection } from "../sections";
 
 export const deleteCommentFactory = ({
   comment,
@@ -16,12 +18,12 @@ export const deleteCommentFactory = ({
   createAction({
     name: ({ t }) => `${t("Delete")}…`,
     analyticsName: "Delete comment",
-    section: ActiveDocumentSection,
+    section: DocumentSection,
     icon: <TrashIcon />,
     keywords: "trash",
     dangerous: true,
-    visible: ({ stores }) => stores.policies.abilities(comment.id).delete,
-    perform: ({ t, stores, event }) => {
+    visible: () => stores.policies.abilities(comment.id).delete,
+    perform: ({ t, event }) => {
       event?.preventDefault();
       event?.stopPropagation();
 
@@ -42,13 +44,23 @@ export const resolveCommentFactory = ({
   createAction({
     name: ({ t }) => t("Mark as resolved"),
     analyticsName: "Resolve thread",
-    section: ActiveDocumentSection,
+    section: DocumentSection,
     icon: <DoneIcon outline />,
-    visible: ({ stores }) =>
+    visible: () =>
       stores.policies.abilities(comment.id).resolve &&
       stores.policies.abilities(comment.documentId).update,
     perform: async ({ t }) => {
       await comment.resolve();
+
+      const locationState = history.location.state as Record<string, unknown>;
+      history.replace({
+        ...history.location,
+        state: {
+          sidebarContext: locationState["sidebarContext"],
+          commentId: undefined,
+        },
+      });
+
       onResolve();
       toast.success(t("Thread resolved"));
     },
@@ -64,13 +76,23 @@ export const unresolveCommentFactory = ({
   createAction({
     name: ({ t }) => t("Mark as unresolved"),
     analyticsName: "Unresolve thread",
-    section: ActiveDocumentSection,
+    section: DocumentSection,
     icon: <DoneIcon outline />,
-    visible: ({ stores }) =>
+    visible: () =>
       stores.policies.abilities(comment.id).unresolve &&
       stores.policies.abilities(comment.documentId).update,
     perform: async () => {
       await comment.unresolve();
+
+      const locationState = history.location.state as Record<string, unknown>;
+      history.replace({
+        ...history.location,
+        state: {
+          sidebarContext: locationState["sidebarContext"],
+          commentId: undefined,
+        },
+      });
+
       onUnresolve();
     },
   });
@@ -83,12 +105,12 @@ export const viewCommentReactionsFactory = ({
   createAction({
     name: ({ t }) => `${t("View reactions")}`,
     analyticsName: "View comment reactions",
-    section: ActiveDocumentSection,
+    section: DocumentSection,
     icon: <SmileyIcon />,
-    visible: ({ stores }) =>
+    visible: () =>
       stores.policies.abilities(comment.id).read &&
       comment.reactions.length > 0,
-    perform: ({ t, stores, event }) => {
+    perform: ({ t, event }) => {
       event?.preventDefault();
       event?.stopPropagation();
 

app/actions/definitions/developer.tsx

@@ -1,4 +1,3 @@
-import Storage from "@shared/utils/Storage";
 import copy from "copy-to-clipboard";
 import {
   BeakerIcon,
@@ -9,7 +8,7 @@ import {
   UserIcon,
 } from "outline-icons";
 import { toast } from "sonner";
-import { createAction, createActionWithChildren } from "~/actions";
+import { createAction } from "~/actions";
 import { DeveloperSection } from "~/actions/sections";
 import env from "~/env";
 import { client } from "~/utils/ApiClient";
@@ -17,19 +16,9 @@ import { Feature, FeatureFlags } from "~/utils/FeatureFlags";
 import Logger from "~/utils/Logger";
 import { deleteAllDatabases } from "~/utils/developer";
 import history from "~/utils/history";
-import { homePath, debugPath } from "~/utils/routeHelpers";
+import { homePath } from "~/utils/routeHelpers";
 
-export const goToDebug = createAction({
-  name: "Go to debug screen",
-  icon: <BeakerIcon />,
-  section: DeveloperSection,
-  visible: () => env.ENVIRONMENT === "development",
-  perform: () => {
-    history.push(debugPath());
-  },
-});
-
-export const copyId = createActionWithChildren({
+export const copyId = createAction({
   name: ({ t }) => t("Copy ID"),
   icon: <CopyIcon />,
   keywords: "uuid",
@@ -138,17 +127,6 @@ export const clearIndexedDB = createAction({
   },
 });
 
-export const clearStorage = createAction({
-  name: ({ t }) => t("Clear local storage"),
-  icon: <TrashIcon />,
-  keywords: "cache clear localstorage",
-  section: DeveloperSection,
-  perform: ({ t }) => {
-    Storage.clear();
-    toast.success(t("Local storage cleared"));
-  },
-});
-
 export const createTestUsers = createAction({
   name: "Create 10 test users",
   icon: <UserIcon />,
@@ -186,22 +164,7 @@ export const toggleDebugLogging = createAction({
   },
 });
 
-export const toggleDebugSafeArea = createAction({
-  name: () => "Toggle menu safe area debugging",
-  icon: <ToolsIcon />,
-  section: DeveloperSection,
-  visible: () => env.ENVIRONMENT === "development",
-  perform: ({ stores }) => {
-    stores.ui.toggleDebugSafeArea();
-    toast.message(
-      stores.ui.debugSafeArea
-        ? "Menu safe area debugging enabled"
-        : "Menu safe area debugging disabled"
-    );
-  },
-});
-
-export const toggleFeatureFlag = createActionWithChildren({
+export const toggleFeatureFlag = createAction({
   name: "Toggle feature flag",
   icon: <BeakerIcon />,
   section: DeveloperSection,
@@ -225,22 +188,19 @@ export const toggleFeatureFlag = createActionWithChildren({
   ),
 });
 
-export const developer = createActionWithChildren({
+export const developer = createAction({
   name: ({ t }) => t("Development"),
   keywords: "debug",
   icon: <ToolsIcon />,
   iconInContextMenu: false,
   section: DeveloperSection,
   children: [
-    goToDebug,
     copyId,
     toggleDebugLogging,
-    toggleDebugSafeArea,
     toggleFeatureFlag,
     createToast,
     createTestUsers,
     clearIndexedDB,
-    clearStorage,
     startTyping,
   ],
 });

app/actions/definitions/emojis.tsx

@@ -1,21 +0,0 @@
-import { PlusIcon } from "outline-icons";
-import { createAction } from "~/actions";
-import { TeamSection } from "../sections";
-import stores from "~/stores";
-import { EmojiCreateDialog } from "~/components/EmojiDialog/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

@@ -1,47 +0,0 @@
-import { TrashIcon } from "outline-icons";
-import stores from "~/stores";
-import { createAction } from "..";
-import { SettingsSection } from "../sections";
-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>
-) =>
-  createAction({
-    name: ({ t }) => t("Disconnect analytics"),
-    analyticsName: "Disconnect analytics",
-    section: SettingsSection,
-    icon: <TrashIcon />,
-    keywords: "disconnect",
-    visible: () => !!integration,
-    perform: ({ t, event }) => {
-      event?.preventDefault();
-      event?.stopPropagation();
-
-      stores.dialogs.openModal({
-        title: t("Disconnect analytics"),
-        content: <DisconnectAnalyticsDialog integration={integration!} />,
-      });
-    },
-  });

app/actions/definitions/navigation.tsx

@@ -12,20 +12,17 @@ import {
   BrowserIcon,
   ShapesIcon,
   DraftsIcon,
-  BugIcon,
 } from "outline-icons";
 import { UrlHelper } from "@shared/utils/UrlHelper";
 import { isMac } from "@shared/utils/browser";
 import stores from "~/stores";
-import type SearchQuery from "~/models/SearchQuery";
+import SearchQuery from "~/models/SearchQuery";
 import KeyboardShortcuts from "~/scenes/KeyboardShortcuts";
-import {
-  createAction,
-  createExternalLinkAction,
-  createInternalLinkAction,
-} from "~/actions";
+import { createAction } from "~/actions";
 import { NavigationSection, RecentSearchesSection } from "~/actions/sections";
+import env from "~/env";
 import Desktop from "~/utils/Desktop";
+import history from "~/utils/history";
 import isCloudHosted from "~/utils/isCloudHosted";
 import {
   homePath,
@@ -36,136 +33,133 @@ import {
   settingsPath,
 } from "~/utils/routeHelpers";
 
-export const navigateToHome = createInternalLinkAction({
+export const navigateToHome = createAction({
   name: ({ t }) => t("Home"),
   analyticsName: "Navigate to home",
   section: NavigationSection,
   shortcut: ["d"],
   icon: <HomeIcon />,
-  to: homePath(),
+  perform: () => history.push(homePath()),
   visible: ({ location }) => location.pathname !== homePath(),
 });
 
 export const navigateToRecentSearchQuery = (searchQuery: SearchQuery) =>
-  createInternalLinkAction({
+  createAction({
     section: RecentSearchesSection,
     name: searchQuery.query,
     analyticsName: "Navigate to recent search query",
     icon: <SearchIcon />,
-    to: searchPath({ query: searchQuery.query }),
+    perform: () => history.push(searchPath({ query: searchQuery.query })),
   });
 
-export const navigateToDrafts = createInternalLinkAction({
+export const navigateToDrafts = createAction({
   name: ({ t }) => t("Drafts"),
   analyticsName: "Navigate to drafts",
   section: NavigationSection,
   icon: <DraftsIcon />,
-  to: draftsPath(),
+  perform: () => history.push(draftsPath()),
   visible: ({ location }) => location.pathname !== draftsPath(),
 });
 
-export const navigateToSearch = createInternalLinkAction({
+export const navigateToSearch = createAction({
   name: ({ t }) => t("Search"),
   analyticsName: "Navigate to search",
   section: NavigationSection,
   icon: <SearchIcon />,
-  to: searchPath(),
+  perform: () => history.push(searchPath()),
   visible: ({ location }) => location.pathname !== searchPath(),
 });
 
-export const navigateToArchive = createInternalLinkAction({
+export const navigateToArchive = createAction({
   name: ({ t }) => t("Archive"),
   analyticsName: "Navigate to archive",
   section: NavigationSection,
   shortcut: ["g", "a"],
   icon: <ArchiveIcon />,
-  to: archivePath(),
+  perform: () => history.push(archivePath()),
   visible: ({ location }) => location.pathname !== archivePath(),
 });
 
-export const navigateToTrash = createInternalLinkAction({
+export const navigateToTrash = createAction({
   name: ({ t }) => t("Trash"),
   analyticsName: "Navigate to trash",
   section: NavigationSection,
   icon: <TrashIcon />,
-  to: trashPath(),
+  perform: () => history.push(trashPath()),
   visible: ({ location }) => location.pathname !== trashPath(),
 });
 
-export const navigateToSettings = createInternalLinkAction({
+export const navigateToSettings = createAction({
   name: ({ t }) => t("Settings"),
   analyticsName: "Navigate to settings",
   section: NavigationSection,
   shortcut: ["g", "s"],
   icon: <SettingsIcon />,
   visible: () => stores.policies.abilities(stores.auth.team?.id || "").update,
-  to: settingsPath(),
+  perform: () => history.push(settingsPath()),
 });
 
-export const navigateToWorkspaceSettings = createInternalLinkAction({
+export const navigateToWorkspaceSettings = createAction({
   name: ({ t }) => t("Settings"),
   analyticsName: "Navigate to workspace settings",
   section: NavigationSection,
   icon: <SettingsIcon />,
   visible: () => stores.policies.abilities(stores.auth.team?.id || "").update,
-  to: settingsPath("details"),
+  perform: () => history.push(settingsPath("details")),
 });
 
-export const navigateToProfileSettings = createInternalLinkAction({
+export const navigateToProfileSettings = createAction({
   name: ({ t }) => t("Profile"),
   analyticsName: "Navigate to profile settings",
   section: NavigationSection,
   iconInContextMenu: false,
   icon: <ProfileIcon />,
-  to: settingsPath(),
+  perform: () => history.push(settingsPath()),
 });
 
-export const navigateToTemplateSettings = createInternalLinkAction({
+export const navigateToTemplateSettings = createAction({
   name: ({ t }) => t("Templates"),
   analyticsName: "Navigate to template settings",
   section: NavigationSection,
   iconInContextMenu: false,
   icon: <ShapesIcon />,
-  to: settingsPath("templates"),
+  perform: () => history.push(settingsPath("templates")),
 });
 
-export const navigateToNotificationSettings = createInternalLinkAction({
-  name: ({ t, isMenu }) =>
-    isMenu ? t("Notification settings") : t("Notifications"),
+export const navigateToNotificationSettings = createAction({
+  name: ({ t }) => t("Notifications"),
   analyticsName: "Navigate to notification settings",
   section: NavigationSection,
   iconInContextMenu: false,
   icon: <EmailIcon />,
-  to: settingsPath("notifications"),
+  perform: () => history.push(settingsPath("notifications")),
 });
 
-export const navigateToAccountPreferences = createInternalLinkAction({
+export const navigateToAccountPreferences = createAction({
   name: ({ t }) => t("Preferences"),
   analyticsName: "Navigate to account preferences",
   section: NavigationSection,
   iconInContextMenu: false,
   icon: <SettingsIcon />,
-  to: settingsPath("preferences"),
+  perform: () => history.push(settingsPath("preferences")),
 });
 
-export const openDocumentation = createExternalLinkAction({
+export const openDocumentation = createAction({
   name: ({ t }) => t("Documentation"),
   analyticsName: "Open documentation",
   section: NavigationSection,
   iconInContextMenu: false,
   icon: <OpenIcon />,
-  url: UrlHelper.guide,
-  target: "_blank",
+  perform: () => window.open(UrlHelper.guide),
 });
 
-export const openAPIDocumentation = createExternalLinkAction({
+export const openAPIDocumentation = createAction({
   name: ({ t }) => t("API documentation"),
   analyticsName: "Open API documentation",
   section: NavigationSection,
   iconInContextMenu: false,
   icon: <OpenIcon />,
-  url: UrlHelper.developers,
-  target: "_blank",
+  perform: () => window.open(UrlHelper.developers),
 });
 
 export const toggleSidebar = createAction({
@@ -176,34 +170,29 @@ export const toggleSidebar = createAction({
   perform: () => stores.ui.toggleCollapsedSidebar(),
 });
 
-export const openFeedbackUrl = createExternalLinkAction({
+export const openFeedbackUrl = createAction({
   name: ({ t }) => t("Send us feedback"),
   analyticsName: "Open feedback",
   section: NavigationSection,
   iconInContextMenu: false,
   icon: <EmailIcon />,
-  url: UrlHelper.contact,
-  target: "_blank",
+  perform: () => window.open(UrlHelper.contact),
 });
 
-export const openBugReportUrl = createExternalLinkAction({
+export const openBugReportUrl = createAction({
   name: ({ t }) => t("Report a bug"),
   analyticsName: "Open bug report",
   section: NavigationSection,
-  iconInContextMenu: false,
-  icon: <BugIcon />,
-  url: UrlHelper.github,
-  target: "_blank",
+  perform: () => window.open(UrlHelper.github),
 });
 
-export const openChangelog = createExternalLinkAction({
+export const openChangelog = createAction({
   name: ({ t }) => t("Changelog"),
   analyticsName: "Open changelog",
   section: NavigationSection,
   iconInContextMenu: false,
   icon: <OpenIcon />,
-  url: UrlHelper.changelog,
-  target: "_blank",
+  perform: () => window.open(UrlHelper.changelog),
 });
 
 export const openKeyboardShortcuts = createAction({
@@ -221,18 +210,19 @@ export const openKeyboardShortcuts = createAction({
   },
 });
 
-export const downloadApp = createExternalLinkAction({
+export const downloadApp = createAction({
   name: ({ t }) =>
     t("Download {{ platform }} app", {
-      platform: isMac ? "macOS" : "Windows",
+      platform: isMac() ? "macOS" : "Windows",
     }),
   analyticsName: "Download app",
   section: NavigationSection,
   iconInContextMenu: false,
   icon: <BrowserIcon />,
-  visible: () => !Desktop.isElectron() && isMac && isCloudHosted,
-  url: "https://desktop.getoutline.com",
-  target: "_blank",
+  visible: () => !Desktop.isElectron() && isMac() && isCloudHosted,
+  perform: () => {
+    window.open("https://desktop.getoutline.com");
+  },
 });
 
 export const logout = createAction({
@@ -241,10 +231,12 @@ export const logout = createAction({
   section: NavigationSection,
   icon: <LogoutIcon />,
   perform: async () => {
-    await stores.auth.logout({
-      userInitiated: true,
-      clearCache: true,
-    });
+    await stores.auth.logout();
+    if (env.OIDC_LOGOUT_URI) {
+      setTimeout(() => {
+        window.location.replace(env.OIDC_LOGOUT_URI);
+      }, 200);
+    }
   },
 });
 

app/actions/definitions/notifications.tsx

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

app/actions/definitions/revisions.tsx

@@ -1,18 +1,14 @@
 import copy from "copy-to-clipboard";
-import { LinkIcon, RestoreIcon, TrashIcon, DownloadIcon } from "outline-icons";
+import { LinkIcon, RestoreIcon, TrashIcon } from "outline-icons";
 import { matchPath } from "react-router-dom";
 import { toast } from "sonner";
-import { ExportContentType } from "@shared/types";
-import Revision from "~/models/Revision";
 import stores from "~/stores";
-import { createAction, createActionWithChildren } from "~/actions";
+import { createAction } from "~/actions";
 import { RevisionSection } from "~/actions/sections";
-import env from "~/env";
 import history from "~/utils/history";
 import {
   documentHistoryPath,
   matchDocumentHistory,
-  urlify,
 } from "~/utils/routeHelpers";
 
 export const restoreRevision = createAction({
@@ -22,7 +18,7 @@ export const restoreRevision = createAction({
   section: RevisionSection,
   visible: ({ activeDocumentId }) =>
     !!activeDocumentId && stores.policies.abilities(activeDocumentId).update,
-  perform: async ({ event, location, activeDocumentId, getActiveModel }) => {
+  perform: async ({ event, location, activeDocumentId }) => {
     event?.preventDefault();
     if (!activeDocumentId) {
       return;
@@ -31,10 +27,7 @@ export const restoreRevision = createAction({
     const match = matchPath<{ revisionId: string }>(location.pathname, {
       path: matchDocumentHistory,
     });
-    const revisionId = getActiveModel(Revision)?.id ?? match?.params.revisionId;
-    if (!revisionId) {
-      return;
-    }
+    const revisionId = match?.params.revisionId;
 
     const document = stores.documents.get(activeDocumentId);
     if (!document) {
@@ -80,105 +73,37 @@ export const deleteRevision = createAction({
   },
 });
 
-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;
-      }
+export const copyLinkToRevision = createAction({
+  name: ({ t }) => t("Copy link"),
+  analyticsName: "Copy link to revision",
+  icon: <LinkIcon />,
+  section: RevisionSection,
+  perform: async ({ activeDocumentId, t }) => {
+    if (!activeDocumentId) {
+      return;
+    }
 
-      const document = stores.documents.get(activeDocumentId);
-      if (!document) {
-        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 url = urlify(documentHistoryPath(document, revisionId));
+    const url = `${window.location.origin}${documentHistoryPath(
+      document,
+      revisionId
+    )}`;
 
-      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),
-    ],
-  });
+    copy(url, {
+      format: "text/plain",
+      onCopy: () => {
+        toast.message(t("Link copied"));
+      },
+    });
+  },
+});
 
 export const rootRevisionActions = [];

app/actions/definitions/settings.tsx

@@ -1,6 +1,7 @@
 import { SunIcon, MoonIcon, BrowserIcon } from "outline-icons";
+import stores from "~/stores";
 import { Theme } from "~/stores/UiStore";
-import { createAction, createActionWithChildren } from "~/actions";
+import { createAction } from "~/actions";
 import { SettingsSection } from "~/actions/sections";
 
 export const changeToDarkTheme = createAction({
@@ -10,8 +11,8 @@ export const changeToDarkTheme = createAction({
   iconInContextMenu: false,
   keywords: "theme dark night",
   section: SettingsSection,
-  selected: ({ stores }) => stores.ui.theme === "dark",
-  perform: ({ stores }) => stores.ui.setTheme(Theme.Dark),
+  selected: () => stores.ui.theme === "dark",
+  perform: () => stores.ui.setTheme(Theme.Dark),
 });
 
 export const changeToLightTheme = createAction({
@@ -21,23 +22,8 @@ export const changeToLightTheme = createAction({
   iconInContextMenu: false,
   keywords: "theme light day",
   section: SettingsSection,
-  selected: ({ stores }) => stores.ui.theme === "light",
-  perform: ({ stores }) => stores.ui.setTheme(Theme.Light),
-});
-
-export const toggleTheme = createAction({
-  name: ({ t }) => t("Toggle theme"),
-  analyticsName: "Change theme",
-  iconInContextMenu: false,
-  icon: ({ stores }) =>
-    stores.ui.resolvedTheme === "light" ? <MoonIcon /> : <SunIcon />,
-  keywords: "theme light day",
-  section: SettingsSection,
-  shortcut: ["Meta+Shift+l"],
-  perform: ({ stores }) =>
-    stores.ui.setTheme(
-      stores.ui.resolvedTheme === "light" ? Theme.Dark : Theme.Light
-    ),
+  selected: () => stores.ui.theme === "light",
+  perform: () => stores.ui.setTheme(Theme.Light),
 });
 
 export const changeToSystemTheme = createAction({
@@ -47,19 +33,21 @@ export const changeToSystemTheme = createAction({
   iconInContextMenu: false,
   keywords: "theme system default",
   section: SettingsSection,
-  selected: ({ stores }) => stores.ui.theme === "system",
-  perform: ({ stores }) => stores.ui.setTheme(Theme.System),
+  selected: () => stores.ui.theme === "system",
+  perform: () => stores.ui.setTheme(Theme.System),
 });
 
-export const changeTheme = createActionWithChildren({
-  name: ({ t, isMenu }) => (isMenu ? t("Appearance") : t("Change theme")),
+export const changeTheme = createAction({
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Appearance") : t("Change theme"),
   analyticsName: "Change theme",
   placeholder: ({ t }) => t("Change theme to"),
-  icon: ({ stores }) =>
-    stores.ui.resolvedTheme === "light" ? <SunIcon /> : <MoonIcon />,
+  icon: function _Icon() {
+    return stores.ui.resolvedTheme === "light" ? <SunIcon /> : <MoonIcon />;
+  },
   keywords: "appearance display",
   section: SettingsSection,
   children: [changeToLightTheme, changeToDarkTheme, changeToSystemTheme],
 });
 
-export const rootSettingsActions = [changeTheme, toggleTheme];
+export const rootSettingsActions = [changeTheme];

app/actions/definitions/shares.tsx

@@ -1,59 +0,0 @@
-import copy from "copy-to-clipboard";
-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 }) =>
-  createAction({
-    name: ({ t }) => t("Copy link"),
-    analyticsName: "Copy share link",
-    section: ShareSection,
-    icon: <CopyIcon />,
-    perform: ({ t }) => {
-      copy(share.url, {
-        debug: env.ENVIRONMENT !== "production",
-        format: "text/plain",
-      });
-      toast.success(t("Share link copied"));
-    },
-  });
-
-export const goToShareSourceFactory = ({ share }: { share: Share }) =>
-  createInternalLinkAction({
-    name: ({ t }) =>
-      share.collectionId ? t("Go to collection") : t("Go to document"),
-    analyticsName: "Go to share source",
-    section: ShareSection,
-    icon: <ArrowIcon />,
-    to: {
-      pathname: share.sourcePathWithFallback,
-      state: { sidebarContext: "collections" }, // optimistic preference of "collections"
-    },
-  });
-
-export const revokeShareFactory = ({
-  share,
-  can,
-}: {
-  share: Share;
-  can: Record<string, boolean>;
-}) =>
-  createAction({
-    name: ({ t }) => t("Revoke link"),
-    analyticsName: "Revoke share",
-    section: ShareSection,
-    icon: <TrashIcon />,
-    dangerous: true,
-    visible: !!can.revoke,
-    perform: async ({ t, stores }) => {
-      try {
-        await stores.shares.revoke(share);
-        toast.message(t("Share link revoked"));
-      } catch (err) {
-        toast.error(err.message);
-      }
-    },
-  });

app/actions/definitions/teams.tsx

@@ -1,28 +1,24 @@
 import { ArrowIcon, PlusIcon } from "outline-icons";
 import styled from "styled-components";
 import { stringToColor } from "@shared/utils/color";
-import type RootStore from "~/stores/RootStore";
+import RootStore from "~/stores/RootStore";
 import { LoginDialog } from "~/scenes/Login/components/LoginDialog";
 import TeamNew from "~/scenes/TeamNew";
 import TeamLogo from "~/components/TeamLogo";
-import {
-  createAction,
-  createActionWithChildren,
-  createExternalLinkAction,
-} from "~/actions";
-import type { ActionContext, ExternalLinkAction } from "~/types";
+import { createAction } from "~/actions";
+import { ActionContext } from "~/types";
 import Desktop from "~/utils/Desktop";
 import { TeamSection } from "../sections";
 
 export const switchTeamsList = ({ stores }: { stores: RootStore }) =>
-  stores.auth.availableTeams?.map<ExternalLinkAction>((session) =>
-    createExternalLinkAction({
-      id: `switch-${session.id}`,
-      name: session.name,
-      analyticsName: "Switch workspace",
-      section: TeamSection,
-      keywords: "change switch workspace organization team",
-      icon: (
+  stores.auth.availableTeams?.map((session) => ({
+    id: `switch-${session.id}`,
+    name: session.name,
+    analyticsName: "Switch workspace",
+    section: TeamSection,
+    keywords: "change switch workspace organization team",
+    icon: function _Icon() {
+      return (
         <StyledTeamLogo
           alt={session.name}
           model={{
@@ -33,15 +29,13 @@ export const switchTeamsList = ({ stores }: { stores: RootStore }) =>
           }}
           size={24}
         />
-      ),
-      visible: ({ currentTeamId }: ActionContext) =>
-        currentTeamId !== session.id,
-      url: session.url,
-      target: "_self",
-    })
-  ) ?? [];
+      );
+    },
+    visible: ({ currentTeamId }: ActionContext) => currentTeamId !== session.id,
+    perform: () => (window.location.href = session.url),
+  })) ?? [];
 
-export const switchTeam = createActionWithChildren({
+export const switchTeam = createAction({
   name: ({ t }) => t("Switch workspace"),
   placeholder: ({ t }) => t("Select a workspace"),
   analyticsName: "Switch workspace",
@@ -68,6 +62,7 @@ export const createTeam = createAction({
     if (user) {
       stores.dialogs.openModal({
         title: t("Create a workspace"),
+        fullscreen: true,
         content: <TeamNew user={user} />,
       });
     }

app/actions/definitions/templates.tsx

@@ -1,230 +0,0 @@
-import copy from "copy-to-clipboard";
-import {
-  CaseSensitiveIcon,
-  CollectionIcon,
-  CopyIcon,
-  MoveIcon,
-  NewDocumentIcon,
-  PlusIcon,
-  PrintIcon,
-  TrashIcon,
-} from "outline-icons";
-import { Trans } from "react-i18next";
-import { toast } from "sonner";
-import ConfirmationDialog from "~/components/ConfirmationDialog";
-import TemplateMove from "~/components/DocumentExplorer/TemplateMove";
-import {
-  createAction,
-  createActionWithChildren,
-  createInternalLinkAction,
-} from "~/actions";
-import history from "~/utils/history";
-import {
-  newDocumentPath,
-  newTemplatePath,
-  settingsPath,
-  urlify,
-} from "~/utils/routeHelpers";
-import { ProsemirrorHelper } from "~/models/helpers/ProsemirrorHelper";
-import { ActiveTemplateSection, TemplateSection } from "../sections";
-import Template from "~/models/Template";
-import { AvatarSize } from "~/components/Avatar";
-import TeamLogo from "~/components/TeamLogo";
-
-export const createTemplate = createInternalLinkAction({
-  name: ({ t }) => t("New template"),
-  analyticsName: "New template",
-  section: TemplateSection,
-  icon: <PlusIcon />,
-  keywords: "new create template",
-  visible: ({ currentTeamId, stores }) =>
-    !!stores.policies.abilities(currentTeamId!).createTemplate,
-  to: newTemplatePath(),
-});
-
-export const deleteTemplate = createAction({
-  name: ({ t }) => `${t("Delete")}…`,
-  analyticsName: "Delete template",
-  section: ActiveTemplateSection,
-  icon: <TrashIcon />,
-  dangerous: true,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Template).some((policy) => policy.abilities.delete),
-  perform: ({ getActiveModel, stores, t }) => {
-    const template = getActiveModel(Template);
-    if (!template) {
-      return;
-    }
-
-    stores.dialogs.openModal({
-      title: t("Delete {{ documentName }}", {
-        documentName: t("template"),
-      }),
-      content: (
-        <ConfirmationDialog
-          onSubmit={async () => {
-            await template.delete();
-            history.push(settingsPath("templates"));
-            toast.success(t("Template deleted"));
-          }}
-          savingText={`${t("Deleting")}…`}
-          danger
-        >
-          <Trans
-            defaults="Are you sure about that? Deleting the <em>{{ templateName }}</em> template is permanent."
-            values={{
-              templateName: template.titleWithDefault,
-            }}
-            components={{
-              em: <strong />,
-            }}
-          />
-        </ConfirmationDialog>
-      ),
-    });
-  },
-});
-
-export const moveTemplateToWorkspace = createAction({
-  name: ({ t }) => t("Move to workspace"),
-  analyticsName: "Move template to workspace",
-  section: ActiveTemplateSection,
-  icon: ({ stores }) => {
-    const { team } = stores.auth;
-    return <TeamLogo model={team} size={AvatarSize.Small} />;
-  },
-  visible: ({ getActiveModel }) => {
-    const template = getActiveModel(Template);
-    return !!template?.collectionId;
-  },
-  perform: async ({ getActiveModel, stores, t }) => {
-    const template = getActiveModel(Template);
-    if (!template) {
-      return;
-    }
-
-    try {
-      await template.save({ collectionId: null });
-      toast.success(t("Template moved"));
-      stores.dialogs.closeAllModals();
-    } catch (_err) {
-      toast.error(t("Couldn't move the template, try again?"));
-    }
-  },
-});
-
-export const moveTemplateToCollection = createAction({
-  name: ({ t }) => t("Move to collection"),
-  analyticsName: "Move template to collection",
-  section: ActiveTemplateSection,
-  icon: <CollectionIcon />,
-  perform: ({ getActiveModel, stores, t }) => {
-    const template = getActiveModel(Template);
-    if (!template) {
-      return;
-    }
-
-    stores.dialogs.openModal({
-      title: t("Move template"),
-      content: <TemplateMove template={template} />,
-    });
-  },
-});
-
-export const moveTemplate = createActionWithChildren({
-  name: ({ t }) => t("Move"),
-  analyticsName: "Move template",
-  section: ActiveTemplateSection,
-  icon: <MoveIcon />,
-  visible: ({ getActivePolicies }) =>
-    getActivePolicies(Template).some((policy) => policy.abilities.move),
-  children: [moveTemplateToWorkspace, moveTemplateToCollection],
-});
-
-export const createDocumentFromTemplate = createInternalLinkAction({
-  name: ({ t }) => t("New document"),
-  analyticsName: "New document from template",
-  section: ActiveTemplateSection,
-  icon: <NewDocumentIcon />,
-  keywords: "create",
-  visible: ({ currentTeamId, getActiveModel, stores }) => {
-    const template = getActiveModel(Template);
-    if (!template || !currentTeamId) {
-      return false;
-    }
-
-    if (template.collectionId) {
-      return !!stores.policies.abilities(template.collectionId).createDocument;
-    }
-    return !!stores.policies.abilities(currentTeamId).createDocument;
-  },
-  to: ({ getActiveModel, activeCollectionId, sidebarContext }) => {
-    const template = getActiveModel(Template);
-    if (!template) {
-      return "";
-    }
-    const collectionId = template?.collectionId ?? activeCollectionId;
-
-    const [pathname, search] = newDocumentPath(collectionId, {
-      templateId: template.id,
-    }).split("?");
-
-    return {
-      pathname,
-      search,
-      state: { sidebarContext },
-    };
-  },
-});
-
-export const copyTemplateLink = createAction({
-  name: ({ t }) => t("Copy link"),
-  analyticsName: "Copy template link",
-  section: ActiveTemplateSection,
-  icon: <CopyIcon />,
-  iconInContextMenu: false,
-  perform: ({ getActiveModel, t }) => {
-    const template = getActiveModel(Template);
-    if (template) {
-      copy(urlify(template.path));
-      toast.success(t("Link copied to clipboard"));
-    }
-  },
-});
-
-export const copyTemplateAsPlainText = createAction({
-  name: ({ t }) => t("Copy as text"),
-  analyticsName: "Copy template as text",
-  section: ActiveTemplateSection,
-  icon: <CaseSensitiveIcon />,
-  iconInContextMenu: false,
-  perform: async ({ getActiveModel, t }) => {
-    const template = getActiveModel(Template);
-    if (template) {
-      copy(ProsemirrorHelper.toPlainText(template));
-      toast.success(t("Text copied to clipboard"));
-    }
-  },
-});
-
-export const copyTemplate = createActionWithChildren({
-  name: ({ t }) => t("Copy"),
-  analyticsName: "Copy template",
-  section: ActiveTemplateSection,
-  icon: <CopyIcon />,
-  keywords: "clipboard",
-  children: [copyTemplateLink, copyTemplateAsPlainText],
-});
-
-export const printTemplate = createAction({
-  name: ({ t, isMenu }) => (isMenu ? t("Print") : t("Print template")),
-  analyticsName: "Print template",
-  section: ActiveTemplateSection,
-  icon: <PrintIcon />,
-  visible: ({ getActiveModel }) => !!getActiveModel(Template) && !!window.print,
-  perform: () => {
-    setTimeout(window.print, 0);
-  },
-});
-
-export const rootTemplateActions = [moveTemplate, createDocumentFromTemplate];

app/actions/definitions/users.tsx

@@ -1,8 +1,8 @@
 import { PlusIcon } from "outline-icons";
-import type { UserRole } from "@shared/types";
+import { UserRole } from "@shared/types";
 import { UserRoleHelper } from "@shared/utils/UserRoleHelper";
 import stores from "~/stores";
-import type User from "~/models/User";
+import User from "~/models/User";
 import Invite from "~/scenes/Invite";
 import {
   UserChangeRoleDialog,
@@ -22,7 +22,6 @@ export const inviteUser = createAction({
   perform: ({ t }) => {
     stores.dialogs.openModal({
       title: t("Invite to workspace"),
-      width: "500px",
       content: <Invite onSubmit={stores.dialogs.closeAllModals} />,
     });
   },
@@ -46,8 +45,8 @@ export const updateUserRoleActionFactory = (user: User, role: UserRole) =>
       return UserRoleHelper.isRoleHigher(role, user.role)
         ? can.promote
         : UserRoleHelper.isRoleLower(role, user.role)
-          ? can.demote
-          : false;
+        ? can.demote
+        : false;
     },
     perform: ({ t }) => {
       stores.dialogs.openModal({

app/actions/index.ts

@@ -1,295 +1,130 @@
-import type { LocationDescriptor } from "history";
+import flattenDeep from "lodash/flattenDeep";
 import { toast } from "sonner";
-import type { Optional } from "utility-types";
+import { Optional } from "utility-types";
 import { v4 as uuidv4 } from "uuid";
-import type {
-  ActionContext,
+import {
   Action,
-  ActionGroup,
-  ActionSeparator as TActionSeparator,
-  ActionVariant,
-  ActionWithChildren,
-  ExternalLinkAction,
-  InternalLinkAction,
-  MenuItem,
+  ActionContext,
+  CommandBarAction,
+  MenuItemButton,
+  MenuItemWithChildren,
 } from "~/types";
 import Analytics from "~/utils/Analytics";
-import history from "~/utils/history";
-import type { Action as KbarAction } from "kbar";
 
-export function resolve<T>(value: unknown, context: ActionContext): T {
-  return (
-    typeof value === "function"
-      ? (value as (context: ActionContext) => T)(context)
-      : value
-  ) as T;
+function resolve<T>(value: any, context: ActionContext): T {
+  return typeof value === "function" ? value(context) : value;
 }
 
-export const ActionSeparator: TActionSeparator = {
-  type: "action_separator",
-};
-
-export function createAction(
-  definition: Optional<Omit<Action, "type" | "variant">, "id">
-): Action {
+export function createAction(definition: Optional<Action, "id">): Action {
   return {
     ...definition,
-    type: "action",
-    variant: "action",
     perform: definition.perform
       ? (context) => {
-          // We must use the specific analytics name here as the action name is
+          // We muse 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",
+                ? "commandbar"
+                : "contextmenu",
             });
           }
-          return definition.perform(context);
+
+          return definition.perform?.(context);
         }
-      : () => {},
+      : undefined,
     id: definition.id ?? uuidv4(),
   };
 }
 
-export function createInternalLinkAction(
-  definition: Optional<Omit<InternalLinkAction, "type" | "variant">, "id">
-): InternalLinkAction {
-  return {
-    ...definition,
-    type: "action",
-    variant: "internal_link",
-    id: definition.id ?? uuidv4(),
-  };
-}
-
-export function createExternalLinkAction(
-  definition: Optional<Omit<ExternalLinkAction, "type" | "variant">, "id">
-): ExternalLinkAction {
-  return {
-    ...definition,
-    type: "action",
-    variant: "external_link",
-    id: definition.id ?? uuidv4(),
-  };
-}
-
-export function createActionWithChildren(
-  definition: Optional<Omit<ActionWithChildren, "type" | "variant">, "id">
-): ActionWithChildren {
-  return {
-    ...definition,
-    type: "action",
-    variant: "action_with_children",
-    id: definition.id ?? uuidv4(),
-  };
-}
-
-export function createActionGroup(
-  definition: Omit<ActionGroup, "type">
-): ActionGroup {
-  return {
-    ...definition,
-    type: "action_group",
-  };
-}
-
-export function createRootMenuAction(
-  actions: (ActionVariant | ActionGroup | TActionSeparator)[]
-): ActionWithChildren {
-  return {
-    id: uuidv4(),
-    type: "action",
-    variant: "action_with_children",
-    name: "root_action",
-    section: "Root",
-    children: actions,
-  };
-}
-
 export function actionToMenuItem(
-  action: ActionVariant | ActionGroup | TActionSeparator,
+  action: Action,
   context: ActionContext
-): MenuItem {
-  switch (action.type) {
-    case "action": {
-      const title = resolve<string>(action.name, context);
-      const visible = resolve<boolean>(action.visible, context) ?? true;
-      const disabled = resolve<boolean>(action.disabled, context);
-      const icon =
-        !!action.icon && action.iconInContextMenu !== false
-          ? resolve<React.ReactNode>(action.icon, context)
-          : undefined;
+): MenuItemButton | 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;
 
-      switch (action.variant) {
-        case "action":
-          return {
-            type: "button",
-            title,
-            icon,
-            visible,
-            disabled,
-            tooltip: resolve<React.ReactChild>(action.tooltip, context),
-            selected: resolve<boolean>(action.selected, context),
-            dangerous: action.dangerous,
-            shortcut: action.shortcut,
-            onClick: () => performAction(action, context),
-          };
+  if (resolvedChildren) {
+    const items = resolvedChildren
+      .map((a) => actionToMenuItem(a, context))
+      .filter(Boolean)
+      .filter((a) => a.visible);
 
-        case "internal_link": {
-          const to = resolve<LocationDescriptor>(action.to, context);
-          return {
-            type: "route",
-            title,
-            icon,
-            visible,
-            disabled,
-            shortcut: action.shortcut,
-            to,
-          };
-        }
-
-        case "external_link":
-          return {
-            type: "link",
-            title,
-            icon,
-            visible,
-            disabled,
-            shortcut: action.shortcut,
-            href: action.target
-              ? { url: action.url, target: action.target }
-              : action.url,
-          };
-
-        case "action_with_children": {
-          const children = resolve<
-            (ActionVariant | ActionGroup | TActionSeparator)[]
-          >(action.children, context);
-          const subMenuItems = children.map((a) =>
-            actionToMenuItem(a, context)
-          );
-          return {
-            type: "submenu",
-            title,
-            icon,
-            items: subMenuItems,
-            disabled,
-            visible: visible && hasVisibleItems(subMenuItems),
-          };
-        }
-
-        default:
-          throw Error("invalid action variant");
-      }
-    }
-
-    case "action_group": {
-      const groupItems = action.actions.map((a) =>
-        actionToMenuItem(a, context)
-      );
-      return {
-        type: "group",
-        title: resolve<string>(action.name, context),
-        visible: hasVisibleItems(groupItems),
-        items: groupItems,
-      };
-    }
-
-    case "action_separator":
-      return { type: "separator" };
+    return {
+      type: "submenu",
+      title,
+      icon,
+      items,
+      visible: visible && items.length > 0,
+    };
   }
+
+  return {
+    type: "button",
+    title,
+    icon,
+    visible,
+    dangerous: action.dangerous,
+    onClick: () => performAction(action, context),
+    selected: action.selected?.(context),
+  };
 }
 
 export function actionToKBar(
-  action: ActionVariant,
+  action: Action,
   context: ActionContext
-): KbarAction[] {
-  const visible = resolve<boolean>(action.visible, context);
-  if (visible === false) {
+): CommandBarAction[] {
+  if (typeof action.visible === "function" && !action.visible(context)) {
     return [];
   }
 
-  const name = resolve<string>(action.name, context);
-  const icon = resolve<React.ReactElement>(action.icon, context);
-  const section = resolve<string>(action.section, context);
-  const subtitle = resolve<string>(action.description, context);
+  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)
+      ? (action.section.priority as number) ?? 0
       : 0;
 
-  const priority = (1 + (action.priority ?? 0)) * (1 + (sectionPriority ?? 0));
-
-  switch (action.variant) {
-    case "action":
-    case "internal_link":
-    case "external_link": {
-      return [
-        {
-          id: action.id,
-          name,
-          section,
-          keywords: action.keywords,
-          shortcut: action.shortcut,
-          subtitle,
-          icon,
-          priority,
-          perform: () => performAction(action, context),
-        },
-      ];
-    }
-
-    case "action_with_children": {
-      const resolvedChildren = resolve<ActionVariant[]>(
-        action.children,
-        context
-      );
-      const children = resolvedChildren
-        .map((a) => actionToKBar(a, context))
-        .flat()
-        .filter(Boolean);
-
-      return [
-        {
-          id: action.id,
-          name,
-          section,
-          keywords: action.keywords,
-          shortcut: action.shortcut,
-          icon,
-          subtitle,
-          priority,
-        },
-        ...children.map((child) => ({
-          ...child,
-          parent: child.parent ?? action.id,
-        })),
-      ];
-    }
-
-    default:
-      throw Error("invalid action variant");
-  }
+  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
+        ? () => 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: Exclude<ActionVariant, ActionWithChildren>,
-  context: ActionContext
-) {
-  const perform =
-    action.variant === "action"
-      ? () => action.perform(context)
-      : action.variant === "internal_link"
-        ? () => history.push(resolve<LocationDescriptor>(action.to, context))
-        : () => window.open(action.url, action.target);
-
-  const result = perform();
+export async function performAction(action: Action, context: ActionContext) {
+  const result = action.perform?.(context);
 
   if (result instanceof Promise) {
     return result.catch((err: Error) => {
@@ -299,10 +134,3 @@ export async function performAction(
 
   return result;
 }
-
-function hasVisibleItems(items: MenuItem[]) {
-  const applicableTypes = ["button", "link", "route", "group", "submenu"];
-  return items.some(
-    (item) => applicableTypes.includes(item.type) && item.visible
-  );
-}

app/actions/sections.ts

@@ -1,4 +1,4 @@
-import type { ActionContext } from "~/types";
+import { ActionContext } from "~/types";
 
 export const CollectionSection = ({ t }: ActionContext) => t("Collection");
 
@@ -13,15 +13,8 @@ ActiveCollectionSection.priority = 0.8;
 
 export const DeveloperSection = ({ t }: ActionContext) => t("Debug");
 
-export const DateSection = ({ t }: ActionContext) => t("Date");
-
-DateSection.priority = 1;
-
 export const DocumentSection = ({ t }: ActionContext) => t("Document");
 
-export const SearchResultsSection = ({ t }: ActionContext) =>
-  t("Search results");
-
 export const DocumentsSection = ({ t }: ActionContext) => t("Documents");
 
 export const ActiveDocumentSection = ({ t, stores }: ActionContext) => {
@@ -31,15 +24,6 @@ export const ActiveDocumentSection = ({ t, stores }: ActionContext) => {
 
 ActiveDocumentSection.priority = 0.9;
 
-export const TemplateSection = ({ t }: ActionContext) => t("Template");
-
-export const ActiveTemplateSection = ({ t, stores }: ActionContext) => {
-  const activeTemplate = stores.templates.active;
-  return `${t("Template")} · ${activeTemplate?.titleWithDefault}`;
-};
-
-ActiveTemplateSection.priority = 0.9;
-
 export const RecentSection = ({ t }: ActionContext) => t("Recently viewed");
 
 RecentSection.priority = 1;
@@ -52,20 +36,14 @@ export const NavigationSection = ({ t }: ActionContext) => t("Navigation");
 
 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;
 
-export const ShareSection = ({ t }: ActionContext) => t("Share");
-
 export const TeamSection = ({ t }: ActionContext) => t("Workspace");
 
 export const RecentSearchesSection = ({ t }: ActionContext) =>
-  t("Recently viewed");
+  t("Recent searches");
 
 RecentSearchesSection.priority = -0.1;
 

app/components/ActionButton.tsx

@@ -1,12 +1,9 @@
-/* oxlint-disable react/prop-types */
-import { observer } from "mobx-react";
+/* eslint-disable react/prop-types */
 import * as React from "react";
-import type { Props as TooltipProps } from "~/components/Tooltip";
-import Tooltip from "~/components/Tooltip";
-import { performAction, resolve } from "~/actions";
+import Tooltip, { Props as TooltipProps } from "~/components/Tooltip";
+import { performAction } from "~/actions";
 import useIsMounted from "~/hooks/useIsMounted";
-import useActionContext from "~/hooks/useActionContext";
-import type { ActionVariant, ActionWithChildren } from "~/types";
+import { Action, ActionContext } from "~/types";
 
 export type Props = React.HTMLAttributes<HTMLButtonElement> & {
   /** Show the button in a disabled state */
@@ -14,7 +11,9 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
   /** Hide the button entirely if action is not applicable */
   hideOnActionDisabled?: boolean;
   /** Action to use on button */
-  action?: Exclude<ActionVariant, ActionWithChildren>;
+  action?: Action;
+  /** Context of action, must be provided with action */
+  context?: ActionContext;
   /** If tooltip props are provided the button will be wrapped in a tooltip */
   tooltip?: Omit<TooltipProps, "children">;
 };
@@ -23,34 +22,35 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  * Button that can be used to trigger an action definition.
  */
 const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
-  function ActionButton_(
-    { action, tooltip, hideOnActionDisabled, ...rest }: Props,
+  function _ActionButton(
+    { action, context, tooltip, hideOnActionDisabled, ...rest }: Props,
     ref: React.Ref<HTMLButtonElement>
   ) {
-    const actionContext = useActionContext({
-      isButton: true,
-    });
     const isMounted = useIsMounted();
     const [executing, setExecuting] = React.useState(false);
+    const disabled = rest.disabled;
 
-    if (!actionContext || !action) {
+    if (action && !context) {
+      throw new Error("Context must be provided with action");
+    }
+    if (!context || !action) {
       return <button {...rest} ref={ref} />;
     }
 
-    const actionIsDisabled =
-      action.visible && !resolve<boolean>(action.visible, actionContext);
+    const actionContext = { ...context, isButton: true };
 
-    if (actionIsDisabled && hideOnActionDisabled) {
+    if (
+      action?.visible &&
+      !action.visible(actionContext) &&
+      hideOnActionDisabled
+    ) {
       return null;
     }
 
-    const disabled = rest.disabled || actionIsDisabled;
-
     const label =
-      rest["aria-label"] ??
-      (typeof action.name === "function"
+      typeof action.name === "function"
         ? action.name(actionContext)
-        : action.name);
+        : action.name;
 
     const button = (
       <button
@@ -59,7 +59,7 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
         disabled={disabled || executing}
         ref={ref}
         onClick={
-          actionContext
+          action?.perform && actionContext
             ? (ev) => {
                 ev.preventDefault();
                 ev.stopPropagation();
@@ -86,4 +86,4 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
   }
 );
 
-export default observer(ActionButton);
+export default ActionButton;

app/components/Actions.ts

@@ -6,6 +6,7 @@ import Flex from "~/components/Flex";
 export const Action = styled(Flex)`
   justify-content: center;
   align-items: center;
+  padding: 0 0 0 12px;
   height: 32px;
   font-size: 15px;
   flex-shrink: 0;
@@ -17,6 +18,7 @@ export const Action = styled(Flex)`
 
 export const Separator = styled.div`
   flex-shrink: 0;
+  margin-left: 12px;
   width: 1px;
   height: 28px;
   background: ${s("divider")};
@@ -31,7 +33,6 @@ const Actions = styled(Flex)`
   background: ${s("background")};
   padding: 12px;
   backdrop-filter: blur(20px);
-  gap: 12px;
 
   @media print {
     display: none;

app/components/Analytics.tsx

@@ -1,9 +1,8 @@
-/* oxlint-disable prefer-rest-params */
+/* eslint-disable prefer-rest-params */
 /* global ga */
-import { escape } from "es-toolkit/compat";
+import escape from "lodash/escape";
 import * as React from "react";
-import type { PublicEnv } from "@shared/types";
-import { IntegrationService } from "@shared/types";
+import { IntegrationService, PublicEnv } from "@shared/types";
 import env from "~/env";
 
 type Props = {

app/components/Arrow.tsx

@@ -0,0 +1,14 @@
+export default function Arrow() {
+  return (
+    <svg
+      width="13"
+      height="30"
+      viewBox="0 0 13 30"
+      fill="currentColor"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path d="M7.40242 1.48635C8.23085 0.0650039 10.0656 -0.421985 11.5005 0.39863C12.9354 1.21924 13.427 3.03671 12.5986 4.45806L5.59858 16.4681C4.77015 17.8894 2.93538 18.3764 1.5005 17.5558C0.065623 16.7352 -0.426002 14.9177 0.402425 13.4964L7.40242 1.48635Z" />
+      <path d="M12.5986 25.5419C13.427 26.9633 12.9354 28.7808 11.5005 29.6014C10.0656 30.422 8.23087 29.935 7.40244 28.5136L0.402438 16.5036C-0.425989 15.0823 0.0656365 13.2648 1.50051 12.4442C2.93539 11.6236 4.77016 12.1106 5.59859 13.5319L12.5986 25.5419Z" />
+    </svg>
+  );
+}

app/components/Authenticated.tsx

@@ -1,5 +1,5 @@
 import { observer } from "mobx-react";
-import { useEffect, useRef } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { Redirect } from "react-router-dom";
 import useCurrentUser from "~/hooks/useCurrentUser";
@@ -16,7 +16,6 @@ const Authenticated = ({ children }: Props) => {
   const { i18n } = useTranslation();
   const user = useCurrentUser({ rejectOnEmpty: false });
   const language = user?.language;
-  const hasLoggedOut = useRef(false);
 
   // Watching for language changes here as this is the earliest point we might have the user
   // available and means we can start loading translations faster
@@ -24,36 +23,15 @@ const Authenticated = ({ children }: Props) => {
     void changeLanguage(language, i18n);
   }, [i18n, language]);
 
-  const shouldLogout = !auth.authenticated && !auth.isFetching;
-
-  // Passive logout when we land here without an authenticated session – note we
-  // intentionally do not revoke the server-side token, as that would clobber
-  // the session in any other tab that may have already re-authenticated.
-  useEffect(() => {
-    if (shouldLogout && !hasLoggedOut.current) {
-      hasLoggedOut.current = true;
-      void auth.logout({
-        savePath: true,
-        clearCache: false,
-        revokeToken: false,
-      });
-    }
-  }, [shouldLogout, auth]);
-
-  useEffect(() => {
-    if (auth.logoutRedirectUri) {
-      window.location.href = auth.logoutRedirectUri;
-    }
-  }, [auth.logoutRedirectUri]);
-
   if (auth.authenticated) {
     return children;
   }
 
-  if (auth.isFetching || auth.logoutRedirectUri) {
+  if (auth.isFetching) {
     return <LoadingIndicator />;
   }
 
+  void auth.logout(true);
   return <Redirect to="/" />;
 };
 

app/components/AuthenticatedLayout.tsx

@@ -1,56 +1,62 @@
+import { AnimatePresence } from "framer-motion";
 import { observer } from "mobx-react";
 import * as React from "react";
-import { DndProvider } from "react-dnd";
-import { useLocation } from "react-router-dom";
-import { EditorAwareHTML5Backend } from "~/components/EditorAwareHTML5Backend";
+import {
+  Switch,
+  Route,
+  useLocation,
+  matchPath,
+  Redirect,
+} from "react-router-dom";
+import { TeamPreference } from "@shared/types";
 import ErrorSuspended from "~/scenes/Errors/ErrorSuspended";
 import Layout from "~/components/Layout";
 import RegisterKeyDown from "~/components/RegisterKeyDown";
-import { RightSidebarProvider } from "~/components/RightSidebarContext";
 import Sidebar from "~/components/Sidebar";
+import SidebarRight from "~/components/Sidebar/Right";
+import SettingsSidebar from "~/components/Sidebar/Settings";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
-import useKeyDown from "~/hooks/useKeyDown";
 import { usePostLoginPath } from "~/hooks/useLastVisitedPath";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
-import Logger from "~/utils/Logger";
 import history from "~/utils/history";
-import { isModKey } from "@shared/utils/keyboard";
 import lazyWithRetry from "~/utils/lazyWithRetry";
 import {
   searchPath,
   newDocumentPath,
   settingsPath,
-  homePath,
+  matchDocumentHistory,
+  matchDocumentSlug as slug,
+  matchDocumentInsights,
 } from "~/utils/routeHelpers";
 import { DocumentContextProvider } from "./DocumentContext";
 import Fade from "./Fade";
-import NotificationBadge from "./NotificationBadge";
 import { PortalContext } from "./Portal";
-import CommandBar from "./CommandBar";
 
-const SettingsSidebar = lazyWithRetry(
-  () => import("~/components/Sidebar/Settings")
+const DocumentComments = lazyWithRetry(
+  () => import("~/scenes/Document/components/Comments")
 );
+const DocumentHistory = lazyWithRetry(
+  () => import("~/scenes/Document/components/History")
+);
+const DocumentInsights = lazyWithRetry(
+  () => import("~/scenes/Document/components/Insights")
+);
+const CommandBar = lazyWithRetry(() => import("~/components/CommandBar"));
 
 type Props = {
   children?: React.ReactNode;
 };
 
 const AuthenticatedLayout: React.FC = ({ children }: Props) => {
-  const { ui, auth } = useStores();
+  const { ui, auth, collections } = useStores();
   const location = useLocation();
   const layoutRef = React.useRef<HTMLDivElement>(null);
+  const can = usePolicy(ui.activeDocumentId);
   const canCollection = usePolicy(ui.activeCollectionId);
   const team = useCurrentTeam();
   const [spendPostLoginPath] = usePostLoginPath();
 
-  useKeyDown(".", (event) => {
-    if (isModKey(event)) {
-      ui.toggleCollapsedSidebar();
-    }
-  });
-
   const goToSearch = (ev: KeyboardEvent) => {
     if (!ev.metaKey && !ev.ctrlKey) {
       ev.preventDefault();
@@ -70,54 +76,79 @@ const AuthenticatedLayout: React.FC = ({ children }: Props) => {
     history.push(newDocumentPath(activeCollectionId));
   };
 
-  React.useEffect(() => {
-    const postLoginPath = spendPostLoginPath();
-    if (postLoginPath) {
-      try {
-        history.replace(postLoginPath);
-      } catch (err) {
-        Logger.warn("Failed to navigate to post login path, falling back", {
-          path: postLoginPath,
-          error: err,
-        });
-        history.replace(homePath());
-      }
-    }
-  }, [spendPostLoginPath]);
-
   if (auth.isSuspended) {
     return <ErrorSuspended />;
   }
 
-  const isSettings = location.pathname.startsWith(settingsPath());
+  const postLoginPath = spendPostLoginPath();
+  if (postLoginPath) {
+    return <Redirect to={postLoginPath} />;
+  }
 
   const sidebar = (
     <Fade>
-      <React.Suspense fallback={null}>
-        {isSettings && <SettingsSidebar />}
-      </React.Suspense>
-      <div style={isSettings ? { display: "none" } : undefined}>
-        <Sidebar />
-      </div>
+      <Switch>
+        <Route path={settingsPath()} component={SettingsSidebar} />
+        <Route component={Sidebar} />
+      </Switch>
     </Fade>
   );
 
+  const showHistory =
+    !!matchPath(location.pathname, {
+      path: matchDocumentHistory,
+    }) && can.listRevisions;
+  const showInsights =
+    !!matchPath(location.pathname, {
+      path: matchDocumentInsights,
+    }) && can.listViews;
+  const showComments =
+    !showInsights &&
+    !showHistory &&
+    can.comment &&
+    ui.activeDocumentId &&
+    ui.commentsExpanded &&
+    (ui.activeCollectionId
+      ? collections.get(ui.activeCollectionId)?.canCreateComment
+      : !!team.getPreference(TeamPreference.Commenting));
+
+  const sidebarRight = (
+    <AnimatePresence
+      initial={false}
+      key={ui.activeDocumentId ? "active" : "inactive"}
+    >
+      {(showHistory || showInsights || showComments) && (
+        <Route path={`/doc/${slug}`}>
+          <SidebarRight>
+            <React.Suspense fallback={null}>
+              {showHistory && <DocumentHistory />}
+              {showInsights && <DocumentInsights />}
+              {showComments && <DocumentComments />}
+            </React.Suspense>
+          </SidebarRight>
+        </Route>
+      )}
+    </AnimatePresence>
+  );
+
   return (
     <DocumentContextProvider>
-      <RightSidebarProvider>
-        <PortalContext.Provider value={layoutRef.current}>
-          <DndProvider backend={EditorAwareHTML5Backend}>
-            <Layout title={team.name} sidebar={sidebar} ref={layoutRef}>
-              <RegisterKeyDown trigger="n" handler={goToNewDocument} />
-              <RegisterKeyDown trigger="t" handler={goToSearch} />
-              <RegisterKeyDown trigger="/" handler={goToSearch} />
-              {children}
-              <CommandBar />
-              <NotificationBadge />
-            </Layout>
-          </DndProvider>
-        </PortalContext.Provider>
-      </RightSidebarProvider>
+      <PortalContext.Provider value={layoutRef.current}>
+        <Layout
+          title={team.name}
+          sidebar={sidebar}
+          sidebarRight={sidebarRight}
+          ref={layoutRef}
+        >
+          <RegisterKeyDown trigger="n" handler={goToNewDocument} />
+          <RegisterKeyDown trigger="t" handler={goToSearch} />
+          <RegisterKeyDown trigger="/" handler={goToSearch} />
+          {children}
+          <React.Suspense fallback={null}>
+            <CommandBar />
+          </React.Suspense>
+        </Layout>
+      </PortalContext.Provider>
     </DocumentContextProvider>
   );
 };

app/components/Avatar/Avatar.tsx

@@ -1,9 +1,7 @@
-import { observer } from "mobx-react";
 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,
@@ -24,7 +22,6 @@ export interface IAvatar {
   avatarUrl: string | null;
   color?: string;
   initial?: string;
-  name?: string;
   id?: string;
 }
 
@@ -45,8 +42,6 @@ type Props = {
   className?: string;
   /** Optional style */
   style?: React.CSSProperties;
-  /** Whether to show a tooltip */
-  showTooltip?: boolean;
 };
 
 function Avatar(props: Props) {
@@ -55,15 +50,12 @@ function Avatar(props: Props) {
     style,
     variant = AvatarVariant.Round,
     className,
-    showTooltip,
     ...rest
   } = props;
   const src = props.src || model?.avatarUrl;
   const [error, handleError] = useBoolean(false);
-  const initial =
-    model?.initial || (model?.name ? model.name[0] : "").toUpperCase();
 
-  const content = (
+  return (
     <Relative
       style={style}
       $variant={variant}
@@ -74,19 +66,13 @@ function Avatar(props: Props) {
         <Image onError={handleError} src={src} {...rest} />
       ) : model ? (
         <Initials color={model.color} {...rest}>
-          {initial}
+          {model.initial}
         </Initials>
       ) : (
         <Initials {...rest} />
       )}
     </Relative>
   );
-
-  return showTooltip ? (
-    <Tooltip content={props.alt || model?.name || ""}>{content}</Tooltip>
-  ) : (
-    content
-  );
 }
 
 Avatar.defaultProps = {
@@ -110,4 +96,4 @@ const Image = styled.img<{ size: number }>`
   height: ${(props) => props.size}px;
 `;
 
-export default observer(Avatar);
+export default Avatar;

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 type User from "~/models/User";
+import User from "~/models/User";
 import Tooltip from "~/components/Tooltip";
 import Avatar, { AvatarSize } from "./Avatar";
 
@@ -25,8 +25,6 @@ type Props = {
   onClick?: React.MouseEventHandler<HTMLImageElement>;
   /** Size of the avatar, defaults to AvatarSize.Large */
   size?: AvatarSize;
-  /** Optional alt text for the avatar image */
-  alt?: string;
   /** Optional inline styles to apply to the avatar wrapper */
   style?: React.CSSProperties;
 };
@@ -55,7 +53,6 @@ function AvatarWithPresence({
   isCurrentUser,
   size = AvatarSize.Large,
   style,
-  alt,
 }: Props) {
   const { t } = useTranslation();
   const status = isPresent
@@ -86,7 +83,7 @@ function AvatarWithPresence({
           $color={user.color}
           style={style}
         >
-          <Avatar model={user} onClick={onClick} size={size} alt={alt} />
+          <Avatar model={user} onClick={onClick} size={size} />
         </AvatarPresence>
       </Tooltip>
     </>

app/components/Avatar/GroupAvatar.tsx

@@ -1,7 +1,7 @@
 import { GroupIcon } from "outline-icons";
 import { useTheme } from "styled-components";
 import Squircle from "@shared/components/Squircle";
-import type Group from "~/models/Group";
+import Group from "~/models/Group";
 import { AvatarSize } from "../Avatar/Avatar";
 
 type Props = {
@@ -26,7 +26,6 @@ export function GroupAvatar({
   return (
     <Squircle color={color ?? theme.text} size={size} className={className}>
       <GroupIcon
-        data-fixed-color
         color={backgroundColor ?? theme.background}
         size={size * 0.75}
       />

app/components/Avatar/index.ts

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

app/components/Badge.ts

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

app/components/Branding.tsx

@@ -1,5 +1,5 @@
-import * as React from "react";
 import styled from "styled-components";
+import breakpoint from "styled-components-breakpoint";
 import { depths, s } from "@shared/styles";
 import env from "~/env";
 import OutlineIcon from "./Icons/OutlineIcon";
@@ -10,7 +10,7 @@ type Props = {
 
 function Branding({ href = env.URL }: Props) {
   return (
-    <Link href={href} target="_blank">
+    <Link href={href}>
       <OutlineIcon size={20} />
       &nbsp;{env.APP_NAME}
     </Link>
@@ -33,16 +33,18 @@ const Link = styled.a`
     fill: ${s("text")};
   }
 
-  z-index: ${depths.sidebar + 1};
-  background: ${s("sidebarBackground")};
-  position: fixed;
-  bottom: 0;
-  right: 0;
-  padding: 16px;
+  ${breakpoint("tablet")`
+    z-index: ${depths.sidebar + 1};
+    background: ${s("sidebarBackground")};
+    position: fixed;
+    bottom: 0;
+    right: 0;
+    padding: 16px;
 
-  &:hover {
-    background: ${s("sidebarControlHoverBackground")};
-  }
+    &:hover {
+      background: ${s("sidebarControlHoverBackground")};
+    }
+  `};
 `;
 
-export default React.memo(Branding);
+export default Branding;

app/components/Breadcrumb.tsx

@@ -1,5 +1,4 @@
 import { GoToIcon } from "outline-icons";
-import { observer } from "mobx-react";
 import * as React from "react";
 import { Link } from "react-router-dom";
 import styled from "styled-components";
@@ -7,96 +6,55 @@ import { s, ellipsis } from "@shared/styles";
 import Flex from "~/components/Flex";
 import BreadcrumbMenu from "~/menus/BreadcrumbMenu";
 import { undraggableOnDesktop } from "~/styles";
-import type { InternalLinkAction, MenuInternalLink } from "~/types";
-import { actionToMenuItem } from "~/actions";
-import useActionContext from "~/hooks/useActionContext";
-import { useComputed } from "~/hooks/useComputed";
-
-type TopLevelAction =
-  | InternalLinkAction
-  | { type: "menu"; actions: InternalLinkAction[] };
+import { MenuInternalLink } from "~/types";
 
 type Props = React.PropsWithChildren<{
-  actions: InternalLinkAction[];
+  items: MenuInternalLink[];
   max?: number;
   highlightFirstItem?: boolean;
 }>;
 
 function Breadcrumb(
-  { actions, highlightFirstItem, children, max = 2 }: Props,
+  { items, highlightFirstItem, children, max = 2 }: Props,
   ref: React.RefObject<HTMLDivElement> | null
 ) {
-  const actionContext = useActionContext({ isMenu: true });
-
-  const visibleActions = useComputed(
-    () =>
-      actions.filter((action) =>
-        typeof action.visible === "function"
-          ? action.visible(actionContext)
-          : (action.visible ?? true)
-      ),
-    [actions, actionContext]
-  );
-  const totalVisibleActions = visibleActions.length;
-
-  const topLevelActions: TopLevelAction[] = [...visibleActions];
+  const totalItems = items.length;
+  const topLevelItems: MenuInternalLink[] = [...items];
+  let overflowItems;
 
   // chop middle breadcrumbs and present a "..." menu instead
-  if (totalVisibleActions > max) {
+  if (totalItems > max) {
     const halfMax = Math.floor(max / 2);
-    const menuActions = topLevelActions.splice(
-      halfMax,
-      totalVisibleActions - max
-    ) as InternalLinkAction[];
+    overflowItems = topLevelItems.splice(halfMax, totalItems - max);
 
-    topLevelActions.splice(halfMax, 0, {
-      type: "menu",
-      actions: menuActions,
+    topLevelItems.splice(halfMax, 0, {
+      to: "",
+      type: "route",
+      title: <BreadcrumbMenu items={overflowItems as MenuInternalLink[]} />,
     });
   }
 
-  const handleClick = React.useCallback(
-    (event: React.MouseEvent<HTMLAnchorElement>) => {
-      if (event.currentTarget.querySelector('[data-state="open"]')) {
-        event.preventDefault();
-      }
-    },
-    []
-  );
-
-  const toBreadcrumb = React.useCallback(
-    (action: TopLevelAction, index: number) => {
-      if (action.type === "menu") {
-        return <BreadcrumbMenu key="menu" actions={action.actions} />;
-      }
-
-      const item = actionToMenuItem(action, actionContext) as MenuInternalLink;
-
-      return (
-        <>
-          {item.icon}
-          <Item
-            to={item.to}
-            onClick={handleClick}
-            $withIcon={!!item.icon}
-            $highlight={!!highlightFirstItem && index === 0}
-          >
-            {item.title}
-          </Item>
-        </>
-      );
-    },
-    [actionContext, handleClick, highlightFirstItem]
-  );
-
   return (
     <Flex justify="flex-start" align="center" ref={ref}>
-      {topLevelActions.map((action, index) => (
-        <React.Fragment key={action.type === "menu" ? "menu" : `item-${index}`}>
-          {toBreadcrumb(action, index)}
-          {index !== topLevelActions.length - 1 || !!children ? (
-            <Slash />
-          ) : null}
+      {topLevelItems.map((item, index) => (
+        <React.Fragment
+          key={
+            (typeof item.to === "string" ? item.to : item.to.pathname) || index
+          }
+        >
+          {item.icon}
+          {item.to ? (
+            <Item
+              to={item.to}
+              $withIcon={!!item.icon}
+              $highlight={!!highlightFirstItem && index === 0}
+            >
+              {item.title}
+            </Item>
+          ) : (
+            item.title
+          )}
+          {index !== topLevelItems.length - 1 || !!children ? <Slash /> : null}
         </React.Fragment>
       ))}
       {children}
@@ -113,20 +71,23 @@ const Item = styled(Link)<{ $highlight: boolean; $withIcon: boolean }>`
   ${ellipsis()}
   ${undraggableOnDesktop()}
 
+  display: flex;
   flex-shrink: 1;
   min-width: 0;
   cursor: var(--pointer);
   color: ${s("text")};
   font-size: 15px;
   height: 24px;
-  line-height: 24px;
   font-weight: ${(props) => (props.$highlight ? "500" : "inherit")};
-  margin-inline-start: ${(props) => (props.$withIcon ? "4px" : "0")};
-  max-width: 460px;
+  margin-left: ${(props) => (props.$withIcon ? "4px" : "0")};
+
+  svg {
+    flex-shrink: 0;
+  }
 
   &:hover {
     text-decoration: underline;
   }
 `;
 
-export default observer(React.forwardRef<HTMLDivElement, Props>(Breadcrumb));
+export default React.forwardRef<HTMLDivElement, Props>(Breadcrumb);

app/components/Button.tsx

@@ -1,13 +1,12 @@
-import type { LocationDescriptor } from "history";
+import { 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 type { HapticInput } from "web-haptics";
-import { useWebHaptics } from "web-haptics/react";
 import { s } from "@shared/styles";
-import type { Props as ActionButtonProps } from "~/components/ActionButton";
-import ActionButton from "~/components/ActionButton";
+import ActionButton, {
+  Props as ActionButtonProps,
+} from "~/components/ActionButton";
 import { undraggableOnDesktop } from "~/styles";
 
 type RealProps = {
@@ -35,7 +34,6 @@ const RealButton = styled(ActionButton)<RealProps>`
   cursor: var(--pointer);
   user-select: none;
   appearance: none !important;
-  transition: background 200ms ease-out;
   ${undraggableOnDesktop()}
 
   &::-moz-focus-inner {
@@ -46,7 +44,6 @@ const RealButton = styled(ActionButton)<RealProps>`
   &:hover:not(:disabled),
   &[aria-expanded="true"] {
     background: ${(props) => darken(0.05, props.theme.accent)};
-    transition: background 0s;
   }
 
   &:disabled {
@@ -81,7 +78,6 @@ const RealButton = styled(ActionButton)<RealProps>`
       box-shadow: rgba(0, 0, 0, 0.07) 0px 1px 2px, ${
         props.theme.buttonNeutralBorder
       } 0 0 0 1px inset;
-      transition: background 0s;
     }
 
     &:focus-visible {
@@ -107,7 +103,6 @@ const RealButton = styled(ActionButton)<RealProps>`
       &:hover:not(:disabled),
       &[aria-expanded="true"] {
         background: ${darken(0.05, props.theme.danger)};
-        transition: background 0s;
       }
 
       &:disabled {
@@ -125,7 +120,7 @@ const Label = styled.span<{ hasIcon?: boolean }>`
   white-space: nowrap;
   text-overflow: ellipsis;
 
-  ${(props) => props.hasIcon && "padding-inline-start: 4px;"};
+  ${(props) => props.hasIcon && "padding-left: 4px;"};
 `;
 
 export const Inner = styled.span<{
@@ -135,13 +130,13 @@ export const Inner = styled.span<{
 }>`
   display: flex;
   padding: 0 8px;
-  padding-inline-end: ${(props) => (props.disclosure ? 2 : 8)}px;
+  padding-right: ${(props) => (props.disclosure ? 2 : 8)}px;
   line-height: ${(props) => (props.hasIcon ? 24 : 32)}px;
   justify-content: center;
   align-items: center;
   min-height: 32px;
 
-  ${(props) => props.hasIcon && props.hasText && "padding-inline-start: 4px;"};
+  ${(props) => props.hasIcon && props.hasText && "padding-left: 4px;"};
   ${(props) => props.hasIcon && !props.hasText && "padding: 0 4px;"};
 `;
 
@@ -154,8 +149,6 @@ export type Props<T> = ActionButtonProps & {
   fullwidth?: boolean;
   as?: T;
   to?: LocationDescriptor;
-  /** Haptic feedback to trigger on click. Pass a preset name or custom pattern. */
-  haptic?: HapticInput;
   borderOnHover?: boolean;
   hideIcon?: boolean;
   href?: string;
@@ -180,13 +173,11 @@ const Button = <T extends React.ElementType = "button">(
     hideIcon,
     fullwidth,
     danger,
-    haptic,
     ...rest
   } = props;
   const hasText = !!children || value !== undefined;
-  const ic = hideIcon ? undefined : (action?.icon ?? icon);
+  const ic = hideIcon ? undefined : action?.icon ?? icon;
   const hasIcon = ic !== undefined;
-  const { trigger } = useWebHaptics();
 
   return (
     <RealButton
@@ -197,7 +188,6 @@ const Button = <T extends React.ElementType = "button">(
       $danger={danger}
       $fullwidth={fullwidth}
       $borderOnHover={borderOnHover}
-      onClickCapture={haptic ? () => void trigger(haptic) : undefined}
       {...rest}
     >
       <Inner hasIcon={hasIcon} hasText={hasText} disclosure={disclosure}>

app/components/CenteredContent.tsx

@@ -1,7 +1,6 @@
 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;
@@ -23,9 +22,12 @@ const Container = styled.div<Props>`
 type ContentProps = { $maxWidth?: string };
 
 const Content = styled.div<ContentProps>`
-  max-width: ${(props: ContentProps) =>
-    props.$maxWidth ?? EditorStyleHelper.documentWidth};
+  max-width: ${(props) => props.$maxWidth ?? "46em"};
   margin: 0 auto;
+
+  ${breakpoint("desktopLarge")`
+    max-width: ${(props: ContentProps) => props.$maxWidth ?? "52em"};
+  `};
 `;
 
 const CenteredContent: React.FC<Props> = ({

app/components/CircularProgressBar.tsx

@@ -22,7 +22,9 @@ const Circle = ({
   if (percentage) {
     // because the circle is so small, anything greater than 85% appears like 100%
     percentage = percentage > 85 && percentage < 100 ? 85 : percentage;
-    strokePercentage = ((100 - percentage) * circumference) / 100;
+    strokePercentage = percentage
+      ? ((100 - percentage) * circumference) / 100
+      : 0;
   }
 
   return (

app/components/Collaborators.tsx

@@ -1,19 +1,21 @@
-import { filter, isEqual, orderBy, uniq } from "es-toolkit/compat";
+import * as Popover from "@radix-ui/react-popover";
+import filter from "lodash/filter";
+import isEqual from "lodash/isEqual";
+import orderBy from "lodash/orderBy";
+import uniq from "lodash/uniq";
 import { observer } from "mobx-react";
 import { useState, useMemo, useEffect, useCallback } from "react";
 import { useTranslation } from "react-i18next";
-import type Document from "~/models/Document";
+import styled from "styled-components";
+import { depths, s } from "@shared/styles";
+import Document from "~/models/Document";
 import { AvatarSize, AvatarWithPresence } from "~/components/Avatar";
 import DocumentViews from "~/components/DocumentViews";
 import Facepile from "~/components/Facepile";
 import NudeButton from "~/components/NudeButton";
-import {
-  Popover,
-  PopoverTrigger,
-  PopoverContent,
-} from "~/components/primitives/Popover";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";
+import { fadeAndScaleIn } from "~/styles/animations";
 
 type Props = {
   /** The document to display live collaborators for */
@@ -22,6 +24,21 @@ type Props = {
   limit?: number;
 };
 
+// Styled components to match the original Popover styling
+const StyledPopoverContent = styled(Popover.Content)`
+  animation: ${fadeAndScaleIn} 200ms ease;
+  transform-origin: 75% 0;
+  background: ${s("menuBackground")};
+  border-radius: 6px;
+  padding: 12px 24px;
+  max-height: 75vh;
+  box-shadow: ${s("menuShadow")};
+  z-index: ${depths.modal};
+  overflow-x: hidden;
+  overflow-y: auto;
+  outline: none;
+`;
+
 /**
  * Displays a list of live collaborators for a document, including their avatars
  * and presence status.
@@ -32,14 +49,14 @@ function Collaborators(props: Props) {
   const user = useCurrentUser();
   const currentUserId = user?.id;
   const [requestedUserIds, setRequestedUserIds] = useState<string[]>([]);
+  const [popoverOpen, setPopoverOpen] = useState(false);
   const { users, presence, ui } = useStores();
   const { document } = props;
   const { observingUserId } = ui;
   const documentPresence = presence.get(document.id);
-  const documentPresenceArray = useMemo(
-    () => (documentPresence ? Array.from(documentPresence.values()) : []),
-    [documentPresence]
-  );
+  const documentPresenceArray = documentPresence
+    ? Array.from(documentPresence.values())
+    : [];
 
   // Use Set for O(1) lookups and stable references
   const presentIds = useMemo(
@@ -79,10 +96,10 @@ function Collaborators(props: Props) {
   // Memoize ids to avoid unnecessary effect executions
   const missingUserIds = useMemo(
     () =>
-      uniq([...collaboratorIdsSet, ...presentIds])
+      uniq([...document.collaboratorIds, ...Array.from(presentIds)])
         .filter((userId) => !users.get(userId))
         .sort(),
-    [collaboratorIdsSet, presentIds, users]
+    [document.collaboratorIds, presentIds, users]
   );
 
   useEffect(() => {
@@ -98,11 +115,11 @@ function Collaborators(props: Props) {
   // Memoize onClick handler to avoid inline function creation
   const handleAvatarClick = useCallback(
     (
-      collaboratorId: string,
-      isPresent: boolean,
-      isObserving: boolean,
-      isObservable: boolean
-    ) =>
+        collaboratorId: string,
+        isPresent: boolean,
+        isObserving: boolean,
+        isObservable: boolean
+      ) =>
       (ev: React.MouseEvent) => {
         if (isObservable && isPresent) {
           ev.preventDefault();
@@ -122,14 +139,13 @@ function Collaborators(props: Props) {
 
       return (
         <AvatarWithPresence
-          key={collaborator.id}
           {...rest}
+          key={collaborator.id}
           user={collaborator}
           isPresent={isPresent}
           isEditing={isEditing}
           isObserving={isObserving}
           isCurrentUser={currentUserId === collaborator.id}
-          alt={t("Avatar of {{ name }}", { name: collaborator.name })}
           onClick={
             isObservable
               ? handleAvatarClick(
@@ -143,23 +159,12 @@ function Collaborators(props: Props) {
         />
       );
     },
-    [
-      presentIds,
-      editingIds,
-      observingUserId,
-      currentUserId,
-      handleAvatarClick,
-      t,
-    ]
+    [presentIds, editingIds, observingUserId, currentUserId, handleAvatarClick]
   );
 
-  if (!document.insightsEnabled) {
-    return null;
-  }
-
   return (
-    <Popover>
-      <PopoverTrigger>
+    <Popover.Root open={popoverOpen} onOpenChange={setPopoverOpen}>
+      <Popover.Trigger asChild>
         <NudeButton
           width={Math.min(collaborators.length, limit) * AvatarSize.Large}
           height={AvatarSize.Large}
@@ -172,11 +177,19 @@ function Collaborators(props: Props) {
             renderAvatar={renderAvatar}
           />
         </NudeButton>
-      </PopoverTrigger>
-      <PopoverContent aria-label={t("Viewers")} side="bottom" align="end">
-        <DocumentViews document={document} />
-      </PopoverContent>
-    </Popover>
+      </Popover.Trigger>
+      <Popover.Portal>
+        <StyledPopoverContent
+          side="bottom"
+          align="end"
+          sideOffset={0}
+          aria-label={t("Viewers")}
+          style={{ width: 300 }}
+        >
+          <DocumentViews document={document} />
+        </StyledPopoverContent>
+      </Popover.Portal>
+    </Popover.Root>
   );
 }
 

app/components/Collapsible.tsx

@@ -1,112 +0,0 @@
-import * as RadixCollapsible from "@radix-ui/react-collapsible";
-import { ExpandedIcon } from "outline-icons";
-import * as React from "react";
-import styled from "styled-components";
-import { s } from "@shared/styles";
-
-interface CollapsibleProps {
-  /** The label displayed on the trigger button. */
-  label: React.ReactNode;
-  /** The content to show/hide inside the collapsible panel. */
-  children: React.ReactNode;
-  /** Whether the collapsible is open by default. */
-  defaultOpen?: boolean;
-  /** Controlled open state. */
-  open?: boolean;
-  /** Callback fired when the open state changes. */
-  onOpenChange?: (open: boolean) => void;
-  /** Additional class name for the root element. */
-  className?: string;
-}
-
-/**
- * An accessible collapsible section built on Radix UI Collapsible.
- * Renders a trigger button with a disclosure chevron and animated content panel.
- *
- * @param props - component props.
- * @returns the collapsible component.
- */
-export function Collapsible({
-  label,
-  children,
-  defaultOpen = false,
-  open,
-  onOpenChange,
-  className,
-}: CollapsibleProps) {
-  return (
-    <RadixCollapsible.Root
-      defaultOpen={defaultOpen}
-      open={open}
-      onOpenChange={onOpenChange}
-      className={className}
-    >
-      <StyledTrigger>
-        <StyledExpandedIcon aria-hidden="true" />
-        {label}
-      </StyledTrigger>
-      <StyledContent>{children}</StyledContent>
-    </RadixCollapsible.Root>
-  );
-}
-
-const StyledExpandedIcon = styled(ExpandedIcon)`
-  flex-shrink: 0;
-  transition: transform 150ms ease-out;
-  margin-left: -4px;
-`;
-
-const StyledTrigger = styled(RadixCollapsible.Trigger)`
-  display: flex;
-  align-items: center;
-  background: none;
-  border: none;
-  padding: 0 0 8px 0;
-  cursor: var(--pointer);
-  color: ${s("textTertiary")};
-  font-size: 14px;
-
-  &:hover {
-    color: ${s("textSecondary")};
-  }
-
-  &[data-state="closed"] {
-    ${StyledExpandedIcon} {
-      transform: rotate(-90deg);
-    }
-  }
-`;
-
-const StyledContent = styled(RadixCollapsible.Content)`
-  overflow: hidden;
-
-  &[data-state="open"] {
-    animation: slideDown 200ms ease-out;
-  }
-
-  &[data-state="closed"] {
-    animation: slideUp 200ms ease-out;
-  }
-
-  @keyframes slideDown {
-    from {
-      height: 0;
-      opacity: 0;
-    }
-    to {
-      height: var(--radix-collapsible-content-height);
-      opacity: 1;
-    }
-  }
-
-  @keyframes slideUp {
-    from {
-      height: var(--radix-collapsible-content-height);
-      opacity: 1;
-    }
-    to {
-      height: 0;
-      opacity: 0;
-    }
-  }
-`;

app/components/Collection/CollectionEdit.tsx

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

app/components/Collection/CollectionForm.tsx

@@ -1,4 +1,4 @@
-import { uniq } from "es-toolkit/compat";
+import uniq from "lodash/uniq";
 import { observer } from "mobx-react";
 import { useMemo, useEffect, useCallback, Suspense } from "react";
 import { Controller, useForm } from "react-hook-form";
@@ -7,16 +7,14 @@ import styled from "styled-components";
 import Icon from "@shared/components/Icon";
 import { randomElement } from "@shared/random";
 import { CollectionPermission, TeamPreference } from "@shared/types";
-import type { Option } from "~/components/InputSelect";
 import { IconLibrary } from "@shared/utils/IconLibrary";
 import { colorPalette } from "@shared/utils/collections";
 import { CollectionValidation } from "@shared/validations";
-import type Collection from "~/models/Collection";
+import Collection from "~/models/Collection";
 import Button from "~/components/Button";
-import { Collapsible } from "~/components/Collapsible";
+import Flex from "~/components/Flex";
 import Input from "~/components/Input";
-import { InputSelect } from "~/components/InputSelect";
-import { InputSelectPermission } from "~/components/InputSelectPermission";
+import InputSelectPermission from "~/components/InputSelectPermission";
 import { createLazyComponent } from "~/components/LazyLoad";
 import Switch from "~/components/Switch";
 import Text from "~/components/Text";
@@ -24,20 +22,18 @@ import useBoolean from "~/hooks/useBoolean";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import useStores from "~/hooks/useStores";
 import { EmptySelectValue } from "~/types";
-import { HStack } from "../primitives/HStack";
-import { useDialogContext } from "~/components/DialogContext";
+import { createSwitchRegister } from "~/utils/forms";
 
 const IconPicker = createLazyComponent(() => import("~/components/IconPicker"));
 
-export type FormData = {
+export interface FormData {
   name: string;
   icon: string;
   color: string | null;
   sharing: boolean;
   permission: CollectionPermission | undefined;
   commenting?: boolean | null;
-  templateManagement: CollectionPermission;
-};
+}
 
 const useIconColor = (collection?: Collection) => {
   const { collections } = useStores();
@@ -68,34 +64,11 @@ export const CollectionForm = observer(function CollectionForm_({
 }) {
   const team = useCurrentTeam();
   const { t } = useTranslation();
-  const dialog = useDialogContext();
 
   const [hasOpenedIconPicker, setHasOpenedIconPicker] = useBoolean(false);
 
-  const templateManagementOptions = useMemo<Option[]>(
-    () => [
-      {
-        type: "item",
-        label: t("Managers"),
-        value: CollectionPermission.Admin,
-      },
-      {
-        type: "item",
-        label: t("Members"),
-        value: CollectionPermission.ReadWrite,
-      },
-    ],
-    [t]
-  );
-
   const iconColor = useIconColor(collection);
-  const fallbackIcon = (
-    <Icon
-      value="collection"
-      initial={collection?.initial ?? "?"}
-      color={iconColor}
-    />
-  );
+  const fallbackIcon = <Icon value="collection" color={iconColor} />;
 
   const {
     register,
@@ -113,8 +86,6 @@ export const CollectionForm = observer(function CollectionForm_({
       sharing: collection?.sharing ?? true,
       permission: collection?.permission,
       commenting: collection?.commenting ?? true,
-      templateManagement:
-        collection?.templateManagement ?? CollectionPermission.Admin,
       color: iconColor,
     },
   });
@@ -155,73 +126,6 @@ export const CollectionForm = observer(function CollectionForm_({
     [setFocus, setValue, values.icon]
   );
 
-  const initial = values.name.charAt(0).toUpperCase();
-
-  const options = (
-    <>
-      <Controller
-        control={control}
-        name="templateManagement"
-        render={({ field }) => (
-          <>
-            <InputSelect
-              value={field.value}
-              onChange={(value: string) => {
-                field.onChange(value as CollectionPermission);
-              }}
-              options={templateManagementOptions}
-              label={t("Manage templates")}
-            />
-            <Text
-              type="secondary"
-              size="small"
-              as="p"
-              style={{ paddingTop: 4 }}
-            >
-              {t(
-                "Choose who can create and edit templates in this collection."
-              )}
-            </Text>
-          </>
-        )}
-      />
-
-      {team.sharing && (
-        <Controller
-          control={control}
-          name="sharing"
-          render={({ field }) => (
-            <Switch
-              id="sharing"
-              label={t("Public document sharing")}
-              note={t(
-                "Allow documents within this collection to be shared publicly on the internet."
-              )}
-              checked={field.value}
-              onChange={field.onChange}
-            />
-          )}
-        />
-      )}
-
-      {team.getPreference(TeamPreference.Commenting) && (
-        <Controller
-          control={control}
-          name="commenting"
-          render={({ field }) => (
-            <Switch
-              id="commenting"
-              label={t("Commenting")}
-              note={t("Allow commenting on documents within this collection.")}
-              checked={!!field.value}
-              onChange={field.onChange}
-            />
-          )}
-        />
-      )}
-    </>
-  );
-
   return (
     <form onSubmit={formHandleSubmit(handleSubmit)}>
       <Text as="p">
@@ -229,10 +133,10 @@ export const CollectionForm = observer(function CollectionForm_({
           Collections are used to group documents and choose permissions
         </Trans>
       </Text>
-      <HStack>
+      <Flex gap={8}>
         <Input
           type="text"
-          label={t("Name")}
+          placeholder={t("Name")}
           {...register("name", {
             required: true,
             maxLength: CollectionValidation.maxNameLength,
@@ -242,7 +146,7 @@ export const CollectionForm = observer(function CollectionForm_({
               <StyledIconPicker
                 icon={values.icon}
                 color={values.color ?? iconColor}
-                initial={initial}
+                initial={values.name[0]}
                 popoverPosition="right"
                 onOpen={setHasOpenedIconPicker}
                 onChange={handleIconChange}
@@ -253,7 +157,7 @@ export const CollectionForm = observer(function CollectionForm_({
           autoFocus
           flex
         />
-      </HStack>
+      </Flex>
 
       {/* Following controls are available in create flow, but moved elsewhere for edit */}
       {!collection && (
@@ -269,7 +173,7 @@ export const CollectionForm = observer(function CollectionForm_({
               ) => {
                 field.onChange(value === EmptySelectValue ? null : value);
               }}
-              help={t(
+              note={t(
                 "The default access for workspace members, you can share with more users or groups later."
               )}
             />
@@ -277,18 +181,27 @@ export const CollectionForm = observer(function CollectionForm_({
         />
       )}
 
-      {collection ? (
-        options
-      ) : (
-        <Collapsible
-          label={t("Advanced options")}
-          onOpenChange={() => dialog.setAnimating(true)}
-        >
-          {options}
-        </Collapsible>
+      {team.sharing && (
+        <Switch
+          id="sharing"
+          label={t("Public document sharing")}
+          note={t(
+            "Allow documents within this collection to be shared publicly on the internet."
+          )}
+          {...createSwitchRegister(register, "sharing")}
+        />
       )}
 
-      <HStack justify="flex-end">
+      {team.getPreference(TeamPreference.Commenting) && (
+        <Switch
+          id="commenting"
+          label={t("Commenting")}
+          note={t("Allow commenting on documents within this collection.")}
+          {...createSwitchRegister(register, "commenting")}
+        />
+      )}
+
+      <Flex justify="flex-end">
         <Button
           type="submit"
           disabled={formState.isSubmitting || !formState.isValid}
@@ -298,10 +211,10 @@ export const CollectionForm = observer(function CollectionForm_({
               ? `${t("Saving")}…`
               : t("Save")
             : formState.isSubmitting
-              ? `${t("Creating")}…`
-              : t("Create")}
+            ? `${t("Creating")}…`
+            : t("Create")}
         </Button>
-      </HStack>
+      </Flex>
     </form>
   );
 });

app/components/Collection/CollectionNew.tsx

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

app/components/CollectionBreadcrumb.tsx

@@ -1,12 +1,11 @@
 import { ArchiveIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import type Collection from "~/models/Collection";
+import Collection from "~/models/Collection";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
+import { MenuInternalLink } from "~/types";
 import { archivePath, collectionPath } from "~/utils/routeHelpers";
 import Breadcrumb from "./Breadcrumb";
-import { createInternalLinkAction } from "~/actions";
-import { ActiveCollectionSection } from "~/actions/sections";
 
 type Props = {
   collection: Collection;
@@ -15,24 +14,32 @@ type Props = {
 export const CollectionBreadcrumb: React.FC<Props> = ({ collection }) => {
   const { t } = useTranslation();
 
-  const actions = React.useMemo(
-    () => [
-      createInternalLinkAction({
-        name: t("Archive"),
-        section: ActiveCollectionSection,
-        icon: <ArchiveIcon />,
-        visible: collection.isArchived,
-        to: archivePath(),
-      }),
-      createInternalLinkAction({
-        name: collection.name,
-        section: ActiveCollectionSection,
-        icon: <CollectionIcon collection={collection} expanded />,
-        to: collectionPath(collection),
-      }),
-    ],
-    [collection, t]
-  );
+  const items = React.useMemo(() => {
+    const collectionNode: MenuInternalLink = {
+      type: "route",
+      title: collection.name,
+      icon: <CollectionIcon collection={collection} expanded />,
+      to: collectionPath(collection.path),
+    };
 
-  return <Breadcrumb actions={actions} highlightFirstItem />;
+    const category: MenuInternalLink | undefined = collection.isArchived
+      ? {
+          type: "route",
+          icon: <ArchiveIcon />,
+          title: t("Archive"),
+          to: archivePath(),
+        }
+      : undefined;
+
+    const output = [];
+    if (category) {
+      output.push(category);
+    }
+
+    output.push(collectionNode);
+
+    return output;
+  }, [collection, t]);
+
+  return <Breadcrumb items={items} highlightFirstItem />;
 };

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 type Collection from "~/models/Collection";
+import Collection from "~/models/Collection";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import Text from "~/components/Text";
 import useCurrentTeam from "~/hooks/useCurrentTeam";

app/components/ColorButton.tsx

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

app/components/CommandBar/CommandBarItem.tsx

@@ -1,14 +1,12 @@
-import type { ActionImpl } from "kbar";
+import { ActionImpl } from "kbar";
 import { ArrowIcon, BackIcon } from "outline-icons";
 import * as React from "react";
 import styled, { css, useTheme } from "styled-components";
 import { s, ellipsis } from "@shared/styles";
-import { normalizeKeyDisplay, shortcutSeparator } from "@shared/utils/keyboard";
-import Highlight from "~/components/Highlight";
+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;
@@ -16,22 +14,14 @@ type Props = {
   currentRootActionId: string | null | undefined;
 };
 
-const SEARCH_RESULT_REGEX = /<b\b[^>]*>(.*?)<\/b>/gi;
-
-function replaceResultMarks(tag: string) {
-  // don't use SEARCH_RESULT_REGEX here as it causes
-  // an infinite loop to trigger a regex inside it's own callback
-  return tag.replace(/<b\b[^>]*>(.*?)<\/b>/gi, "$1");
-}
-
 function CommandBarItem(
   { action, active, currentRootActionId }: Props,
   ref: React.RefObject<HTMLDivElement>
 ) {
   const theme = useTheme();
   const ancestors = React.useMemo(() => {
-    if (!currentRootActionId || !action.ancestors) {
-      return action.ancestors ?? [];
+    if (!currentRootActionId) {
+      return action.ancestors;
     }
     const index = action.ancestors.findIndex(
       (ancestor) => ancestor.id === currentRootActionId
@@ -45,7 +35,7 @@ function CommandBarItem(
 
   return (
     <Item active={active} ref={ref}>
-      <Content>
+      <Content align="center" gap={8}>
         <Icon>
           {action.icon ? (
             // @ts-expect-error no icon on ActionImpl
@@ -65,16 +55,6 @@ function CommandBarItem(
         ))}
         {action.name}
         {action.children?.length ? "…" : ""}
-        {action.subtitle && (
-          <Text type="secondary" ellipsis>
-            &nbsp;&nbsp;
-            <Highlight
-              text={action.subtitle}
-              highlight={SEARCH_RESULT_REGEX}
-              processResult={replaceResultMarks}
-            />
-          </Text>
-        )}
       </Content>
       {action.shortcut?.length ? (
         <Shortcut>
@@ -90,12 +70,9 @@ function CommandBarItem(
               ) : (
                 ""
               )}
-              {sc.split("+").flatMap((key, i, arr) => {
-                const el = <Key key={key}>{normalizeKeyDisplay(key)}</Key>;
-                return i < arr.length - 1 && shortcutSeparator
-                  ? [el, shortcutSeparator]
-                  : [el];
-              })}
+              {sc.split("+").map((key) => (
+                <Key key={key}>{normalizeKeyDisplay(key)}</Key>
+              ))}
             </React.Fragment>
           ))}
         </Shortcut>
@@ -123,7 +100,7 @@ const Ancestor = styled.span`
   color: ${s("textSecondary")};
 `;
 
-const Content = styled(HStack)`
+const Content = styled(Flex)`
   ${ellipsis()}
   flex-shrink: 1;
 `;

app/components/CommandBar/CommandBarResults.tsx

@@ -43,8 +43,7 @@ const Container = styled.div`
 const Header = styled(Text).attrs({ as: "h3" })`
   letter-spacing: 0.03em;
   margin: 0;
-  padding-block: 16px 4px;
-  padding-inline: 20px 0;
+  padding: 16px 0 4px 20px;
   height: 36px;
   cursor: default;
 `;

app/components/CommandBar/SharedCommandBar.tsx

@@ -1,94 +0,0 @@
-import { useKBar, KBarPositioner, KBarAnimator, KBarSearch } from "kbar";
-import { observer } from "mobx-react";
-import * as React from "react";
-import { useTranslation } from "react-i18next";
-import { Portal } from "react-portal";
-import styled from "styled-components";
-import breakpoint from "styled-components-breakpoint";
-import { depths, s } from "@shared/styles";
-import CommandBarResults from "./CommandBarResults";
-import SharedSearchActions from "./SharedSearchActions";
-
-/**
- * A simplified command bar for public shares that only provides search.
- */
-function SharedCommandBar() {
-  const { t } = useTranslation();
-
-  return (
-    <>
-      <SharedSearchActions />
-      <KBarPortal>
-        <Positioner>
-          <Animator>
-            <SearchInput defaultPlaceholder={`${t("Search")}…`} />
-            <CommandBarResults />
-          </Animator>
-        </Positioner>
-      </KBarPortal>
-    </>
-  );
-}
-
-type Props = {
-  children?: React.ReactNode;
-};
-
-const KBarPortal: React.FC = ({ children }: Props) => {
-  const { showing } = useKBar((state) => ({
-    showing: state.visualState !== "hidden",
-  }));
-
-  if (!showing) {
-    return null;
-  }
-
-  return <Portal>{children}</Portal>;
-};
-
-const Positioner = styled(KBarPositioner)`
-  z-index: ${depths.commandBar};
-`;
-
-const SearchInput = styled(KBarSearch)`
-  position: relative;
-  padding: 16px 12px;
-  margin: 0 8px;
-  width: calc(100% - 16px);
-  outline: none;
-  border: none;
-  background: ${s("menuBackground")};
-  color: ${s("text")};
-
-  &:not(:last-child) {
-    border-bottom: 1px solid ${s("inputBorder")};
-  }
-
-  &:disabled,
-  &::placeholder {
-    color: ${s("placeholder")};
-    opacity: 1;
-  }
-`;
-
-const Animator = styled(KBarAnimator)`
-  max-width: 600px;
-  max-height: 75vh;
-  width: 90vw;
-  background: ${s("menuBackground")};
-  color: ${s("text")};
-  border-radius: 8px;
-  overflow: hidden;
-  box-shadow: rgb(0 0 0 / 40%) 0px 16px 60px;
-  transition: max-width 0.2s ease-in-out;
-
-  ${breakpoint("desktopLarge")`
-    max-width: 740px;
-  `};
-
-  @media print {
-    display: none;
-  }
-`;
-
-export default observer(SharedCommandBar);

app/components/CommandBar/SharedSearchActions.tsx

@@ -1,187 +0,0 @@
-import { useKBar } from "kbar";
-import { escapeRegExp } from "es-toolkit/compat";
-import { observer } from "mobx-react";
-import { DocumentIcon } from "outline-icons";
-import * as React from "react";
-import Icon from "@shared/components/Icon";
-import useShare from "@shared/hooks/useShare";
-import { Minute } from "@shared/utils/time";
-import { createAction } from "~/actions";
-import {
-  RecentSearchesSection,
-  SearchResultsSection,
-} from "~/actions/sections";
-import useCommandBarActions from "~/hooks/useCommandBarActions";
-import useStores from "~/hooks/useStores";
-import type Document from "~/models/Document";
-import history from "~/utils/history";
-import { sharedModelPath } from "~/utils/routeHelpers";
-import type { SearchResult } from "~/types";
-
-interface CacheEntry {
-  timestamp: number;
-  results: SearchResult[];
-}
-
-const cacheTTL = Minute.ms * 5;
-const maxRecentDocs = 5;
-
-/**
- * Strip server-generated `<b>` highlight tags from context and re-apply them
- * using the current search query. This prevents stale highlights when the
- * displayed results are from a previous (in-flight) query.
- *
- * @param context the server-generated context string with `<b>` tags.
- * @param query the current search query to highlight.
- * @returns the context string with highlights matching the current query.
- */
-function rehighlightContext(
-  context: string | undefined,
-  query: string
-): string | undefined {
-  if (!context) {
-    return context;
-  }
-
-  const plain = context.replace(/<b\b[^>]*>(.*?)<\/b>/gi, "$1");
-  const trimmed = query.trim();
-
-  if (!trimmed) {
-    return plain;
-  }
-
-  const terms = trimmed.split(/\s+/).filter(Boolean);
-  const patterns = [escapeRegExp(trimmed)];
-
-  if (terms.length > 1) {
-    patterns.push(...terms.map((t) => `\\b${escapeRegExp(t)}\\b`));
-  }
-
-  const regex = new RegExp(patterns.join("|"), "gi");
-  return plain.replace(regex, "<b>$&</b>");
-}
-
-/**
- * Registers search result actions in the command bar scoped to a public share.
- */
-function SharedSearchActions() {
-  const { documents } = useStores();
-  const { shareId } = useShare();
-  const searchCache = React.useRef<Map<string, CacheEntry>>(new Map());
-  const [results, setResults] = React.useState<SearchResult[]>([]);
-  const recentDocsRef = React.useRef<Document[]>([]);
-  const [recentDocs, setRecentDocs] = React.useState<Document[]>([]);
-
-  const { searchQuery } = useKBar((state) => ({
-    searchQuery: state.searchQuery,
-  }));
-
-  const searchQueryRef = React.useRef(searchQuery);
-  searchQueryRef.current = searchQuery;
-
-  React.useEffect(() => {
-    if (!searchQuery || !shareId) {
-      setResults([]);
-      return;
-    }
-
-    const now = Date.now();
-    const cachedEntry = searchCache.current.get(searchQuery);
-    const isExpired = cachedEntry
-      ? now - cachedEntry.timestamp > cacheTTL
-      : true;
-
-    if (cachedEntry && !isExpired) {
-      setResults(cachedEntry.results);
-      return;
-    }
-
-    const currentQuery = searchQuery;
-    void documents.search({ query: searchQuery, shareId }).then((res) => {
-      searchCache.current.set(currentQuery, { timestamp: now, results: res });
-      if (searchQueryRef.current === currentQuery) {
-        setResults(res);
-      }
-    });
-  }, [documents, searchQuery, shareId]);
-
-  const addRecentDoc = React.useCallback((doc: Document) => {
-    const prev = recentDocsRef.current;
-    const filtered = prev.filter((d) => d.id !== doc.id);
-    const next = [doc, ...filtered].slice(0, maxRecentDocs);
-    recentDocsRef.current = next;
-    setRecentDocs(next);
-  }, []);
-
-  const documentIcon = React.useCallback(
-    (doc: Document) =>
-      doc.icon ? (
-        <Icon
-          value={doc.icon}
-          initial={doc.initial}
-          color={doc.color ?? undefined}
-        />
-      ) : (
-        <DocumentIcon />
-      ),
-    []
-  );
-
-  const actions = React.useMemo(
-    () =>
-      results.map((result) =>
-        createAction({
-          id: `shared-search-${result.document.id}`,
-          name: result.document.titleWithDefault,
-          description: rehighlightContext(result.context, searchQuery),
-          keywords: searchQuery,
-          analyticsName: "Open shared search result",
-          section: SearchResultsSection,
-          icon: documentIcon(result.document),
-          perform: () => {
-            if (shareId) {
-              const currentQuery = searchQueryRef.current;
-              addRecentDoc(result.document);
-              history.push({
-                pathname: sharedModelPath(shareId, result.document.url),
-                search: currentQuery
-                  ? `?q=${encodeURIComponent(currentQuery)}`
-                  : undefined,
-              });
-            }
-          },
-        })
-      ),
-    [results, shareId, searchQuery, addRecentDoc, documentIcon]
-  );
-
-  const recentDocActions = React.useMemo(
-    () =>
-      recentDocs.map((doc) =>
-        createAction({
-          id: `shared-recent-doc-${doc.id}`,
-          name: doc.titleWithDefault,
-          analyticsName: "Open recent shared document",
-          section: RecentSearchesSection,
-          icon: documentIcon(doc),
-          perform: () => {
-            if (shareId) {
-              history.push(sharedModelPath(shareId, doc.url));
-            }
-          },
-        })
-      ),
-    [recentDocs, shareId, documentIcon]
-  );
-
-  useCommandBarActions(searchQuery ? actions : recentDocActions, [
-    searchQuery
-      ? actions.map((a) => a.id).join("")
-      : recentDocActions.map((a) => a.id).join(""),
-    searchQuery,
-  ]);
-
-  return null;
-}
-
-export default observer(SharedSearchActions);

app/components/CommandBar/useRecentDocumentActions.tsx

@@ -1,16 +1,14 @@
 import { DocumentIcon } from "outline-icons";
 import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
 import Icon from "@shared/components/Icon";
-import { createInternalLinkAction } from "~/actions";
+import { createAction } from "~/actions";
 import { RecentSection } from "~/actions/sections";
-import { documentBreadcrumbText } from "~/components/DocumentBreadcrumb";
 import useStores from "~/hooks/useStores";
+import history from "~/utils/history";
 import { documentPath } from "~/utils/routeHelpers";
 
 const useRecentDocumentActions = (count = 6) => {
   const { documents, ui } = useStores();
-  const { t } = useTranslation();
 
   return useMemo(
     () =>
@@ -18,24 +16,19 @@ const useRecentDocumentActions = (count = 6) => {
         .filter((document) => document.id !== ui.activeDocumentId)
         .slice(0, count)
         .map((item) =>
-          createInternalLinkAction({
+          createAction({
             name: item.titleWithDefault,
             analyticsName: "Recently viewed document",
             section: RecentSection,
-            description: documentBreadcrumbText(item, t),
             icon: item.icon ? (
-              <Icon
-                value={item.icon}
-                initial={item.initial}
-                color={item.color ?? undefined}
-              />
+              <Icon value={item.icon} color={item.color ?? undefined} />
             ) : (
-              <DocumentIcon outline={item.isDraft} />
+              <DocumentIcon />
             ),
-            to: documentPath(item),
+            perform: () => history.push(documentPath(item)),
           })
         ),
-    [count, ui.activeDocumentId, documents.recentlyViewed, t]
+    [count, ui.activeDocumentId, documents.recentlyViewed]
   );
 };
 

app/components/CommandBar/useSettingsAction.tsx

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

app/components/CommandBar/useTemplatesAction.tsx

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

app/components/CommentDeleteDialog.tsx

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

app/components/ConfirmMoveDialog.tsx

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

app/components/ConfirmationDialog.tsx

@@ -64,7 +64,7 @@ const ConfirmationDialog: React.FC<Props> = ({
             danger={danger}
             autoFocus
           >
-            {isSaving && savingText ? savingText : (submitText ?? t("Confirm"))}
+            {isSaving && savingText ? savingText : submitText ?? t("Confirm")}
           </Button>
         </Flex>
       </Flex>

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,
@@ -87,23 +87,22 @@ const ContentEditable = React.forwardRef(function ContentEditable_(
   }));
 
   const wrappedEvent =
-    <E extends React.SyntheticEvent<HTMLSpanElement>>(
-      callback: ((event: E) => void) | undefined
+    (
+      callback:
+        | React.FocusEventHandler<HTMLSpanElement>
+        | React.FormEventHandler<HTMLSpanElement>
+        | React.KeyboardEventHandler<HTMLSpanElement>
+        | undefined
     ) =>
-    (event: E) => {
+    (event: any) => {
       if (readOnly) {
         return;
       }
 
       const text = event.currentTarget.textContent || "";
 
-      if (
-        maxLength &&
-        event.nativeEvent instanceof KeyboardEvent &&
-        isPrintableKeyEvent(event.nativeEvent) &&
-        text.length >= maxLength
-      ) {
-        event.preventDefault();
+      if (maxLength && isPrintableKeyEvent(event) && text.length >= maxLength) {
+        event?.preventDefault();
         return;
       }
 
@@ -129,14 +128,7 @@ const ContentEditable = React.forwardRef(function ContentEditable_(
 
   React.useEffect(() => {
     if (contentRef.current && value !== contentRef.current.textContent) {
-      if (document.activeElement === contentRef.current) {
-        // Don't reset content while the user is actively editing. Update
-        // lastValue so that the next input or blur event will push the
-        // current DOM text back to the model via onChange.
-        lastValue.current = value;
-      } else {
-        setInnerValue(value);
-      }
+      setInnerValue(value);
     }
   }, [value, contentRef]);
 
@@ -151,14 +143,13 @@ const ContentEditable = React.forwardRef(function ContentEditable_(
     },
     []
   );
-  const contentEditable = !disabled && !readOnly;
 
   return (
     <div className={className} dir={dir} onClick={onClick} tabIndex={-1}>
       {children}
       <Content
         ref={contentRef}
-        contentEditable={contentEditable}
+        contentEditable={!disabled && !readOnly}
         onInput={wrappedEvent(onInput)}
         onFocus={wrappedEvent(onFocus)}
         onBlur={wrappedEvent(onBlur)}
@@ -166,7 +157,7 @@ const ContentEditable = React.forwardRef(function ContentEditable_(
         onPaste={handlePaste}
         data-placeholder={placeholder}
         suppressContentEditableWarning
-        role={contentEditable ? "textbox" : undefined}
+        role="textbox"
         {...rest}
       >
         {innerValue}

app/components/ContextMenu/Header.ts

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

app/components/ContextMenu/MenuIconWrapper.ts

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

app/components/ContextMenu/MenuItem.tsx

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

app/components/ContextMenu/MouseSafeArea.tsx

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

app/components/ContextMenu/OverflowMenuButton.tsx

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

app/components/ContextMenu/Separator.tsx

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

app/components/ContextMenu/Template.tsx

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

app/components/ContextMenu/index.tsx

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

app/components/DefaultCollectionInputSelect.tsx

@@ -1,17 +1,9 @@
-import {
-  CollectionIcon as CollectionIconComponent,
-  HomeIcon,
-  PrivateCollectionIcon,
-} from "outline-icons";
-import { observer } from "mobx-react";
-import { getLuminance } from "polished";
+import { HomeIcon } from "outline-icons";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
-import Icon from "@shared/components/Icon";
-import { colorPalette } from "@shared/utils/collections";
-import type { Option } from "~/components/InputSelect";
-import { InputSelect } from "~/components/InputSelect";
+import CollectionIcon from "~/components/Icons/CollectionIcon";
+import { InputSelectNew, Option } from "~/components/InputSelectNew";
 import useStores from "~/hooks/useStores";
 
 type DefaultCollectionInputSelectProps = {
@@ -19,112 +11,75 @@ type DefaultCollectionInputSelectProps = {
   defaultCollectionId: string | null;
 };
 
-const DefaultCollectionInputSelect = observer(
-  ({
-    onSelectCollection,
-    defaultCollectionId,
-  }: DefaultCollectionInputSelectProps) => {
-    const { t } = useTranslation();
-    const { collections, ui } = useStores();
-    const [fetching, setFetching] = useState(false);
-    const [fetchError, setFetchError] = useState();
+const DefaultCollectionInputSelect = ({
+  onSelectCollection,
+  defaultCollectionId,
+}: DefaultCollectionInputSelectProps) => {
+  const { t } = useTranslation();
+  const { collections } = useStores();
+  const [fetching, setFetching] = useState(false);
+  const [fetchError, setFetchError] = useState();
 
-    React.useEffect(() => {
-      async function fetchData() {
-        if (!collections.isLoaded && !fetching && !fetchError) {
-          try {
-            setFetching(true);
-            await collections.fetchPage({
-              limit: 100,
-            });
-          } catch (error) {
-            toast.error(
-              t("Collections could not be loaded, please reload the app")
-            );
-            setFetchError(error);
-          } finally {
-            setFetching(false);
-          }
+  React.useEffect(() => {
+    async function fetchData() {
+      if (!collections.isLoaded && !fetching && !fetchError) {
+        try {
+          setFetching(true);
+          await collections.fetchPage({
+            limit: 100,
+          });
+        } catch (error) {
+          toast.error(
+            t("Collections could not be loaded, please reload the app")
+          );
+          setFetchError(error);
+        } finally {
+          setFetching(false);
         }
       }
-      void fetchData();
-    }, [fetchError, t, fetching, collections]);
-
-    if (fetching) {
-      return null;
     }
+    void fetchData();
+  }, [fetchError, t, fetching, collections]);
 
-    const isDark = ui.resolvedTheme === "dark";
-
-    // Eagerly resolve collection icon properties within this observer context
-    // to avoid MobX warnings when Radix Select clones elements for the trigger.
-    const options: Option[] = collections.nonPrivate.reduce(
-      (acc, collection) => {
-        const collectionIcon = collection.icon;
-        const rawColor = collection.color ?? colorPalette[0];
-
-        let icon: React.ReactElement;
-        if (!collectionIcon || collectionIcon === "collection") {
-          const color =
-            isDark && rawColor !== "currentColor"
-              ? getLuminance(rawColor) > 0.09
-                ? rawColor
-                : "currentColor"
-              : rawColor;
-          const Component = collection.isPrivate
-            ? PrivateCollectionIcon
-            : CollectionIconComponent;
-          icon = <Component color={color} />;
-        } else {
-          let color = rawColor;
-          if (color !== "currentColor") {
-            if (isDark) {
-              color = getLuminance(color) > 0.09 ? color : "currentColor";
-            } else {
-              color = getLuminance(color) < 0.9 ? color : "currentColor";
-            }
-          }
-          icon = (
-            <Icon
-              value={collectionIcon}
-              color={color}
-              initial={collection.initial}
-              forceColor
-            />
-          );
-        }
-
-        return [
+  const options: Option[] = React.useMemo(
+    () =>
+      collections.nonPrivate.reduce(
+        (acc, collection) => [
           ...acc,
           {
-            type: "item" as const,
+            type: "item",
             label: collection.name,
             value: collection.id,
-            icon,
+            icon: <CollectionIcon collection={collection} />,
           },
-        ];
-      },
-      [
-        {
-          type: "item",
-          label: t("Home"),
-          value: "home",
-          icon: <HomeIcon />,
-        },
-      ] satisfies Option[]
-    );
+        ],
+        [
+          {
+            type: "item",
+            label: t("Home"),
+            value: "home",
+            icon: <HomeIcon />,
+          },
+        ] satisfies Option[]
+      ),
+    [collections.nonPrivate, t]
+  );
 
-    return (
-      <InputSelect
-        options={options}
-        value={defaultCollectionId ?? "home"}
-        onChange={onSelectCollection}
-        label={t("Start view")}
-        labelHidden
-        short
-      />
-    );
+  if (fetching) {
+    return null;
   }
-);
+
+  return (
+    <InputSelectNew
+      options={options}
+      value={defaultCollectionId ?? "home"}
+      onChange={onSelectCollection}
+      ariaLabel={t("Default collection")}
+      label={t("Start view")}
+      hideLabel
+      short
+    />
+  );
+};
 
 export default DefaultCollectionInputSelect;

app/components/DesktopEventHandler.tsx

@@ -15,7 +15,7 @@ export default function DesktopEventHandler() {
   const hasDisabledUpdateMessage = useRef(false);
 
   useEffect(() => {
-    Desktop.bridge?.redirect((path: string, replace: boolean) => {
+    Desktop.bridge?.redirect((path: string, replace = false) => {
       if (replace) {
         history.replace(path);
       } else {

app/components/DialogContext.tsx

@@ -1,32 +0,0 @@
-import { createContext, useContext, useMemo, useState } from "react";
-
-export type DialogContext = {
-  animating: boolean;
-  setAnimating: (isAnimating: boolean) => void;
-};
-
-/**
- * Context for the dialogs (Guide/Modal) being rendered.
- * This helps control the dialog's behavior from within any nested component.
- */
-const DialogContext = createContext<DialogContext>({
-  animating: false,
-  setAnimating: () => {},
-});
-
-export function DialogProvider({ children }: { children: React.ReactNode }) {
-  const [animating, setAnimating] = useState(false);
-  const ctx = useMemo<DialogContext>(
-    () => ({
-      animating,
-      setAnimating,
-    }),
-    [animating]
-  );
-
-  return (
-    <DialogContext.Provider value={ctx}>{children}</DialogContext.Provider>
-  );
-}
-
-export const useDialogContext = () => useContext(DialogContext);