Fix: Prevent multiple context menus from being open simultaneously

This commit addresses an issue where multiple context menus could be open at the same time. The fix involves the following: - Modified `MenuContext` in `app/hooks/useMenuContext.tsx` to store a reference to the `hide` function of the currently open menu, instead of a boolean. - Updated the `ContextMenu` component in `app/components/ContextMenu/index.tsx` to: - Use the modified `MenuContext`. - Before opening a new menu, check if another menu is already open. - If an existing menu is open, it's closed before the new one is displayed. Testing: - I attempted to add a test for this change. However, due to a Node.js version incompatibility (sandbox: 18.19.1 vs. required: >=18.20 for a transitive dependency `lru-cache@^11.0.0` of `jest-environment-jsdom`), I was not able to run Jest tests in the development environment. - I recommend that you run tests in a compatible Node.js environment, such as in your CI/CD pipeline, to ensure the new behavior is correctly tested and existing functionality remains unaffected.
2026-06-13 19:35:02 +03:00 · 2025-06-01 02:36:34 +00:00
997 changed files with 20852 additions and 34446 deletions
@@ -21,7 +21,10 @@
    [
      "transform-inline-environment-variables",
      {
-        "include": ["SOURCE_COMMIT", "SOURCE_VERSION"]
+        "include": [
+          "SOURCE_COMMIT",
+          "SOURCE_VERSION"
+        ]
      }
    ],
    "tsconfig-paths-module-resolver"
@@ -36,10 +39,16 @@
          }
        ]
      ],
-      "ignore": ["**/__mocks__", "**/*.test.ts"]
+      "ignore": [
+        "**/__mocks__",
+        "**/*.test.ts"
+      ]
    },
    "development": {
-      "ignore": ["**/__mocks__", "**/*.test.ts"]
+      "ignore": [
+        "**/__mocks__",
+        "**/*.test.ts"
+      ]
    },
    "test": {
      "presets": [
@@ -56,4 +65,4 @@
      ]
    }
  }
-}
+}
@@ -6,7 +6,6 @@ __mocks__
 .DS_Store
 .env*
 .eslint*
-.oxlintrc*
 .log
 Makefile
 Procfile
@@ -202,7 +202,6 @@ RATE_LIMITER_DURATION_WINDOW=60
 # 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=
@@ -0,0 +1 @@
+server/migrations/*.js
@@ -0,0 +1,174 @@
+{
+  "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": {
+    "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-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": "^_",
+        "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": {}
+    }
+  }
+}
@@ -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
@@ -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
@@ -26,6 +26,3 @@ updates:
      aws:
        patterns:
          - "@aws-sdk/*"
-      radix-ui:
-        patterns:
-          - "@radix-ui/*"
@@ -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:
@@ -2,9 +2,9 @@ name: CI

 on:
  push:
-    branches: [main]
+    branches: [ main ]
  pull_request:
-    branches: [main]
+    branches: [ main ]

 env:
  NODE_ENV: test
@@ -22,46 +22,46 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        node-version: [20.x, 22.x]
+        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 --prefer-offline
+    - 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: 22.x
-          cache: "yarn"
-      - run: yarn install --frozen-lockfile --prefer-offline
-      - run: yarn lint --quiet
+    - 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: 22.x
-          cache: "yarn"
-      - run: yarn install --frozen-lockfile --prefer-offline
-      - run: yarn tsc
+    - 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 }}
    steps:
@@ -70,9 +70,6 @@ jobs:
        id: filter
        with:
          filters: |
-            config:
-              - '.github/**'
-              - 'vite.config.ts'
            server:
              - 'server/**'
              - 'shared/**'
@@ -86,23 +83,23 @@ jobs:

  test:
    needs: [build, changes]
-    if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.config == 'true' }}
+    if: ${{ needs.changes.outputs.app == 'true' }}
    runs-on: ubuntu-latest
    strategy:
      matrix:
        test-group: [app, shared]
    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22.x
-          cache: "yarn"
-      - run: yarn install --frozen-lockfile --prefer-offline
-      - run: yarn 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: [build, changes]
-    if: ${{ needs.changes.outputs.server == 'true' || needs.changes.outputs.config == 'true' }}
+    if: ${{ needs.changes.outputs.server == 'true' }}
    runs-on: ubuntu-latest
    services:
      postgres:
@@ -118,41 +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@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22.x
-          cache: "yarn"
-      - run: yarn install --frozen-lockfile --prefer-offline
-      - 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
+    - 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: [build, types, changes]
    if: ${{ needs.changes.outputs.app == 'true' && github.repository == 'outline/outline' }}
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22.x
-          cache: "yarn"
-      - run: yarn install --frozen-lockfile --prefer-offline
-      - 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
+    - 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
@@ -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@v2
+    - 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
@@ -209,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 }}
@@ -2,7 +2,7 @@ name: Lint

 on:
  pull_request:
-    branches: [main]
+    branches: [ main ]

 jobs:
  run-linters:
@@ -20,11 +20,11 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version: 20.x
-          cache: "yarn"
-      - run: yarn install --frozen-lockfile --prefer-offline
+          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"
+          commit_message: 'Applied automatic fixes'
@@ -7,10 +7,12 @@
      "roots": ["<rootDir>/server", "<rootDir>/plugins"],
      "moduleNameMapper": {
        "^@server/(.*)$": "<rootDir>/server/$1",
-        "^@shared/(.*)$": "<rootDir>/shared/$1"
+        "^@shared/(.*)$": "<rootDir>/shared/$1",
+        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
      },
      "setupFiles": ["<rootDir>/__mocks__/console.js"],
      "setupFilesAfterEnv": ["<rootDir>/server/test/setup.ts"],
+      "globalSetup": "<rootDir>/server/test/globalSetup.js",
      "globalTeardown": "<rootDir>/server/test/globalTeardown.js",
      "testEnvironment": "node"
    },
@@ -21,7 +23,8 @@
        "^~/(.*)$": "<rootDir>/app/$1",
        "^@shared/(.*)$": "<rootDir>/shared/$1",
        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js",
-        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.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"],
@@ -36,7 +39,8 @@
      "roots": ["<rootDir>/shared"],
      "moduleNameMapper": {
        "^@server/(.*)$": "<rootDir>/server/$1",
-        "^@shared/(.*)$": "<rootDir>/shared/$1"
+        "^@shared/(.*)$": "<rootDir>/shared/$1",
+        "react-medium-image-zoom": "<rootDir>/__mocks__/react-medium-image-zoom.js"
      },
      "setupFiles": ["<rootDir>/__mocks__/console.js"],
      "setupFilesAfterEnv": ["<rootDir>/shared/test/setup.ts"],
@@ -49,7 +53,8 @@
        "^~/(.*)$": "<rootDir>/app/$1",
        "^@shared/(.*)$": "<rootDir>/shared/$1",
        "^.*[.](gif|ttf|eot|svg)$": "<rootDir>/__test__/fileMock.js",
-        "^uuid$": "<rootDir>/node_modules/uuid/dist/index.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",
@@ -1 +0,0 @@
-22
@@ -1,102 +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": "warn",
-    "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",
-        "arrow-body-style": ["error", "as-needed"],
-        "no-useless-escape": "off",
-        "react/react-in-jsx-scope": "off",
-        "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",
-        "no-unused-vars": [
-          "error",
-          {
-            "argsIgnorePattern": "^_",
-            "caughtErrorsIgnorePattern": "^_",
-            "args": "after-used",
-            "ignoreRestSiblings": true
-          }
-        ]
-      },
-      "plugins": ["eslint", "oxc", "react", "typescript", "import"]
-    }
-  ]
-}
@@ -1,4 +0,0 @@
-{
-  "printWidth": 80,
-  "trailingComma": "es5"
-}
@@ -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'),
 }
@@ -6,7 +6,7 @@ ARG APP_PATH
 WORKDIR $APP_PATH

 # ---
-FROM node:22-slim AS runner
+FROM node:20-slim AS runner

 LABEL org.opencontainers.image.source="https://github.com/outline/outline"

@@ -3,7 +3,7 @@ Business Source License 1.1
 Parameters

 Licensor:             General Outline, Inc.
-Licensed Work:        Outline 0.87.4
+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
@@ -15,7 +15,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided that
                      Licensed Work by creating teams and documents
                      controlled by such third parties.

-Change Date:          2029-09-18
+Change Date:          2029-05-11

 Change License:       Apache License, Version 2.0

@@ -8,7 +8,7 @@ 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
@@ -7,13 +7,14 @@
  <img width="1640" alt="screenshot" src="https://user-images.githubusercontent.com/380914/110356468-26374600-7fef-11eb-9f6a-f2cc2c8c6590.png">
 </p>
 <p align="center">
+  <a href="https://circleci.com/gh/outline/outline" rel="nofollow"><img src="https://circleci.com/gh/outline/outline.svg?style=shield"></a>
  <a href="http://www.typescriptlang.org" rel="nofollow"><img src="https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg" alt="TypeScript"></a>
  <a href="https://github.com/prettier/prettier"><img src="https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat" alt="Prettier"></a>
  <a href="https://github.com/styled-components/styled-components"><img src="https://img.shields.io/badge/style-%F0%9F%92%85%20styled--components-orange.svg" alt="Styled Components"></a>
  <a href="https://translate.getoutline.com/project/outline" alt="Localized"><img src="https://badges.crowdin.net/outline/localized.svg"></a>
 </p>

-This is the source code that runs [**Outline**](https://www.getoutline.com) and all the associated services. If you want to use Outline then you don't need to run this code, A hosted version of the app is offered at [getoutline.com](https://www.getoutline.com). You can also find documentation on using Outline in [our guide](https://docs.getoutline.com/s/guide).
+This is the source code that runs [**Outline**](https://www.getoutline.com) and all the associated services. If you want to use Outline then you don't need to run this code, we offer a hosted version of the app at [getoutline.com](https://www.getoutline.com). You can also find documentation on using Outline in [our guide](https://docs.getoutline.com/s/guide).

 If you'd like to run your own copy of Outline or contribute to development then this is the place for you.

@@ -50,14 +51,13 @@ please refer to the [architecture document](docs/ARCHITECTURE.md) first for a hi

 In development Outline outputs simple logging to the console, prefixed by categories. In production it outputs JSON logs, these can be easily parsed by your preferred log ingestion pipeline.

-HTTP logging is disabled by default, but can be enabled by setting the `DEBUG=http` environment variable. logging
-can be enabled for all categories by setting `DEBUG=*` or for specific categories such as `DEBUG=database` and `LOG_LEVEL=debug`, or `LOG_LEVEL=silly` for very verbose logging.
+HTTP logging is disabled by default, but can be enabled by setting the `DEBUG=http` environment variable.

 ## Tests

 We aim to have sufficient test coverage for critical parts of the application and aren't aiming for 100% unit test coverage. All API endpoints and anything authentication related should be thoroughly tested.

-To add new tests, write your tests with [Jest](https://facebook.github.io/jest/) and add a file with `.test.ts` extension next to the tested code.
+To add new tests, write your tests with [Jest](https://facebook.github.io/jest/) and add a file with `.test.js` extension next to the tested code.

 ```shell
 # To run all tests
@@ -68,14 +68,14 @@ make watch
 ```

 Once the test database is created with `make test` you may individually run
-frontend and backend tests directly with jest:
+frontend and backend tests directly.

 ```shell
 # To run backend tests
 yarn test:server

-# To run a specific backend test in watch mode
-yarn test path/to/file.test.ts --watch
+# To run a specific backend test
+yarn test:server myTestFile

 # To run frontend tests
 yarn test:app
@@ -86,15 +86,14 @@ yarn test:app
 Sequelize is used to create and run migrations, for example:

 ```shell
-yarn db:create-migration --name my-migration
-yarn db:migrate
-yarn db:rollback
+yarn sequelize migration:generate --name my-migration
+yarn sequelize db:migrate
 ```

-Or, to run migrations on test database:
+Or to run migrations on test database:

 ```shell
-yarn db:migrate --env test
+yarn sequelize db:migrate --env test
 ```

 # Activity
@@ -1 +1 @@
-export default "";
+export default '';
@@ -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;
  },
@@ -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": {
@@ -216,4 +222,4 @@
      "required": false
    }
  }
-}
+}
@@ -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
+  }
+}
@@ -1,27 +0,0 @@
-{
-  "extends": ["../.oxlintrc.json"],
-  "plugins": ["oxc", "eslint", "typescript", "react"],
-  "overrides": [
-    {
-      "files": ["**/*.{jsx,tsx}"],
-      "rules": {
-        "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
-  }
-}
@@ -1,9 +1,7 @@
-import { PlusIcon, TrashIcon } from "outline-icons";
+import { PlusIcon } from "outline-icons";
 import stores from "~/stores";
-import ApiKey from "~/models/ApiKey";
 import ApiKeyNew from "~/scenes/ApiKeyNew";
-import ApiKeyRevokeDialog from "~/scenes/Settings/components/ApiKeyRevokeDialog";
-import { createAction, createActionV2 } from "..";
+import { createAction } from "..";
 import { SettingsSection } from "../sections";

 export const createApiKey = createAction({
@@ -24,37 +22,3 @@ export const createApiKey = createAction({
    });
  },
 });
-
-export const revokeApiKeyFactory = ({ apiKey }: { apiKey: ApiKey }) =>
-  createActionV2({
-    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}
-          />
-        ),
-      });
-    },
-  });
@@ -2,8 +2,6 @@ import {
  ArchiveIcon,
  CollectionIcon,
  EditIcon,
-  ExportIcon,
-  NewDocumentIcon,
  PadlockIcon,
  PlusIcon,
  RestoreIcon,
@@ -24,19 +22,11 @@ import ConfirmationDialog from "~/components/ConfirmationDialog";
 import DynamicCollectionIcon from "~/components/Icons/CollectionIcon";
 import SharePopover from "~/components/Sharing/Collection/SharePopover";
 import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
-import {
-  createAction,
-  createActionV2,
-  createInternalLinkActionV2,
-} 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 history from "~/utils/history";
+import { newTemplatePath, searchPath } from "~/utils/routeHelpers";

 const ColorCollectionIcon = ({ collection }: { collection: Collection }) => (
  <DynamicCollectionIcon collection={collection} />
@@ -57,7 +47,7 @@ export const openCollection = createAction({
      name: collection.name,
      icon: <ColorCollectionIcon collection={collection} />,
      section: CollectionSection,
-      to: collection.path,
+      perform: () => history.push(collection.path),
    }));
  },
 });
@@ -80,8 +70,9 @@ export const createCollection = createAction({
  },
 });

-export const editCollection = createActionV2({
-  name: ({ t, isMenu }) => (isMenu ? `${t("Edit")}…` : t("Edit collection")),
+export const editCollection = createAction({
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? `${t("Edit")}…` : t("Edit collection"),
  analyticsName: "Edit collection",
  section: ActiveCollectionSection,
  icon: <EditIcon />,
@@ -105,9 +96,9 @@ export const editCollection = createActionV2({
  },
 });

-export const editCollectionPermissions = createActionV2({
-  name: ({ t, isMenu }) =>
-    isMenu ? `${t("Permissions")}…` : t("Collection permissions"),
+export const editCollectionPermissions = createAction({
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? `${t("Permissions")}…` : t("Collection permissions"),
  analyticsName: "Collection permissions",
  section: ActiveCollectionSection,
  icon: <PadlockIcon />,
@@ -137,7 +128,7 @@ export const editCollectionPermissions = createActionV2({
  },
 });

-export const searchInCollection = createInternalLinkActionV2({
+export const searchInCollection = createAction({
  name: ({ t }) => t("Search in collection"),
  analyticsName: "Search collection",
  section: ActiveCollectionSection,
@@ -155,20 +146,13 @@ export const searchInCollection = createInternalLinkActionV2({

    return stores.policies.abilities(activeCollectionId).readDocument;
  },
-  to: ({ activeCollectionId, sidebarContext }) => {
-    const [pathname, search] = searchPath({
-      collectionId: activeCollectionId,
-    }).split("?");

-    return {
-      pathname,
-      search,
-      state: { sidebarContext },
-    };
+  perform: ({ activeCollectionId }) => {
+    history.push(searchPath({ collectionId: activeCollectionId }));
  },
 });

-export const starCollection = createActionV2({
+export const starCollection = createAction({
  name: ({ t }) => t("Star"),
  analyticsName: "Star collection",
  section: ActiveCollectionSection,
@@ -195,7 +179,7 @@ export const starCollection = createActionV2({
  },
 });

-export const unstarCollection = createActionV2({
+export const unstarCollection = createAction({
  name: ({ t }) => t("Unstar"),
  analyticsName: "Unstar collection",
  section: ActiveCollectionSection,
@@ -221,7 +205,7 @@ export const unstarCollection = createActionV2({
  },
 });

-export const subscribeCollection = createActionV2({
+export const subscribeCollection = createAction({
  name: ({ t }) => t("Subscribe"),
  analyticsName: "Subscribe to collection",
  section: ActiveCollectionSection,
@@ -234,7 +218,6 @@ export const subscribeCollection = createActionV2({
    const collection = stores.collections.get(activeCollectionId);

    return (
-      !!collection?.isActive &&
      !collection?.isSubscribed &&
      stores.policies.abilities(activeCollectionId).subscribe
    );
@@ -252,7 +235,7 @@ export const subscribeCollection = createActionV2({
  },
 });

-export const unsubscribeCollection = createActionV2({
+export const unsubscribeCollection = createAction({
  name: ({ t }) => t("Unsubscribe"),
  analyticsName: "Unsubscribe from collection",
  section: ActiveCollectionSection,
@@ -265,7 +248,6 @@ export const unsubscribeCollection = createActionV2({
    const collection = stores.collections.get(activeCollectionId);

    return (
-      !!collection?.isActive &&
      !!collection?.isSubscribed &&
      stores.policies.abilities(activeCollectionId).unsubscribe
    );
@@ -283,10 +265,10 @@ export const unsubscribeCollection = createActionV2({
  },
 });

-export const archiveCollection = createActionV2({
+export const archiveCollection = createAction({
  name: ({ t }) => `${t("Archive")}…`,
  analyticsName: "Archive collection",
-  section: ActiveCollectionSection,
+  section: CollectionSection,
  icon: <ArchiveIcon />,
  visible: ({ activeCollectionId, stores }) => {
    if (!activeCollectionId) {
@@ -324,7 +306,7 @@ export const archiveCollection = createActionV2({
  },
 });

-export const restoreCollection = createActionV2({
+export const restoreCollection = createAction({
  name: ({ t }) => t("Restore"),
  analyticsName: "Restore collection",
  section: CollectionSection,
@@ -349,7 +331,7 @@ export const restoreCollection = createActionV2({
  },
 });

-export const deleteCollection = createActionV2({
+export const deleteCollection = createAction({
  name: ({ t }) => `${t("Delete")}…`,
  analyticsName: "Delete collection",
  section: ActiveCollectionSection,
@@ -383,65 +365,7 @@ export const deleteCollection = createActionV2({
  },
 });

-export const exportCollection = createActionV2({
-  name: ({ t }) => `${t("Export")}…`,
-  analyticsName: "Export collection",
-  section: ActiveCollectionSection,
-  icon: <ExportIcon />,
-  visible: ({ currentTeamId, activeCollectionId, stores }) => {
-    if (!currentTeamId || !activeCollectionId) {
-      return false;
-    }
-
-    return (
-      !!stores.policies.abilities(currentTeamId).createExport &&
-      !!stores.policies.abilities(activeCollectionId).export
-    );
-  },
-  perform: async ({ activeCollectionId, stores, t }) => {
-    if (!activeCollectionId) {
-      return;
-    }
-    const collection = stores.collections.get(activeCollectionId);
-    if (!collection) {
-      return;
-    }
-
-    stores.dialogs.openModal({
-      title: t("Export collection"),
-      content: (
-        <ExportDialog
-          collection={collection}
-          onSubmit={stores.dialogs.closeAllModals}
-        />
-      ),
-    });
-  },
-});
-
-export const createDocument = createInternalLinkActionV2({
-  name: ({ t }) => t("New document"),
-  analyticsName: "New document",
-  section: ActiveCollectionSection,
-  icon: <NewDocumentIcon />,
-  keywords: "new create document",
-  visible: ({ activeCollectionId, stores }) =>
-    !!(
-      !!activeCollectionId &&
-      stores.policies.abilities(activeCollectionId).createDocument
-    ),
-  to: ({ activeCollectionId, sidebarContext }) => {
-    const [pathname, search] = newDocumentPath(activeCollectionId).split("?");
-
-    return {
-      pathname,
-      search,
-      state: { sidebarContext },
-    };
-  },
-});
-
-export const createTemplate = createInternalLinkActionV2({
+export const createTemplate = createAction({
  name: ({ t }) => t("New template"),
  analyticsName: "New template",
  section: ActiveCollectionSection,
@@ -452,14 +376,13 @@ export const createTemplate = createInternalLinkActionV2({
      !!activeCollectionId &&
      stores.policies.abilities(activeCollectionId).createDocument
    ),
-  to: ({ activeCollectionId, sidebarContext }) => {
-    const [pathname, search] = newTemplatePath(activeCollectionId).split("?");
-
-    return {
-      pathname,
-      search,
-      state: { sidebarContext },
-    };
+  perform: ({ activeCollectionId, event }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+    event?.preventDefault();
+    event?.stopPropagation();
+    history.push(newTemplatePath(activeCollectionId));
  },
 });

@@ -1,10 +1,12 @@
 import { DoneIcon, SmileyIcon, TrashIcon } from "outline-icons";
 import { toast } from "sonner";
+import stores from "~/stores";
 import Comment from "~/models/Comment";
 import CommentDeleteDialog from "~/components/CommentDeleteDialog";
 import ViewReactionsDialog from "~/components/Reactions/ViewReactionsDialog";
-import { createActionV2 } from "..";
-import { ActiveDocumentSection } from "../sections";
+import history from "~/utils/history";
+import { createAction } from "..";
+import { DocumentSection } from "../sections";

 export const deleteCommentFactory = ({
  comment,
@@ -13,15 +15,15 @@ export const deleteCommentFactory = ({
  comment: Comment;
  onDelete: () => void;
 }) =>
-  createActionV2({
+  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();

@@ -39,16 +41,26 @@ export const resolveCommentFactory = ({
  comment: Comment;
  onResolve: () => void;
 }) =>
-  createActionV2({
+  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"));
    },
@@ -61,16 +73,26 @@ export const unresolveCommentFactory = ({
  comment: Comment;
  onUnresolve: () => void;
 }) =>
-  createActionV2({
+  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();
    },
  });
@@ -80,15 +102,15 @@ export const viewCommentReactionsFactory = ({
 }: {
  comment: Comment;
 }) =>
-  createActionV2({
+  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();

@@ -1,4 +1,3 @@
-import Storage from "@shared/utils/Storage";
 import copy from "copy-to-clipboard";
 import {
  BeakerIcon,
@@ -107,8 +106,8 @@ export const startTyping = createAction({
    }, 250);

    window.addEventListener("keydown", (event) => {
-      if (event.key === "Escape" && intervalId) {
-        clearInterval(intervalId);
+      if (event.key === "Escape") {
+        intervalId && clearInterval(intervalId);
      }
    });

@@ -128,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 />,
@@ -213,7 +201,6 @@ export const developer = createAction({
    createToast,
    createTestUsers,
    clearIndexedDB,
-    clearStorage,
    startTyping,
  ],
 });
@@ -1,6 +1,5 @@
 import copy from "copy-to-clipboard";
 import invariant from "invariant";
-import uniqBy from "lodash/uniqBy";
 import {
  DownloadIcon,
  DuplicateIcon,
@@ -26,12 +25,11 @@ import {
  PublishIcon,
  CommentIcon,
  CopyIcon,
+  EyeIcon,
  PadlockIcon,
  GlobeIcon,
  LogoutIcon,
  CaseSensitiveIcon,
-  RestoreIcon,
-  EditIcon,
 } from "outline-icons";
 import { toast } from "sonner";
 import Icon from "@shared/components/Icon";
@@ -53,13 +51,7 @@ import MarkdownIcon from "~/components/Icons/MarkdownIcon";
 import SharePopover from "~/components/Sharing/Document";
 import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
 import DocumentTemplatizeDialog from "~/components/TemplatizeDialog";
-import {
-  createAction,
-  createActionV2,
-  createActionV2Group,
-  createActionV2WithChildren,
-  createInternalLinkActionV2,
-} from "~/actions";
+import { createAction } from "~/actions";
 import {
  ActiveDocumentSection,
  DocumentSection,
@@ -69,6 +61,7 @@ import env from "~/env";
 import { setPersistedState } from "~/hooks/usePersistedState";
 import history from "~/utils/history";
 import {
+  documentInsightsPath,
  documentHistoryPath,
  homePath,
  newDocumentPath,
@@ -77,12 +70,7 @@ import {
  documentPath,
  urlify,
  trashPath,
-  documentEditPath,
 } from "~/utils/routeHelpers";
-import capitalize from "lodash/capitalize";
-import CollectionIcon from "~/components/Icons/CollectionIcon";
-import { ActionV2, ActionV2Group, ActionV2Separator } from "~/types";
-import Insights from "~/scenes/Document/components/Insights";

 export const openDocument = createAction({
  name: ({ t }) => t("Open document"),
@@ -96,9 +84,8 @@ export const openDocument = createAction({
      (acc, node) => [...acc, ...node.children],
      [] as NavigationNode[]
    );
-    const documents = stores.documents.orderedData;

-    return uniqBy([...documents, ...nodes], "id").map((item) => ({
+    return nodes.map((item) => ({
      // Note: using url which includes the slug rather than id here to bust
      // cache if the document is renamed
      id: item.url,
@@ -109,43 +96,11 @@ export const openDocument = createAction({
        <DocumentIcon />
      ),
      section: DocumentSection,
-      to: item.url,
+      perform: () => history.push(item.url),
    }));
  },
 });

-export const editDocument = createInternalLinkActionV2({
-  name: ({ t }) => t("Edit"),
-  analyticsName: "Edit document",
-  section: ActiveDocumentSection,
-  keywords: "edit",
-  icon: <EditIcon />,
-  visible: ({ activeDocumentId, stores }) => {
-    const { auth, documents, policies } = stores;
-
-    const document = activeDocumentId
-      ? documents.get(activeDocumentId)
-      : undefined;
-    const can = activeDocumentId
-      ? policies.abilities(activeDocumentId)
-      : undefined;
-
-    return (
-      !!can?.update && !!auth.user?.separateEditMode && !document?.template
-    );
-  },
-  to: ({ activeDocumentId, stores }) => {
-    const document = activeDocumentId
-      ? stores.documents.get(activeDocumentId)
-      : undefined;
-    if (!document) {
-      return "";
-    }
-
-    return documentEditPath(document);
-  },
-});
-
 export const createDocument = createAction({
  name: ({ t }) => t("New document"),
  analyticsName: "New document",
@@ -184,7 +139,7 @@ export const createDraftDocument = createAction({
    }),
 });

-export const createDocumentFromTemplate = createInternalLinkActionV2({
+export const createDocumentFromTemplate = createAction({
  name: ({ t }) => t("New from template"),
  analyticsName: "New document",
  section: DocumentSection,
@@ -214,24 +169,16 @@ export const createDocumentFromTemplate = createInternalLinkActionV2({
    }
    return stores.policies.abilities(currentTeamId).createDocument;
  },
-  to: ({ activeDocumentId, activeCollectionId, sidebarContext }) => {
-    if (!activeDocumentId || !activeCollectionId) {
-      return "";
-    }
-
-    const [pathname, search] = newDocumentPath(activeCollectionId, {
-      templateId: activeDocumentId,
-    }).split("?");
-
-    return {
-      pathname,
-      search,
-      state: { sidebarContext },
-    };
-  },
+  perform: ({ activeCollectionId, activeDocumentId, sidebarContext }) =>
+    history.push(
+      newDocumentPath(activeCollectionId, { templateId: activeDocumentId }),
+      {
+        sidebarContext,
+      }
+    ),
 });

-export const createNestedDocument = createInternalLinkActionV2({
+export const createNestedDocument = createAction({
  name: ({ t }) => t("New nested document"),
  analyticsName: "New document",
  section: ActiveDocumentSection,
@@ -242,19 +189,13 @@ export const createNestedDocument = createInternalLinkActionV2({
    !!activeDocumentId &&
    stores.policies.abilities(currentTeamId).createDocument &&
    stores.policies.abilities(activeDocumentId).createChildDocument,
-  to: ({ activeDocumentId, sidebarContext }) => {
-    const [pathname, search] =
-      newNestedDocumentPath(activeDocumentId).split("?");
-
-    return {
-      pathname,
-      search,
-      state: { sidebarContext },
-    };
-  },
+  perform: ({ activeDocumentId, sidebarContext }) =>
+    history.push(newNestedDocumentPath(activeDocumentId), {
+      sidebarContext,
+    }),
 });

-export const starDocument = createActionV2({
+export const starDocument = createAction({
  name: ({ t }) => t("Star"),
  analyticsName: "Star document",
  section: ActiveDocumentSection,
@@ -280,7 +221,7 @@ export const starDocument = createActionV2({
  },
 });

-export const unstarDocument = createActionV2({
+export const unstarDocument = createAction({
  name: ({ t }) => t("Unstar"),
  analyticsName: "Unstar document",
  section: ActiveDocumentSection,
@@ -306,7 +247,7 @@ export const unstarDocument = createActionV2({
  },
 });

-export const publishDocument = createActionV2({
+export const publishDocument = createAction({
  name: ({ t }) => t("Publish"),
  analyticsName: "Publish document",
  section: ActiveDocumentSection,
@@ -348,7 +289,7 @@ export const publishDocument = createActionV2({
  },
 });

-export const unpublishDocument = createActionV2({
+export const unpublishDocument = createAction({
  name: ({ t }) => t("Unpublish"),
  analyticsName: "Unpublish document",
  section: ActiveDocumentSection,
@@ -379,27 +320,11 @@ export const unpublishDocument = createActionV2({
  },
 });

-export const subscribeDocument = createActionV2({
+export const subscribeDocument = createAction({
  name: ({ t }) => t("Subscribe"),
  analyticsName: "Subscribe to document",
  section: ActiveDocumentSection,
  icon: <SubscribeIcon />,
-  tooltip: ({ activeCollectionId, isMenu, stores, t }) => {
-    if (!isMenu || !activeCollectionId) {
-      return undefined;
-    }
-
-    return stores.collections.get(activeCollectionId)?.isSubscribed
-      ? t("Subscription inherited from collection")
-      : undefined;
-  },
-  disabled: ({ activeCollectionId, isMenu, stores }) => {
-    if (!isMenu || !activeCollectionId) {
-      return false;
-    }
-
-    return !!stores.collections.get(activeCollectionId)?.isSubscribed;
-  },
  visible: ({ activeDocumentId, stores }) => {
    if (!activeDocumentId) {
      return false;
@@ -408,7 +333,6 @@ export const subscribeDocument = createActionV2({
    const document = stores.documents.get(activeDocumentId);

    return (
-      !!document?.isActive &&
      !document?.collection?.isSubscribed &&
      !document?.isSubscribed &&
      stores.policies.abilities(activeDocumentId).subscribe
@@ -425,27 +349,11 @@ export const subscribeDocument = createActionV2({
  },
 });

-export const unsubscribeDocument = createActionV2({
+export const unsubscribeDocument = createAction({
  name: ({ t }) => t("Unsubscribe"),
  analyticsName: "Unsubscribe from document",
  section: ActiveDocumentSection,
  icon: <UnsubscribeIcon />,
-  tooltip: ({ activeCollectionId, isMenu, stores, t }) => {
-    if (!isMenu || !activeCollectionId) {
-      return undefined;
-    }
-
-    return stores.collections.get(activeCollectionId)?.isSubscribed
-      ? t("Subscription inherited from collection")
-      : undefined;
-  },
-  disabled: ({ activeCollectionId, isMenu, stores }) => {
-    if (!isMenu || !activeCollectionId) {
-      return false;
-    }
-
-    return !!stores.collections.get(activeCollectionId)?.isSubscribed;
-  },
  visible: ({ activeDocumentId, stores }) => {
    if (!activeDocumentId) {
      return false;
@@ -454,10 +362,9 @@ export const unsubscribeDocument = createActionV2({
    const document = stores.documents.get(activeDocumentId);

    return (
-      !!document?.isActive &&
-      (!!document?.collection?.isSubscribed ||
-        (!!document?.isSubscribed &&
-          stores.policies.abilities(activeDocumentId).unsubscribe))
+      !!document?.collection?.isSubscribed ||
+      (!!document?.isSubscribed &&
+        stores.policies.abilities(activeDocumentId).unsubscribe)
    );
  },
  perform: async ({ activeDocumentId, stores, currentUserId, t }) => {
@@ -473,7 +380,7 @@ export const unsubscribeDocument = createActionV2({
  },
 });

-export const shareDocument = createActionV2({
+export const shareDocument = createAction({
  name: ({ t }) => `${t("Permissions")}…`,
  analyticsName: "Share document",
  section: ActiveDocumentSection,
@@ -506,7 +413,7 @@ export const shareDocument = createActionV2({
  },
 });

-export const downloadDocumentAsHTML = createActionV2({
+export const downloadDocumentAsHTML = createAction({
  name: ({ t }) => t("HTML"),
  analyticsName: "Download document as HTML",
  section: ActiveDocumentSection,
@@ -525,7 +432,7 @@ export const downloadDocumentAsHTML = createActionV2({
  },
 });

-export const downloadDocumentAsPDF = createActionV2({
+export const downloadDocumentAsPDF = createAction({
  name: ({ t }) => t("PDF"),
  analyticsName: "Download document as PDF",
  section: ActiveDocumentSection,
@@ -533,11 +440,9 @@ export const downloadDocumentAsPDF = createActionV2({
  icon: <DownloadIcon />,
  iconInContextMenu: false,
  visible: ({ activeDocumentId, stores }) =>
-    !!(
-      activeDocumentId &&
-      stores.policies.abilities(activeDocumentId).download &&
-      env.PDF_EXPORT_ENABLED
-    ),
+    !!activeDocumentId &&
+    stores.policies.abilities(activeDocumentId).download &&
+    env.PDF_EXPORT_ENABLED,
  perform: ({ activeDocumentId, t, stores }) => {
    if (!activeDocumentId) {
      return;
@@ -551,7 +456,7 @@ export const downloadDocumentAsPDF = createActionV2({
  },
 });

-export const downloadDocumentAsMarkdown = createActionV2({
+export const downloadDocumentAsMarkdown = createAction({
  name: ({ t }) => t("Markdown"),
  analyticsName: "Download document as Markdown",
  section: ActiveDocumentSection,
@@ -570,8 +475,9 @@ export const downloadDocumentAsMarkdown = createActionV2({
  },
 });

-export const downloadDocument = createActionV2WithChildren({
-  name: ({ t, isMenu }) => (isMenu ? t("Download") : t("Download document")),
+export const downloadDocument = createAction({
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Download") : t("Download document"),
  analyticsName: "Download document",
  section: ActiveDocumentSection,
  icon: <DownloadIcon />,
@@ -585,7 +491,7 @@ export const downloadDocument = createActionV2WithChildren({
  ],
 });

-export const copyDocumentAsMarkdown = createActionV2({
+export const copyDocumentAsMarkdown = createAction({
  name: ({ t }) => t("Copy as Markdown"),
  section: ActiveDocumentSection,
  keywords: "clipboard",
@@ -604,7 +510,7 @@ export const copyDocumentAsMarkdown = createActionV2({
  },
 });

-export const copyDocumentAsPlainText = createActionV2({
+export const copyDocumentAsPlainText = createAction({
  name: ({ t }) => t("Copy as text"),
  section: ActiveDocumentSection,
  keywords: "clipboard",
@@ -623,7 +529,7 @@ export const copyDocumentAsPlainText = createActionV2({
  },
 });

-export const copyDocumentShareLink = createActionV2({
+export const copyDocumentShareLink = createAction({
  name: ({ t }) => t("Copy public link"),
  section: ActiveDocumentSection,
  keywords: "clipboard share",
@@ -644,7 +550,7 @@ export const copyDocumentShareLink = createActionV2({
  },
 });

-export const copyDocumentLink = createActionV2({
+export const copyDocumentLink = createAction({
  name: ({ t }) => t("Copy link"),
  section: ActiveDocumentSection,
  keywords: "clipboard",
@@ -662,7 +568,7 @@ export const copyDocumentLink = createActionV2({
  },
 });

-export const copyDocument = createActionV2WithChildren({
+export const copyDocument = createAction({
  name: ({ t }) => t("Copy"),
  analyticsName: "Copy document",
  section: ActiveDocumentSection,
@@ -676,8 +582,9 @@ export const copyDocument = createActionV2WithChildren({
  ],
 });

-export const duplicateDocument = createActionV2({
-  name: ({ t, isMenu }) => (isMenu ? t("Duplicate") : t("Duplicate document")),
+export const duplicateDocument = createAction({
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Duplicate") : t("Duplicate document"),
  analyticsName: "Duplicate document",
  section: ActiveDocumentSection,
  icon: <DuplicateIcon />,
@@ -711,7 +618,7 @@ export const duplicateDocument = createActionV2({
 * Pin a document to a collection. Pinned documents will be displayed at the top
 * of the collection for all collection members to see.
 */
-export const pinDocumentToCollection = createActionV2({
+export const pinDocumentToCollection = createAction({
  name: ({ activeDocumentId = "", t, stores }) => {
    const selectedDocument = stores.documents.get(activeDocumentId);
    const collectionName = selectedDocument
@@ -756,7 +663,7 @@ export const pinDocumentToCollection = createActionV2({
 * Pin a document to team home. Pinned documents will be displayed at the top
 * of the home screen for all team members to see.
 */
-export const pinDocumentToHome = createActionV2({
+export const pinDocumentToHome = createAction({
  name: ({ t }) => t("Pin to home"),
  analyticsName: "Pin document to home",
  section: ActiveDocumentSection,
@@ -788,7 +695,7 @@ export const pinDocumentToHome = createActionV2({
  },
 });

-export const pinDocument = createActionV2WithChildren({
+export const pinDocument = createAction({
  name: ({ t }) => t("Pin"),
  analyticsName: "Pin document",
  section: ActiveDocumentSection,
@@ -796,7 +703,7 @@ export const pinDocument = createActionV2WithChildren({
  children: [pinDocumentToCollection, pinDocumentToHome],
 });

-export const searchInDocument = createInternalLinkActionV2({
+export const searchInDocument = createAction({
  name: ({ t }) => t("Search in document"),
  analyticsName: "Search document",
  section: ActiveDocumentSection,
@@ -809,25 +716,14 @@ export const searchInDocument = createInternalLinkActionV2({
    const document = stores.documents.get(activeDocumentId);
    return !!document?.isActive;
  },
-  to: ({ activeDocumentId, sidebarContext }) => {
-    if (!activeDocumentId) {
-      return "";
-    }
-
-    const [pathname, search] = searchPath({
-      documentId: activeDocumentId,
-    }).split("?");
-
-    return {
-      pathname,
-      search,
-      state: { sidebarContext },
-    };
+  perform: ({ activeDocumentId }) => {
+    history.push(searchPath({ documentId: activeDocumentId }));
  },
 });

-export const printDocument = createActionV2({
-  name: ({ t, isMenu }) => (isMenu ? t("Print") : t("Print document")),
+export const printDocument = createAction({
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Print") : t("Print document"),
  analyticsName: "Print document",
  section: ActiveDocumentSection,
  icon: <PrintIcon />,
@@ -837,7 +733,7 @@ export const printDocument = createActionV2({
  },
 });

-export const importDocument = createActionV2({
+export const importDocument = createAction({
  name: ({ t }) => t("Import document"),
  analyticsName: "Import document",
  section: DocumentSection,
@@ -854,7 +750,7 @@ export const importDocument = createActionV2({

    return false;
  },
-  perform: ({ activeDocumentId, activeCollectionId, stores }) => {
+  perform: ({ activeCollectionId, activeDocumentId, stores }) => {
    const { documents } = stores;
    const input = document.createElement("input");
    input.type = "file";
@@ -884,7 +780,7 @@ export const importDocument = createActionV2({
  },
 });

-export const createTemplateFromDocument = createActionV2({
+export const createTemplateFromDocument = createAction({
  name: ({ t }) => t("Templatize"),
  analyticsName: "Templatize document",
  section: ActiveDocumentSection,
@@ -942,11 +838,11 @@ export const searchDocumentsForQuery = (query: string) =>
    analyticsName: "Search documents",
    section: DocumentSection,
    icon: <SearchIcon />,
-    to: searchPath({ query }),
+    perform: () => history.push(searchPath({ query })),
    visible: ({ location }) => location.pathname !== searchPath(),
  });

-export const moveTemplateToWorkspace = createActionV2({
+export const moveTemplateToWorkspace = createAction({
  name: ({ t }) => t("Move to workspace"),
  analyticsName: "Move template to workspace",
  section: DocumentSection,
@@ -976,7 +872,7 @@ export const moveTemplateToWorkspace = createActionV2({
  },
 });

-export const moveDocumentToCollection = createActionV2({
+export const moveDocumentToCollection = createAction({
  name: ({ activeDocumentId, stores, t }) => {
    if (!activeDocumentId) {
      return t("Move");
@@ -1013,7 +909,7 @@ export const moveDocumentToCollection = createActionV2({
  },
 });

-export const moveDocument = createActionV2({
+export const moveDocument = createAction({
  name: ({ t }) => t("Move"),
  analyticsName: "Move document",
  section: ActiveDocumentSection,
@@ -1032,7 +928,7 @@ export const moveDocument = createActionV2({
  perform: moveDocumentToCollection.perform,
 });

-export const moveTemplate = createActionV2WithChildren({
+export const moveTemplate = createAction({
  name: ({ t }) => t("Move"),
  analyticsName: "Move document",
  section: ActiveDocumentSection,
@@ -1051,7 +947,7 @@ export const moveTemplate = createActionV2WithChildren({
  children: [moveTemplateToWorkspace, moveDocumentToCollection],
 });

-export const archiveDocument = createActionV2({
+export const archiveDocument = createAction({
  name: ({ t }) => `${t("Archive")}…`,
  analyticsName: "Archive document",
  section: ActiveDocumentSection,
@@ -1091,102 +987,7 @@ export const archiveDocument = createActionV2({
  },
 });

-export const restoreDocument = createActionV2({
-  name: ({ t }) => `${t("Restore")}`,
-  analyticsName: "Restore document",
-  section: ActiveDocumentSection,
-  icon: <RestoreIcon />,
-  visible: ({ activeDocumentId, stores }) => {
-    const document = activeDocumentId
-      ? stores.documents.get(activeDocumentId)
-      : undefined;
-    if (!document) {
-      return false;
-    }
-
-    const collection = document.collectionId
-      ? stores.collections.get(document.collectionId)
-      : undefined;
-    const can = stores.policies.abilities(document.id);
-
-    return (
-      !!(document.isWorkspaceTemplate || collection?.isActive) &&
-      !!(can.restore || can.unarchive)
-    );
-  },
-  perform: async ({ t, stores, activeDocumentId }) => {
-    const document = activeDocumentId
-      ? stores.documents.get(activeDocumentId)
-      : undefined;
-    if (!document) {
-      return;
-    }
-
-    await document.restore();
-    toast.success(
-      t("{{ documentName }} restored", {
-        documentName: capitalize(document.noun),
-      })
-    );
-  },
-});
-
-export const restoreDocumentToCollection = createActionV2WithChildren({
-  name: ({ t }) => `${t("Restore")}…`,
-  analyticsName: "Restore document",
-  section: ActiveDocumentSection,
-  icon: <RestoreIcon />,
-  visible: ({ stores, activeDocumentId }) => {
-    const document = activeDocumentId
-      ? stores.documents.get(activeDocumentId)
-      : undefined;
-    if (!document) {
-      return false;
-    }
-
-    const can = stores.policies.abilities(document.id);
-    const collection = document.collectionId
-      ? stores.collections.get(document.collectionId)
-      : undefined;
-
-    return (
-      !(document.isWorkspaceTemplate || collection?.isActive) &&
-      !!(can.restore || can.unarchive)
-    );
-  },
-  children: ({ t, activeDocumentId, stores }) => {
-    const { collections, documents, policies } = stores;
-
-    const document = activeDocumentId
-      ? documents.get(activeDocumentId)
-      : undefined;
-    if (!document) {
-      return [];
-    }
-
-    const actions = collections.orderedData.map((collection) => {
-      const can = policies.abilities(collection.id);
-      return createActionV2({
-        name: collection.name,
-        section: ActiveDocumentSection,
-        icon: <CollectionIcon collection={collection} />,
-        visible: can.createDocument,
-        perform: async () => {
-          await document.restore({ collectionId: collection.id });
-          toast.success(
-            t("{{ documentName }} restored", {
-              documentName: capitalize(document.noun),
-            })
-          );
-        },
-      });
-    });
-
-    return [createActionV2Group({ name: t("Choose a collection"), actions })];
-  },
-});
-
-export const deleteDocument = createActionV2({
+export const deleteDocument = createAction({
  name: ({ t }) => `${t("Delete")}…`,
  analyticsName: "Delete document",
  section: ActiveDocumentSection,
@@ -1220,7 +1021,7 @@ export const deleteDocument = createActionV2({
  },
 });

-export const permanentlyDeleteDocument = createActionV2({
+export const permanentlyDeleteDocument = createAction({
  name: ({ t }) => t("Permanently delete"),
  analyticsName: "Permanently delete document",
  section: ActiveDocumentSection,
@@ -1275,14 +1076,13 @@ export const permanentlyDeleteDocumentsInTrash = createAction({
  },
 });

-export const openDocumentComments = createActionV2({
+export const openDocumentComments = createAction({
  name: ({ t }) => t("Comments"),
  analyticsName: "Open comments",
  section: ActiveDocumentSection,
  icon: <CommentIcon />,
  visible: ({ activeDocumentId, stores }) => {
    const can = stores.policies.abilities(activeDocumentId ?? "");
-
    return (
      !!activeDocumentId &&
      can.comment &&
@@ -1298,7 +1098,7 @@ export const openDocumentComments = createActionV2({
  },
 });

-export const openDocumentHistory = createInternalLinkActionV2({
+export const openDocumentHistory = createAction({
  name: ({ t }) => t("History"),
  analyticsName: "Open document history",
  section: ActiveDocumentSection,
@@ -1307,25 +1107,19 @@ export const openDocumentHistory = createInternalLinkActionV2({
    const can = stores.policies.abilities(activeDocumentId ?? "");
    return !!activeDocumentId && can.listRevisions;
  },
-  to: ({ activeDocumentId, stores, sidebarContext }) => {
-    const document = activeDocumentId
-      ? stores.documents.get(activeDocumentId)
-      : undefined;
-    if (!document) {
-      return "";
+  perform: ({ activeDocumentId, stores }) => {
+    if (!activeDocumentId) {
+      return;
    }
-
-    const [pathname, search] = documentHistoryPath(document).split("?");
-
-    return {
-      pathname,
-      search,
-      state: { sidebarContext },
-    };
+    const document = stores.documents.get(activeDocumentId);
+    if (!document) {
+      return;
+    }
+    history.push(documentHistoryPath(document));
  },
 });

-export const openDocumentInsights = createActionV2({
+export const openDocumentInsights = createAction({
  name: ({ t }) => t("Insights"),
  analyticsName: "Open document insights",
  section: ActiveDocumentSection,
@@ -1343,22 +1137,50 @@ export const openDocumentInsights = createActionV2({
      !document?.isDeleted
    );
  },
-  perform: ({ activeDocumentId, stores, t }) => {
+  perform: ({ activeDocumentId, stores }) => {
+    if (!activeDocumentId) {
+      return;
+    }
+    const document = stores.documents.get(activeDocumentId);
+    if (!document) {
+      return;
+    }
+    history.push(documentInsightsPath(document));
+  },
+});
+
+export const toggleViewerInsights = createAction({
+  name: ({ t, stores, activeDocumentId }) => {
    const document = activeDocumentId
      ? stores.documents.get(activeDocumentId)
      : undefined;
+    return document?.insightsEnabled
+      ? t("Disable viewer insights")
+      : t("Enable viewer insights");
+  },
+  analyticsName: "Toggle viewer insights",
+  section: ActiveDocumentSection,
+  icon: <EyeIcon />,
+  visible: ({ activeDocumentId, stores }) => {
+    const can = stores.policies.abilities(activeDocumentId ?? "");
+    return can.updateInsights;
+  },
+  perform: async ({ activeDocumentId, stores }) => {
+    if (!activeDocumentId) {
+      return;
+    }
+    const document = stores.documents.get(activeDocumentId);
    if (!document) {
      return;
    }

-    stores.dialogs.openModal({
-      title: t("Insights"),
-      content: <Insights document={document} />,
+    await document.save({
+      insightsEnabled: !document.insightsEnabled,
    });
  },
 });

-export const leaveDocument = createActionV2({
+export const leaveDocument = createAction({
  name: ({ t }) => t("Leave document"),
  analyticsName: "Leave document",
  section: ActiveDocumentSection,
@@ -1388,33 +1210,12 @@ export const leaveDocument = createActionV2({
      } as UserMembership);

      toast.success(t("You have left the shared document"));
-    } catch (_err) {
+    } catch (err) {
      toast.error(t("Could not leave document"));
    }
  },
 });

-export const applyTemplateFactory = ({
-  actions,
-}: {
-  actions: (ActionV2 | ActionV2Group | ActionV2Separator)[];
-}) =>
-  createActionV2WithChildren({
-    name: ({ t }) => t("Apply template"),
-    analyticsName: "Apply template",
-    section: ActiveDocumentSection,
-    icon: <ShapesIcon />,
-    visible: ({ activeDocumentId, stores }) => {
-      const { policies } = stores;
-      const can = activeDocumentId
-        ? policies.abilities(activeDocumentId)
-        : undefined;
-
-      return !!can?.update;
-    },
-    children: actions,
-  });
-
 export const rootDocumentActions = [
  openDocument,
  archiveDocument,
@@ -1,28 +0,0 @@
-import { TrashIcon } from "outline-icons";
-import stores from "~/stores";
-import { createAction } from "..";
-import { SettingsSection } from "../sections";
-import Integration from "~/models/Integration";
-import { IntegrationType } from "@shared/types";
-import { DisconnectAnalyticsDialog } from "~/components/DisconnectAnalyticsDialog";
-
-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!} />,
-      });
-    },
-  });
@@ -12,21 +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 SearchQuery from "~/models/SearchQuery";
 import KeyboardShortcuts from "~/scenes/KeyboardShortcuts";
-import {
-  createAction,
-  createActionV2,
-  createExternalLinkActionV2,
-  createInternalLinkActionV2,
-} 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,
@@ -43,7 +39,7 @@ export const navigateToHome = createAction({
  section: NavigationSection,
  shortcut: ["d"],
  icon: <HomeIcon />,
-  to: homePath(),
+  perform: () => history.push(homePath()),
  visible: ({ location }) => location.pathname !== homePath(),
 });

@@ -53,7 +49,7 @@ export const navigateToRecentSearchQuery = (searchQuery: SearchQuery) =>
    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 = createAction({
@@ -61,7 +57,7 @@ export const navigateToDrafts = createAction({
  analyticsName: "Navigate to drafts",
  section: NavigationSection,
  icon: <DraftsIcon />,
-  to: draftsPath(),
+  perform: () => history.push(draftsPath()),
  visible: ({ location }) => location.pathname !== draftsPath(),
 });

@@ -70,7 +66,7 @@ export const navigateToSearch = createAction({
  analyticsName: "Navigate to search",
  section: NavigationSection,
  icon: <SearchIcon />,
-  to: searchPath(),
+  perform: () => history.push(searchPath()),
  visible: ({ location }) => location.pathname !== searchPath(),
 });

@@ -80,7 +76,7 @@ export const navigateToArchive = createAction({
  section: NavigationSection,
  shortcut: ["g", "a"],
  icon: <ArchiveIcon />,
-  to: archivePath(),
+  perform: () => history.push(archivePath()),
  visible: ({ location }) => location.pathname !== archivePath(),
 });

@@ -89,7 +85,7 @@ export const navigateToTrash = createAction({
  analyticsName: "Navigate to trash",
  section: NavigationSection,
  icon: <TrashIcon />,
-  to: trashPath(),
+  perform: () => history.push(trashPath()),
  visible: ({ location }) => location.pathname !== trashPath(),
 });

@@ -100,25 +96,25 @@ export const navigateToSettings = createAction({
  shortcut: ["g", "s"],
  icon: <SettingsIcon />,
  visible: () => stores.policies.abilities(stores.auth.team?.id || "").update,
-  to: settingsPath(),
+  perform: () => history.push(settingsPath()),
 });

-export const navigateToWorkspaceSettings = createInternalLinkActionV2({
+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 = createInternalLinkActionV2({
+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 = createAction({
@@ -127,46 +123,43 @@ export const navigateToTemplateSettings = createAction({
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <ShapesIcon />,
-  to: settingsPath("templates"),
+  perform: () => history.push(settingsPath("templates")),
 });

-export const navigateToNotificationSettings = createInternalLinkActionV2({
-  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 = createInternalLinkActionV2({
+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 = createExternalLinkActionV2({
+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 = createExternalLinkActionV2({
+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({
@@ -177,37 +170,32 @@ export const toggleSidebar = createAction({
  perform: () => stores.ui.toggleCollapsedSidebar(),
 });

-export const openFeedbackUrl = createExternalLinkActionV2({
+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 = createExternalLinkActionV2({
+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 = createExternalLinkActionV2({
+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 = createActionV2({
+export const openKeyboardShortcuts = createAction({
  name: ({ t }) => t("Keyboard shortcuts"),
  analyticsName: "Open keyboard shortcuts",
  section: NavigationSection,
@@ -232,19 +220,23 @@ export const downloadApp = createAction({
  iconInContextMenu: false,
  icon: <BrowserIcon />,
  visible: () => !Desktop.isElectron() && isMac() && isCloudHosted,
-  to: {
-    url: "https://desktop.getoutline.com",
-    target: "_blank",
+  perform: () => {
+    window.open("https://desktop.getoutline.com");
  },
 });

-export const logout = createActionV2({
+export const logout = createAction({
  name: ({ t }) => t("Log out"),
  analyticsName: "Log out",
  section: NavigationSection,
  icon: <LogoutIcon />,
  perform: async () => {
-    await stores.auth.logout({ userInitiated: true });
+    await stores.auth.logout();
+    if (env.OIDC_LOGOUT_URI) {
+      setTimeout(() => {
+        window.location.replace(env.OIDC_LOGOUT_URI);
+      }, 200);
+    }
  },
 });

@@ -1,5 +1,5 @@
 import { ArchiveIcon, MarkAsReadIcon } from "outline-icons";
-import { createAction, createActionV2 } from "..";
+import { createAction } from "..";
 import { NotificationSection } from "../sections";

 export const markNotificationsAsRead = createAction({
@@ -12,7 +12,7 @@ export const markNotificationsAsRead = createAction({
  visible: ({ stores }) => stores.notifications.approximateUnreadCount > 0,
 });

-export const markNotificationsAsArchived = createActionV2({
+export const markNotificationsAsArchived = createAction({
  name: ({ t }) => t("Archive all notifications"),
  analyticsName: "Mark notifications as archived",
  section: NotificationSection,
@@ -3,7 +3,7 @@ import { LinkIcon, RestoreIcon, TrashIcon } from "outline-icons";
 import { matchPath } from "react-router-dom";
 import { toast } from "sonner";
 import stores from "~/stores";
-import { createAction, createActionV2 } from "~/actions";
+import { createAction } from "~/actions";
 import { RevisionSection } from "~/actions/sections";
 import history from "~/utils/history";
 import {
@@ -11,7 +11,7 @@ import {
  matchDocumentHistory,
 } from "~/utils/routeHelpers";

-export const restoreRevision = createActionV2({
+export const restoreRevision = createAction({
  name: ({ t }) => t("Restore"),
  analyticsName: "Restore revision",
  icon: <RestoreIcon />,
@@ -73,7 +73,7 @@ export const deleteRevision = createAction({
  },
 });

-export const copyLinkToRevision = createActionV2({
+export const copyLinkToRevision = createAction({
  name: ({ t }) => t("Copy link"),
  analyticsName: "Copy link to revision",
  icon: <LinkIcon />,
@@ -1,47 +1,50 @@
 import { SunIcon, MoonIcon, BrowserIcon } from "outline-icons";
+import stores from "~/stores";
 import { Theme } from "~/stores/UiStore";
-import { createActionV2, createActionV2WithChildren } from "~/actions";
+import { createAction } from "~/actions";
 import { SettingsSection } from "~/actions/sections";

-export const changeToDarkTheme = createActionV2({
+export const changeToDarkTheme = createAction({
  name: ({ t }) => t("Dark"),
  analyticsName: "Change to dark theme",
  icon: <MoonIcon />,
  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 = createActionV2({
+export const changeToLightTheme = createAction({
  name: ({ t }) => t("Light"),
  analyticsName: "Change to light theme",
  icon: <SunIcon />,
  iconInContextMenu: false,
  keywords: "theme light day",
  section: SettingsSection,
-  selected: ({ stores }) => stores.ui.theme === "light",
-  perform: ({ stores }) => stores.ui.setTheme(Theme.Light),
+  selected: () => stores.ui.theme === "light",
+  perform: () => stores.ui.setTheme(Theme.Light),
 });

-export const changeToSystemTheme = createActionV2({
+export const changeToSystemTheme = createAction({
  name: ({ t }) => t("System"),
  analyticsName: "Change to system theme",
  icon: <BrowserIcon />,
  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 = createActionV2WithChildren({
-  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],
@@ -1,59 +0,0 @@
-import copy from "copy-to-clipboard";
-import Share from "~/models/Share";
-import { createActionV2, createInternalLinkActionV2 } from "..";
-import { ArrowIcon, CopyIcon, TrashIcon } from "outline-icons";
-import { ShareSection } from "../sections";
-import env from "~/env";
-import { toast } from "sonner";
-
-export const copyShareUrlFactory = ({ share }: { share: Share }) =>
-  createActionV2({
-    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 }) =>
-  createInternalLinkActionV2({
-    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>;
-}) =>
-  createActionV2({
-    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);
-      }
-    },
-  });
@@ -5,24 +5,20 @@ import RootStore from "~/stores/RootStore";
 import { LoginDialog } from "~/scenes/Login/components/LoginDialog";
 import TeamNew from "~/scenes/TeamNew";
 import TeamLogo from "~/components/TeamLogo";
-import {
-  createActionV2,
-  createActionV2WithChildren,
-  createExternalLinkActionV2,
-} from "~/actions";
-import { ActionContext, ExternalLinkActionV2 } 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<ExternalLinkActionV2>((session) =>
-    createExternalLinkActionV2({
-      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 = createActionV2WithChildren({
+export const switchTeam = createAction({
  name: ({ t }) => t("Switch workspace"),
  placeholder: ({ t }) => t("Select a workspace"),
  analyticsName: "Switch workspace",
@@ -52,7 +46,7 @@ export const switchTeam = createActionV2WithChildren({
  children: switchTeamsList,
 });

-export const createTeam = createActionV2({
+export const createTeam = createAction({
  name: ({ t }) => `${t("New workspace")}…`,
  analyticsName: "New workspace",
  keywords: "create change switch workspace organization team",
@@ -63,18 +57,17 @@ export const createTeam = createActionV2({
  perform: ({ t, event, stores }) => {
    event?.preventDefault();
    event?.stopPropagation();
-
    const { user } = stores.auth;
-    if (user) {
+    user &&
      stores.dialogs.openModal({
        title: t("Create a workspace"),
+        fullscreen: true,
        content: <TeamNew user={user} />,
      });
-    }
  },
 });

-export const desktopLoginTeam = createActionV2({
+export const desktopLoginTeam = createAction({
  name: ({ t }) => t("Login to workspace"),
  analyticsName: "Login to workspace",
  keywords: "change switch workspace organization team",
@@ -8,7 +8,7 @@ import {
  UserChangeRoleDialog,
  UserDeleteDialog,
 } from "~/components/UserDialogs";
-import { createAction, createActionV2 } from "~/actions";
+import { createAction } from "~/actions";
 import { UserSection } from "~/actions/sections";

 export const inviteUser = createAction({
@@ -28,7 +28,7 @@ export const inviteUser = createAction({
 });

 export const updateUserRoleActionFactory = (user: User, role: UserRole) =>
-  createActionV2({
+  createAction({
    name: ({ t }) =>
      UserRoleHelper.isRoleHigher(role, user!.role)
        ? `${t("Promote to {{ role }}", {
@@ -45,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({
@@ -63,7 +63,7 @@ export const updateUserRoleActionFactory = (user: User, role: UserRole) =>
  });

 export const deleteUserActionFactory = (userId: string) =>
-  createActionV2({
+  createAction({
    name: ({ t }) => `${t("Delete user")}…`,
    analyticsName: "Delete user",
    keywords: "leave",
@@ -1,4 +1,3 @@
-import { LocationDescriptor } from "history";
 import flattenDeep from "lodash/flattenDeep";
 import { toast } from "sonner";
 import { Optional } from "utility-types";
@@ -6,24 +5,13 @@ import { v4 as uuidv4 } from "uuid";
 import {
  Action,
  ActionContext,
-  ActionV2,
-  ActionV2Group,
-  ActionV2Separator as TActionV2Separator,
-  ActionV2Variant,
-  ActionV2WithChildren,
-  ExternalLinkActionV2,
-  InternalLinkActionV2,
-  MenuExternalLink,
-  MenuInternalLink,
-  MenuItem,
+  CommandBarAction,
  MenuItemButton,
  MenuItemWithChildren,
 } from "~/types";
 import Analytics from "~/utils/Analytics";
-import history from "~/utils/history";
-import { Action as KbarAction } from "kbar";

-export function resolve<T>(value: any, context: ActionContext): T {
+function resolve<T>(value: any, context: ActionContext): T {
  return typeof value === "function" ? value(context) : value;
 }

@@ -32,17 +20,18 @@ export function createAction(definition: Optional<Action, "id">): Action {
    ...definition,
    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);
        }
      : undefined,
@@ -53,7 +42,7 @@ export function createAction(definition: Optional<Action, "id">): Action {
 export function actionToMenuItem(
  action: Action,
  context: ActionContext
-): MenuItemButton | MenuExternalLink | MenuInternalLink | MenuItemWithChildren {
+): 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;
@@ -78,26 +67,6 @@ export function actionToMenuItem(
    };
  }

-  if (action.to) {
-    return typeof action.to === "string"
-      ? {
-          type: "route",
-          title,
-          icon,
-          visible,
-          to: action.to,
-          selected: action.selected?.(context),
-        }
-      : {
-          type: "link",
-          title,
-          icon,
-          visible,
-          href: action.to,
-          selected: action.selected?.(context),
-        };
-  }
-
  return {
    type: "button",
    title,
@@ -112,7 +81,7 @@ export function actionToMenuItem(
 export function actionToKBar(
  action: Action,
  context: ActionContext
-): KbarAction[] {
+): CommandBarAction[] {
  if (typeof action.visible === "function" && !action.visible(context)) {
    return [];
  }
@@ -130,7 +99,7 @@ export function actionToKBar(

  const sectionPriority =
    typeof action.section !== "string" && "priority" in action.section
-      ? ((action.section.priority as number) ?? 0)
+      ? (action.section.priority as number) ?? 0
      : 0;

  return [
@@ -144,10 +113,9 @@ export function actionToKBar(
      shortcut: action.shortcut || [],
      icon: resolvedIcon,
      priority: (1 + (action.priority ?? 0)) * (1 + (sectionPriority ?? 0)),
-      perform:
-        action.perform || action.to
-          ? () => performAction(action, context)
-          : undefined,
+      perform: action.perform
+        ? () => performAction(action, context)
+        : undefined,
    },
  ].concat(
    // @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.
@@ -156,13 +124,7 @@ export function actionToKBar(
 }

 export async function performAction(action: Action, context: ActionContext) {
-  const result = action.perform
-    ? action.perform(context)
-    : action.to
-      ? typeof action.to === "string"
-        ? history.push(action.to)
-        : window.open(action.to.url, action.to.target)
-      : undefined;
+  const result = action.perform?.(context);

  if (result instanceof Promise) {
    return result.catch((err: Error) => {
@@ -172,281 +134,3 @@ export async function performAction(action: Action, context: ActionContext) {

  return result;
 }
-
-/** Actions V2 */
-
-export const ActionV2Separator: TActionV2Separator = {
-  type: "action_separator",
-};
-
-export function createActionV2(
-  definition: Optional<Omit<ActionV2, "type" | "variant">, "id">
-): ActionV2 {
-  return {
-    ...definition,
-    type: "action",
-    variant: "action",
-    perform: definition.perform
-      ? (context) => {
-          // We must use the specific analytics name here as the action name is
-          // translated and potentially contains user strings.
-          if (definition.analyticsName) {
-            Analytics.track("perform_action", definition.analyticsName, {
-              context: context.isButton
-                ? "button"
-                : context.isCommandBar
-                  ? "commandbar"
-                  : "contextmenu",
-            });
-          }
-          return definition.perform(context);
-        }
-      : () => {},
-    id: definition.id ?? uuidv4(),
-  };
-}
-
-export function createInternalLinkActionV2(
-  definition: Optional<Omit<InternalLinkActionV2, "type" | "variant">, "id">
-): InternalLinkActionV2 {
-  return {
-    ...definition,
-    type: "action",
-    variant: "internal_link",
-    id: definition.id ?? uuidv4(),
-  };
-}
-
-export function createExternalLinkActionV2(
-  definition: Optional<Omit<ExternalLinkActionV2, "type" | "variant">, "id">
-): ExternalLinkActionV2 {
-  return {
-    ...definition,
-    type: "action",
-    variant: "external_link",
-    id: definition.id ?? uuidv4(),
-  };
-}
-
-export function createActionV2WithChildren(
-  definition: Optional<Omit<ActionV2WithChildren, "type" | "variant">, "id">
-): ActionV2WithChildren {
-  return {
-    ...definition,
-    type: "action",
-    variant: "action_with_children",
-    id: definition.id ?? uuidv4(),
-  };
-}
-
-export function createActionV2Group(
-  definition: Omit<ActionV2Group, "type">
-): ActionV2Group {
-  return {
-    ...definition,
-    type: "action_group",
-  };
-}
-
-export function createRootMenuAction(
-  actions: (ActionV2Variant | ActionV2Group | TActionV2Separator)[]
-): ActionV2WithChildren {
-  return {
-    id: uuidv4(),
-    type: "action",
-    variant: "action_with_children",
-    name: "root_action",
-    section: "Root",
-    children: actions,
-  };
-}
-
-export function actionV2ToMenuItem(
-  action: ActionV2Variant | ActionV2Group | TActionV2Separator,
-  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;
-
-      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,
-            onClick: () => performActionV2(action, context),
-          };
-
-        case "internal_link": {
-          const to = resolve<LocationDescriptor>(action.to, context);
-          return {
-            type: "route",
-            title,
-            icon,
-            visible,
-            disabled,
-            to,
-          };
-        }
-
-        case "external_link":
-          return {
-            type: "link",
-            title,
-            icon,
-            visible,
-            disabled,
-            href: action.target
-              ? { url: action.url, target: action.target }
-              : action.url,
-          };
-
-        case "action_with_children": {
-          const children = resolve<
-            (ActionV2Variant | ActionV2Group | TActionV2Separator)[]
-          >(action.children, context);
-          const subMenuItems = children.map((a) =>
-            actionV2ToMenuItem(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) =>
-        actionV2ToMenuItem(a, context)
-      );
-      return {
-        type: "group",
-        title: resolve<string>(action.name, context),
-        visible: hasVisibleItems(groupItems),
-        items: groupItems,
-      };
-    }
-
-    case "action_separator":
-      return { type: "separator" };
-  }
-}
-
-export function actionV2ToKBar(
-  action: ActionV2Variant,
-  context: ActionContext
-): KbarAction[] {
-  const visible = resolve<boolean>(action.visible, context);
-  if (visible === false) {
-    return [];
-  }
-
-  const name = resolve<string>(action.name, context);
-  const icon = resolve<React.ReactElement>(action.icon, context);
-  const section = resolve<string>(action.section, context);
-
-  const sectionPriority =
-    typeof action.section !== "string" && "priority" in action.section
-      ? ((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,
-          icon,
-          priority,
-          perform: () => performActionV2(action, context),
-        },
-      ];
-    }
-
-    case "action_with_children": {
-      const resolvedChildren = resolve<ActionV2Variant[]>(
-        action.children,
-        context
-      );
-      const children = resolvedChildren
-        .map((a) => actionV2ToKBar(a, context))
-        .flat()
-        .filter(Boolean);
-
-      return [
-        {
-          id: action.id,
-          name,
-          section,
-          keywords: action.keywords,
-          shortcut: action.shortcut,
-          icon,
-          priority,
-        },
-        ...children.map((child) => ({
-          ...child,
-          parent: child.parent ?? action.id,
-        })),
-      ];
-    }
-
-    default:
-      throw Error("invalid action variant");
-  }
-}
-
-export async function performActionV2(
-  action: Exclude<ActionV2Variant, ActionV2WithChildren>,
-  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();
-
-  if (result instanceof Promise) {
-    return result.catch((err: Error) => {
-      toast.error(err.message);
-    });
-  }
-
-  return result;
-}
-
-function hasVisibleItems(items: MenuItem[]) {
-  const applicableTypes = ["button", "link", "route", "group", "submenu"];
-  return items.some(
-    (item) => applicableTypes.includes(item.type) && item.visible
-  );
-}
@@ -36,14 +36,10 @@ export const NavigationSection = ({ t }: ActionContext) => t("Navigation");

 export const NotificationSection = ({ t }: ActionContext) => t("Notification");

-export const GroupSection = ({ t }: ActionContext) => t("Groups");
-
 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) =>
@@ -1,10 +1,9 @@
-/* oxlint-disable react/prop-types */
+/* eslint-disable react/prop-types */
 import * as React from "react";
 import Tooltip, { Props as TooltipProps } from "~/components/Tooltip";
-import { performAction, performActionV2, resolve } from "~/actions";
+import { performAction } from "~/actions";
 import useIsMounted from "~/hooks/useIsMounted";
-import { Action, ActionV2Variant, ActionV2WithChildren } from "~/types";
-import useActionContext from "~/hooks/useActionContext";
+import { Action, ActionContext } from "~/types";

 export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  /** Show the button in a disabled state */
@@ -12,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?: Action | Exclude<ActionV2Variant, ActionV2WithChildren>;
+  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">;
 };
@@ -22,33 +23,34 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
 */
 const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
  function _ActionButton(
-    { action, tooltip, hideOnActionDisabled, ...rest }: Props,
+    { action, context, tooltip, hideOnActionDisabled, ...rest }: Props,
    ref: React.Ref<HTMLButtonElement>
  ) {
-    const actionContext = useActionContext({
-      isButton: true,
-    });
    const isMounted = useIsMounted();
    const [executing, setExecuting] = React.useState(false);
    const disabled = rest.disabled;

-    if (!actionContext || !action) {
+    if (action && !context) {
+      throw new Error("Context must be provided with action");
+    }
+    if (!context || !action) {
      return <button {...rest} ref={ref} />;
    }

+    const actionContext = { ...context, isButton: true };
+
    if (
-      action.visible &&
-      !resolve<boolean>(action.visible, actionContext) &&
+      action?.visible &&
+      !action.visible(actionContext) &&
      hideOnActionDisabled
    ) {
      return null;
    }

    const label =
-      rest["aria-label"] ??
-      (typeof action.name === "function"
+      typeof action.name === "function"
        ? action.name(actionContext)
-        : action.name);
+        : action.name;

    const button = (
      <button
@@ -57,14 +59,11 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
        disabled={disabled || executing}
        ref={ref}
        onClick={
-          actionContext
+          action?.perform && actionContext
            ? (ev) => {
                ev.preventDefault();
                ev.stopPropagation();
-                const response =
-                  "variant" in action
-                    ? performActionV2(action, actionContext)
-                    : performAction(action, actionContext);
+                const response = performAction(action, actionContext);
                if (response?.finally) {
                  setExecuting(true);
                  void response.finally(
@@ -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;
@@ -1,4 +1,4 @@
-/* oxlint-disable prefer-rest-params */
+/* eslint-disable prefer-rest-params */
 /* global ga */
 import escape from "lodash/escape";
 import * as React from "react";
@@ -31,12 +31,7 @@ const Authenticated = ({ children }: Props) => {
    return <LoadingIndicator />;
  }

-  void auth.logout({ savePath: true });
-
-  if (auth.logoutRedirectUri) {
-    window.location.href = auth.logoutRedirectUri;
-    return null;
-  }
+  void auth.logout(true);
  return <Redirect to="/" />;
 };

@@ -13,6 +13,7 @@ import ErrorSuspended from "~/scenes/Errors/ErrorSuspended";
 import Layout from "~/components/Layout";
 import RegisterKeyDown from "~/components/RegisterKeyDown";
 import Sidebar from "~/components/Sidebar";
+import SidebarRight from "~/components/Sidebar/Right";
 import SettingsSidebar from "~/components/Sidebar/Settings";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import { usePostLoginPath } from "~/hooks/useLastVisitedPath";
@@ -26,6 +27,7 @@ import {
  settingsPath,
  matchDocumentHistory,
  matchDocumentSlug as slug,
+  matchDocumentInsights,
 } from "~/utils/routeHelpers";
 import { DocumentContextProvider } from "./DocumentContext";
 import Fade from "./Fade";
@@ -37,7 +39,9 @@ const DocumentComments = lazyWithRetry(
 const DocumentHistory = lazyWithRetry(
  () => import("~/scenes/Document/components/History")
 );
-
+const DocumentInsights = lazyWithRetry(
+  () => import("~/scenes/Document/components/Insights")
+);
 const CommandBar = lazyWithRetry(() => import("~/components/CommandBar"));

 type Props = {
@@ -94,24 +98,32 @@ const AuthenticatedLayout: React.FC = ({ children }: Props) => {
    !!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 &&
-    !!team.getPreference(TeamPreference.Commenting);
+    team.getPreference(TeamPreference.Commenting);

  const sidebarRight = (
    <AnimatePresence
      initial={false}
      key={ui.activeDocumentId ? "active" : "inactive"}
    >
-      {(showHistory || showComments) && (
+      {(showHistory || showInsights || showComments) && (
        <Route path={`/doc/${slug}`}>
-          <React.Suspense fallback={null}>
-            {showHistory && <DocumentHistory />}
-            {showComments && <DocumentComments />}
-          </React.Suspense>
+          <SidebarRight>
+            <React.Suspense fallback={null}>
+              {showHistory && <DocumentHistory />}
+              {showInsights && <DocumentInsights />}
+              {showComments && <DocumentComments />}
+            </React.Suspense>
+          </SidebarRight>
        </Route>
      )}
    </AnimatePresence>
@@ -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>
    </>
@@ -10,8 +10,8 @@ const Badge = styled.span<{ yellow?: boolean; primary?: boolean }>`
    primary
      ? theme.accentText
      : yellow
-        ? theme.almostBlack
-        : theme.textTertiary};
+      ? theme.almostBlack
+      : theme.textTertiary};
  border: 1px solid
    ${({ primary, yellow, theme }) =>
      primary || yellow
@@ -1,4 +1,5 @@
 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";
@@ -9,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>
@@ -32,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 Branding;
@@ -6,89 +6,55 @@ import { s, ellipsis } from "@shared/styles";
 import Flex from "~/components/Flex";
 import BreadcrumbMenu from "~/menus/BreadcrumbMenu";
 import { undraggableOnDesktop } from "~/styles";
-import { InternalLinkActionV2, MenuInternalLink } from "~/types";
-import { actionV2ToMenuItem } from "~/actions";
-import useActionContext from "~/hooks/useActionContext";
-import { useComputed } from "~/hooks/useComputed";
-
-type TopLevelAction =
-  | InternalLinkActionV2
-  | { type: "menu"; actions: InternalLinkActionV2[] };
+import { MenuInternalLink } from "~/types";

 type Props = React.PropsWithChildren<{
-  actions: InternalLinkActionV2[];
+  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 InternalLinkActionV2[];
+    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 toBreadcrumb = React.useCallback(
-    (action: TopLevelAction, index: number) => {
-      if (action.type === "menu") {
-        return <BreadcrumbMenu key="menu" actions={action.actions} />;
-      }
-
-      const item = actionV2ToMenuItem(
-        action,
-        actionContext
-      ) as MenuInternalLink;
-
-      return (
-        <>
-          {item.icon}
-          <Item
-            to={item.to}
-            $withIcon={!!item.icon}
-            $highlight={!!highlightFirstItem && index === 0}
-          >
-            {item.title}
-          </Item>
-        </>
-      );
-    },
-    [actionContext, 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}
@@ -176,7 +176,7 @@ const Button = <T extends React.ElementType = "button">(
    ...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;

  return (
@@ -5,16 +5,13 @@ import uniq from "lodash/uniq";
 import { observer } from "mobx-react";
 import { useState, useMemo, useEffect, useCallback } from "react";
 import { useTranslation } from "react-i18next";
+import { usePopoverState, PopoverDisclosure } from "reakit/Popover";
 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 Popover from "~/components/Popover";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";

@@ -39,10 +36,9 @@ function Collaborators(props: Props) {
  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(
@@ -98,14 +94,19 @@ function Collaborators(props: Props) {
    }
  }, [missingUserIds, requestedUserIds, users]);

+  const popover = usePopoverState({
+    gutter: 0,
+    placement: "bottom-end",
+  });
+
  // 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();
@@ -132,7 +133,6 @@ function Collaborators(props: Props) {
          isEditing={isEditing}
          isObserving={isObserving}
          isCurrentUser={currentUserId === collaborator.id}
-          alt={t("Avatar of {{ name }}", { name: collaborator.name })}
          onClick={
            isObservable
              ? handleAvatarClick(
@@ -149,30 +149,29 @@ function Collaborators(props: Props) {
    [presentIds, editingIds, observingUserId, currentUserId, handleAvatarClick]
  );

-  if (!document.insightsEnabled) {
-    return null;
-  }
-
  return (
-    <Popover>
-      <PopoverTrigger>
-        <NudeButton
-          width={Math.min(collaborators.length, limit) * AvatarSize.Large}
-          height={AvatarSize.Large}
-        >
-          <Facepile
-            size={AvatarSize.Large}
-            limit={limit}
-            overflow={Math.max(0, collaborators.length - limit)}
-            users={collaborators}
-            renderAvatar={renderAvatar}
-          />
-        </NudeButton>
-      </PopoverTrigger>
-      <PopoverContent aria-label={t("Viewers")} side="bottom" align="end">
-        <DocumentViews document={document} />
-      </PopoverContent>
-    </Popover>
+    <>
+      <PopoverDisclosure {...popover}>
+        {(popoverProps) => (
+          <NudeButton
+            width={Math.min(collaborators.length, limit) * AvatarSize.Large}
+            height={AvatarSize.Large}
+            {...popoverProps}
+          >
+            <Facepile
+              size={AvatarSize.Large}
+              limit={limit}
+              overflow={Math.max(0, collaborators.length - limit)}
+              users={collaborators}
+              renderAvatar={renderAvatar}
+            />
+          </NudeButton>
+        )}
+      </PopoverDisclosure>
+      <Popover {...popover} width={300} aria-label={t("Viewers")} tabIndex={0}>
+        {popover.visible && <DocumentViews document={document} />}
+      </Popover>
+    </>
  );
 }

@@ -6,7 +6,7 @@ import { Trans, useTranslation } from "react-i18next";
 import styled from "styled-components";
 import Icon from "@shared/components/Icon";
 import { randomElement } from "@shared/random";
-import { CollectionPermission, TeamPreference } from "@shared/types";
+import { CollectionPermission } from "@shared/types";
 import { IconLibrary } from "@shared/utils/IconLibrary";
 import { colorPalette } from "@shared/utils/collections";
 import { CollectionValidation } from "@shared/validations";
@@ -14,7 +14,7 @@ import Collection from "~/models/Collection";
 import Button from "~/components/Button";
 import Flex from "~/components/Flex";
 import Input from "~/components/Input";
-import { InputSelectPermission } from "~/components/InputSelectPermission";
+import InputSelectPermission from "~/components/InputSelectPermission";
 import { createLazyComponent } from "~/components/LazyLoad";
 import Switch from "~/components/Switch";
 import Text from "~/components/Text";
@@ -31,7 +31,6 @@ export interface FormData {
  color: string | null;
  sharing: boolean;
  permission: CollectionPermission | undefined;
-  commenting?: boolean | null;
 }

 const useIconColor = (collection?: Collection) => {
@@ -84,7 +83,6 @@ export const CollectionForm = observer(function CollectionForm_({
      icon: collection?.icon,
      sharing: collection?.sharing ?? true,
      permission: collection?.permission,
-      commenting: collection?.commenting ?? true,
      color: iconColor,
    },
  });
@@ -114,7 +112,7 @@ export const CollectionForm = observer(function CollectionForm_({
  }, [setFocus]);

  const handleIconChange = useCallback(
-    (icon: string, color: string) => {
+    (icon: string, color: string | null) => {
      if (icon !== values.icon) {
        setFocus("name");
      }
@@ -125,14 +123,13 @@ export const CollectionForm = observer(function CollectionForm_({
    [setFocus, setValue, values.icon]
  );

-  const initial = values.name.charAt(0).toUpperCase();
-
  return (
    <form onSubmit={formHandleSubmit(handleSubmit)}>
      <Text as="p">
        <Trans>
          Collections are used to group documents and choose permissions
        </Trans>
+        .
      </Text>
      <Flex gap={8}>
        <Input
@@ -147,7 +144,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}
@@ -174,7 +171,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."
              )}
            />
@@ -183,36 +180,13 @@ export const CollectionForm = observer(function CollectionForm_({
      )}

      {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}
-            />
+        <Switch
+          id="sharing"
+          label={t("Public document sharing")}
+          note={t(
+            "Allow documents within this collection to be shared publicly on the internet."
          )}
+          {...register("sharing")}
        />
      )}

@@ -226,8 +200,8 @@ export const CollectionForm = observer(function CollectionForm_({
              ? `${t("Saving")}…`
              : t("Save")
            : formState.isSubmitting
-              ? `${t("Creating")}…`
-              : t("Create")}
+            ? `${t("Creating")}…`
+            : t("Create")}
        </Button>
      </Flex>
    </form>
@@ -3,10 +3,9 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 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 { createInternalLinkActionV2 } 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(
-    () => [
-      createInternalLinkActionV2({
-        name: t("Archive"),
-        section: ActiveCollectionSection,
-        icon: <ArchiveIcon />,
-        visible: collection.isArchived,
-        to: archivePath(),
-      }),
-      createInternalLinkActionV2({
-        name: collection.name,
-        section: ActiveCollectionSection,
-        icon: <CollectionIcon collection={collection} expanded />,
-        to: collectionPath(collection.path),
-      }),
-    ],
-    [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 />;
 };
@@ -4,6 +4,7 @@ import Icon from "@shared/components/Icon";
 import { createAction } from "~/actions";
 import { RecentSection } from "~/actions/sections";
 import useStores from "~/hooks/useStores";
+import history from "~/utils/history";
 import { documentPath } from "~/utils/routeHelpers";

 const useRecentDocumentActions = (count = 6) => {
@@ -24,7 +25,7 @@ const useRecentDocumentActions = (count = 6) => {
            ) : (
              <DocumentIcon />
            ),
-            to: documentPath(item),
+            perform: () => history.push(documentPath(item)),
          })
        ),
    [count, ui.activeDocumentId, documents.recentlyViewed]
@@ -3,6 +3,7 @@ import { useMemo } from "react";
 import { createAction } from "~/actions";
 import { NavigationSection } from "~/actions/sections";
 import useSettingsConfig from "~/hooks/useSettingsConfig";
+import history from "~/utils/history";

 const useSettingsAction = () => {
  const config = useSettingsConfig();
@@ -15,7 +16,7 @@ const useSettingsAction = () => {
          name: item.name,
          icon: <Icon />,
          section: NavigationSection,
-          to: item.path,
+          perform: () => history.push(item.path),
        };
      }),
    [config]
@@ -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>
@@ -143,14 +143,13 @@ const ContentEditable = React.forwardRef(function _ContentEditable(
    },
    []
  );
-  const contentEditable = !disabled && !readOnly;

  return (
    <div className={className} dir={dir} onClick={onClick} tabIndex={-1}>
      {children}
      <Content
        ref={contentRef}
-        contentEditable={contentEditable}
+        contentEditable={!disabled && !readOnly}
        onInput={wrappedEvent(onInput)}
        onFocus={wrappedEvent(onFocus)}
        onBlur={wrappedEvent(onBlur)}
@@ -158,7 +157,7 @@ const ContentEditable = React.forwardRef(function _ContentEditable(
        onPaste={handlePaste}
        data-placeholder={placeholder}
        suppressContentEditableWarning
-        role={contentEditable ? "textbox" : undefined}
+        role="textbox"
        {...rest}
      >
        {innerValue}
@@ -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;
@@ -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;
@@ -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);
@@ -0,0 +1,70 @@
+import * as React from "react";
+import { useMousePosition } from "~/hooks/useMousePosition";
+
+type Positions = {
+  /** Sub-menu x */
+  x: number;
+  /** Sub-menu y */
+  y: number;
+  /** Sub-menu height */
+  h: number;
+  /** Sub-menu width */
+  w: number;
+  /** Mouse x */
+  mouseX: number;
+  /** Mouse y */
+  mouseY: number;
+};
+
+/**
+ * Component to cover the area between the mouse cursor and the sub-menu, to
+ * allow moving cursor to lower parts of sub-menu without the sub-menu
+ * disappearing.
+ */
+export default function MouseSafeArea(props: {
+  parentRef: React.RefObject<HTMLElement | null>;
+}) {
+  const {
+    x = 0,
+    y = 0,
+    height: h = 0,
+    width: w = 0,
+  } = props.parentRef.current?.getBoundingClientRect() || {};
+  const [mouseX, mouseY] = useMousePosition();
+  const positions = { x, y, h, w, mouseX, mouseY };
+
+  return (
+    <div
+      style={{
+        position: "absolute",
+        top: 0,
+        // backgroundColor: "rgba(255,0,0,0.1)", // Uncomment to debug
+        right: getRight(positions),
+        left: getLeft(positions),
+        height: h,
+        width: getWidth(positions),
+        clipPath: getClipPath(positions),
+      }}
+    />
+  );
+}
+
+const getLeft = ({ x, mouseX }: Positions) =>
+  mouseX > x ? undefined : -Math.max(x - mouseX, 10) + "px";
+
+const getRight = ({ x, w, mouseX }: Positions) =>
+  mouseX > x ? -Math.max(mouseX - (x + w), 10) + "px" : undefined;
+
+const getWidth = ({ x, w, mouseX }: Positions) =>
+  mouseX > x
+    ? 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% ${(100 * (mouseY - y)) / h - 10}%, 100% ${
+        (100 * (mouseY - y)) / h + 5
+      }%)`
+    : `polygon(100% 0%, 0% ${(100 * (mouseY - y)) / h - 10}%, 0% ${
+        (100 * (mouseY - y)) / h + 5
+      }%, 100% 100%)`;
@@ -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>
+  );
+}
@@ -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;
+`;
@@ -0,0 +1,254 @@
+import { ExpandedIcon } from "outline-icons";
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
+import {
+  useMenuState,
+  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 {
+  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();
+
+  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);
@@ -0,0 +1,314 @@
+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 { openMenuHideFn, setOpenMenuHideFn } = useMenuContext();
+  const isMobile = useMobile();
+  const isSubMenu = !!parentMenuState;
+
+  React.useEffect(() => {
+    if (rest.visible && !previousVisible) {
+      onOpen?.();
+
+      if (openMenuHideFn && openMenuHideFn !== rest.hide) {
+        openMenuHideFn();
+      }
+      setOpenMenuHideFn(() => rest.hide);
+    }
+
+    if (!rest.visible && previousVisible) {
+      onClose?.();
+
+      if (openMenuHideFn === rest.hide) {
+        setOpenMenuHideFn(null);
+      }
+    }
+  }, [
+    onOpen,
+    onClose,
+    previousVisible,
+    rest.visible,
+    ui.sidebarCollapsed,
+    isSubMenu,
+    t,
+    openMenuHideFn,
+    setOpenMenuHideFn,
+    rest.hide,
+  ]);
+
+  // 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 () => {
+      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};
+  `};
+`;
@@ -15,7 +15,7 @@ function CopyToClipboard(props: Props, ref: React.Ref<HTMLElement>) {

  const onClick = React.useCallback(
    (ev: React.MouseEvent<HTMLElement>) => {
-      const childElem = React.Children.only(children);
+      const elem = React.Children.only(children);

      copy(text, {
        debug: env.ENVIRONMENT !== "production",
@@ -24,12 +24,8 @@ function CopyToClipboard(props: Props, ref: React.Ref<HTMLElement>) {

      onCopy?.();

-      if (
-        childElem &&
-        childElem.props &&
-        typeof childElem.props.onClick === "function"
-      ) {
-        childElem.props.onClick(ev);
+      if (elem && elem.props && typeof elem.props.onClick === "function") {
+        elem.props.onClick(ev);
      } else {
        ev.preventDefault();
        ev.stopPropagation();
@@ -3,7 +3,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
-import { InputSelect, Option } from "~/components/InputSelect";
+import { InputSelectNew, Option } from "~/components/InputSelectNew";
 import useStores from "~/hooks/useStores";

 type DefaultCollectionInputSelectProps = {
@@ -70,10 +70,11 @@ const DefaultCollectionInputSelect = ({
  }

  return (
-    <InputSelect
+    <InputSelectNew
      options={options}
      value={defaultCollectionId ?? "home"}
      onChange={onSelectCollection}
+      ariaLabel={t("Default collection")}
      label={t("Start view")}
      hideLabel
      short
@@ -6,8 +6,6 @@ import useStores from "~/hooks/useStores";
 function Dialogs() {
  const { dialogs } = useStores();
  const { guide, modalStack } = dialogs;
-  const modals = [...modalStack];
-
  return (
    <>
      {guide ? (
@@ -19,10 +17,11 @@ function Dialogs() {
          {guide.content}
        </Guide>
      ) : undefined}
-      {modals.map(([id, modal]) => (
+      {[...modalStack].map(([id, modal]) => (
        <Modal
          key={id}
          isOpen={modal.isOpen}
+          fullscreen={modal.fullscreen ?? false}
          onRequestClose={() => {
            modal.onClose?.();
            dialogs.closeModal(id);
@@ -1,50 +0,0 @@
-import { Trans, useTranslation } from "react-i18next";
-import ConfirmationDialog from "~/components/ConfirmationDialog";
-import Text from "~/components/Text";
-import { IntegrationType } from "@shared/types";
-import Integration from "~/models/Integration";
-import useStores from "~/hooks/useStores";
-import { useHistory } from "react-router-dom";
-import { settingsPath } from "~/utils/routeHelpers";
-import { observer } from "mobx-react";
-import capitalize from "lodash/capitalize";
-
-type Props = {
-  integration: Integration<IntegrationType.Analytics>;
-};
-
-export const DisconnectAnalyticsDialog = observer(({ integration }: Props) => {
-  const { t } = useTranslation();
-  const { dialogs } = useStores();
-  const history = useHistory();
-
-  const handleSubmit = async () => {
-    await integration.delete();
-    history.push(settingsPath("integrations"));
-    dialogs.closeAllModals();
-  };
-
-  return (
-    <ConfirmationDialog
-      onSubmit={handleSubmit}
-      submitText={t("Disconnect")}
-      savingText={`${t("Disconnecting")}…`}
-      danger
-    >
-      <Text as="p" type="secondary">
-        <Trans
-          defaults="Are you sure you want to disconnect the <em>{{ service }}</em> integration?"
-          values={{
-            service: capitalize(integration.service),
-          }}
-          components={{
-            em: <strong />,
-          }}
-        />
-      </Text>
-      <Text as="p" type="secondary">
-        <Trans defaults="This will stop sending analytics events to the configured instance." />
-      </Text>
-    </ConfirmationDialog>
-  );
-});
@@ -11,9 +11,8 @@ import CollectionIcon from "~/components/Icons/CollectionIcon";
 import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
+import { MenuInternalLink } from "~/types";
 import { archivePath, settingsPath, trashPath } from "~/utils/routeHelpers";
-import { createInternalLinkActionV2 } from "~/actions";
-import { ActiveDocumentSection } from "~/actions/sections";

 type Props = {
  children?: React.ReactNode;
@@ -28,12 +27,46 @@ type Props = {
  maxDepth?: number;
 };

+function useCategory(document: Document): MenuInternalLink | null {
+  const { t } = useTranslation();
+
+  if (document.isDeleted) {
+    return {
+      type: "route",
+      icon: <TrashIcon />,
+      title: t("Trash"),
+      to: trashPath(),
+    };
+  }
+
+  if (document.isArchived) {
+    return {
+      type: "route",
+      icon: <ArchiveIcon />,
+      title: t("Archive"),
+      to: archivePath(),
+    };
+  }
+
+  if (document.template) {
+    return {
+      type: "route",
+      icon: <ShapesIcon />,
+      title: t("Templates"),
+      to: settingsPath("templates"),
+    };
+  }
+
+  return null;
+}
+
 function DocumentBreadcrumb(
  { document, children, onlyText, reverse = false, maxDepth }: Props,
  ref: React.RefObject<HTMLDivElement> | null
 ) {
  const { collections } = useStores();
  const { t } = useTranslation();
+  const category = useCategory(document);
  const sidebarContext = useLocationSidebarContext();
  const collection = document.collectionId
    ? collections.get(document.collectionId)
@@ -45,91 +78,69 @@ function DocumentBreadcrumb(
    void document.loadRelations({ withoutPolicies: true });
  }, [document]);

+  let collectionNode: MenuInternalLink | undefined;
+
+  if (collection && can.readDocument) {
+    collectionNode = {
+      type: "route",
+      title: collection.name,
+      icon: <CollectionIcon collection={collection} expanded />,
+      to: {
+        pathname: collection.path,
+        state: { sidebarContext },
+      },
+    };
+  } else if (document.isCollectionDeleted) {
+    collectionNode = {
+      type: "route",
+      title: t("Deleted Collection"),
+      icon: undefined,
+      to: "",
+    };
+  }
+
  const path = document.pathTo.slice(0, -1);

-  const actions = React.useMemo(() => {
+  const items = React.useMemo(() => {
+    const output: MenuInternalLink[] = [];
+
    if (depth === 0) {
-      return [];
+      return output;
    }

-    const outputActions = [
-      createInternalLinkActionV2({
-        name: t("Trash"),
-        section: ActiveDocumentSection,
-        icon: <TrashIcon />,
-        visible: document.isDeleted,
-        to: trashPath(),
-      }),
-      createInternalLinkActionV2({
-        name: t("Archive"),
-        section: ActiveDocumentSection,
-        icon: <ArchiveIcon />,
-        visible: document.isArchived,
-        to: archivePath(),
-      }),
-      createInternalLinkActionV2({
-        name: t("Templates"),
-        section: ActiveDocumentSection,
-        icon: <ShapesIcon />,
-        visible: document.template,
-        to: settingsPath("templates"),
-      }),
-      createInternalLinkActionV2({
-        name: collection?.name,
-        section: ActiveDocumentSection,
-        icon: collection ? (
-          <CollectionIcon collection={collection} expanded />
-        ) : undefined,
-        visible: !!(collection && can.readDocument),
-        to: collection
-          ? {
-              pathname: collection.path,
-              state: { sidebarContext },
-            }
-          : "",
-      }),
-      createInternalLinkActionV2({
-        name: t("Deleted Collection"),
-        section: ActiveDocumentSection,
-        visible: document.isCollectionDeleted,
-        to: "",
-      }),
-      ...path.map((node) => {
-        const title = node.title || t("Untitled");
-        return createInternalLinkActionV2({
-          name: node.icon ? (
-            <>
-              <StyledIcon value={node.icon} color={node.color} /> {title}
-            </>
-          ) : (
-            title
-          ),
-          section: ActiveDocumentSection,
-          to: {
-            pathname: node.url,
-            state: { sidebarContext },
-          },
-        });
-      }),
-    ];
+    if (category) {
+      output.push(category);
+    }
+    if (collectionNode) {
+      output.push(collectionNode);
+    }
+
+    path.forEach((node: NavigationNode) => {
+      const title = node.title || t("Untitled");
+      output.push({
+        type: "route",
+        title: node.icon ? (
+          <>
+            <StyledIcon value={node.icon} color={node.color} /> {title}
+          </>
+        ) : (
+          title
+        ),
+        to: {
+          pathname: node.url,
+          state: { sidebarContext },
+        },
+      });
+    });

    return reverse
      ? depth !== undefined
-        ? outputActions.slice(-depth)
-        : outputActions
+        ? output.slice(-depth)
+        : output
      : depth !== undefined
-        ? outputActions.slice(0, depth)
-        : outputActions;
-  }, [
-    t,
-    document,
-    collection,
-    can.readDocument,
-    sidebarContext,
-    path,
-    reverse,
-    depth,
-  ]);
+      ? output.slice(0, depth)
+      : output;
+  }, [t, path, category, sidebarContext, collectionNode, reverse, depth]);

  if (!collections.isLoaded) {
    return null;
@@ -165,7 +176,7 @@ function DocumentBreadcrumb(
  }

  return (
-    <Breadcrumb actions={actions} ref={ref} highlightFirstItem>
+    <Breadcrumb items={items} ref={ref} highlightFirstItem>
      {children}
    </Breadcrumb>
  );
@@ -123,7 +123,6 @@ function DocumentCard(props: Props) {
              <DocumentSquircle
                icon={document.icon}
                color={document.color ?? undefined}
-                initial={document.initial}
              />
            ) : (
              <Squircle
@@ -195,22 +194,17 @@ const ReadingTime = ({ document }: { document: Document }) => {
 const DocumentSquircle = ({
  icon,
  color,
-  initial,
 }: {
  icon: string;
  color?: string;
-  initial?: string;
 }) => {
  const theme = useTheme();
  const iconType = determineIconType(icon)!;
  const squircleColor = iconType === IconType.SVG ? color : theme.slateLight;
-  const style = {
-    "--background": squircleColor,
-  } as React.CSSProperties;

  return (
-    <Squircle color={squircleColor} style={style}>
-      <Icon value={icon} color={theme.white} initial={initial} forceColor />
+    <Squircle color={squircleColor}>
+      <Icon value={icon} color={theme.white} forceColor />
    </Squircle>
  );
 };
@@ -11,15 +11,9 @@ class DocumentContext {
  /** The editor instance for this document */
  editor?: Editor;

-  /** The ID of the currently focused comment, or null if no comment is focused */
-  @observable
-  focusedCommentId: string | null = null;
-
-  /** Whether the editor has been initialized */
  @observable
  isEditorInitialized: boolean = false;

-  /** The headings in the document */
  @observable
  headings: Heading[] = [];

@@ -45,11 +39,6 @@ class DocumentContext {
    this.isEditorInitialized = initialized;
  };

-  @action
-  setFocusedCommentId = (commentId: string | null) => {
-    this.focusedCommentId = commentId;
-  };
-
  @action
  updateState = () => {
    this.updateHeadings();
@@ -1,3 +1,4 @@
+import flatten from "lodash/flatten";
 import { observer } from "mobx-react";
 import * as React from "react";
 import { Trans, useTranslation } from "react-i18next";
@@ -10,6 +11,7 @@ import Button from "~/components/Button";
 import DocumentExplorer from "~/components/DocumentExplorer";
 import useCollectionTrees from "~/hooks/useCollectionTrees";
 import useStores from "~/hooks/useStores";
+import { flattenTree } from "~/utils/tree";
 import Switch from "./Switch";
 import Text from "./Text";

@@ -30,7 +32,7 @@ function DocumentCopy({ document, onSubmit }: Props) {
  );

  const items = React.useMemo(() => {
-    const nodes = collectionTrees.filter((node) =>
+    const nodes = flatten(collectionTrees.map(flattenTree)).filter((node) =>
      node.collectionId
        ? policies.get(node.collectionId)?.abilities.createDocument
        : true
@@ -44,6 +46,20 @@ function DocumentCopy({ document, onSubmit }: Props) {
    return nodes;
  }, [policies, collectionTrees, document.isTemplate]);

+  const handlePublishChange = React.useCallback(
+    (ev: React.ChangeEvent<HTMLInputElement>) => {
+      setPublish(ev.target.checked);
+    },
+    []
+  );
+
+  const handleRecursiveChange = React.useCallback(
+    (ev: React.ChangeEvent<HTMLInputElement>) => {
+      setRecursive(ev.target.checked);
+    },
+    []
+  );
+
  const copy = async () => {
    if (!selectedPath) {
      toast.message(t("Select a location to copy"));
@@ -63,7 +79,7 @@ function DocumentCopy({ document, onSubmit }: Props) {

      toast.success(t("Document copied"));
      onSubmit(result);
-    } catch (_err) {
+    } catch (err) {
      toast.error(t("Couldn’t copy the document, try again?"));
    }
  };
@@ -76,32 +92,34 @@ function DocumentCopy({ document, onSubmit }: Props) {
        onSelect={selectPath}
        defaultValue={document.parentDocumentId || document.collectionId || ""}
      />
-      {!document.isTemplate && (
-        <OptionsContainer>
-          {document.collectionId && (
-            <Text size="small">
-              <Switch
-                name="publish"
-                label={t("Publish")}
-                labelPosition="right"
-                checked={publish}
-                onChange={setPublish}
-              />
-            </Text>
-          )}
-          {document.publishedAt && document.childDocuments.length > 0 && (
-            <Text size="small">
-              <Switch
-                name="recursive"
-                label={t("Include nested documents")}
-                labelPosition="right"
-                checked={recursive}
-                onChange={setRecursive}
-              />
-            </Text>
-          )}
-        </OptionsContainer>
-      )}
+      <OptionsContainer>
+        {!document.isTemplate && (
+          <>
+            {document.collectionId && (
+              <Text size="small">
+                <Switch
+                  name="publish"
+                  label={t("Publish")}
+                  labelPosition="right"
+                  checked={publish}
+                  onChange={handlePublishChange}
+                />
+              </Text>
+            )}
+            {document.publishedAt && document.childDocuments.length > 0 && (
+              <Text size="small">
+                <Switch
+                  name="recursive"
+                  label={t("Include nested documents")}
+                  labelPosition="right"
+                  checked={recursive}
+                  onChange={handleRecursiveChange}
+                />
+              </Text>
+            )}
+          </>
+        )}
+      </OptionsContainer>
      <Footer justify="space-between" align="center" gap={8}>
        <StyledText type="secondary">
          {selectedPath ? (
@@ -123,11 +141,9 @@ function DocumentCopy({ document, onSubmit }: Props) {
 }

 const OptionsContainer = styled.div`
-  border-top: 1px solid ${(props) => props.theme.horizontalRule};
-  padding: 16px 24px 0;
-  margin-bottom: -1px;
-  background: ${(props) => props.theme.modalBackground};
-  z-index: 1;
+  margin: 16px 0 8px 0;
+  padding-left: 24px;
+  padding-right: 24px;
 `;

 export default observer(DocumentCopy);
@@ -15,7 +15,7 @@ import scrollIntoView from "scroll-into-view-if-needed";
 import styled, { useTheme } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import Icon from "@shared/components/Icon";
-import { NavigationNode } from "@shared/types";
+import { NavigationNode, NavigationNodeType } from "@shared/types";
 import { isModKey } from "@shared/utils/keyboard";
 import DocumentExplorerNode from "~/components/DocumentExplorerNode";
 import DocumentExplorerSearchResult from "~/components/DocumentExplorerSearchResult";
@@ -26,8 +26,7 @@ import InputSearch from "~/components/InputSearch";
 import Text from "~/components/Text";
 import useMobile from "~/hooks/useMobile";
 import useStores from "~/hooks/useStores";
-import { ancestors, descendants, flattenTree } from "~/utils/tree";
-import flatten from "lodash/flatten";
+import { ancestors, descendants } from "~/utils/tree";

 type Props = {
  /** Action taken upon submission of selected item, could be publish, move etc. */
@@ -61,7 +60,7 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
    if (defaultValue) {
      const node = items.find((item) => item.id === defaultValue);
      if (node) {
-        return ancestors(node).map((ancestorNode) => ancestorNode.id);
+        return ancestors(node).map((node) => node.id);
      }
    }
    return [];
@@ -79,9 +78,13 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
  const VERTICAL_PADDING = 6;
  const HORIZONTAL_PADDING = 24;

+  const recentlyViewedItemIds = documents.recentlyViewed
+    .slice(0, 5)
+    .map((item) => item.id);
+
  const searchIndex = React.useMemo(
    () =>
-      new FuzzySearch(flatten(items.map(flattenTree)), ["title"], {
+      new FuzzySearch(items, ["title"], {
        caseSensitive: false,
      }),
    [items]
@@ -96,10 +99,10 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
  }, [searchTerm]);

  React.useEffect(() => {
-    setItemRefs((existingItemRefs) =>
+    setItemRefs((itemRefs) =>
      map(
        fill(Array(items.length), 0),
-        (_, i) => existingItemRefs[i] || React.createRef()
+        (_, i) => itemRefs[i] || React.createRef()
      )
    );
  }, [items.length]);
@@ -126,7 +129,12 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {

    return searchTerm
      ? searchIndex.search(searchTerm)
-      : items.flatMap(includeDescendants);
+      : items
+          .filter((item) => recentlyViewedItemIds.includes(item.id))
+          .concat(
+            items.filter((item) => item.type === NavigationNodeType.Collection)
+          )
+          .flatMap(includeDescendants);
  }

  const nodes = getNodes();
@@ -134,7 +142,6 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
    (min, node) => (node.depth ? Math.min(min, node.depth) : min),
    Infinity
  );
-  const normalizedBaseDepth = baseDepth === Infinity ? 0 : baseDepth;

  const scrollNodeIntoView = React.useCallback(
    (node: number) => {
@@ -173,7 +180,7 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
    );

    // remove children
-    const newNodes = filter(nodes, (n) => !includes(descendantIds, n.id));
+    const newNodes = filter(nodes, (node) => !includes(descendantIds, node.id));
    const scrollOffset = calculateInitialScrollOffset(newNodes.length);
    setInitialScrollOffset(scrollOffset);
  };
@@ -308,7 +315,7 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
          expanded={isExpanded(index)}
          icon={renderedIcon}
          title={title}
-          depth={(node.depth ?? 0) - normalizedBaseDepth}
+          depth={(node.depth ?? 0) - baseDepth}
          hasChildren={hasChildren(index)}
          ref={itemRefs[index]}
        />
@@ -25,10 +25,6 @@ import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
 import DocumentMenu from "~/menus/DocumentMenu";
 import { documentPath } from "~/utils/routeHelpers";
 import { determineSidebarContext } from "./Sidebar/components/SidebarContext";
-import { ActionContextProvider } from "~/hooks/useActionContext";
-import { useDocumentMenuAction } from "~/hooks/useDocumentMenuAction";
-import { ContextMenu } from "./Menu/ContextMenu";
-import useStores from "~/hooks/useStores";

 type Props = {
  document: Document;
@@ -37,6 +33,7 @@ type Props = {
  showParentDocuments?: boolean;
  showCollection?: boolean;
  showPublished?: boolean;
+  showPin?: boolean;
  showDraft?: boolean;
  showTemplate?: boolean;
 };
@@ -54,7 +51,6 @@ function DocumentListItem(
 ) {
  const { t } = useTranslation();
  const user = useCurrentUser();
-  const { userMemberships, groupMemberships } = useStores();
  const locationSidebarContext = useLocationSidebarContext();
  const [menuOpen, handleMenuOpen, handleMenuClose] = useBoolean();

@@ -72,6 +68,7 @@ function DocumentListItem(
    showParentDocuments,
    showCollection,
    showPublished,
+    showPin,
    showDraft = true,
    showTemplate,
    highlight,
@@ -83,110 +80,85 @@ function DocumentListItem(
    !!document.title.toLowerCase().includes(highlight.toLowerCase());
  const canStar = !document.isArchived && !document.isTemplate;

-  const isShared = !!(
-    userMemberships.getByDocumentId(document.id) ||
-    groupMemberships.getByDocumentId(document.id)
-  );
-
  const sidebarContext = determineSidebarContext({
    document,
    user,
    currentContext: locationSidebarContext,
  });

-  const contextMenuAction = useDocumentMenuAction({ document });
-
  return (
-    <ActionContextProvider
-      value={{
-        activeDocumentId: document.id,
-        activeCollectionId:
-          !isShared && document.collectionId
-            ? document.collectionId
-            : undefined,
+    <DocumentLink
+      ref={itemRef}
+      dir={document.dir}
+      role="menuitem"
+      $isStarred={document.isStarred}
+      $menuOpen={menuOpen}
+      to={{
+        pathname: documentPath(document),
+        state: {
+          title: document.titleWithDefault,
+          sidebarContext,
+        },
      }}
+      {...rest}
+      {...rovingTabIndex}
    >
-      <ContextMenu
-        action={contextMenuAction}
-        ariaLabel={t("Document options")}
-        onOpen={handleMenuOpen}
-        onClose={handleMenuClose}
-      >
-        <DocumentLink
-          ref={itemRef}
-          dir={document.dir}
-          $isStarred={document.isStarred}
-          $menuOpen={menuOpen}
-          to={{
-            pathname: documentPath(document),
-            state: {
-              title: document.titleWithDefault,
-              sidebarContext,
-            },
-          }}
-          {...rest}
-          {...rovingTabIndex}
-        >
-          <Content>
-            <Heading dir={document.dir}>
-              {document.icon && (
-                <>
-                  <Icon
-                    value={document.icon}
-                    color={document.color ?? undefined}
-                    initial={document.initial}
-                  />
-                  &nbsp;
-                </>
-              )}
-              <Title
-                text={document.titleWithDefault}
-                highlight={highlight}
-                dir={document.dir}
-              />
-              {document.isBadgedNew && document.createdBy?.id !== user.id && (
-                <Badge yellow>{t("New")}</Badge>
-              )}
-              {document.isDraft && showDraft && (
-                <Tooltip content={t("Only visible to you")} placement="top">
-                  <Badge>{t("Draft")}</Badge>
-                </Tooltip>
-              )}
-              {canStar && (
-                <StarPositioner>
-                  <StarButton document={document} />
-                </StarPositioner>
-              )}
-              {document.isTemplate && showTemplate && (
-                <Badge primary>{t("Template")}</Badge>
-              )}
-            </Heading>
+      <Content>
+        <Heading dir={document.dir}>
+          {document.icon && (
+            <>
+              <Icon value={document.icon} color={document.color ?? undefined} />
+              &nbsp;
+            </>
+          )}
+          <Title
+            text={document.titleWithDefault}
+            highlight={highlight}
+            dir={document.dir}
+          />
+          {document.isBadgedNew && document.createdBy?.id !== user.id && (
+            <Badge yellow>{t("New")}</Badge>
+          )}
+          {document.isDraft && showDraft && (
+            <Tooltip content={t("Only visible to you")} placement="top">
+              <Badge>{t("Draft")}</Badge>
+            </Tooltip>
+          )}
+          {canStar && (
+            <StarPositioner>
+              <StarButton document={document} />
+            </StarPositioner>
+          )}
+          {document.isTemplate && showTemplate && (
+            <Badge primary>{t("Template")}</Badge>
+          )}
+        </Heading>

-            {!queryIsInTitle && (
-              <ResultContext
-                text={context}
-                highlight={highlight ? SEARCH_RESULT_REGEX : undefined}
-                processResult={replaceResultMarks}
-              />
-            )}
-            <DocumentMeta
-              document={document}
-              showCollection={showCollection}
-              showPublished={showPublished}
-              showParentDocuments={showParentDocuments}
-              showLastViewed
-            />
-          </Content>
-          <Actions>
-            <DocumentMenu
-              document={document}
-              onOpen={handleMenuOpen}
-              onClose={handleMenuClose}
-            />
-          </Actions>
-        </DocumentLink>
-      </ContextMenu>
-    </ActionContextProvider>
+        {!queryIsInTitle && (
+          <ResultContext
+            text={context}
+            highlight={highlight ? SEARCH_RESULT_REGEX : undefined}
+            processResult={replaceResultMarks}
+          />
+        )}
+        <DocumentMeta
+          document={document}
+          showCollection={showCollection}
+          showPublished={showPublished}
+          showParentDocuments={showParentDocuments}
+          showLastViewed
+        />
+      </Content>
+      <Actions>
+        <DocumentMenu
+          document={document}
+          showPin={showPin}
+          onOpen={handleMenuOpen}
+          onClose={handleMenuClose}
+          modal={false}
+        />
+      </Actions>
+    </DocumentLink>
  );
 }

@@ -205,9 +177,7 @@ const Actions = styled(EventBoundary)`
  color: ${s("textSecondary")};

  ${NudeButton} {
-    &:
-      ${hover},
-      &[aria-expanded= "true"] {
+    &: ${hover}, &[aria-expanded= "true"] {
      background: ${s("sidebarControlHoverBackground")};
    }
  }
@@ -280,7 +250,7 @@ const DocumentLink = styled(Link)<{
    `}
 `;

-const Heading = styled.span<{ rtl?: boolean }>`
+const Heading = styled.h3<{ rtl?: boolean }>`
  display: flex;
  justify-content: ${(props) => (props.rtl ? "flex-end" : "flex-start")};
  align-items: center;
@@ -290,8 +260,6 @@ const Heading = styled.span<{ rtl?: boolean }>`
  color: ${s("text")};
  font-family: ${s("fontFamily")};
  font-weight: 500;
-  font-size: 20px;
-  line-height: 1.2;
 `;

 const StarPositioner = styled(Flex)`
@@ -155,22 +155,26 @@ const DocumentMeta: React.FC<Props> = ({
      }
      return (
        <Viewed>
-          <Separator />
-          <Modified highlight>{t("Never viewed")}</Modified>
+          •&nbsp;<Modified highlight>{t("Never viewed")}</Modified>
        </Viewed>
      );
    }

    return (
      <Viewed>
-        <Separator />
-        {t("Viewed")} <Time dateTime={lastViewedAt} addSuffix shorten />
+        •&nbsp;{t("Viewed")} <Time dateTime={lastViewedAt} addSuffix shorten />
      </Viewed>
    );
  };

  return (
-    <Container align="center" rtl={document.dir === "rtl"} {...rest} dir="ltr">
+    <Container
+      align="center"
+      rtl={document.dir === "rtl"}
+      {...rest}
+      dir="ltr"
+      lang=""
+    >
      {to ? (
        <Link to={to} replace={replace}>
          {content}
@@ -188,17 +192,16 @@ const DocumentMeta: React.FC<Props> = ({
      )}
      {showParentDocuments && nestedDocumentsCount > 0 && (
        <span>
-          <Separator />
-          {nestedDocumentsCount}{" "}
+          &nbsp;• {nestedDocumentsCount}{" "}
          {t("nested document", {
            count: nestedDocumentsCount,
          })}
        </span>
      )}
-      {timeSinceNow()}
+      &nbsp;{timeSinceNow()}
      {canShowProgressBar && (
        <>
-          <Separator />
+          &nbsp;•&nbsp;
          <DocumentTasks document={document} />
        </>
      )}
@@ -207,14 +210,6 @@ const DocumentMeta: React.FC<Props> = ({
  );
 };

-export const Separator = styled.span`
-  padding: 0 0.4em;
-
-  &::after {
-    content: "•";
-  }
-`;
-
 const Strong = styled.strong`
  font-weight: 550;
 `;
@@ -1,7 +1,7 @@
 import * as React from "react";
 import { toast } from "sonner";
 import styled from "styled-components";
-import { s, truncateMultiline } from "@shared/styles";
+import { s } from "@shared/styles";

 type Props = Omit<React.HTMLAttributes<HTMLInputElement>, "onSubmit"> & {
  /** A callback when the title is submitted. */
@@ -128,21 +128,17 @@ function EditableTitle(
          />
        </form>
      ) : (
-        <Text
+        <span
          onDoubleClick={canUpdate ? handleDoubleClick : undefined}
          className={rest.className}
        >
          {value}
-        </Text>
+        </span>
      )}
    </>
  );
 }

-const Text = styled.span`
-  ${truncateMultiline(3)}
-`;
-
 const Input = styled.input`
  color: ${s("text")};
  background: ${s("background")};
@@ -201,7 +201,6 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
            grow={props.grow}
            style={props.style}
            editorStyle={props.editorStyle}
-            commenting={!!props.onClickCommentMark}
          >
            <div className="ProseMirror">
              {paragraphs.map((paragraph, index) => (
@@ -13,9 +13,6 @@ import Text from "~/components/Text";
 import env from "~/env";
 import Logger from "~/utils/Logger";
 import isCloudHosted from "~/utils/isCloudHosted";
-import Storage from "@shared/utils/Storage";
-import { deleteAllDatabases } from "~/utils/developer";
-import Flex from "./Flex";

 type Props = WithTranslation & {
  /** Whether to reload the page if a chunk fails to load. */
@@ -26,9 +23,6 @@ type Props = WithTranslation & {
  component?: React.ComponentType | string;
 };

-const ERROR_TRACKING_KEY = "error-boundary-tracking";
-const ERROR_TRACKING_WINDOW_MS = 5 * 60 * 1000; // 5 minutes
-
@observer
 class ErrorBoundary extends React.Component<Props> {
  @observable
@@ -37,13 +31,6 @@ class ErrorBoundary extends React.Component<Props> {
  @observable
  showDetails = false;

-  @observable
-  isRepeatedError = false;
-
-  componentDidMount() {
-    this.checkForPreviousErrors();
-  }
-
  componentDidCatch(error: Error) {
    this.error = error;

@@ -59,47 +46,9 @@ class ErrorBoundary extends React.Component<Props> {
      return;
    }

-    this.trackError();
    Logger.error("ErrorBoundary", error);
  }

-  private checkForPreviousErrors = () => {
-    try {
-      const stored = Storage.get(ERROR_TRACKING_KEY);
-      if (!stored) {
-        return;
-      }
-
-      const errors: number[] = JSON.parse(stored);
-      const cutoff = Date.now() - ERROR_TRACKING_WINDOW_MS;
-      const recentErrors = errors.filter((timestamp) => timestamp > cutoff);
-
-      this.isRepeatedError = recentErrors.length > 0;
-    } catch (err) {
-      Logger.warn("Failed to parse stored errors for error boundary", { err });
-    }
-  };
-
-  private trackError = () => {
-    try {
-      const stored = Storage.get(ERROR_TRACKING_KEY);
-      const errors: number[] = stored ? JSON.parse(stored) : [];
-      const cutoff = Date.now() - ERROR_TRACKING_WINDOW_MS;
-
-      // Filter out old errors and add current one
-      const updatedErrors = [
-        ...errors.filter((timestamp) => timestamp > cutoff),
-        Date.now(),
-      ];
-
-      Storage.set(ERROR_TRACKING_KEY, JSON.stringify(updatedErrors));
-
-      this.isRepeatedError = updatedErrors.length > 1;
-    } catch (err) {
-      Logger.warn("Failed to track error in error boundary", { err });
-    }
-  };
-
  handleReload = () => {
    window.location.reload();
  };
@@ -112,12 +61,6 @@ class ErrorBoundary extends React.Component<Props> {
    window.open(isCloudHosted ? UrlHelper.contact : UrlHelper.github);
  };

-  handleClearCache = async () => {
-    await deleteAllDatabases();
-    Storage.clear();
-    window.location.reload();
-  };
-
  render() {
    const { t, component: Component = CenteredContent, showTitle } = this.props;

@@ -164,46 +107,29 @@ class ErrorBoundary extends React.Component<Props> {
              </Heading>
            </>
          )}
-
-          {this.isRepeatedError ? (
-            <Text as="p" type="secondary">
-              <Trans>
-                An error has occurred multiple times recently. If it continues
-                please try clearing the cache or using a different browser.
-              </Trans>
-            </Text>
-          ) : (
-            <Text as="p" type="secondary">
-              <Trans
-                defaults="Sorry, an unrecoverable error occurred{{notified}}. Please try reloading the page, it may have been a temporary glitch."
-                values={{
-                  notified: isReported
-                    ? ` – ${t("our engineers have been notified")}`
-                    : undefined,
-                }}
-              />
-            </Text>
-          )}
-          {this.showDetails && <Pre>{error.stack}</Pre>}
-          <Flex gap={8} wrap>
-            {this.isRepeatedError && (
-              <Button onClick={this.handleClearCache}>
-                <Trans>Clear cache + reload</Trans>
-              </Button>
-            )}
-            <Button onClick={this.handleReload} neutral={this.isRepeatedError}>
-              {t("Reload")}
-            </Button>
+          <Text as="p" type="secondary">
+            <Trans
+              defaults="Sorry, an unrecoverable error occurred{{notified}}. Please try reloading the page, it may have been a temporary glitch."
+              values={{
+                notified: isReported
+                  ? ` – ${t("our engineers have been notified")}`
+                  : undefined,
+              }}
+            />
+          </Text>
+          {this.showDetails && <Pre>{error.toString()}</Pre>}
+          <p>
+            <Button onClick={this.handleReload}>{t("Reload")}</Button>{" "}
            {this.showDetails ? (
              <Button onClick={this.handleReportBug} neutral>
-                <Trans>Report a bug</Trans>
+                <Trans>Report a bug</Trans>…
              </Button>
            ) : (
              <Button onClick={this.handleShowDetails} neutral>
                <Trans>Show detail</Trans>…
              </Button>
            )}
-          </Flex>
+          </p>
        </Component>
      );
    }
@@ -1,7 +1,9 @@
+import { LocationDescriptor } from "history";
 import { observer } from "mobx-react";
 import {
  TrashIcon,
  ArchiveIcon,
+  EditIcon,
  PublishIcon,
  MoveIcon,
  UnpublishIcon,
@@ -9,28 +11,120 @@ import {
  UserIcon,
  CrossIcon,
 } from "outline-icons";
+import { useRef } from "react";
 import { useTranslation } from "react-i18next";
+import { useLocation } from "react-router-dom";
 import styled, { css } from "styled-components";
-import { s } from "@shared/styles";
+import EventBoundary from "@shared/components/EventBoundary";
+import { s, hover } from "@shared/styles";
+import { RevisionHelper } from "@shared/utils/RevisionHelper";
 import Document from "~/models/Document";
-import Event from "~/models/Event";
+import { Avatar, AvatarSize } from "~/components/Avatar";
+import Item, { Actions } from "~/components/List/Item";
 import Time from "~/components/Time";
+import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
+import useStores from "~/hooks/useStores";
+import RevisionMenu from "~/menus/RevisionMenu";
 import Logger from "~/utils/Logger";
+import { documentHistoryPath } from "~/utils/routeHelpers";
 import Text from "./Text";

+export type RevisionEvent = {
+  name: "revisions.create";
+  latest: boolean;
+};
+
+export type DocumentEvent = {
+  name:
+    | "documents.publish"
+    | "documents.unpublish"
+    | "documents.archive"
+    | "documents.unarchive"
+    | "documents.delete"
+    | "documents.restore"
+    | "documents.add_user"
+    | "documents.remove_user"
+    | "documents.move";
+  userId: string;
+};
+
+export type Event = {
+  id: string;
+  actorId: string;
+  createdAt: string;
+  deletedAt?: string;
+} & (RevisionEvent | DocumentEvent);
+
 type Props = {
  document: Document;
-  item: Event<Document>;
+  event: Event;
 };

-const EventListItem = ({ item }: Props) => {
+const EventListItem = ({ event, document, ...rest }: Props) => {
  const { t } = useTranslation();
+  const { revisions, users } = useStores();
+  const actor = "actorId" in event ? users.get(event.actorId) : undefined;
+  const user = "userId" in event ? users.get(event.userId) : undefined;
+  const location = useLocation();
+  const sidebarContext = useLocationSidebarContext();
+  const revisionLoadedRef = useRef(false);
  const opts = {
-    userName: item.actor?.name,
+    userName: actor?.name,
  };
-  let meta, icon;
+  const isRevision = event.name === "revisions.create";
+  const isDerivedFromDocument =
+    event.id === RevisionHelper.latestId(document.id);
+  let meta, icon, to: LocationDescriptor | undefined;
+
+  const ref = useRef<HTMLAnchorElement>(null);
+  // the time component tends to steal focus when clicked
+  // ...so forward the focus back to the parent item
+  const handleTimeClick = () => {
+    ref.current?.focus();
+  };
+
+  const prefetchRevision = async () => {
+    if (
+      !document.isDeleted &&
+      event.name === "revisions.create" &&
+      !event.deletedAt &&
+      !isDerivedFromDocument &&
+      !revisionLoadedRef.current
+    ) {
+      await revisions.fetch(event.id, { force: true });
+      revisionLoadedRef.current = true;
+    }
+  };
+
+  switch (event.name) {
+    case "revisions.create":
+      {
+        if (event.deletedAt) {
+          icon = <TrashIcon />;
+          meta = t("Revision deleted");
+        } else {
+          icon = <EditIcon size={16} />;
+          meta = event.latest ? (
+            <>
+              {t("Current version")} &middot; {actor?.name}
+            </>
+          ) : (
+            t("{{userName}} edited", opts)
+          );
+          to = {
+            pathname: documentHistoryPath(
+              document,
+              isDerivedFromDocument ? "latest" : event.id
+            ),
+            state: {
+              sidebarContext,
+              retainScrollPosition: true,
+            },
+          };
+        }
+      }
+      break;

-  switch (item.name) {
    case "documents.archive":
      icon = <ArchiveIcon />;
      meta = t("{{userName}} archived", opts);
@@ -49,14 +143,14 @@ const EventListItem = ({ item }: Props) => {
      icon = <UserIcon />;
      meta = t("{{userName}} added {{addedUserName}}", {
        ...opts,
-        addedUserName: item.user?.name ?? t("a user"),
+        addedUserName: user?.name ?? t("a user"),
      });
      break;
    case "documents.remove_user":
      icon = <CrossIcon />;
      meta = t("{{userName}} removed {{removedUserName}}", {
        ...opts,
-        removedUserName: item.user?.name ?? t("a user"),
+        removedUserName: user?.name ?? t("a user"),
      });
      break;

@@ -81,27 +175,71 @@ const EventListItem = ({ item }: Props) => {
      break;

    default:
-      Logger.warn("Unhandled item", { item });
+      Logger.warn("Unhandled event", { event });
  }

  if (!meta) {
    return null;
  }

-  return (
+  const isActive =
+    typeof to === "string"
+      ? location.pathname === to
+      : location.pathname === to?.pathname;
+
+  if (document.isDeleted) {
+    to = undefined;
+  }
+
+  return event.name === "revisions.create" && !event.deletedAt ? (
+    <RevisionItem
+      small
+      exact
+      to={to}
+      title={
+        <Time
+          dateTime={event.createdAt}
+          format={{
+            en_US: "MMM do, h:mm a",
+            fr_FR: "'Le 'd MMMM 'à' H:mm",
+          }}
+          relative={false}
+          addSuffix
+          onClick={handleTimeClick}
+        />
+      }
+      image={<Avatar model={actor} size={AvatarSize.Large} />}
+      subtitle={meta}
+      actions={
+        isRevision && isActive && !event.latest ? (
+          <StyledEventBoundary>
+            <RevisionMenu document={document} revisionId={event.id} />
+          </StyledEventBoundary>
+        ) : undefined
+      }
+      onMouseEnter={prefetchRevision}
+      ref={ref}
+      {...rest}
+    />
+  ) : (
    <EventItem>
      <IconWrapper size="xsmall" type="secondary">
        {icon}
      </IconWrapper>
      <Text size="xsmall" type="secondary">
        {meta} &middot;{" "}
-        <Time dateTime={item.createdAt} relative shorten addSuffix />
+        <Time
+          dateTime={event.deletedAt ?? event.createdAt}
+          relative
+          shorten
+          addSuffix
+        />
      </Text>
    </EventItem>
  );
 };

-export const lineStyle = css`
+const lineStyle = css`
  &::before {
    content: "";
    display: block;
@@ -147,10 +285,9 @@ export const lineStyle = css`

 const IconWrapper = styled(Text)`
  height: 24px;
-  min-width: 24px;
 `;

-export const EventItem = styled.li`
+const EventItem = styled.li`
  display: flex;
  align-items: center;
  gap: 8px;
@@ -171,4 +308,26 @@ export const EventItem = styled.li`
  ${lineStyle}
 `;

+const StyledEventBoundary = styled(EventBoundary)`
+  height: 24px;
+`;
+
+const RevisionItem = styled(Item)`
+  border: 0;
+  position: relative;
+  margin: 8px 0;
+  padding: 8px;
+  border-radius: 8px;
+
+  ${lineStyle}
+
+  ${Actions} {
+    opacity: 0.5;
+
+    &: ${hover} {
+      opacity: 1;
+    }
+  }
+`;
+
 export default observer(EventListItem);
@@ -1,10 +1,10 @@
 import { observer } from "mobx-react";
 import * as React from "react";
-import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import User from "~/models/User";
 import { Avatar, AvatarSize } from "~/components/Avatar";
 import Flex from "~/components/Flex";
+import Initials from "./Avatar/Initials";

 type Props = {
  /** The users to display */
@@ -31,22 +31,19 @@ function Facepile({
  renderAvatar = Avatar,
  ...rest
 }: Props) {
-  const { t } = useTranslation();
  const filtered = users.filter(Boolean).slice(-limit);
  const Component = renderAvatar;

-  if (overflow > 0) {
-    filtered.unshift({
-      id: "overflow",
-      initial: `${users.length ? "+" : ""}${overflow}`,
-      name: t(`{{count}} more user`, { count: overflow }),
-    } as User);
-  }
-
  return (
    <Avatars {...rest}>
+      {overflow > 0 && (
+        <Initials size={size} content={String(overflow)}>
+          {users.length ? "+" : ""}
+          {overflow}
+        </Initials>
+      )}
      {filtered.map((model, index) => {
-        const lastChild = index === 0;
+        const lastChild = index === 0 && overflow <= 0;
        return (
          <Component
            key={model.id}
@@ -1,19 +1,21 @@
 import deburr from "lodash/deburr";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import { useMenuState, MenuButton } from "reakit/Menu";
 import styled from "styled-components";
 import { s } from "@shared/styles";
 import type { FetchPageParams } from "~/stores/base/Store";
 import Button, { Inner } from "~/components/Button";
+import ContextMenu from "~/components/ContextMenu";
+import MenuItem from "~/components/ContextMenu/MenuItem";
 import Text from "~/components/Text";
 import Input, { NativeInput, Outline } from "./Input";
 import PaginatedList, { PaginatedItem } from "./PaginatedList";
-import { MenuProvider } from "./primitives/Menu/MenuContext";
-import { Menu, MenuContent, MenuTrigger, MenuButton } from "./primitives/Menu";

 interface TFilterOption extends PaginatedItem {
  key: string;
  label: string;
+  note?: string;
  icon?: React.ReactNode;
 }

@@ -31,17 +33,19 @@ type Props = {
 const FilterOptions = ({
  options,
  selectedKeys = [],
+  defaultLabel = "Filter options",
  className,
  onSelect,
  showFilter,
  fetchQuery,
  fetchQueryOptions,
-  ...rest
 }: Props) => {
  const { t } = useTranslation();
  const searchInputRef = React.useRef<HTMLInputElement>(null);
  const listRef = React.useRef<HTMLDivElement | null>(null);
-  const [open, setOpen] = React.useState(false);
+  const menu = useMenuState({
+    modal: false,
+  });
  const selectedItems = options.filter((option) =>
    selectedKeys.includes(option.key)
  );
@@ -53,26 +57,32 @@ const FilterOptions = ({

  const renderItem = React.useCallback(
    (option) => (
-      <MenuButton
+      <MenuItem
        key={option.key}
-        icon={option.icon}
-        label={option.label}
        onClick={() => {
          onSelect(option.key);
-          setOpen(false);
+          menu.hide();
        }}
        selected={selectedKeys.includes(option.key)}
-      />
+        {...menu}
+      >
+        {option.icon}
+        {option.note ? (
+          <LabelWithNote>
+            {option.label}
+            <Note>{option.note}</Note>
+          </LabelWithNote>
+        ) : (
+          option.label
+        )}
+      </MenuItem>
    ),
-    [onSelect, selectedKeys]
+    [menu, onSelect, selectedKeys]
  );

-  const handleFilter = React.useCallback(
-    (ev: React.ChangeEvent<HTMLInputElement>) => {
-      setQuery(ev.target.value);
-    },
-    []
-  );
+  const handleFilter = (ev: React.ChangeEvent<HTMLInputElement>) => {
+    setQuery(ev.target.value);
+  };

  const filteredOptions = React.useMemo(() => {
    const normalizedQuery = deburr(query.toLowerCase());
@@ -110,13 +120,13 @@ const FilterOptions = ({

      switch (ev.key) {
        case "Escape":
-          setOpen(false);
+          menu.hide();
          break;
        case "Enter":
          if (filteredOptions.length === 1) {
            ev.preventDefault();
            onSelect(filteredOptions[0].key);
-            setOpen(false);
+            menu.hide();
          }
          break;
        case "ArrowDown":
@@ -127,7 +137,7 @@ const FilterOptions = ({
          break;
      }
    },
-    [filteredOptions, onSelect]
+    [filteredOptions, menu, onSelect]
  );

  const handleEscapeFromList = React.useCallback((ev: React.KeyboardEvent) => {
@@ -139,21 +149,21 @@ const FilterOptions = ({
  }, []);

  React.useEffect(() => {
-    if (open) {
+    if (menu.visible) {
      searchInputRef.current?.focus();
    } else {
      setQuery("");
    }
-  }, [open]);
+  }, [menu.visible]);

  const showFilterInput = showFilter || options.length > 10;
-  const defaultLabel = rest.defaultLabel || t("Filter options");

  return (
-    <MenuProvider variant="dropdown">
-      <Menu open={open} onOpenChange={setOpen}>
-        <MenuTrigger>
+    <>
+      <MenuButton {...menu}>
+        {(props) => (
          <StyledButton
+            {...props}
            className={className}
            icon={selectedItems[0]?.key && selectedItems[0]?.icon}
            neutral
@@ -161,31 +171,31 @@ const FilterOptions = ({
          >
            {selectedItems.length ? selectedLabel : defaultLabel}
          </StyledButton>
-        </MenuTrigger>
-        <MenuContent aria-label={defaultLabel} align="start">
-          <PaginatedList<TFilterOption>
-            listRef={listRef}
-            options={{ query, ...fetchQueryOptions }}
-            items={filteredOptions}
-            fetch={fetchQuery}
-            renderItem={renderItem}
-            onEscape={handleEscapeFromList}
-            heading={showFilterInput ? <Spacer /> : undefined}
-            empty={<Empty />}
+        )}
+      </MenuButton>
+      <ContextMenu aria-label={defaultLabel} minHeight={66} {...menu}>
+        <PaginatedList<TFilterOption>
+          listRef={listRef}
+          options={{ query, ...fetchQueryOptions }}
+          items={filteredOptions}
+          fetch={fetchQuery}
+          renderItem={renderItem}
+          onEscape={handleEscapeFromList}
+          heading={showFilterInput ? <Spacer /> : undefined}
+          empty={<Empty />}
+        />
+        {showFilterInput && (
+          <SearchInput
+            ref={searchInputRef}
+            value={query}
+            onChange={handleFilter}
+            onKeyDown={handleKeyDown}
+            placeholder={`${t("Filter")}…`}
+            autoFocus
          />
-          {showFilterInput && (
-            <SearchInput
-              ref={searchInputRef}
-              value={query}
-              onChange={handleFilter}
-              onKeyDown={handleKeyDown}
-              placeholder={`${t("Filter")}…`}
-              autoFocus
-            />
-          )}
-        </MenuContent>
-      </Menu>
-    </MenuProvider>
+        )}
+      </ContextMenu>
+    </>
  );
 };

@@ -231,6 +241,24 @@ const SearchInput = styled(Input)`
  }
 `;

+const Note = styled(Text)`
+  display: block;
+  margin: 2px 0;
+  line-height: 1.2em;
+  font-size: 14px;
+  font-weight: 500;
+  color: ${s("textTertiary")};
+`;
+
+const LabelWithNote = styled.div`
+  font-weight: 500;
+  text-align: left;
+
+  &:hover ${Note} {
+    color: ${(props) => props.theme.white50};
+  }
+`;
+
 export const StyledButton = styled(Button)`
  box-shadow: none;
  text-transform: none;
@@ -1,14 +1,9 @@
 import * as React from "react";
-import * as Dialog from "@radix-ui/react-dialog";
+import { Dialog, DialogBackdrop, useDialogState } from "reakit/Dialog";
 import styled from "styled-components";
 import { depths, s } from "@shared/styles";
 import Scrollable from "~/components/Scrollable";
-import {
-  fadeIn,
-  fadeOut,
-  fadeInAndSlideLeft,
-  fadeOutAndSlideRight,
-} from "~/styles/animations";
+import usePrevious from "~/hooks/usePrevious";

 type Props = {
  children?: React.ReactNode;
@@ -23,33 +18,55 @@ const Guide: React.FC<Props> = ({
  title = "Untitled",
  onRequestClose,
  ...rest
-}: Props) => (
-  <Dialog.Root open={isOpen} onOpenChange={(open) => !open && onRequestClose()}>
-    <Dialog.Portal>
-      <StyledOverlay>
-        <Scene
-          onEscapeKeyDown={onRequestClose}
-          onPointerDownOutside={onRequestClose}
-          aria-describedby={undefined}
-          {...rest}
-        >
-          <Content>
-            {title && <Header>{title}</Header>}
-            {children}
-          </Content>
-        </Scene>
-      </StyledOverlay>
-    </Dialog.Portal>
-  </Dialog.Root>
-);
+}: Props) => {
+  const dialog = useDialogState({
+    animated: 250,
+  });
+  const wasOpen = usePrevious(isOpen);

-const Header = styled(Dialog.Title)`
+  React.useEffect(() => {
+    if (!wasOpen && isOpen) {
+      dialog.show();
+    }
+
+    if (wasOpen && !isOpen) {
+      dialog.hide();
+    }
+  }, [dialog, wasOpen, isOpen]);
+
+  return (
+    <DialogBackdrop {...dialog}>
+      {(props) => (
+        <Backdrop {...props}>
+          <Dialog
+            {...dialog}
+            aria-label={title}
+            preventBodyScroll
+            hideOnEsc
+            hide={onRequestClose}
+          >
+            {(props) => (
+              <Scene {...props} {...rest}>
+                <Content>
+                  {title && <Header>{title}</Header>}
+                  {children}
+                </Content>
+              </Scene>
+            )}
+          </Dialog>
+        </Backdrop>
+      )}
+    </DialogBackdrop>
+  );
+};
+
+const Header = styled.h1`
  font-size: 18px;
  margin-top: 0;
  margin-bottom: 1em;
 `;

-const StyledOverlay = styled(Dialog.Overlay)`
+const Backdrop = styled.div`
  position: fixed;
  top: 0;
  left: 0;
@@ -57,37 +74,35 @@ const StyledOverlay = styled(Dialog.Overlay)`
  bottom: 0;
  background-color: ${s("backdrop")} !important;
  z-index: ${depths.overlay};
+  transition: opacity 200ms ease-in-out;
+  opacity: 0;

-  &[data-state="open"] {
-    animation: ${fadeIn} 200ms ease;
-  }
-
-  &[data-state="closed"] {
-    animation: ${fadeOut} 200ms ease;
+  &[data-enter] {
+    opacity: 1;
  }
 `;

-const Scene = styled(Dialog.Content)`
+const Scene = styled.div`
  position: absolute;
  top: 0;
  right: 0;
  bottom: 0;
  margin: 12px;
-  display: flex;
  z-index: ${depths.modal};
+  display: flex;
  justify-content: center;
  align-items: flex-start;
  width: 350px;
  background: ${s("background")};
  border-radius: 8px;
  outline: none;
+  opacity: 0;
+  transform: translateX(16px);
+  transition: transform 250ms ease, opacity 250ms ease;

-  &[data-state="open"] {
-    animation: ${fadeInAndSlideLeft} 200ms ease;
-  }
-
-  &[data-state="closed"] {
-    animation: ${fadeOutAndSlideRight} 200ms ease;
+  &[data-enter] {
+    opacity: 1;
+    transform: translateX(0px);
  }
 `;

@@ -6,7 +6,7 @@ import * as React from "react";
 import { mergeRefs } from "react-merge-refs";
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
-import useMeasure from "react-use-measure";
+import { useComponentSize } from "@shared/hooks/useComponentSize";
 import { depths, s } from "@shared/styles";
 import { supportsPassiveListener } from "@shared/utils/browser";
 import Button from "~/components/Button";
@@ -38,8 +38,8 @@ function Header(
  const { ui } = useStores();
  const isMobile = useMobile();
  const hasMobileSidebar = hasSidebar && isMobile;
-  const [internalMeasureRef, size] = useMeasure();
-  const [breadcrumbsMeasureRef, breadcrumbsSize] = useMeasure();
+  const internalRef = React.useRef<HTMLDivElement | null>(null);
+  const breadcrumbsRef = React.useRef<HTMLDivElement | null>(null);
  const passThrough = !actions && !left && !title;

  const [isScrolled, setScrolled] = React.useState(false);
@@ -62,22 +62,19 @@ function Header(
    });
  }, []);

-  const setBreadcrumbRef = React.useCallback(
-    (node: HTMLDivElement | null) => {
-      if (node?.firstElementChild) {
-        breadcrumbsMeasureRef(node.firstElementChild as HTMLDivElement);
-      }
-    },
-    [breadcrumbsMeasureRef]
-  );
+  const setBreadcrumbRef = React.useCallback((node: HTMLDivElement | null) => {
+    breadcrumbsRef.current = node?.firstElementChild as HTMLDivElement;
+  }, []);

+  const size = useComponentSize(internalRef);
+  const breadcrumbsSize = useComponentSize(breadcrumbsRef);
  const breadcrumbMakesCompact = breadcrumbsSize.width > size.width / 3;
  const isCompact = size.width < 1000 || breadcrumbMakesCompact;

  return (
    <TooltipProvider>
      <Wrapper
-        ref={mergeRefs([ref, internalMeasureRef])}
+        ref={mergeRefs([ref, internalRef])}
        align="center"
        shrink={false}
        className={className}
@@ -125,7 +122,6 @@ const Actions = styled(Flex)`
  flex-basis: 0;
  min-width: auto;
  padding-left: 8px;
-  gap: 12px;

  ${breakpoint("tablet")`
    position: unset;
@@ -20,8 +20,7 @@ export const Preview = styled(Link)`
  cursor: ${(props: { as?: string }) =>
    props.as === "div" ? "default" : "var(--pointer)"};
  border-radius: 4px;
-  box-shadow:
-    0 30px 90px -20px rgba(0, 0, 0, 0.3),
+  box-shadow: 0 30px 90px -20px rgba(0, 0, 0, 0.3),
    0 0 1px 1px rgba(0, 0, 0, 0.05);
  overflow: hidden;
  position: absolute;
@@ -136,7 +136,6 @@ const CustomColor = ({
        maxLength={7}
        value={value}
        onChange={handleInputChange}
-        autoFocus
      />
    </Flex>
  );
@@ -194,7 +193,7 @@ const SwitcherButton = styled(NudeButton)<{ panel: Panel }>`
 `;

 const LargeMobileBuiltinColors = styled(BuiltinColors)`
-  max-width: 400px;
+  max-width: 380px;
  padding-right: 8px;
 `;

@@ -136,12 +136,11 @@ const EmojiPanel = ({
        freqEmojis,
      });

-  React.useLayoutEffect(() => {
-    if (!panelActive) {
-      return;
+  React.useEffect(() => {
+    if (scrollableRef.current) {
+      scrollableRef.current.scrollTop = 0;
    }
-    scrollableRef.current?.scroll({ top: 0 });
-    requestAnimationFrame(() => searchRef.current?.focus());
+    searchRef.current?.focus();
  }, [panelActive]);

  return (
@@ -115,9 +115,7 @@ const CategoryName = styled(Text)`
 `;

 const Icon = styled.svg`
-  transition:
-    color 150ms ease-in-out,
-    fill 150ms ease-in-out;
+  transition: color 150ms ease-in-out, fill 150ms ease-in-out;
  transition-delay: var(--delay);
 `;

@@ -155,12 +155,11 @@ const IconPanel = ({
        baseIcons,
      ];

-  React.useLayoutEffect(() => {
-    if (!panelActive) {
-      return;
+  React.useEffect(() => {
+    if (scrollableRef.current) {
+      scrollableRef.current.scrollTop = 0;
    }
-    scrollableRef.current?.scroll({ top: 0 });
-    requestAnimationFrame(() => searchRef.current?.focus());
+    searchRef.current?.focus();
  }, [panelActive]);

  return (
@@ -12,8 +12,7 @@ export const PopoverButton = styled(NudeButton)<{ $borderOnHover?: boolean }>`
      $borderOnHover &&
      css`
        background: ${s("buttonNeutralBackground")};
-        box-shadow:
-          rgba(0, 0, 0, 0.07) 0px 1px 2px,
+        box-shadow: rgba(0, 0, 0, 0.07) 0px 1px 2px,
          ${s("buttonNeutralBorder")} 0 0 0 1px inset;
      `};
  }
@@ -1,17 +1,13 @@
-import { useMemo, useCallback, useState } from "react";
+import { useMemo, useCallback } from "react";
 import { useTranslation } from "react-i18next";
+import { Menu, MenuButton, MenuItem, useMenuState } from "reakit";
 import styled from "styled-components";
-import { s, hover } from "@shared/styles";
+import { depths, s, hover } from "@shared/styles";
 import { EmojiSkinTone } from "@shared/types";
 import { getEmojiVariants } from "@shared/utils/emoji";
 import { Emoji } from "~/components/Emoji";
 import Flex from "~/components/Flex";
 import NudeButton from "~/components/NudeButton";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "~/components/primitives/Popover";
 import { IconButton } from "./IconButton";

 const SkinTonePicker = ({
@@ -22,61 +18,62 @@ const SkinTonePicker = ({
  onChange: (skin: EmojiSkinTone) => void;
 }) => {
  const { t } = useTranslation();
-  const [open, setOpen] = useState(false);

  const handEmojiVariants = useMemo(() => getEmojiVariants({ id: "hand" }), []);

+  const menu = useMenuState({
+    placement: "bottom-end",
+  });
+
  const handleSkinClick = useCallback(
-    (emojiSkin: EmojiSkinTone) => {
-      setOpen(false);
+    (emojiSkin) => {
+      menu.hide();
      onChange(emojiSkin);
    },
-    [onChange]
+    [menu, onChange]
  );

  const menuItems = useMemo(
    () =>
-      Object.values(EmojiSkinTone)
-        .map((skinTone) => {
-          const emoji = handEmojiVariants[skinTone];
-          return emoji ? (
-            <IconButton
-              key={emoji.value}
-              onClick={() => handleSkinClick(skinTone)}
-            >
+      Object.entries(handEmojiVariants).map(([eskin, emoji]) => (
+        <MenuItem {...menu} key={emoji.value}>
+          {(menuprops) => (
+            <IconButton {...menuprops} onClick={() => handleSkinClick(eskin)}>
              <Emoji width={24} height={24}>
                {emoji.value}
              </Emoji>
            </IconButton>
-          ) : null;
-        })
-        .filter(Boolean),
-    [handEmojiVariants, handleSkinClick]
+          )}
+        </MenuItem>
+      )),
+    [menu, handEmojiVariants, handleSkinClick]
  );

  return (
-    <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger>
-        <StyledMenuButton aria-label={t("Choose default skin tone")}>
-          {handEmojiVariants[skinTone]?.value}
-        </StyledMenuButton>
-      </PopoverTrigger>
-      <PopoverContent
-        side="bottom"
-        align="end"
-        aria-label={t("Choose default skin tone")}
-        width={208}
-        scrollable={false}
-        shrink
-      >
-        <Emojis>{menuItems}</Emojis>
-      </PopoverContent>
-    </Popover>
+    <>
+      <MenuButton {...menu}>
+        {(props) => (
+          <StyledMenuButton
+            {...props}
+            aria-label={t("Choose default skin tone")}
+          >
+            {handEmojiVariants[skinTone]!.value}
+          </StyledMenuButton>
+        )}
+      </MenuButton>
+      <Menu {...menu} aria-label={t("Choose default skin tone")}>
+        {(props) => <MenuContainer {...props}>{menuItems}</MenuContainer>}
+      </Menu>
+    </>
  );
 };

-const Emojis = styled(Flex)`
-  padding: 0 8px;
+const MenuContainer = styled(Flex)`
+  z-index: ${depths.menu};
+  padding: 4px;
+  border-radius: 4px;
+  background: ${s("menuBackground")};
+  box-shadow: ${s("menuShadow")};
 `;

 const StyledMenuButton = styled(NudeButton)`
@@ -1,7 +1,14 @@
-import * as Tabs from "@radix-ui/react-tabs";
 import { SmileyIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import {
+  PopoverDisclosure,
+  Tab,
+  TabList,
+  TabPanel,
+  usePopoverState,
+  useTabState,
+} from "reakit";
 import styled, { css } from "styled-components";
 import Icon from "@shared/components/Icon";
 import { s, hover } from "@shared/styles";
@@ -10,14 +17,11 @@ import { IconType } from "@shared/types";
 import { determineIconType } from "@shared/utils/icon";
 import Flex from "~/components/Flex";
 import NudeButton from "~/components/NudeButton";
-import {
-  Popover,
-  PopoverTrigger,
-  PopoverContent,
-} from "~/components/primitives/Popover";
+import Popover from "~/components/Popover";
 import useMobile from "~/hooks/useMobile";
+import useOnClickOutside from "~/hooks/useOnClickOutside";
+import usePrevious from "~/hooks/usePrevious";
 import useWindowSize from "~/hooks/useWindowSize";
-import { Drawer, DrawerContent, DrawerTrigger } from "../primitives/Drawer";
 import EmojiPanel from "./components/EmojiPanel";
 import IconPanel from "./components/IconPanel";
 import { PopoverButton } from "./components/PopoverButton";
@@ -27,8 +31,6 @@ const TAB_NAMES = {
  Emoji: "emoji",
 } as const;

-type TabName = (typeof TAB_NAMES)[keyof typeof TAB_NAMES];
-
 const POPOVER_WIDTH = 408;

 type Props = {
@@ -65,9 +67,9 @@ const IconPicker = ({
  const { width: windowWidth } = useWindowSize();
  const isMobile = useMobile();

-  const [open, setOpen] = React.useState(false);
  const [query, setQuery] = React.useState("");
  const [chosenColor, setChosenColor] = React.useState(color);
+  const contentRef = React.useRef<HTMLDivElement | null>(null);

  const iconType = determineIconType(icon);
  const defaultTab = React.useMemo(
@@ -76,40 +78,32 @@ const IconPicker = ({
    [iconType]
  );

-  const [activeTab, setActiveTab] = React.useState<TabName>(defaultTab);
+  const popover = usePopoverState({
+    placement: popoverPosition,
+    modal: true,
+    unstable_offset: [0, 0],
+  });
+  const { hide, show, visible } = popover;
+  const tab = useTabState({ selectedId: defaultTab });
+  const previouslyVisible = usePrevious(popover.visible);

  const popoverWidth = isMobile ? windowWidth : POPOVER_WIDTH;
-
-  const handleTabChange = React.useCallback((value: string) => {
-    setActiveTab(value as TabName);
-  }, []);
+  // In mobile, popover is absolutely positioned to leave 8px on both sides.
+  const panelWidth = isMobile ? windowWidth - 16 : popoverWidth;

  const resetDefaultTab = React.useCallback(() => {
-    setActiveTab(defaultTab);
+    tab.select(defaultTab);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [defaultTab]);

-  const handleOpenChange = React.useCallback(
-    (isOpen: boolean) => {
-      setOpen(isOpen);
-      if (isOpen) {
-        onOpen?.();
-      } else {
-        onClose?.();
-        setQuery("");
-        resetDefaultTab();
-      }
-    },
-    [onOpen, onClose, resetDefaultTab]
-  );
-
  const handleIconChange = React.useCallback(
    (ic: string) => {
-      setOpen(false);
+      hide();
      const icType = determineIconType(ic);
      const finalColor = icType === IconType.SVG ? chosenColor : null;
      onChange(ic, finalColor);
    },
-    [onChange, chosenColor]
+    [hide, onChange, chosenColor]
  );

  const handleIconColorChange = React.useCallback(
@@ -117,6 +111,7 @@ const IconPicker = ({
      setChosenColor(c);

      const icType = determineIconType(icon);
+      // Outline icon set; propagate color change
      if (icType === IconType.SVG) {
        onChange(icon, c);
      }
@@ -125,153 +120,135 @@ const IconPicker = ({
  );

  const handleIconRemove = React.useCallback(() => {
-    setOpen(false);
+    hide();
    onChange(null, null);
-  }, [setOpen, onChange]);
+  }, [hide, onChange]);

-  const pickerTrigger = (
-    <PopoverButton
-      aria-label={t("Show menu")}
-      className={className}
-      size={size}
-      $borderOnHover={borderOnHover}
-    >
-      {children ? (
-        children
-      ) : iconType && icon ? (
-        <Icon value={icon} color={color} size={size} initial={initial} />
-      ) : (
-        <StyledSmileyIcon color={theme.placeholder} size={size} />
-      )}
-    </PopoverButton>
+  const handlePopoverButtonClick = React.useCallback(
+    (ev: React.MouseEvent) => {
+      ev.stopPropagation();
+      if (visible) {
+        hide();
+      } else {
+        show();
+      }
+    },
+    [hide, show, visible]
  );

-  const pickerContent = (
-    <Content
-      open={open}
-      activeTab={activeTab}
-      iconColor={chosenColor}
-      iconInitial={initial ?? ""}
-      query={query}
-      panelWidth={popoverWidth}
-      allowDelete={!!(allowDelete && icon)}
-      onTabChange={handleTabChange}
-      onQueryChange={setQuery}
-      onIconChange={handleIconChange}
-      onIconColorChange={handleIconColorChange}
-      onIconRemove={handleIconRemove}
-    />
-  );
-
-  // Update selected tab when default tab changes
+  // Popover open effect
  React.useEffect(() => {
-    setActiveTab(defaultTab);
-  }, [defaultTab]);
+    if (visible && !previouslyVisible) {
+      onOpen?.();
+    } else if (!visible && previouslyVisible) {
+      onClose?.();
+      setQuery("");
+      resetDefaultTab();
+    }
+  }, [visible, previouslyVisible, onOpen, onClose, resetDefaultTab]);

-  if (isMobile) {
-    return (
-      <Drawer open={open} onOpenChange={setOpen}>
-        <DrawerTrigger asChild>{pickerTrigger}</DrawerTrigger>
-        <DrawerContent aria-label={t("Icon Picker")}>
-          {pickerContent}
-        </DrawerContent>
-      </Drawer>
-    );
-  }
-
-  return (
-    <Popover open={open} onOpenChange={handleOpenChange} modal={true}>
-      <PopoverTrigger>{pickerTrigger}</PopoverTrigger>
-      <PopoverContent
-        aria-label={t("Icon Picker")}
-        width={popoverWidth}
-        side={popoverPosition === "right" ? "right" : "bottom"}
-        align={popoverPosition === "bottom-start" ? "start" : "center"}
-        scrollable={false}
-        shrink
-      >
-        {pickerContent}
-      </PopoverContent>
-    </Popover>
+  // Custom click outside handling rather than using `hideOnClickOutside` from reakit so that we can
+  // prevent event bubbling.
+  useOnClickOutside(
+    contentRef,
+    (event) => {
+      if (
+        popover.visible &&
+        !popover.unstable_disclosureRef.current?.contains(event.target as Node)
+      ) {
+        event.stopPropagation();
+        event.preventDefault();
+        popover.hide();
+      }
+    },
+    { capture: true }
  );
-};
-
-type ContentProps = {
-  open: boolean;
-  activeTab: TabName;
-  query: string;
-  iconColor: string;
-  iconInitial: string;
-  panelWidth: number;
-  allowDelete: boolean;
-  onTabChange: (tab: string) => void;
-  onQueryChange: (query: string) => void;
-  onIconChange: (icon: string) => void;
-  onIconColorChange: (color: string) => void;
-  onIconRemove: () => void;
-};
-
-const Content = ({
-  open,
-  activeTab,
-  iconColor,
-  iconInitial,
-  query,
-  panelWidth,
-  allowDelete,
-  onTabChange,
-  onQueryChange,
-  onIconChange,
-  onIconColorChange,
-  onIconRemove,
-}: ContentProps) => {
-  const { t } = useTranslation();

  return (
-    <Tabs.Root value={activeTab} onValueChange={onTabChange}>
-      <TabActionsWrapper justify="space-between" align="center">
-        <Tabs.List>
-          <StyledTab
-            value={TAB_NAMES["Icon"]}
-            aria-label={t("Icons")}
-            $active={activeTab === TAB_NAMES["Icon"]}
+    <>
+      <PopoverDisclosure {...popover}>
+        {(props) => (
+          <PopoverButton
+            {...props}
+            aria-label={t("Show menu")}
+            className={className}
+            size={size}
+            onClick={handlePopoverButtonClick}
+            $borderOnHover={borderOnHover}
          >
-            {t("Icons")}
-          </StyledTab>
-          <StyledTab
-            value={TAB_NAMES["Emoji"]}
-            aria-label={t("Emojis")}
-            $active={activeTab === TAB_NAMES["Emoji"]}
-          >
-            {t("Emojis")}
-          </StyledTab>
-        </Tabs.List>
-        {allowDelete && (
-          <RemoveButton onClick={onIconRemove}>{t("Remove")}</RemoveButton>
+            {children ? (
+              children
+            ) : iconType && icon ? (
+              <Icon value={icon} color={color} size={size} initial={initial} />
+            ) : (
+              <StyledSmileyIcon color={theme.placeholder} size={size} />
+            )}
+          </PopoverButton>
        )}
-      </TabActionsWrapper>
-      <StyledTabContent value={TAB_NAMES["Icon"]}>
-        <IconPanel
-          panelWidth={panelWidth}
-          initial={iconInitial}
-          color={iconColor}
-          query={query}
-          panelActive={open && activeTab === TAB_NAMES["Icon"]}
-          onIconChange={onIconChange}
-          onColorChange={onIconColorChange}
-          onQueryChange={onQueryChange}
-        />
-      </StyledTabContent>
-      <StyledTabContent value={TAB_NAMES["Emoji"]}>
-        <EmojiPanel
-          panelWidth={panelWidth}
-          query={query}
-          panelActive={open && activeTab === TAB_NAMES["Emoji"]}
-          onEmojiChange={onIconChange}
-          onQueryChange={onQueryChange}
-        />
-      </StyledTabContent>
-    </Tabs.Root>
+      </PopoverDisclosure>
+      <Popover
+        {...popover}
+        ref={contentRef}
+        width={popoverWidth}
+        shrink
+        aria-label={t("Icon Picker")}
+        onClick={(e) => e.stopPropagation()}
+        hideOnClickOutside={false}
+      >
+        <>
+          <TabActionsWrapper justify="space-between" align="center">
+            <TabList {...tab}>
+              <StyledTab
+                {...tab}
+                id={TAB_NAMES["Icon"]}
+                aria-label={t("Icons")}
+                $active={tab.selectedId === TAB_NAMES["Icon"]}
+              >
+                {t("Icons")}
+              </StyledTab>
+              <StyledTab
+                {...tab}
+                id={TAB_NAMES["Emoji"]}
+                aria-label={t("Emojis")}
+                $active={tab.selectedId === TAB_NAMES["Emoji"]}
+              >
+                {t("Emojis")}
+              </StyledTab>
+            </TabList>
+            {allowDelete && icon && (
+              <RemoveButton onClick={handleIconRemove}>
+                {t("Remove")}
+              </RemoveButton>
+            )}
+          </TabActionsWrapper>
+          <StyledTabPanel {...tab}>
+            <IconPanel
+              panelWidth={panelWidth}
+              initial={initial ?? "?"}
+              color={chosenColor}
+              query={query}
+              panelActive={
+                popover.visible && tab.selectedId === TAB_NAMES["Icon"]
+              }
+              onIconChange={handleIconChange}
+              onColorChange={handleIconColorChange}
+              onQueryChange={setQuery}
+            />
+          </StyledTabPanel>
+          <StyledTabPanel {...tab}>
+            <EmojiPanel
+              panelWidth={panelWidth}
+              query={query}
+              panelActive={
+                popover.visible && tab.selectedId === TAB_NAMES["Emoji"]
+              }
+              onEmojiChange={handleIconChange}
+              onQueryChange={setQuery}
+            />
+          </StyledTabPanel>
+        </>
+      </Popover>
+    </>
  );
 };

@@ -300,7 +277,7 @@ const TabActionsWrapper = styled(Flex)`
  border-bottom: 1px solid ${s("inputBorder")};
 `;

-const StyledTab = styled(Tabs.Trigger)<{ $active: boolean }>`
+const StyledTab = styled(Tab)<{ $active: boolean }>`
  position: relative;
  font-weight: 500;
  font-size: 14px;
@@ -331,7 +308,7 @@ const StyledTab = styled(Tabs.Trigger)<{ $active: boolean }>`
    `}
 `;

-const StyledTabContent = styled(Tabs.Content)`
+const StyledTabPanel = styled(TabPanel)`
  height: 410px;
  overflow-y: auto;
 `;
@@ -1,16 +0,0 @@
-import { ArrowIcon as ArrowRightIcon } from "outline-icons";
-import styled from "styled-components";
-
-export { ArrowIcon as ArrowRightIcon } from "outline-icons";
-
-export const ArrowUpIcon = styled(ArrowRightIcon)`
-  transform: rotate(-90deg);
-`;
-
-export const ArrowDownIcon = styled(ArrowRightIcon)`
-  transform: rotate(90deg);
-`;
-
-export const ArrowLeftIcon = styled(ArrowRightIcon)`
-  transform: rotate(180deg);
-`;
@@ -1,6 +1,6 @@
-import * as VisuallyHidden from "@radix-ui/react-visually-hidden";
 import * as React from "react";
 import { mergeRefs } from "react-merge-refs";
+import { VisuallyHidden } from "reakit/VisuallyHidden";
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import { s, ellipsis } from "@shared/styles";
@@ -107,8 +107,8 @@ export const Outline = styled(Flex)<{
    props.hasError
      ? props.theme.danger
      : props.focused
-        ? props.theme.inputBorderFocused
-        : props.theme.inputBorder};
+      ? props.theme.inputBorderFocused
+      : props.theme.inputBorder};
  border-radius: 4px;
  font-weight: normal;
  align-items: center;
@@ -221,7 +221,7 @@ function Input(
      <label>
        {label &&
          (labelHidden ? (
-            <VisuallyHidden.Root>{wrappedLabel}</VisuallyHidden.Root>
+            <VisuallyHidden>{wrappedLabel}</VisuallyHidden>
          ) : (
            wrappedLabel
          ))}
@@ -1,14 +1,15 @@
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import { MenuButton, useMenuState } from "reakit/Menu";
 import styled from "styled-components";
 import { s } from "@shared/styles";
 import lazyWithRetry from "~/utils/lazyWithRetry";
+import ContextMenu from "./ContextMenu";
 import DelayedMount from "./DelayedMount";
 import Input, { Props as InputProps } from "./Input";
 import NudeButton from "./NudeButton";
 import Relative from "./Sidebar/components/Relative";
 import Text from "./Text";
-import { Popover, PopoverContent, PopoverTrigger } from "./primitives/Popover";

 type Props = Omit<InputProps, "onChange"> & {
  value: string | undefined;
@@ -17,6 +18,10 @@ type Props = Omit<InputProps, "onChange"> & {

 const InputColor: React.FC<Props> = ({ value, onChange, ...rest }: Props) => {
  const { t } = useTranslation();
+  const menu = useMenuState({
+    modal: true,
+    placement: "bottom-end",
+  });

  return (
    <Relative>
@@ -27,26 +32,30 @@ const InputColor: React.FC<Props> = ({ value, onChange, ...rest }: Props) => {
        maxLength={7}
        {...rest}
      />
-      <Popover modal={true}>
-        <PopoverTrigger>
-          <SwatchButton aria-label={t("Show menu")} $background={value} />
-        </PopoverTrigger>
-        <StyledContent aria-label={t("Select a color")} align="end">
-          <React.Suspense
-            fallback={
-              <DelayedMount>
-                <Text>{t("Loading")}…</Text>
-              </DelayedMount>
-            }
-          >
-            <StyledColorPicker
-              disableAlpha
-              color={value}
-              onChange={(color) => onChange(color.hex)}
-            />
-          </React.Suspense>
-        </StyledContent>
-      </Popover>
+      <MenuButton {...menu}>
+        {(props) => (
+          <SwatchButton
+            aria-label={t("Show menu")}
+            {...props}
+            $background={value}
+          />
+        )}
+      </MenuButton>
+      <ContextMenu {...menu} aria-label={t("Select a color")}>
+        <React.Suspense
+          fallback={
+            <DelayedMount>
+              <Text>{t("Loading")}…</Text>
+            </DelayedMount>
+          }
+        >
+          <StyledColorPicker
+            disableAlpha
+            color={value}
+            onChange={(color) => onChange(color.hex)}
+          />
+        </React.Suspense>
+      </ContextMenu>
    </Relative>
  );
 };
@@ -60,11 +69,6 @@ const SwatchButton = styled(NudeButton)<{ $background: string | undefined }>`
  right: 6px;
 `;

-const StyledContent = styled(PopoverContent)`
-  width: auto;
-  padding: 8px;
-`;
-
 const ColorPicker = lazyWithRetry(
  () => import("react-color/lib/components/chrome/Chrome")
 );
@@ -2,42 +2,23 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { s } from "@shared/styles";
-import { InputSelect, Option } from "~/components/InputSelect";
+import InputSelect, { Props as SelectProps } from "~/components/InputSelect";
 import { EmptySelectValue, Permission } from "~/types";

-type Props = Pick<
-  React.ComponentProps<typeof InputSelect>,
-  "value" | "onChange" | "disabled" | "className"
->;
-
 export default function InputMemberPermissionSelect(
-  props: Props & { permissions: Permission[] }
+  props: Partial<SelectProps> & { permissions: Permission[] }
 ) {
  const { value, onChange, ...rest } = props;
  const { t } = useTranslation();

-  const options = React.useMemo<Option[]>(
-    () =>
-      props.permissions.reduce((acc, permission) => {
-        if (permission.divider) {
-          acc.push({ type: "separator" });
-        }
-        acc.push({
-          ...permission,
-          type: "item",
-        });
-        return acc;
-      }, [] as Option[]),
-    [props.permissions]
-  );
-
  return (
    <Select
-      options={options}
-      value={value || EmptySelectValue}
-      onChange={onChange}
      label={t("Permissions")}
-      hideLabel
+      options={props.permissions}
+      ariaLabel={t("Permissions")}
+      onChange={onChange}
+      value={value || EmptySelectValue}
+      labelHidden
      nude
      {...rest}
    />
@@ -45,5 +26,13 @@ export default function InputMemberPermissionSelect(
 }

 const Select = styled(InputSelect)`
+  margin: 0;
+  font-size: 14px;
+  border-color: transparent;
+  box-shadow: none;
  color: ${s("textSecondary")};
-`;
+
+  select {
+    margin: 0;
+  }
+` as React.ComponentType<SelectProps>;
@@ -1,401 +1,383 @@
-import * as VisuallyHidden from "@radix-ui/react-visually-hidden";
-import { QuestionMarkIcon } from "outline-icons";
-import { transparentize } from "polished";
+import {
+  Select,
+  SelectOption,
+  useSelectState,
+  useSelectPopover,
+  SelectPopover,
+} from "@renderlesskit/react";
+import { CheckmarkIcon } from "outline-icons";
 import * as React from "react";
-import styled from "styled-components";
+import { VisuallyHidden } from "reakit/VisuallyHidden";
+import styled, { css } from "styled-components";
 import { s } from "@shared/styles";
+import Button, { Props as ButtonProps, Inner } from "~/components/Button";
 import Text from "~/components/Text";
+import useMenuHeight from "~/hooks/useMenuHeight";
 import useMobile from "~/hooks/useMobile";
-import Flex from "./Flex";
+import useOnClickOutside from "~/hooks/useOnClickOutside";
+import { fadeAndScaleIn } from "~/styles/animations";
+import {
+  Position,
+  Background as ContextMenuBackground,
+  Backdrop,
+  Placement,
+} from "./ContextMenu";
+import { MenuAnchorCSS } from "./ContextMenu/MenuItem";
+import Separator from "./ContextMenu/Separator";
 import { LabelText } from "./Input";
-import NudeButton from "./NudeButton";
-import Scrollable from "./Scrollable";
-import Tooltip from "./Tooltip";
-import {
-  Drawer,
-  DrawerContent,
-  DrawerTitle,
-  DrawerTrigger,
-} from "./primitives/Drawer";
-import {
-  InputSelectRoot,
-  InputSelectContent,
-  InputSelectItem,
-  InputSelectSeparator,
-  InputSelectTrigger,
-  type TriggerButtonProps,
-} from "./primitives/InputSelect";
-import {
-  SelectItemIndicator,
-  SelectItem as SelectItemWrapper,
-  SelectButton,
-} from "./primitives/components/InputSelect";

-type Separator = {
-  /* Denotes a horizontal divider line to be rendered in the menu, */
-  type: "separator";
-};
-
-export type Item = {
-  /* Denotes a selectable option in the menu. */
-  type: "item";
-  /* Representative text shown in the menu for this option. */
-  label: string;
-  /* Actual value of this option. */
+export type Option = {
+  label: string | JSX.Element;
  value: string;
-  /* Additional info shown alongside the label.  */
  description?: string;
-  /* An icon shown alongside the label.  */
-  icon?: React.ReactElement;
+  divider?: boolean;
 };

-export type Option = Item | Separator;
-
-type Props = {
-  /* Options to display in the select menu. */
-  options: Option[];
-  /* Current chosen value. */
+export type Props = Omit<ButtonProps<any>, "onChange"> & {
+  id?: string;
+  name?: string;
  value?: string | null;
-  /* Callback when an option is selected. */
-  onChange: (value: string) => void;
-  /* Label for the select menu. */
-  label: string;
-  /* When true, label is hidden in an accessible manner. */
-  hideLabel?: boolean;
-  /* When true, menu is disabled. */
-  disabled?: boolean;
-  /* When true, width of the menu trigger is restricted. Otherwise, takes up the full width of parent. */
+  label?: React.ReactNode;
+  nude?: boolean;
+  ariaLabel: string;
  short?: boolean;
-  /** Display a tooltip with the descriptive help text about the select menu. */
-  help?: string;
-} & TriggerButtonProps;
-
-export const InputSelect = React.forwardRef<HTMLButtonElement, Props>(
-  (props, ref) => {
-    const {
-      options,
-      value,
-      onChange,
-      label,
-      hideLabel,
-      short,
-      help,
-      ...triggerProps
-    } = props;
-
-    const [localValue, setLocalValue] = React.useState(value);
-    const [open, setOpen] = React.useState(false);
-
-    const contentRef =
-      React.useRef<React.ElementRef<typeof InputSelectContent>>(null);
-
-    const isMobile = useMobile();
-
-    const placeholder = `Select a ${label.toLowerCase()}`;
-    const optionsHaveIcon = options.some(
-      (opt) => opt.type === "item" && !!opt.icon
-    );
-
-    const renderOption = React.useCallback(
-      (option: Option, idx: number) => {
-        if (option.type === "separator") {
-          return <InputSelectSeparator key={`separator-${idx}`} />;
-        }
-
-        return (
-          <InputSelectItem key={option.value} value={option.value}>
-            <Option option={option} optionsHaveIcon={optionsHaveIcon} />
-          </InputSelectItem>
-        );
-      },
-      [optionsHaveIcon]
-    );
-
-    const onValueChange = React.useCallback(
-      async (val: string) => {
-        setLocalValue(val);
-        onChange(val);
-      },
-      [onChange, setLocalValue]
-    );
-
-    const enablePointerEvents = React.useCallback(() => {
-      if (contentRef.current) {
-        contentRef.current.style.pointerEvents = "auto";
-      }
-    }, []);
-
-    const disablePointerEvents = React.useCallback(() => {
-      if (contentRef.current) {
-        contentRef.current.style.pointerEvents = "none";
-      }
-    }, []);
-
-    React.useEffect(() => {
-      setLocalValue(value);
-    }, [value]);
-
-    if (isMobile) {
-      return (
-        <MobileSelect
-          ref={ref}
-          {...props}
-          value={localValue}
-          onChange={onValueChange}
-          placeholder={placeholder}
-          optionsHaveIcon={optionsHaveIcon}
-        />
-      );
-    }
-
-    return (
-      <Wrapper short={short}>
-        <Label text={label} hidden={hideLabel ?? false} help={help} />
-        <InputSelectRoot
-          open={open}
-          onOpenChange={setOpen}
-          value={localValue ?? undefined}
-          onValueChange={onValueChange}
-        >
-          <InputSelectTrigger
-            ref={ref}
-            placeholder={placeholder}
-            {...triggerProps}
-          />
-          <InputSelectContent
-            ref={contentRef}
-            aria-label={label}
-            onAnimationStart={disablePointerEvents}
-            onAnimationEnd={enablePointerEvents}
-          >
-            {options.map(renderOption)}
-          </InputSelectContent>
-        </InputSelectRoot>
-      </Wrapper>
-    );
-  }
-);
-InputSelect.displayName = "InputSelect";
-
-type MobileSelectProps = Props & {
-  placeholder: string;
-  optionsHaveIcon: boolean;
+  disabled?: boolean;
+  className?: string;
+  labelHidden?: boolean;
+  icon?: React.ReactNode;
+  options: Option[];
+  /** @deprecated Removing soon, do not use. */
+  note?: React.ReactNode;
+  /** Callback function that is called when the value changes. Return false to cancel the change. */
+  onChange?: (value: string | null) => void | Promise<boolean | void>;
+  style?: React.CSSProperties;
+  /**
+   * Set to true if this component is rendered inside a Modal.
+   * The Modal will take care of preventing body scroll behaviour.
+   */
+  skipBodyScroll?: boolean;
 };

-const MobileSelect = React.forwardRef<HTMLButtonElement, MobileSelectProps>(
-  (props, ref) => {
-    const {
-      options,
-      value,
-      onChange,
-      label,
-      hideLabel,
-      disabled,
-      short,
-      placeholder,
-      optionsHaveIcon,
-      ...triggerProps
-    } = props;
-
-    const [open, setOpen] = React.useState(false);
-    const contentRef =
-      React.useRef<React.ElementRef<typeof DrawerContent>>(null);
-
-    const selectedOption = React.useMemo(
-      () =>
-        value
-          ? options.find((opt) => opt.type === "item" && opt.value === value)
-          : undefined,
-      [value, options]
-    );
-
-    const handleSelect = React.useCallback(
-      async (val: string) => {
-        setOpen(false);
-        onChange(val);
-      },
-      [onChange]
-    );
-
-    const renderOption = React.useCallback(
-      (option: Option, idx: number) => {
-        if (option.type === "separator") {
-          return <InputSelectSeparator key={`separator-${idx}`} />;
-        }
-
-        const isSelected = option === selectedOption;
-
-        return (
-          <SelectItemWrapper
-            key={option.value}
-            onClick={() => handleSelect(option.value)}
-            data-state={isSelected ? "checked" : "unchecked"}
-          >
-            <Option option={option} optionsHaveIcon={optionsHaveIcon} />
-            {isSelected && <SelectItemIndicator />}
-          </SelectItemWrapper>
-        );
-      },
-      [handleSelect, selectedOption, optionsHaveIcon]
-    );
-
-    const enablePointerEvents = React.useCallback(() => {
-      if (contentRef.current) {
-        contentRef.current.style.pointerEvents = "auto";
-      }
-    }, []);
-
-    const disablePointerEvents = React.useCallback(() => {
-      if (contentRef.current) {
-        contentRef.current.style.pointerEvents = "none";
-      }
-    }, []);
-
-    return (
-      <Wrapper>
-        <Label text={label} hidden={hideLabel ?? false} />
-        <Drawer open={open} onOpenChange={setOpen}>
-          <DrawerTrigger asChild>
-            <SelectButton
-              ref={ref}
-              {...triggerProps}
-              neutral
-              disclosure
-              data-placeholder={selectedOption ? false : ""}
-            >
-              {selectedOption ? (
-                <Option
-                  option={selectedOption as Item}
-                  optionsHaveIcon={optionsHaveIcon}
-                />
-              ) : (
-                <>{placeholder}</>
-              )}
-            </SelectButton>
-          </DrawerTrigger>
-          <DrawerContent
-            ref={contentRef}
-            aria-label={label}
-            onAnimationStart={disablePointerEvents}
-            onAnimationEnd={enablePointerEvents}
-          >
-            <DrawerTitle hidden={!label}>{label}</DrawerTitle>
-            <StyledScrollable hiddenScrollbars>
-              {options.map(renderOption)}
-            </StyledScrollable>
-          </DrawerContent>
-        </Drawer>
-      </Wrapper>
-    );
-  }
-);
-MobileSelect.displayName = "InputSelect";
-
-function Label({
-  text,
-  hidden,
-  help,
-}: {
-  text: string;
-  hidden: boolean;
-  help?: string;
-}) {
-  const content = (
-    <Flex align="center" gap={2} style={{ marginBottom: "4px" }}>
-      <LabelText style={{ paddingBottom: 0 }}>{text}</LabelText>
-      {help ? (
-        <Tooltip content={help}>
-          <TooltipButton size={18}>
-            <QuestionMarkIcon size={18} />
-          </TooltipButton>
-        </Tooltip>
-      ) : null}
-    </Flex>
-  );
-
-  return hidden ? (
-    <VisuallyHidden.Root>{content}</VisuallyHidden.Root>
-  ) : (
-    content
-  );
+export interface InputSelectRef {
+  value: string | null;
+  focus: () => void;
+  blur: () => void;
 }

-function Option({
-  option,
-  optionsHaveIcon,
-}: {
-  option: Item;
-  optionsHaveIcon: boolean;
-}) {
-  const icon = optionsHaveIcon ? (
-    option.icon ? (
-      <IconWrapper>{option.icon}</IconWrapper>
-    ) : (
-      <IconSpacer />
-    )
-  ) : null;
+interface InnerProps extends React.HTMLAttributes<HTMLDivElement> {
+  placement: Placement;
+}
+
+const getOptionFromValue = (options: Option[], value: string | null) =>
+  options.find((option) => option.value === value);
+
+const InputSelect = (props: Props, ref: React.RefObject<InputSelectRef>) => {
+  const {
+    value = null,
+    label,
+    className,
+    labelHidden,
+    options,
+    short,
+    ariaLabel,
+    onChange,
+    disabled,
+    note,
+    icon,
+    nude,
+    skipBodyScroll,
+    ...rest
+  } = props;
+
+  const select = useSelectState({
+    gutter: 0,
+    modal: true,
+    selectedValue: value,
+  });
+
+  const popover = useSelectPopover({
+    ...select,
+    hideOnClickOutside: false,
+    preventBodyScroll: skipBodyScroll ? false : true,
+    disabled,
+  });
+
+  const isMobile = useMobile();
+  const previousValue = React.useRef<string | null>(value);
+  const selectedRef = React.useRef<HTMLDivElement>(null);
+  const buttonRef = React.useRef<HTMLButtonElement>(null);
+  const contentRef = React.useRef<HTMLDivElement>(null);
+  const minWidth = buttonRef.current?.offsetWidth || 0;
+  const margin = 8;
+  const menuMaxHeight = useMenuHeight({
+    visible: select.visible,
+    elementRef: select.unstable_disclosureRef,
+    margin,
+  });
+  const maxHeight = Math.min(
+    menuMaxHeight ?? 0,
+    window.innerHeight -
+      (buttonRef.current?.getBoundingClientRect().bottom ?? 0) -
+      margin
+  );
+
+  const wrappedLabel = <LabelText>{label}</LabelText>;
+  const selectedValueIndex = options.findIndex(
+    (opt) => opt.value === select.selectedValue
+  );
+
+  // Custom click outside handling rather than using `hideOnClickOutside` from reakit so that we can
+  // prevent event bubbling.
+  useOnClickOutside(
+    contentRef,
+    (event) => {
+      if (buttonRef.current?.contains(event.target as Node)) {
+        return;
+      }
+      if (select.visible) {
+        event.stopPropagation();
+        event.preventDefault();
+        select.hide();
+      }
+    },
+    { capture: true }
+  );
+
+  React.useImperativeHandle(ref, () => ({
+    focus: () => {
+      buttonRef.current?.focus();
+    },
+    blur: () => {
+      buttonRef.current?.blur();
+    },
+    value: select.selectedValue,
+  }));
+
+  React.useEffect(() => {
+    previousValue.current = value;
+
+    // Update the selected value if it changes from the outside – both of these lines are needed
+    // for correct functioning
+    select.selectedValue = value;
+    select.setSelectedValue(value);
+  }, [value]);
+
+  React.useEffect(() => {
+    if (previousValue.current === select.selectedValue) {
+      return;
+    }
+    const previous = previousValue.current;
+    previousValue.current = select.selectedValue;
+
+    const response = onChange?.(select.selectedValue);
+    if (response && response instanceof Promise) {
+      void response.then((success) => {
+        if (success === false) {
+          select.selectedValue = previous;
+          select.setSelectedValue(previous);
+        }
+      });
+    }
+  }, [onChange, select.selectedValue]);
+
+  React.useLayoutEffect(() => {
+    if (select.visible) {
+      requestAnimationFrame(() => {
+        if (contentRef.current) {
+          contentRef.current.scrollTop = selectedValueIndex * 32;
+        }
+      });
+    }
+  }, [select.visible, selectedValueIndex]);
+
+  function labelForOption(opt: Option) {
+    return (
+      <>
+        {opt.label}
+        {opt.description && (
+          <>
+            &nbsp;
+            <Text as="span" type="tertiary" size="small" ellipsis>
+              – {opt.description}
+            </Text>
+          </>
+        )}
+      </>
+    );
+  }
+
+  const option = getOptionFromValue(options, select.selectedValue);

  return (
-    <OptionContainer align="center">
-      {icon}
-      {option.label}
-      {option.description && (
-        <>
-          &nbsp;
-          <Description type="tertiary" size="small" ellipsis>
-            – {option.description}
-          </Description>
-        </>
+    <>
+      <Wrapper short={short}>
+        {label &&
+          (labelHidden ? (
+            <VisuallyHidden>{wrappedLabel}</VisuallyHidden>
+          ) : (
+            wrappedLabel
+          ))}
+
+        <Select {...select} disabled={disabled} {...rest} ref={buttonRef}>
+          {(buttonProps) => (
+            <StyledButton
+              neutral
+              disclosure
+              className={className}
+              icon={icon}
+              $nude={nude}
+              {...buttonProps}
+            >
+              {option ? (
+                labelForOption(option)
+              ) : (
+                <Placeholder>Select a {ariaLabel.toLowerCase()}</Placeholder>
+              )}
+            </StyledButton>
+          )}
+        </Select>
+        <SelectPopover
+          {...select}
+          {...popover}
+          aria-label={ariaLabel}
+          preventBodyScroll={skipBodyScroll ? false : true}
+        >
+          {(popoverProps: InnerProps) => {
+            const topAnchor = popoverProps.style?.top === "0";
+            const rightAnchor = popoverProps.placement === "bottom-end";
+
+            return (
+              <Positioner {...popoverProps}>
+                <Background
+                  dir="auto"
+                  ref={contentRef}
+                  topAnchor={topAnchor}
+                  rightAnchor={rightAnchor}
+                  hiddenScrollbars
+                  maxWidth={400}
+                  style={
+                    maxHeight && topAnchor
+                      ? {
+                          maxHeight,
+                          minWidth,
+                        }
+                      : {
+                          minWidth,
+                        }
+                  }
+                >
+                  {select.visible
+                    ? options.map((opt) => {
+                        const isSelected = select.selectedValue === opt.value;
+                        const Icon = isSelected ? CheckmarkIcon : Spacer;
+                        return (
+                          <React.Fragment key={opt.value}>
+                            {opt.divider && <Separator />}
+                            <StyledSelectOption
+                              {...select}
+                              value={opt.value}
+                              key={opt.value}
+                              ref={isSelected ? selectedRef : undefined}
+                            >
+                              <Icon />
+                              &nbsp;
+                              {labelForOption(opt)}
+                            </StyledSelectOption>
+                          </React.Fragment>
+                        );
+                      })
+                    : null}
+                </Background>
+              </Positioner>
+            );
+          }}
+        </SelectPopover>
+      </Wrapper>
+      {note && (
+        <Text as="p" type="secondary" size="small">
+          {note}
+        </Text>
      )}
-    </OptionContainer>
+      {select.visible && isMobile && <Backdrop />}
+    </>
  );
-}
+};
+
+const Background = styled(ContextMenuBackground)`
+  animation: ${fadeAndScaleIn} 200ms ease;
+`;
+
+const Placeholder = styled.span`
+  color: ${s("placeholder")};
+`;
+
+const Spacer = styled.div`
+  width: 24px;
+  height: 24px;
+  flex-shrink: 0;
+`;
+
+const StyledButton = styled(Button)<{ $nude?: boolean }>`
+  font-weight: normal;
+  text-transform: none;
+  margin-bottom: 16px;
+  display: block;
+  width: 100%;
+  cursor: var(--pointer);
+
+  &:hover:not(:disabled) {
+    background: ${s("buttonNeutralBackground")};
+  }
+
+  ${(props) =>
+    props.$nude &&
+    css`
+      border-color: transparent;
+      box-shadow: none;
+    `}
+
+  ${Inner} {
+    line-height: 28px;
+    padding-left: 12px;
+    padding-right: 4px;
+  }
+
+  svg {
+    justify-self: flex-end;
+    margin-left: auto;
+  }
+`;
+
+export const StyledSelectOption = styled(SelectOption)`
+  ${MenuAnchorCSS}
+  /* overriding the styles from MenuAnchorCSS because we use &nbsp; here */
+  svg:not(:last-child) {
+    margin-right: 0px;
+  }
+`;

 const Wrapper = styled.label<{ short?: boolean }>`
  display: block;
  max-width: ${(props) => (props.short ? "350px" : "100%")};
 `;

-const OptionContainer = styled(Flex)`
-  min-height: 24px;
-`;
+export const Positioner = styled(Position)`
+  pointer-events: all;

-const Description = styled(Text)`
-  @media (hover: hover) {
-    &:hover,
-    &:focus {
-      color: ${(props) => transparentize(0.5, props.theme.accentText)};
+  &:focus-visible {
+    ${StyledSelectOption} {
+      &[aria-selected="true"] {
+        color: ${(props) => props.theme.white};
+        background: ${s("accent")};
+        box-shadow: none;
+        cursor: var(--pointer);
+
+        svg {
+          fill: ${(props) => props.theme.white};
+        }
+      }
    }
  }
 `;

-const IconWrapper = styled.span`
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 24px;
-  height: 24px;
-  margin-left: -4px;
-  margin-right: 4px;
-  overflow: hidden;
-  flex-shrink: 0;
-`;
-
-const IconSpacer = styled.div`
-  width: 24px;
-  height: 24px;
-  flex-shrink: 0;
-`;
-
-const StyledScrollable = styled(Scrollable)`
-  max-height: 75vh;
-`;
-
-const TooltipButton = styled(NudeButton)`
-  color: ${s("textSecondary")};
-
-  &:hover,
-  &[aria-expanded="true"] {
-    background: none !important;
-  }
-`;
+export default React.forwardRef(InputSelect);
@@ -0,0 +1,354 @@
+import * as VisuallyHidden from "@radix-ui/react-visually-hidden";
+import { transparentize } from "polished";
+import * as React from "react";
+import styled from "styled-components";
+import Text from "~/components/Text";
+import useMobile from "~/hooks/useMobile";
+import Separator from "./ContextMenu/Separator";
+import Flex from "./Flex";
+import { LabelText } from "./Input";
+import Scrollable from "./Scrollable";
+import { IconWrapper } from "./Sidebar/components/SidebarLink";
+import {
+  Drawer,
+  DrawerContent,
+  DrawerTitle,
+  DrawerTrigger,
+} from "./primitives/Drawer";
+import {
+  InputSelectRoot,
+  InputSelectContent,
+  InputSelectItem,
+  InputSelectSeparator,
+  InputSelectTrigger,
+  type TriggerButtonProps,
+} from "./primitives/InputSelect";
+import {
+  SelectItemIndicator,
+  SelectItem as SelectItemWrapper,
+  SelectButton,
+} from "./primitives/components/InputSelect";
+
+type Separator = {
+  /* Denotes a horizontal divider line to be rendered in the menu, */
+  type: "separator";
+};
+
+export type Item = {
+  /* Denotes a selectable option in the menu. */
+  type: "item";
+  /* Representative text shown in the menu for this option. */
+  label: string;
+  /* Actual value of this option. */
+  value: string;
+  /* Additional info shown alongside the label.  */
+  description?: string;
+  /* An icon shown alongside the label.  */
+  icon?: React.ReactElement;
+};
+
+export type Option = Item | Separator;
+
+type Props = {
+  /* Options to display in the select menu. */
+  options: Option[];
+  /* Current chosen value. */
+  value?: string;
+  /* Callback when an option is selected. */
+  onChange: (value: string) => void;
+  /* ARIA label for accessibility. */
+  ariaLabel: string;
+  /* Label for the select menu. */
+  label: string;
+  /* When true, label is hidden in an accessible manner. */
+  hideLabel?: boolean;
+  /* When true, menu is disabled. */
+  disabled?: boolean;
+  /* When true, width of the menu trigger is restricted. Otherwise, takes up the full width of parent. */
+  short?: boolean;
+} & TriggerButtonProps;
+
+export function InputSelectNew(props: Props) {
+  const {
+    options,
+    value,
+    onChange,
+    ariaLabel,
+    label,
+    hideLabel,
+    disabled,
+    short,
+    ...triggerProps
+  } = props;
+
+  const [localValue, setLocalValue] = React.useState(value);
+  const [open, setOpen] = React.useState(false);
+
+  const triggerRef =
+    React.useRef<React.ElementRef<typeof InputSelectTrigger>>(null);
+  const contentRef =
+    React.useRef<React.ElementRef<typeof InputSelectContent>>(null);
+
+  const isMobile = useMobile();
+
+  const placeholder = `Select a ${ariaLabel.toLowerCase()}`;
+  const optionsHaveIcon = options.some(
+    (opt) => opt.type === "item" && !!opt.icon
+  );
+
+  const renderOption = React.useCallback(
+    (option: Option) => {
+      if (option.type === "separator") {
+        return <InputSelectSeparator />;
+      }
+
+      return (
+        <InputSelectItem key={option.value} value={option.value}>
+          <Option option={option} optionsHaveIcon={optionsHaveIcon} />
+        </InputSelectItem>
+      );
+    },
+    [optionsHaveIcon]
+  );
+
+  const onValueChange = React.useCallback(
+    async (val: string) => {
+      setLocalValue(val);
+      onChange(val);
+    },
+    [onChange, setLocalValue]
+  );
+
+  const enablePointerEvents = React.useCallback(() => {
+    if (contentRef.current) {
+      contentRef.current.style.pointerEvents = "auto";
+    }
+  }, []);
+
+  const disablePointerEvents = React.useCallback(() => {
+    if (contentRef.current) {
+      contentRef.current.style.pointerEvents = "none";
+    }
+  }, []);
+
+  React.useEffect(() => {
+    setLocalValue(value);
+  }, [value]);
+
+  if (isMobile) {
+    return (
+      <MobileSelect
+        {...props}
+        value={localValue}
+        onChange={onValueChange}
+        placeholder={placeholder}
+        optionsHaveIcon={optionsHaveIcon}
+      />
+    );
+  }
+
+  return (
+    <Wrapper short={short}>
+      <Label text={label} hidden={hideLabel ?? false} />
+      <InputSelectRoot
+        open={open}
+        onOpenChange={setOpen}
+        value={localValue}
+        onValueChange={onValueChange}
+      >
+        <InputSelectTrigger
+          ref={triggerRef}
+          placeholder={placeholder}
+          {...triggerProps}
+        />
+        <InputSelectContent
+          ref={contentRef}
+          aria-label={ariaLabel}
+          onAnimationStart={disablePointerEvents}
+          onAnimationEnd={enablePointerEvents}
+        >
+          {options.map(renderOption)}
+        </InputSelectContent>
+      </InputSelectRoot>
+    </Wrapper>
+  );
+}
+
+type MobileSelectProps = Props & {
+  placeholder: string;
+  optionsHaveIcon: boolean;
+};
+
+function MobileSelect(props: MobileSelectProps) {
+  const {
+    options,
+    value,
+    onChange,
+    ariaLabel,
+    label,
+    hideLabel,
+    disabled,
+    short,
+    placeholder,
+    optionsHaveIcon,
+    ...triggerProps
+  } = props;
+
+  const [open, setOpen] = React.useState(false);
+  const contentRef = React.useRef<React.ElementRef<typeof DrawerContent>>(null);
+
+  const selectedOption = React.useMemo(
+    () =>
+      value
+        ? options.find((opt) => opt.type === "item" && opt.value === value)
+        : undefined,
+    [value, options]
+  );
+
+  const handleSelect = React.useCallback(
+    async (val: string) => {
+      setOpen(false);
+      onChange(val);
+    },
+    [onChange]
+  );
+
+  const renderOption = React.useCallback(
+    (option: Option) => {
+      if (option.type === "separator") {
+        return <Separator />;
+      }
+
+      const isSelected = option === selectedOption;
+
+      return (
+        <SelectItemWrapper
+          key={option.value}
+          onClick={() => handleSelect(option.value)}
+          data-state={isSelected ? "checked" : "unchecked"}
+        >
+          <Option option={option} optionsHaveIcon={optionsHaveIcon} />
+          {isSelected && <SelectItemIndicator />}
+        </SelectItemWrapper>
+      );
+    },
+    [handleSelect, selectedOption, optionsHaveIcon]
+  );
+
+  const enablePointerEvents = React.useCallback(() => {
+    if (contentRef.current) {
+      contentRef.current.style.pointerEvents = "auto";
+    }
+  }, []);
+
+  const disablePointerEvents = React.useCallback(() => {
+    if (contentRef.current) {
+      contentRef.current.style.pointerEvents = "none";
+    }
+  }, []);
+
+  return (
+    <Wrapper>
+      <Label text={label} hidden={hideLabel ?? false} />
+      <Drawer open={open} onOpenChange={setOpen}>
+        <DrawerTrigger asChild>
+          <SelectButton
+            {...triggerProps}
+            neutral
+            disclosure
+            data-placeholder={selectedOption ? false : ""}
+          >
+            {selectedOption ? (
+              <Option
+                option={selectedOption as Item}
+                optionsHaveIcon={optionsHaveIcon}
+              />
+            ) : (
+              <>{placeholder}</>
+            )}
+          </SelectButton>
+        </DrawerTrigger>
+        <DrawerContent
+          ref={contentRef}
+          aria-label={ariaLabel}
+          onAnimationStart={disablePointerEvents}
+          onAnimationEnd={enablePointerEvents}
+        >
+          <DrawerTitle hidden={!label}>{label ?? ariaLabel}</DrawerTitle>
+          <StyledScrollable hiddenScrollbars>
+            {options.map(renderOption)}
+          </StyledScrollable>
+        </DrawerContent>
+      </Drawer>
+    </Wrapper>
+  );
+}
+
+function Label({ text, hidden }: { text: string; hidden: boolean }) {
+  const labelText = <LabelText>{text}</LabelText>;
+
+  return hidden ? (
+    <VisuallyHidden.Root>{labelText}</VisuallyHidden.Root>
+  ) : (
+    labelText
+  );
+}
+
+function Option({
+  option,
+  optionsHaveIcon,
+}: {
+  option: Item;
+  optionsHaveIcon: boolean;
+}) {
+  const icon = optionsHaveIcon ? (
+    option.icon ? (
+      <IconWrapper>{option.icon}</IconWrapper>
+    ) : (
+      <IconSpacer />
+    )
+  ) : null;
+
+  return (
+    <OptionContainer align="center">
+      {icon}
+      {option.label}
+      {option.description && (
+        <>
+          &nbsp;
+          <Description type="tertiary" size="small" ellipsis>
+            – {option.description}
+          </Description>
+        </>
+      )}
+    </OptionContainer>
+  );
+}
+
+const Wrapper = styled.label<{ short?: boolean }>`
+  display: block;
+  max-width: ${(props) => (props.short ? "350px" : "100%")};
+`;
+
+const OptionContainer = styled(Flex)`
+  min-height: 24px;
+`;
+
+const Description = styled(Text)`
+  @media (hover: hover) {
+    &:hover,
+    &:focus {
+      color: ${(props) => transparentize(0.5, props.theme.accentText)};
+    }
+  }
+`;
+
+const IconSpacer = styled.div`
+  width: 24px;
+  height: 24px;
+  flex-shrink: 0;
+`;
+
+const StyledScrollable = styled(Scrollable)`
+  max-height: 75vh;
+`;
--- a/Show More
+++ b/Show More