fix: ExportDocumentTreeTask needs documentStructure

2026-06-13 19:35:02 +03:00 · 2025-05-07 19:38:30 -04:00
815 changed files with 10356 additions and 19463 deletions
@@ -1,11 +1,6 @@
 {
  "presets": [
-    [
-      "@babel/preset-react",
-      {
-        "runtime": "automatic"
-      }
-    ],
+    "@babel/preset-react",
    "@babel/preset-env",
    "@babel/preset-typescript"
  ],
@@ -21,7 +16,10 @@
    [
      "transform-inline-environment-variables",
      {
-        "include": ["SOURCE_COMMIT", "SOURCE_VERSION"]
+        "include": [
+          "SOURCE_COMMIT",
+          "SOURCE_VERSION"
+        ]
      }
    ],
    "tsconfig-paths-module-resolver"
@@ -36,10 +34,16 @@
          }
        ]
      ],
-      "ignore": ["**/__mocks__", "**/*.test.ts"]
+      "ignore": [
+        "**/__mocks__",
+        "**/*.test.ts"
+      ]
    },
    "development": {
-      "ignore": ["**/__mocks__", "**/*.test.ts"]
+      "ignore": [
+        "**/__mocks__",
+        "**/*.test.ts"
+      ]
    },
    "test": {
      "presets": [
@@ -1,80 +1,48 @@
+# –––––––––––––––– REQUIRED ––––––––––––––––
+
 NODE_ENV=production

-# This URL should point to the fully qualified, publicly accessible, URL. If using a
-# proxy this will be the proxy's URL.
-URL=
+# Generate a hex-encoded 32-byte random key. You should use `openssl rand -hex 32`
+# in your terminal to generate a random value.
+SECRET_KEY=generate_a_new_key

-# The port to expose the Outline server on, this should match what is configured
-# in your docker-compose.yml
+# Generate a unique random key. The format is not important but you could still use
+# `openssl rand -hex 32` in your terminal to produce this.
+UTILS_SECRET=generate_a_new_key
+
+# For production point these at your databases, in development the default
+# should work out of the box.
+DATABASE_URL=postgres://user:pass@postgres:5432/outline
+DATABASE_CONNECTION_POOL_MIN=
+DATABASE_CONNECTION_POOL_MAX=
+# Uncomment this to disable SSL for connecting to Postgres
+# PGSSLMODE=disable
+
+# For redis you can either specify an ioredis compatible url like this
+REDIS_URL=redis://redis:6379
+# or alternatively, if you would like to provide additional connection options,
+# use a base64 encoded JSON connection option object. Refer to the ioredis documentation
+# for a list of available options.
+# Example: Use Redis Sentinel for high availability
+# {"sentinels":[{"host":"sentinel-0","port":26379},{"host":"sentinel-1","port":26379}],"name":"mymaster"}
+# REDIS_URL=ioredis://eyJzZW50aW5lbHMiOlt7Imhvc3QiOiJzZW50aW5lbC0wIiwicG9ydCI6MjYzNzl9LHsiaG9zdCI6InNlbnRpbmVsLTEiLCJwb3J0IjoyNjM3OX1dLCJuYW1lIjoibXltYXN0ZXIifQ==
+
+# URL should point to the fully qualified, publicly accessible URL. If using a
+# proxy the port in URL and PORT may be different.
+URL=
 PORT=3000

 # See [documentation](docs/SERVICES.md) on running a separate collaboration
 # server, for normal operation this does not need to be set.
 COLLABORATION_URL=

-# If using a Cloudfront/Cloudflare distribution or similar it can be set below.
-# This will cause paths to javascript, stylesheets, and images to be updated to
-# the hostname defined in CDN_URL. In your CDN configuration the origin server
-# should be set to the same as URL.
-CDN_URL=
-
-# How many processes should be spawned. As a reasonable rule divide your servers
-# available memory by 512 for a rough estimate
-WEB_CONCURRENCY=1
-
-# Generate a hex-encoded 32-byte random key. Use `openssl rand -hex 32` in your
-# terminal to generate a random value.
-SECRET_KEY=generate_a_new_key
-
-# Generate a unique random key. The format is not important but you could still use
-# `openssl rand -hex 32` in your terminal to generate a random value.
-UTILS_SECRET=generate_a_new_key
-
-# The default interface language. See translate.getoutline.com for a list of
-# available language codes and their rough percentage translated.
-DEFAULT_LANGUAGE=en_US
-
-
-# ––––––––––––––––––––––––––––––––––––––
-# –––––––––––––  DATABASE  –––––––––––––
-# ––––––––––––––––––––––––––––––––––––––
-
-# The database URL for your production database, including username, password, and database name.
-DATABASE_URL=postgres://user:pass@postgres:5432/outline
-
-# The in-memory database pool per-process settings. Ensure that the pool size that will not exceed
-# the maximum number of connections allowed by your database. Defaults to 0 and 5.
-DATABASE_CONNECTION_POOL_MIN=
-DATABASE_CONNECTION_POOL_MAX=
-
-# Uncomment this line if you will not use SSL for connecting to Postgres. This is acceptable
-# if the database and the application are on the same machine.
-# PGSSLMODE=disable
-
-
-# ––––––––––––––––––––––––––––––––––––––
-# ––––––––––––––  REDIS  –––––––––––––––
-# ––––––––––––––––––––––––––––––––––––––
-
-# The Redis URL for your environment you can either specify an ioredis compatible url or a Base64
-# encoded configuration object.
-# DOCS: https://docs.getoutline.com/s/hosting/doc/redis-LGM4BFXYp4
-REDIS_URL=redis://redis:6379
-
-
-# ––––––––––––––––––––––––––––––––––––––
-# –––––––––––  FILE STORAGE  –––––––––––
-# ––––––––––––––––––––––––––––––––––––––
-
 # Specify what storage system to use. Possible value is one of "s3" or "local".
-# For "local" images and document attachments will be saved on local disk, for "s3" they
-# will be stored in an S3-compatible network store.
-# DOCS: https://docs.getoutline.com/s/hosting/doc/file-storage-N4M0T6Ypu7
+# For "local", the avatar images and document attachments will be saved on local disk. 
 FILE_STORAGE=local

 # If "local" is configured for FILE_STORAGE above, then this sets the parent directory under
-# which all attachments/images are stored. Make sure that the process has permissions to
-# create this path and also to write files to it.
+# which all attachments/images go. Make sure that the process has permissions to create
+# this path and also to write files to it.
 FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data

 # Maximum allowed size for the uploaded attachment.
@@ -88,8 +56,8 @@ FILE_STORAGE_IMPORT_MAX_SIZE=
 # and the files are temporary being automatically deleted after a period of time.
 FILE_STORAGE_WORKSPACE_IMPORT_MAX_SIZE=

-# To support uploading of images for avatars and document attachments in a distributed
-# architecture, an s3-compatible storage can be configured if FILE_STORAGE=s3 above.
+# To support uploading of images for avatars and document attachments in a distributed 
+# architecture an s3-compatible storage can be configured if FILE_STORAGE=s3 above.
 AWS_ACCESS_KEY_ID=get_a_key_from_aws
 AWS_SECRET_ACCESS_KEY=get_the_secret_of_above_key
 AWS_REGION=xx-xxxx-x
@@ -99,55 +67,38 @@ AWS_S3_UPLOAD_BUCKET_NAME=bucket_name_here
 AWS_S3_FORCE_PATH_STYLE=true
 AWS_S3_ACL=private

-
-# ––––––––––––––––––––––––––––––––––––––
-# ––––––––––––––––  SSL  –––––––––––––––
-# ––––––––––––––––––––––––––––––––––––––
-
-# Base64 encoded private key and certificate for HTTPS termination. This is one
-# of three ways to configure SSL and can be left empty.
-# DOCS: https://docs.getoutline.com/s/hosting/doc/ssl-pzk7WO8d1n
-SSL_KEY=
-SSL_CERT=
-
-# Auto-redirect to https in production. The default is true but you may set to
-# false if you can be sure that SSL is terminated at an external loadbalancer.
-FORCE_HTTPS=true
-
-
-# ––––––––––––––––––––––––––––––––––––––
-# ––––––––––  AUTHENTICATION  ––––––––––
-# ––––––––––––––––––––––––––––––––––––––
+# –––––––––––––– AUTHENTICATION ––––––––––––––

 # Third party signin credentials, at least ONE OF EITHER Google, Slack,
-# Discord, or Microsoft is required for a working installation or you'll
-# have no sign-in options.
+# or Microsoft is required for a working installation or you'll have no sign-in
+# options.

-# Slack sign-in provider
-# DOCS: https://docs.getoutline.com/s/hosting/doc/slack-sgMujR8J9J
+# To configure Slack auth, you'll need to create an Application at
+# => https://api.slack.com/apps
+#
+# When configuring the Client ID, add a redirect URL under "OAuth & Permissions":
+# https://<URL>/auth/slack.callback
 SLACK_CLIENT_ID=get_a_key_from_slack
 SLACK_CLIENT_SECRET=get_the_secret_of_above_key

-# Google sign-in provider
-# DOCS: https://docs.getoutline.com/s/hosting/doc/google-hOuvtCmTqQ
+# To configure Google auth, you'll need to create an OAuth Client ID at
+# => https://console.cloud.google.com/apis/credentials
+#
+# When configuring the Client ID, add an Authorized redirect URI:
+# https://<URL>/auth/google.callback
 GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=

-# Microsoft Entra / Azure AD sign-in provider
-# DOCS: https://docs.getoutline.com/s/hosting/doc/microsoft-entra-UVz6jsIOcv
+# To configure Microsoft/Azure auth, you'll need to create an OAuth Client. See
+# the guide for details on setting up your Azure App:
+# => https://wiki.generaloutline.com/share/dfa77e56-d4d2-4b51-8ff8-84ea6608faa4
 AZURE_CLIENT_ID=
 AZURE_CLIENT_SECRET=
 AZURE_RESOURCE_APP_ID=

-# Discord sign-in provider
-# DOCS: https://docs.getoutline.com/s/hosting/doc/discord-g4JdWFFub6
-DISCORD_CLIENT_ID=
-DISCORD_CLIENT_SECRET=
-DISCORD_SERVER_ID=
-DISCORD_SERVER_ROLES=
-
-# Generic OIDC provider
-# DOCS: https://docs.getoutline.com/s/hosting/doc/oidc-8CPBm6uC0I
+# To configure generic OIDC auth, you'll need some kind of identity provider.
+# See documentation for whichever IdP you use to acquire the following info:
+# Redirect URI is https://<URL>/auth/oidc.callback
 OIDC_CLIENT_ID=
 OIDC_CLIENT_SECRET=
 OIDC_AUTH_URI=
@@ -165,55 +116,83 @@ OIDC_DISPLAY_NAME=OpenID Connect
 # Space separated auth scopes.
 OIDC_SCOPES=openid profile email

-
-# ––––––––––––––––––––––––––––––––––––––
-# ––––––––––––––  EMAIL  –––––––––––––––
-# ––––––––––––––––––––––––––––––––––––––
-
-# To support sending outgoing transactional emails such as "document updated" or
-# email sign-in you'll need to connect an SMTP server. Service can be configured
-# with any service from this list: https://community.nodemailer.com/2-0-0-beta/setup-smtp/well-known-services/
-# DOCS: https://docs.getoutline.com/s/hosting/doc/smtp-cqCJyZGMIB
-SMTP_SERVICE=
-SMTP_USERNAME=
-SMTP_PASSWORD=
-SMTP_FROM_EMAIL=
-
-
-# ––––––––––––––––––––––––––––––––––––––
-# ––––––––––  RATE LIMITER  ––––––––––––
-# ––––––––––––––––––––––––––––––––––––––
-
-# Whether the rate limiter is enabled or not
-RATE_LIMITER_ENABLED=true
-
-# Individual endpoints have hardcoded rate limits that are enabled
-# with the above setting, however this is a global rate limiter
-# across all requests
-RATE_LIMITER_REQUESTS=1000
-RATE_LIMITER_DURATION_WINDOW=60
-
-
-# ––––––––––––––––––––––––––––––––––––––
-# –––––––––––  INTEGRATIONS  –––––––––––
-# ––––––––––––––––––––––––––––––––––––––
-
-# The GitHub integration allows previewing issue and pull request links
-# DOCS: https://docs.getoutline.com/s/hosting/doc/github-GchT3NNxI9
+# To configure the GitHub integration, you'll need to create a GitHub App at
+# => https://github.com/settings/apps
+#
+# When configuring the Client ID, add a redirect URL under "Permissions & events":
+# https://<URL>/api/github.callback
 GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
-GITHUB_WEBHOOK_SECRET=
 GITHUB_APP_NAME=
 GITHUB_APP_ID=
 GITHUB_APP_PRIVATE_KEY=

-# The Linear integration allows previewing issue links as rich mentions
+# Linear
 LINEAR_CLIENT_ID=
 LINEAR_CLIENT_SECRET=

+# To configure Discord auth, you'll need to create a Discord Application at
+# => https://discord.com/developers/applications/
+#
+# When configuring the Client ID, add a redirect URL under "OAuth2":
+# https://<URL>/auth/discord.callback
+DISCORD_CLIENT_ID=
+DISCORD_CLIENT_SECRET=
+
+# DISCORD_SERVER_ID should be the ID of the Discord server that Outline is
+# integrated with. 
+# Used to verify that the user is a member of the server as well as server
+# metadata such as nicknames, server icon and name.
+DISCORD_SERVER_ID=
+
+# DISCORD_SERVER_ROLES should be a comma separated list of role IDs that are
+# allowed to access Outline. If this is not set, all members of the server
+# will be allowed to access Outline.
+# DISCORD_SERVER_ID and DISCORD_SERVER_ROLES must be set together.
+DISCORD_SERVER_ROLES=
+
+# –––––––––––––– IMPORTS ––––––––––––––
+NOTION_CLIENT_ID=
+NOTION_CLIENT_SECRET=
+
+# –––––––––––––––– OPTIONAL ––––––––––––––––
+
+# Base64 encoded private key and certificate for HTTPS termination. This is only
+# required if you do not use an external reverse proxy. See documentation:
+# https://wiki.generaloutline.com/share/1c922644-40d8-41fe-98f9-df2b67239d45
+SSL_KEY=
+SSL_CERT=
+
+# If using a Cloudfront/Cloudflare distribution or similar it can be set below.
+# This will cause paths to javascript, stylesheets, and images to be updated to
+# the hostname defined in CDN_URL. In your CDN configuration the origin server
+# should be set to the same as URL.
+CDN_URL=
+
+# Auto-redirect to https in production. The default is true but you may set to
+# false if you can be sure that SSL is terminated at an external loadbalancer.
+FORCE_HTTPS=true
+
+# Have the installation check for updates by sending anonymized statistics to
+# the maintainers
+ENABLE_UPDATES=true
+
+# How many processes should be spawned. As a reasonable rule divide your servers
+# available memory by 512 for a rough estimate
+WEB_CONCURRENCY=1
+
+# You can remove this line if your reverse proxy already logs incoming http
+# requests and this ends up being duplicative
+DEBUG=http
+
+# Configure lowest severity level for server logs. Should be one of
+# error, warn, info, http, verbose, debug and silly
+LOG_LEVEL=info
+
 # For a complete Slack integration with search and posting to channels the
-# following configs are also needed in addition to Slack authentication:
-# DOCS: https://docs.getoutline.com/s/hosting/doc/slack-G2mc8DOJHk
+# following configs are also needed, some more details
+# => https://wiki.generaloutline.com/share/be25efd1-b3ef-4450-b8e5-c4a4fc11e02a
+#
 SLACK_VERIFICATION_TOKEN=your_token
 SLACK_APP_ID=A0XXXXXXX
 SLACK_MESSAGE_ACTIONS=true
@@ -223,34 +202,29 @@ SLACK_MESSAGE_ACTIONS=true
 DROPBOX_APP_KEY=

 # Optionally enable Sentry (sentry.io) to track errors and performance,
-# DOCS: https://docs.getoutline.com/s/hosting/doc/sentry-jxcFttcDl5
+# and optionally add a Sentry proxy tunnel for bypassing ad blockers in the UI:
+# https://docs.sentry.io/platforms/javascript/troubleshooting/#using-the-tunnel-option)
 SENTRY_DSN=
 SENTRY_TUNNEL=

-# Enable importing pages from a Notion workspace
-# DOCS: https://docs.getoutline.com/s/hosting/doc/notion-2v6g7WY3l3
-NOTION_CLIENT_ID=
-NOTION_CLIENT_SECRET=
+# To support sending outgoing transactional emails such as "document updated" or
+# "you've been invited" you'll need to provide authentication for an SMTP server
+SMTP_SERVICE=
+SMTP_USERNAME=
+SMTP_PASSWORD=
+SMTP_FROM_EMAIL=

-# The Iframely integration allows previews of third-party content within Outline.
-# For example, hovering over an external link will show a preview.
-# DOCS: https://docs.getoutline.com/s/hosting/doc/iframely-HwLF1EZ9mo
+# The default interface language. See translate.getoutline.com for a list of
+# available language codes and their rough percentage translated.
+DEFAULT_LANGUAGE=en_US
+
+# Optionally enable rate limiter at application web server
+RATE_LIMITER_ENABLED=true
+
+# Configure default throttling parameters for rate limiter
+RATE_LIMITER_REQUESTS=1000
+RATE_LIMITER_DURATION_WINDOW=60
+
+# Iframely API config
 IFRAMELY_URL=
 IFRAMELY_API_KEY=
-
-
-# ––––––––––––––––––––––––––––––––––––––
-# –––––––––––––  DEBUGGING  ––––––––––––
-# ––––––––––––––––––––––––––––––––––––––
-
-# Have the installation check for updates by sending anonymized statistics to
-# the maintainers
-ENABLE_UPDATES=true
-
-# Debugging categories to enable – you can remove the default "http" value if
-# your proxy already logs incoming http requests and this ends up being duplicative
-DEBUG=http
-
-# Configure lowest severity level for server logs. Should be one of
-# error, warn, info, http, verbose, debug, or silly
-LOG_LEVEL=info
@@ -2,9 +2,7 @@
  "parser": "@typescript-eslint/parser",
  "parserOptions": {
    "sourceType": "module",
-    "extraFileExtensions": [
-      ".json"
-    ],
+    "extraFileExtensions": [".json"],
    "project": "./tsconfig.json",
    "ecmaFeatures": {
      "jsx": true
@@ -15,11 +13,10 @@
    "plugin:@typescript-eslint/recommended",
    "plugin:import/recommended",
    "plugin:import/typescript",
-    "prettier"
+    "plugin:prettier/recommended"
  ],
  "plugins": [
    "es",
-    "react",
    "@typescript-eslint",
    "eslint-plugin-import",
    "eslint-plugin-node",
@@ -27,52 +24,28 @@
    "eslint-plugin-lodash"
  ],
  "rules": {
-    "no-restricted-imports": [
-      "error",
-      {
-        "paths": [
-          {
-            "name": "reakit/Menu",
-            "importNames": [
-              "useMenuState"
-            ],
-            "message": "Do not use useMenuState from reakit/Menu. Use useMenuState instead."
-          }
-        ]
-      }
-    ],
    "eqeqeq": 2,
    "curly": 2,
    "no-console": "error",
-    "arrow-body-style": [
-      "error",
-      "as-needed"
-    ],
+    "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
-      }
-    ],
+    "react/self-closing-comp": ["error", {
+      "component": true,
+      "html": true
+    }],
    "@typescript-eslint/no-shadow": [
      "warn",
      {
-        "allow": [
-          "transaction"
-        ],
+        "allow": ["transaction"],
        "hoist": "all",
        "ignoreTypeValueShadow": true
      }
    ],
-    "@typescript-eslint/no-require-imports": "off",
    "@typescript-eslint/no-explicit-any": "warn",
    "@typescript-eslint/no-floating-promises": "error",
    "@typescript-eslint/await-thenable": "error",
@@ -86,30 +59,13 @@
      "error",
      {
        "argsIgnorePattern": "^_",
-        "caughtErrorsIgnorePattern": "^_",
        "args": "after-used",
        "ignoreRestSiblings": true
      }
    ],
-    "padding-line-between-statements": [
-      "error",
-      {
-        "blankLine": "always",
-        "prev": "*",
-        "next": "export"
-      }
-    ],
-    "lines-between-class-members": [
-      "error",
-      "always",
-      {
-        "exceptAfterSingleLine": true
-      }
-    ],
-    "lodash/import-scope": [
-      "error",
-      "method"
-    ],
+    "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,
@@ -162,6 +118,13 @@
          }
        ]
      }
+    ],
+    "prettier/prettier": [
+      "error",
+      {
+        "printWidth": 80,
+        "trailingComma": "es5"
+      }
    ]
  },
  "settings": {
@@ -171,10 +134,7 @@
      "version": "detect"
    },
    "import/parsers": {
-      "@typescript-eslint/parser": [
-        ".ts",
-        ".tsx"
-      ]
+      "@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
@@ -1,59 +0,0 @@
-name: Auto Close Unsigned PRs
-
-on:
-  schedule:
-    - cron: "0 0 * * *" # Run daily at midnight UTC
-
-jobs:
-  close-unsigned-prs:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-      issues: write
-
-    steps:
-      - name: Close unsigned PRs
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const now = new Date();
-            const TWO_WEEKS = 14 * 24 * 60 * 60 * 1000; // 14 days in milliseconds
-
-            const prs = await github.rest.pulls.list({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'open'
-            });
-
-            for (const pr of prs.data) {
-              const prCreatedAt = new Date(pr.created_at);
-              const prAge = now - prCreatedAt;
-
-              if (prAge < TWO_WEEKS) continue;
-
-              const comments = await github.rest.issues.listComments({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: pr.number
-              });
-
-              const hasNotSignedComment = comments.data.some(comment =>
-                comment.body.toLowerCase().includes('https://cla-assistant.io/pull/badge/not_signed')
-              );
-
-              if (hasNotSignedComment) {
-                await github.rest.pulls.update({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  pull_number: pr.number,
-                  state: 'closed'
-                });
-
-                await github.rest.issues.createComment({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: pr.number,
-                  body: 'This PR has been automatically closed because it has been open for more than 14 days and has not accepted the CLA.'
-                });
-              }
-            }
@@ -2,9 +2,9 @@ name: CI

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

 env:
  NODE_ENV: test
@@ -22,7 +22,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        node-version: [20.x, 22.x]
+        node-version: [20.x]

    steps:
    - uses: actions/checkout@v4
@@ -31,7 +31,7 @@ jobs:
      with:
        node-version: ${{ matrix.node-version }}
        cache: 'yarn'
-
+    
    - name: Install dependencies
      run: yarn install --frozen-lockfile

@@ -39,25 +39,25 @@ jobs:
    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
-      - run: yarn lint
+    - 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
-      - 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
@@ -89,13 +89,13 @@ jobs:
      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
-      - 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]
@@ -115,7 +115,7 @@ jobs:
          --health-interval 10s
          --health-timeout 5s
          --health-retries 5
-
+      
      redis:
        image: redis:5.0
        ports:
@@ -129,37 +129,37 @@ jobs:
    strategy:
      matrix:
        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
-      - 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
-      - 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"
+          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'
@@ -1,7 +1,6 @@
 {
-  "workerIdleMemoryLimit": "0.5",
-  "maxWorkers": "75%",
-  "testTimeout": 30000,
+  "workerIdleMemoryLimit": "0.75",
+  "maxWorkers": "50%",
  "projects": [
    {
      "displayName": "server",
@@ -1 +0,0 @@
-22
@@ -1,4 +0,0 @@
-{
-  "printWidth": 80,
-  "trailingComma": "es5"
-}
@@ -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.85.0
+Licensed Work:        Outline 0.83.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-07-03
+Change Date:          2029-04-11

 Change License:       Apache License, Version 2.0

@@ -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
    }
  }
-}
+}
@@ -7,9 +7,6 @@
  "plugins": [
    "eslint-plugin-react-hooks"
  ],
-  "rules": {
-    "react/react-in-jsx-scope": "off"
-  },
  "env": {
    "jest": true,
    "browser": true
@@ -1,4 +1,5 @@
 import { PlusIcon } from "outline-icons";
+import * as React from "react";
 import stores from "~/stores";
 import ApiKeyNew from "~/scenes/ApiKeyNew";
 import { createAction } from "..";
@@ -13,6 +13,7 @@ import {
  UnstarredIcon,
  UnsubscribeIcon,
 } from "outline-icons";
+import * as React from "react";
 import { toast } from "sonner";
 import Collection from "~/models/Collection";
 import { CollectionEdit } from "~/components/Collection/CollectionEdit";
@@ -47,7 +48,7 @@ export const openCollection = createAction({
      name: collection.name,
      icon: <ColorCollectionIcon collection={collection} />,
      section: CollectionSection,
-      to: collection.path,
+      perform: () => history.push(collection.path),
    }));
  },
 });
@@ -1,4 +1,5 @@
 import { DoneIcon, SmileyIcon, TrashIcon } from "outline-icons";
+import * as React from "react";
 import { toast } from "sonner";
 import stores from "~/stores";
 import Comment from "~/models/Comment";
@@ -7,6 +7,7 @@ import {
  TrashIcon,
  UserIcon,
 } from "outline-icons";
+import * as React from "react";
 import { toast } from "sonner";
 import { createAction } from "~/actions";
 import { DeveloperSection } from "~/actions/sections";
@@ -106,8 +107,8 @@ export const startTyping = createAction({
    }, 250);

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

@@ -1,6 +1,5 @@
 import copy from "copy-to-clipboard";
 import invariant from "invariant";
-import uniqBy from "lodash/uniqBy";
 import {
  DownloadIcon,
  DuplicateIcon,
@@ -32,6 +31,7 @@ import {
  LogoutIcon,
  CaseSensitiveIcon,
 } from "outline-icons";
+import * as React from "react";
 import { toast } from "sonner";
 import Icon from "@shared/components/Icon";
 import {
@@ -85,9 +85,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,
@@ -98,7 +97,7 @@ export const openDocument = createAction({
        <DocumentIcon />
      ),
      section: DocumentSection,
-      to: item.url,
+      perform: () => history.push(item.url),
    }));
  },
 });
@@ -752,7 +751,7 @@ export const importDocument = createAction({

    return false;
  },
-  perform: ({ activeDocumentId, activeCollectionId, stores }) => {
+  perform: ({ activeCollectionId, activeDocumentId, stores }) => {
    const { documents } = stores;
    const input = document.createElement("input");
    input.type = "file";
@@ -840,7 +839,7 @@ 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(),
  });

@@ -1085,7 +1084,6 @@ export const openDocumentComments = createAction({
  icon: <CommentIcon />,
  visible: ({ activeDocumentId, stores }) => {
    const can = stores.policies.abilities(activeDocumentId ?? "");
-
    return (
      !!activeDocumentId &&
      can.comment &&
@@ -1213,7 +1211,7 @@ export const leaveDocument = createAction({
      } as UserMembership);

      toast.success(t("You have left the shared document"));
-    } catch (_err) {
+    } catch (err) {
      toast.error(t("Could not leave document"));
    }
  },
@@ -13,6 +13,7 @@ import {
  ShapesIcon,
  DraftsIcon,
 } from "outline-icons";
+import * as React from "react";
 import { UrlHelper } from "@shared/utils/UrlHelper";
 import { isMac } from "@shared/utils/browser";
 import stores from "~/stores";
@@ -20,7 +21,9 @@ import SearchQuery from "~/models/SearchQuery";
 import KeyboardShortcuts from "~/scenes/KeyboardShortcuts";
 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,
@@ -37,7 +40,7 @@ export const navigateToHome = createAction({
  section: NavigationSection,
  shortcut: ["d"],
  icon: <HomeIcon />,
-  to: homePath(),
+  perform: () => history.push(homePath()),
  visible: ({ location }) => location.pathname !== homePath(),
 });

@@ -47,7 +50,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({
@@ -55,7 +58,7 @@ export const navigateToDrafts = createAction({
  analyticsName: "Navigate to drafts",
  section: NavigationSection,
  icon: <DraftsIcon />,
-  to: draftsPath(),
+  perform: () => history.push(draftsPath()),
  visible: ({ location }) => location.pathname !== draftsPath(),
 });

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

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

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

@@ -94,7 +97,7 @@ 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 = createAction({
@@ -103,7 +106,7 @@ export const navigateToWorkspaceSettings = createAction({
  section: NavigationSection,
  icon: <SettingsIcon />,
  visible: () => stores.policies.abilities(stores.auth.team?.id || "").update,
-  to: settingsPath("details"),
+  perform: () => history.push(settingsPath("details")),
 });

 export const navigateToProfileSettings = createAction({
@@ -112,7 +115,7 @@ export const navigateToProfileSettings = createAction({
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <ProfileIcon />,
-  to: settingsPath(),
+  perform: () => history.push(settingsPath()),
 });

 export const navigateToTemplateSettings = createAction({
@@ -121,7 +124,7 @@ export const navigateToTemplateSettings = createAction({
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <ShapesIcon />,
-  to: settingsPath("templates"),
+  perform: () => history.push(settingsPath("templates")),
 });

 export const navigateToNotificationSettings = createAction({
@@ -130,7 +133,7 @@ export const navigateToNotificationSettings = createAction({
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <EmailIcon />,
-  to: settingsPath("notifications"),
+  perform: () => history.push(settingsPath("notifications")),
 });

 export const navigateToAccountPreferences = createAction({
@@ -139,7 +142,7 @@ export const navigateToAccountPreferences = createAction({
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <SettingsIcon />,
-  to: settingsPath("preferences"),
+  perform: () => history.push(settingsPath("preferences")),
 });

 export const openDocumentation = createAction({
@@ -148,10 +151,7 @@ export const openDocumentation = createAction({
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <OpenIcon />,
-  to: {
-    url: UrlHelper.guide,
-    target: "_blank",
-  },
+  perform: () => window.open(UrlHelper.guide),
 });

 export const openAPIDocumentation = createAction({
@@ -160,10 +160,7 @@ export const openAPIDocumentation = createAction({
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <OpenIcon />,
-  to: {
-    url: UrlHelper.developers,
-    target: "_blank",
-  },
+  perform: () => window.open(UrlHelper.developers),
 });

 export const toggleSidebar = createAction({
@@ -180,20 +177,14 @@ export const openFeedbackUrl = createAction({
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <EmailIcon />,
-  to: {
-    url: UrlHelper.contact,
-    target: "_blank",
-  },
+  perform: () => window.open(UrlHelper.contact),
 });

 export const openBugReportUrl = createAction({
  name: ({ t }) => t("Report a bug"),
  analyticsName: "Open bug report",
  section: NavigationSection,
-  to: {
-    url: UrlHelper.github,
-    target: "_blank",
-  },
+  perform: () => window.open(UrlHelper.github),
 });

 export const openChangelog = createAction({
@@ -202,10 +193,7 @@ export const openChangelog = createAction({
  section: NavigationSection,
  iconInContextMenu: false,
  icon: <OpenIcon />,
-  to: {
-    url: UrlHelper.changelog,
-    target: "_blank",
-  },
+  perform: () => window.open(UrlHelper.changelog),
 });

 export const openKeyboardShortcuts = createAction({
@@ -233,9 +221,8 @@ 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");
  },
 });

@@ -245,7 +232,12 @@ export const logout = createAction({
  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,4 +1,5 @@
 import { ArchiveIcon, MarkAsReadIcon } from "outline-icons";
+import * as React from "react";
 import { createAction } from "..";
 import { NotificationSection } from "../sections";

@@ -1,4 +1,5 @@
 import { PlusIcon } from "outline-icons";
+import * as React from "react";
 import stores from "~/stores";
 import { OAuthClientNew } from "~/components/OAuthClient/OAuthClientNew";
 import { createAction } from "..";
@@ -1,5 +1,6 @@
 import copy from "copy-to-clipboard";
-import { LinkIcon, RestoreIcon, TrashIcon } from "outline-icons";
+import { LinkIcon, RestoreIcon } from "outline-icons";
+import * as React from "react";
 import { matchPath } from "react-router-dom";
 import { toast } from "sonner";
 import stores from "~/stores";
@@ -12,7 +13,7 @@ import {
 } from "~/utils/routeHelpers";

 export const restoreRevision = createAction({
-  name: ({ t }) => t("Restore"),
+  name: ({ t }) => t("Restore revision"),
  analyticsName: "Restore revision",
  icon: <RestoreIcon />,
  section: RevisionSection,
@@ -41,38 +42,6 @@ export const restoreRevision = createAction({
  },
 });

-export const deleteRevision = createAction({
-  name: ({ t }) => t("Delete"),
-  analyticsName: "Delete revision",
-  icon: <TrashIcon />,
-  section: RevisionSection,
-  dangerous: true,
-  visible: ({ activeDocumentId }) =>
-    !!activeDocumentId && stores.policies.abilities(activeDocumentId).update,
-  perform: async ({ t, event, location, activeDocumentId }) => {
-    event?.preventDefault();
-    if (!activeDocumentId) {
-      return;
-    }
-
-    const document = stores.documents.get(activeDocumentId);
-    if (!document) {
-      return;
-    }
-
-    const match = matchPath<{ revisionId: string }>(location.pathname, {
-      path: matchDocumentHistory,
-    });
-    const revisionId = match?.params.revisionId;
-    if (revisionId) {
-      const revision = stores.revisions.get(revisionId);
-      await revision?.delete();
-      toast.success(t("This version of the document was deleted"));
-      history.push(documentHistoryPath(document));
-    }
-  },
-});
-
 export const copyLinkToRevision = createAction({
  name: ({ t }) => t("Copy link"),
  analyticsName: "Copy link to revision",
@@ -1,4 +1,5 @@
 import { SunIcon, MoonIcon, BrowserIcon } from "outline-icons";
+import * as React from "react";
 import stores from "~/stores";
 import { Theme } from "~/stores/UiStore";
 import { createAction } from "~/actions";
@@ -1,4 +1,5 @@
 import { ArrowIcon, PlusIcon } from "outline-icons";
+import * as React from "react";
 import styled from "styled-components";
 import { stringToColor } from "@shared/utils/color";
 import RootStore from "~/stores/RootStore";
@@ -32,10 +33,7 @@ export const switchTeamsList = ({ stores }: { stores: RootStore }) =>
      );
    },
    visible: ({ currentTeamId }: ActionContext) => currentTeamId !== session.id,
-    to: {
-      url: session.url,
-      target: "_self",
-    },
+    perform: () => (window.location.href = session.url),
  })) ?? [];

 export const switchTeam = createAction({
@@ -60,15 +58,13 @@ export const createTeam = createAction({
  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} />,
      });
-    }
  },
 });

@@ -1,4 +1,5 @@
 import { PlusIcon } from "outline-icons";
+import * as React from "react";
 import { UserRole } from "@shared/types";
 import { UserRoleHelper } from "@shared/utils/UserRoleHelper";
 import stores from "~/stores";
@@ -45,8 +46,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({
@@ -1,4 +1,5 @@
 import flattenDeep from "lodash/flattenDeep";
+import * as React from "react";
 import { toast } from "sonner";
 import { Optional } from "utility-types";
 import { v4 as uuidv4 } from "uuid";
@@ -6,13 +7,10 @@ import {
  Action,
  ActionContext,
  CommandBarAction,
-  MenuExternalLink,
-  MenuInternalLink,
  MenuItemButton,
  MenuItemWithChildren,
 } from "~/types";
 import Analytics from "~/utils/Analytics";
-import history from "~/utils/history";

 function resolve<T>(value: any, context: ActionContext): T {
  return typeof value === "function" ? value(context) : value;
@@ -30,10 +28,11 @@ export function createAction(definition: Optional<Action, "id">): Action {
              context: context.isButton
                ? "button"
                : context.isCommandBar
-                  ? "commandbar"
-                  : "contextmenu",
+                ? "commandbar"
+                : "contextmenu",
            });
          }
+
          return definition.perform?.(context);
        }
      : undefined,
@@ -44,7 +43,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;
@@ -69,26 +68,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,
@@ -121,7 +100,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 [
@@ -135,10 +114,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.
@@ -147,13 +125,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) => {
@@ -59,7 +59,7 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
        disabled={disabled || executing}
        ref={ref}
        onClick={
-          actionContext
+          action?.perform && actionContext
            ? (ev) => {
                ev.preventDefault();
                ev.stopPropagation();
@@ -1,3 +1,5 @@
+import * as React from "react";
+
 export default function Arrow() {
  return (
    <svg
@@ -1,5 +1,5 @@
 import { observer } from "mobx-react";
-import { useEffect } from "react";
+import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Redirect } from "react-router-dom";
 import useCurrentUser from "~/hooks/useCurrentUser";
@@ -19,7 +19,7 @@ const Authenticated = ({ children }: Props) => {

  // Watching for language changes here as this is the earliest point we might have the user
  // available and means we can start loading translations faster
-  useEffect(() => {
+  React.useEffect(() => {
    void changeLanguage(language, i18n);
  }, [i18n, language]);

@@ -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="/" />;
 };

@@ -108,7 +108,7 @@ const AuthenticatedLayout: React.FC = ({ children }: Props) => {
    can.comment &&
    ui.activeDocumentId &&
    ui.commentsExpanded &&
-    !!team.getPreference(TeamPreference.Commenting);
+    team.getPreference(TeamPreference.Commenting);

  const sidebarRight = (
    <AnimatePresence
@@ -45,23 +45,12 @@ type Props = {
 };

 function Avatar(props: Props) {
-  const {
-    model,
-    style,
-    variant = AvatarVariant.Round,
-    className,
-    ...rest
-  } = props;
+  const { model, style, variant = AvatarVariant.Round, ...rest } = props;
  const src = props.src || model?.avatarUrl;
  const [error, handleError] = useBoolean(false);

  return (
-    <Relative
-      style={style}
-      $variant={variant}
-      $size={props.size}
-      className={className}
-    >
+    <Relative style={style} $variant={variant} $size={props.size}>
      {src && !error ? (
        <Image onError={handleError} src={src} {...rest} />
      ) : model ? (
@@ -86,8 +75,6 @@ const Relative = styled.div<{ $variant: AvatarVariant; $size: AvatarSize }>`
  border-radius: ${(props) =>
    props.$variant === AvatarVariant.Round ? "50%" : `${props.$size / 8}px`};
  overflow: hidden;
-  width: ${(props) => props.$size}px;
-  height: ${(props) => props.$size}px;
 `;

 const Image = styled.img<{ size: number }>`
@@ -1,4 +1,5 @@
 import { GroupIcon } from "outline-icons";
+import * as React from "react";
 import { useTheme } from "styled-components";
 import Squircle from "@shared/components/Squircle";
 import Group from "~/models/Group";
@@ -1,7 +1,7 @@
-import Avatar, { IAvatar, AvatarSize, AvatarVariant } from "./Avatar";
+import Avatar, { IAvatar, AvatarSize } from "./Avatar";
 import AvatarWithPresence from "./AvatarWithPresence";
 import { GroupAvatar } from "./GroupAvatar";

-export { Avatar, GroupAvatar, AvatarSize, AvatarVariant, AvatarWithPresence };
+export { Avatar, GroupAvatar, AvatarSize, AvatarWithPresence };

 export type { IAvatar };
@@ -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,3 +1,4 @@
+import * as React from "react";
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import { depths, s } from "@shared/styles";
@@ -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 (
@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { changeLanguage } from "~/utils/language";

@@ -9,7 +9,7 @@ type Props = {
 export default function ChangeLanguage({ locale }: Props) {
  const { i18n } = useTranslation();

-  useEffect(() => {
+  React.useEffect(() => {
    void changeLanguage(locale, i18n);
  }, [locale, i18n]);

@@ -1,3 +1,4 @@
+import React from "react";
 import styled, { useTheme } from "styled-components";

 const cleanPercentage = (percentage: number) => {
@@ -3,18 +3,15 @@ import isEqual from "lodash/isEqual";
 import orderBy from "lodash/orderBy";
 import uniq from "lodash/uniq";
 import { observer } from "mobx-react";
-import { useState, useMemo, useEffect, useCallback } from "react";
+import * as React 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";

@@ -34,93 +31,58 @@ function Collaborators(props: Props) {
  const { t } = useTranslation();
  const user = useCurrentUser();
  const currentUserId = user?.id;
-  const [requestedUserIds, setRequestedUserIds] = useState<string[]>([]);
+  const [requestedUserIds, setRequestedUserIds] = React.useState<string[]>([]);
  const { users, presence, ui } = useStores();
  const { document } = props;
-  const { observingUserId } = ui;
  const documentPresence = presence.get(document.id);
-  const documentPresenceArray = useMemo(
-    () => (documentPresence ? Array.from(documentPresence.values()) : []),
-    [documentPresence]
-  );
+  const documentPresenceArray = documentPresence
+    ? Array.from(documentPresence.values())
+    : [];

-  // Use Set for O(1) lookups and stable references
-  const presentIds = useMemo(
-    () => new Set(documentPresenceArray.map((p) => p.userId)),
-    [documentPresenceArray]
-  );
-  const editingIds = useMemo(
-    () =>
-      new Set(
-        documentPresenceArray.filter((p) => p.isEditing).map((p) => p.userId)
-      ),
-    [documentPresenceArray]
-  );
+  const presentIds = documentPresenceArray.map((p) => p.userId);
+  const editingIds = documentPresenceArray
+    .filter((p) => p.isEditing)
+    .map((p) => p.userId);

  // ensure currently present via websocket are always ordered first
-  // Memoize collaboratorIds as a Set for efficient lookup
-  const collaboratorIdsSet = useMemo(
-    () => new Set(document.collaboratorIds),
-    [document.collaboratorIds]
-  );
-  const collaborators = useMemo(
+  const collaborators = React.useMemo(
    () =>
      orderBy(
        filter(
          users.all,
          (u) =>
-            (presentIds.has(u.id) || collaboratorIdsSet.has(u.id)) &&
+            (presentIds.includes(u.id) ||
+              document.collaboratorIds.includes(u.id)) &&
            !u.isSuspended
        ),
-        [(u) => presentIds.has(u.id), "id"],
+        [(u) => presentIds.includes(u.id), "id"],
        ["asc", "asc"]
      ),
-    [collaboratorIdsSet, users.all, presentIds]
+    [document.collaboratorIds, users.all, presentIds]
  );

  // load any users we don't yet have in memory
-  // Memoize ids to avoid unnecessary effect executions
-  const missingUserIds = useMemo(
-    () =>
-      uniq([...document.collaboratorIds, ...Array.from(presentIds)])
-        .filter((userId) => !users.get(userId))
-        .sort(),
-    [document.collaboratorIds, presentIds, users]
-  );
+  React.useEffect(() => {
+    const ids = uniq([...document.collaboratorIds, ...presentIds])
+      .filter((userId) => !users.get(userId))
+      .sort();

-  useEffect(() => {
-    if (
-      !isEqual(requestedUserIds, missingUserIds) &&
-      missingUserIds.length > 0
-    ) {
-      setRequestedUserIds(missingUserIds);
-      void users.fetchPage({ ids: missingUserIds, limit: 100 });
+    if (!isEqual(requestedUserIds, ids) && ids.length > 0) {
+      setRequestedUserIds(ids);
+      void users.fetchPage({ ids, limit: 100 });
    }
-  }, [missingUserIds, requestedUserIds, users]);
+  }, [document, users, presentIds, document.collaboratorIds, requestedUserIds]);

-  // Memoize onClick handler to avoid inline function creation
-  const handleAvatarClick = useCallback(
-    (
-      collaboratorId: string,
-      isPresent: boolean,
-      isObserving: boolean,
-      isObservable: boolean
-    ) =>
-      (ev: React.MouseEvent) => {
-        if (isObservable && isPresent) {
-          ev.preventDefault();
-          ev.stopPropagation();
-          ui.setObservingUser(isObserving ? undefined : collaboratorId);
-        }
-      },
-    [ui]
-  );
+  const popover = usePopoverState({
+    gutter: 0,
+    placement: "bottom-end",
+  });

-  const renderAvatar = useCallback(
+  const renderAvatar = React.useCallback(
    ({ model: collaborator, ...rest }) => {
-      const isPresent = presentIds.has(collaborator.id);
-      const isEditing = editingIds.has(collaborator.id);
-      const isObserving = observingUserId === collaborator.id;
+      const isPresent = presentIds.includes(collaborator.id);
+      const isEditing = editingIds.includes(collaborator.id);
+      const isObserving = ui.observingUserId === collaborator.id;
      const isObservable = collaborator.id !== currentUserId;

      return (
@@ -134,40 +96,46 @@ function Collaborators(props: Props) {
          isCurrentUser={currentUserId === collaborator.id}
          onClick={
            isObservable
-              ? handleAvatarClick(
-                  collaborator.id,
-                  isPresent,
-                  isObserving,
-                  isObservable
-                )
+              ? (ev) => {
+                  if (isPresent) {
+                    ev.preventDefault();
+                    ev.stopPropagation();
+                    ui.setObservingUser(
+                      isObserving ? undefined : collaborator.id
+                    );
+                  }
+                }
              : undefined
          }
        />
      );
    },
-    [presentIds, editingIds, observingUserId, currentUserId, handleAvatarClick]
+    [presentIds, ui, currentUserId, editingIds]
  );

  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}>
+        <DocumentViews document={document} isOpen={popover.visible} />
+      </Popover>
+    </>
  );
 }

@@ -1,5 +1,5 @@
 import { observer } from "mobx-react";
-import { useCallback } from "react";
+import * as React from "react";
 import { toast } from "sonner";
 import useStores from "~/hooks/useStores";
 import { CollectionForm, FormData } from "./CollectionForm";
@@ -16,7 +16,7 @@ export const CollectionEdit = observer(function CollectionEdit_({
  const { collections } = useStores();
  const collection = collections.get(collectionId);

-  const handleSubmit = useCallback(
+  const handleSubmit = React.useCallback(
    async (data: FormData) => {
      try {
        await collection?.save(data);
@@ -1,12 +1,12 @@
 import uniq from "lodash/uniq";
 import { observer } from "mobx-react";
-import { useMemo, useEffect, useCallback, Suspense } from "react";
+import * as React from "react";
 import { Controller, useForm } from "react-hook-form";
 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,8 +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 { createLazyComponent } from "~/components/LazyLoad";
+import InputSelectPermission from "~/components/InputSelectPermission";
 import Switch from "~/components/Switch";
 import Text from "~/components/Text";
 import useBoolean from "~/hooks/useBoolean";
@@ -23,7 +22,7 @@ import useCurrentTeam from "~/hooks/useCurrentTeam";
 import useStores from "~/hooks/useStores";
 import { EmptySelectValue } from "~/types";

-const IconPicker = createLazyComponent(() => import("~/components/IconPicker"));
+const IconPicker = React.lazy(() => import("~/components/IconPicker"));

 export interface FormData {
  name: string;
@@ -31,7 +30,6 @@ export interface FormData {
  color: string | null;
  sharing: boolean;
  permission: CollectionPermission | undefined;
-  commenting?: boolean | null;
 }

 const useIconColor = (collection?: Collection) => {
@@ -41,7 +39,7 @@ const useIconColor = (collection?: Collection) => {
    collections.orderedData.map((c) => c.color).filter(Boolean)
  ) as string[];

-  const iconColor = useMemo(
+  const iconColor = React.useMemo(
    () =>
      collection?.color ??
      // If all the existing collections have the same color, use that color,
@@ -84,19 +82,13 @@ export const CollectionForm = observer(function CollectionForm_({
      icon: collection?.icon,
      sharing: collection?.sharing ?? true,
      permission: collection?.permission,
-      commenting: collection?.commenting ?? true,
      color: iconColor,
    },
  });

  const values = watch();

-  // Preload the IconPicker component on mount
-  useEffect(() => {
-    void IconPicker.preload();
-  }, []);
-
-  useEffect(() => {
+  React.useEffect(() => {
    // If the user hasn't picked an icon yet, go ahead and suggest one based on
    // the name of the collection. It's the little things sometimes.
    if (!hasOpenedIconPicker && !collection) {
@@ -109,12 +101,12 @@ export const CollectionForm = observer(function CollectionForm_({
    }
  }, [collection, hasOpenedIconPicker, setValue, values.name, values.icon]);

-  useEffect(() => {
+  React.useEffect(() => {
    setTimeout(() => setFocus("name", { shouldSelect: true }), 100);
  }, [setFocus]);

-  const handleIconChange = useCallback(
-    (icon: string, color: string) => {
+  const handleIconChange = React.useCallback(
+    (icon: string, color: string | null) => {
      if (icon !== values.icon) {
        setFocus("name");
      }
@@ -131,6 +123,7 @@ export const CollectionForm = observer(function CollectionForm_({
        <Trans>
          Collections are used to group documents and choose permissions
        </Trans>
+        .
      </Text>
      <Flex gap={8}>
        <Input
@@ -141,7 +134,7 @@ export const CollectionForm = observer(function CollectionForm_({
            maxLength: CollectionValidation.maxNameLength,
          })}
          prefix={
-            <Suspense fallback={fallbackIcon}>
+            <React.Suspense fallback={fallbackIcon}>
              <StyledIconPicker
                icon={values.icon}
                color={values.color ?? iconColor}
@@ -150,7 +143,7 @@ export const CollectionForm = observer(function CollectionForm_({
                onOpen={setHasOpenedIconPicker}
                onChange={handleIconChange}
              />
-            </Suspense>
+            </React.Suspense>
          }
          autoComplete="off"
          autoFocus
@@ -172,7 +165,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."
              )}
            />
@@ -181,36 +174,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")}
        />
      )}

@@ -224,15 +194,15 @@ export const CollectionForm = observer(function CollectionForm_({
              ? `${t("Saving")}…`
              : t("Save")
            : formState.isSubmitting
-              ? `${t("Creating")}…`
-              : t("Create")}
+            ? `${t("Creating")}…`
+            : t("Create")}
        </Button>
      </Flex>
    </form>
  );
 });

-const StyledIconPicker = styled(IconPicker.Component)`
+const StyledIconPicker = styled(IconPicker)`
  margin-left: 4px;
  margin-right: 4px;
 `;
@@ -1,6 +1,6 @@
 import { runInAction } from "mobx";
 import { observer } from "mobx-react";
-import { useCallback } from "react";
+import * as React from "react";
 import { toast } from "sonner";
 import useStores from "~/hooks/useStores";
 import history from "~/utils/history";
@@ -14,7 +14,7 @@ export const CollectionNew = observer(function CollectionNew_({
  onSubmit,
 }: Props) {
  const { collections } = useStores();
-  const handleSubmit = useCallback(
+  const handleSubmit = React.useCallback(
    async (data: FormData) => {
      try {
        const collection = await collections.save(data);
@@ -1,4 +1,5 @@
 import { observer } from "mobx-react";
+import * as React from "react";
 import { useTranslation, Trans } from "react-i18next";
 import { useHistory } from "react-router-dom";
 import { toast } from "sonner";
@@ -1,4 +1,5 @@
 import { useMatches, KBarResults } from "kbar";
+import * as React from "react";
 import styled from "styled-components";
 import Text from "~/components/Text";
 import CommandBarItem from "./CommandBarItem";
@@ -1,15 +1,16 @@
 import { DocumentIcon } from "outline-icons";
-import { useMemo } from "react";
+import * as React from "react";
 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) => {
  const { documents, ui } = useStores();

-  return useMemo(
+  return React.useMemo(
    () =>
      documents.recentlyViewed
        .filter((document) => document.id !== ui.activeDocumentId)
@@ -24,7 +25,7 @@ const useRecentDocumentActions = (count = 6) => {
            ) : (
              <DocumentIcon />
            ),
-            to: documentPath(item),
+            perform: () => history.push(documentPath(item)),
          })
        ),
    [count, ui.activeDocumentId, documents.recentlyViewed]
@@ -1,12 +1,13 @@
 import { SettingsIcon } from "outline-icons";
-import { useMemo } from "react";
+import * as React 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();
-  const actions = useMemo(
+  const actions = React.useMemo(
    () =>
      config.map((item) => {
        const Icon = item.icon;
@@ -15,13 +16,13 @@ const useSettingsAction = () => {
          name: item.name,
          icon: <Icon />,
          section: NavigationSection,
-          to: item.path,
+          perform: () => history.push(item.path),
        };
      }),
    [config]
  );

-  const navigateToSettings = useMemo(
+  const navigateToSettings = React.useMemo(
    () =>
      createAction({
        id: "settings",
@@ -1,5 +1,5 @@
 import { NewDocumentIcon, ShapesIcon } from "outline-icons";
-import { useEffect, useMemo } from "react";
+import * as React from "react";
 import Icon from "@shared/components/Icon";
 import { createAction } from "~/actions";
 import {
@@ -14,11 +14,11 @@ import { newDocumentPath } from "~/utils/routeHelpers";
 const useTemplatesAction = () => {
  const { documents } = useStores();

-  useEffect(() => {
+  React.useEffect(() => {
    void documents.fetchAllTemplates();
  }, [documents]);

-  const actions = useMemo(
+  const actions = React.useMemo(
    () =>
      documents.templatesAlphabetical.map((template) =>
        createAction({
@@ -61,7 +61,7 @@ const useTemplatesAction = () => {
    [documents.templatesAlphabetical]
  );

-  const newFromTemplate = useMemo(
+  const newFromTemplate = React.useMemo(
    () =>
      createAction({
        id: "templates",
@@ -1,4 +1,5 @@
 import { observer } from "mobx-react";
+import * as React from "react";
 import { useTranslation, Trans } from "react-i18next";
 import { toast } from "sonner";
 import Comment from "~/models/Comment";
@@ -1,4 +1,5 @@
 import { observer } from "mobx-react";
+import * as React from "react";
 import { Trans, useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import { CollectionPermission, NavigationNode } from "@shared/types";
@@ -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>
@@ -1,5 +1,6 @@
 import { observer } from "mobx-react";
 import { DisconnectedIcon } from "outline-icons";
+import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
@@ -74,6 +75,10 @@ function ConnectionStatus() {

 const Button = styled(NudeButton)`
  display: none;
+  position: fixed;
+  bottom: 0;
+  margin: 20px;
+  transform: translateX(-32px);

  ${breakpoint("tablet")`
    display: block;
@@ -20,7 +20,7 @@ type Props = {
  dangerous?: boolean;
  to?: LocationDescriptor;
  href?: string;
-  target?: string;
+  target?: "_blank";
  as?: string | React.ComponentType<any>;
  hide?: () => void;
  level?: number;
@@ -3,6 +3,7 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import {
+  useMenuState,
  MenuButton,
  MenuItem as BaseMenuItem,
  MenuStateReturn,
@@ -12,7 +13,6 @@ import MenuIconWrapper from "~/components/ContextMenu/MenuIconWrapper";
 import Flex from "~/components/Flex";
 import { actionToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
-import { useMenuState } from "~/hooks/useMenuState";
 import {
  Action,
  ActionContext,
@@ -52,9 +52,7 @@ const SubMenu = React.forwardRef(function _Template(
 ) {
  const { t } = useTranslation();
  const theme = useTheme();
-  const menu = useMenuState({
-    parentId: parentMenuState.baseId,
-  });
+  const menu = useMenuState();

  return (
    <>
@@ -140,7 +138,7 @@ function Template({ items, actions, context, showIcons, ...menu }: Props) {
              as={Link}
              id={`${item.title}-${index}`}
              to={item.to}
-              key={`${item.type}-${item.title}-${index}`}
+              key={index}
              disabled={item.disabled}
              selected={item.selected}
              icon={showIcons !== false ? item.icon : undefined}
@@ -155,14 +153,12 @@ function Template({ items, actions, context, showIcons, ...menu }: Props) {
          return (
            <MenuItem
              id={`${item.title}-${index}`}
-              href={typeof item.href === "string" ? item.href : item.href.url}
-              key={`${item.type}-${item.title}-${index}`}
+              href={item.href}
+              key={index}
              disabled={item.disabled}
              selected={item.selected}
              level={item.level}
-              target={
-                typeof item.href === "string" ? undefined : item.href.target
-              }
+              target={item.href.startsWith("#") ? undefined : "_blank"}
              icon={showIcons !== false ? item.icon : undefined}
              {...menu}
            >
@@ -180,7 +176,7 @@ function Template({ items, actions, context, showIcons, ...menu }: Props) {
              disabled={item.disabled}
              selected={item.selected}
              dangerous={item.dangerous}
-              key={`${item.type}-${item.title}-${index}`}
+              key={index}
              icon={showIcons !== false ? item.icon : undefined}
              {...menu}
            >
@@ -189,25 +185,18 @@ function Template({ items, actions, context, showIcons, ...menu }: Props) {
          );

          return item.tooltip ? (
-            <Tooltip
-              content={item.tooltip}
-              placement={"bottom"}
-              key={`tooltip-${item.title}-${index}`}
-            >
+            <Tooltip content={item.tooltip} placement={"bottom"}>
              <div>{menuItem}</div>
            </Tooltip>
          ) : (
-            <React.Fragment key={`${item.type}-${item.title}-${index}`}>
-              {menuItem}
-            </React.Fragment>
+            <>{menuItem}</>
          );
        }

        if (item.type === "submenu") {
-          // Skip rendering empty submenus
-          return item.items.length > 0 ? (
+          return (
            <BaseMenuItem
-              key={`${item.type}-${item.title}-${index}`}
+              key={index}
              as={SubMenu}
              id={`${item.title}-${index}`}
              templateItems={item.items}
@@ -220,17 +209,15 @@ function Template({ items, actions, context, showIcons, ...menu }: Props) {
              }
              {...menu}
            />
-          ) : null;
+          );
        }

        if (item.type === "separator") {
-          return <Separator key={`separator-${index}`} />;
+          return <Separator key={index} />;
        }

        if (item.type === "heading") {
-          return (
-            <Header key={`heading-${item.title}-${index}`}>{item.title}</Header>
-          );
+          return <Header key={index}>{item.title}</Header>;
        }

        const _exhaustiveCheck: never = item;
@@ -171,9 +171,7 @@ const InnerContextMenu = (props: InnerContextMenuProps) => {
      });
    }
    return () => {
-      if (scrollElement && !props.isSubMenu) {
-        enableBodyScroll(scrollElement);
-      }
+      scrollElement && !props.isSubMenu && enableBodyScroll(scrollElement);
    };
  }, [props.isSubMenu, props.visible]);

@@ -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
@@ -1,4 +1,4 @@
-import { useState, useEffect } from "react";
+import * as React from "react";

 type Props = {
  delay?: number;
@@ -6,9 +6,9 @@ type Props = {
 };

 export default function DelayedMount({ delay = 250, children }: Props) {
-  const [isShowing, setShowing] = useState(false);
+  const [isShowing, setShowing] = React.useState(false);

-  useEffect(() => {
+  React.useEffect(() => {
    const timeout = setTimeout(() => setShowing(true), delay);
    return () => {
      clearTimeout(timeout);
@@ -1,4 +1,4 @@
-import { useRef, useEffect } from "react";
+import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
 import { toast } from "sonner";
@@ -12,9 +12,9 @@ export default function DesktopEventHandler() {
  const { t } = useTranslation();
  const history = useHistory();
  const { dialogs } = useStores();
-  const hasDisabledUpdateMessage = useRef(false);
+  const hasDisabledUpdateMessage = React.useRef(false);

-  useEffect(() => {
+  React.useEffect(() => {
    Desktop.bridge?.redirect((path: string, replace = false) => {
      if (replace) {
        history.replace(path);
@@ -1,4 +1,5 @@
 import { observer } from "mobx-react";
+import * as React from "react";
 import Guide from "~/components/Guide";
 import Modal from "~/components/Modal";
 import useStores from "~/hooks/useStores";
@@ -138,8 +138,8 @@ function DocumentBreadcrumb(
        ? output.slice(-depth)
        : output
      : depth !== undefined
-        ? output.slice(0, depth)
-        : output;
+      ? output.slice(0, depth)
+      : output;
  }, [t, path, category, sidebarContext, collectionNode, reverse, depth]);

  if (!collections.isLoaded) {
@@ -4,7 +4,7 @@ import { subDays } from "date-fns";
 import { m } from "framer-motion";
 import { observer } from "mobx-react";
 import { CloseIcon, DocumentIcon, ClockIcon, EyeIcon } from "outline-icons";
-import { useRef, useCallback, useMemo } from "react";
+import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import styled, { useTheme } from "styled-components";
@@ -40,7 +40,7 @@ function DocumentCard(props: Props) {
  const { collections } = useStores();
  const theme = useTheme();
  const { document, pin, canUpdatePin, isDraggable } = props;
-  const pinnedToHome = useRef(!pin?.collectionId).current;
+  const pinnedToHome = React.useRef(!pin?.collectionId).current;
  const collection = document.collectionId
    ? collections.get(document.collectionId)
    : undefined;
@@ -63,7 +63,7 @@ function DocumentCard(props: Props) {
    transition,
  };

-  const handleUnpin = useCallback(
+  const handleUnpin = React.useCallback(
    async (ev) => {
      ev.preventDefault();
      ev.stopPropagation();
@@ -178,7 +178,7 @@ function DocumentCard(props: Props) {

 const ReadingTime = ({ document }: { document: Document }) => {
  const { t } = useTranslation();
-  const markdown = useMemo(() => document.toMarkdown(), [document]);
+  const markdown = React.useMemo(() => document.toMarkdown(), [document]);
  const stats = useTextStats(markdown);

  return (
@@ -1,5 +1,5 @@
 import { action, computed, observable } from "mobx";
-import { createContext, useContext, useMemo, PropsWithChildren } from "react";
+import React, { PropsWithChildren } from "react";
 import { Heading } from "@shared/utils/ProsemirrorHelper";
 import Document from "~/models/Document";
 import { Editor } from "~/editor";
@@ -64,10 +64,10 @@ class DocumentContext {
  }
 }

-const Context = createContext<DocumentContext | null>(null);
+const Context = React.createContext<DocumentContext | null>(null);

 export const useDocumentContext = () => {
-  const ctx = useContext(Context);
+  const ctx = React.useContext(Context);
  if (!ctx) {
    throw new Error(
      "useDocumentContext must be used within DocumentContextProvider"
@@ -79,6 +79,6 @@ export const useDocumentContext = () => {
 export const DocumentContextProvider = ({
  children,
 }: PropsWithChildren<unknown>) => {
-  const context = useMemo(() => new DocumentContext(), []);
+  const context = React.useMemo(() => new DocumentContext(), []);
  return <Context.Provider value={context}>{children}</Context.Provider>;
 };
@@ -46,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"));
@@ -65,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?"));
    }
  };
@@ -88,7 +102,7 @@ function DocumentCopy({ document, onSubmit }: Props) {
                  label={t("Publish")}
                  labelPosition="right"
                  checked={publish}
-                  onChange={setPublish}
+                  onChange={handlePublishChange}
                />
              </Text>
            )}
@@ -99,7 +113,7 @@ function DocumentCopy({ document, onSubmit }: Props) {
                  label={t("Include nested documents")}
                  labelPosition="right"
                  checked={recursive}
-                  onChange={setRecursive}
+                  onChange={handleRecursiveChange}
                />
              </Text>
            )}
@@ -60,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 [];
@@ -78,6 +78,10 @@ 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(items, ["title"], {
@@ -95,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,6 +130,7 @@ function DocumentExplorer({ onSubmit, onSelect, items, defaultValue }: Props) {
    return searchTerm
      ? searchIndex.search(searchTerm)
      : items
+          .filter((item) => recentlyViewedItemIds.includes(item.id))
          .concat(
            items.filter((item) => item.type === NavigationNodeType.Collection)
          )
@@ -175,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);
  };
@@ -177,9 +177,7 @@ const Actions = styled(EventBoundary)`
  color: ${s("textSecondary")};

  ${NudeButton} {
-    &:
-      ${hover},
-      &[aria-expanded= "true"] {
+    &: ${hover}, &[aria-expanded= "true"] {
      background: ${s("sidebarControlHoverBackground")};
    }
  }
@@ -1,6 +1,7 @@
 import { TFunction } from "i18next";
 import { observer } from "mobx-react";
 import { DoneIcon } from "outline-icons";
+import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled, { useTheme } from "styled-components";
 import Document from "~/models/Document";
@@ -1,7 +1,7 @@
 import compact from "lodash/compact";
 import sortBy from "lodash/sortBy";
 import { observer } from "mobx-react";
-import { useMemo, useCallback } from "react";
+import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { dateLocale, dateToRelative } from "@shared/utils/date";
 import Document from "~/models/Document";
@@ -14,86 +14,78 @@ import useStores from "~/hooks/useStores";

 type Props = {
  document: Document;
+  isOpen?: boolean;
 };

-function DocumentViews({ document }: Props) {
+function DocumentViews({ document, isOpen }: Props) {
  const { t } = useTranslation();
  const { views, presence } = useStores();
  const user = useCurrentUser();
  const locale = dateLocale(user.language);
+
  const documentPresence = presence.get(document.id);
  const documentPresenceArray = documentPresence
    ? Array.from(documentPresence.values())
    : [];
-
-  // Use Set for O(1) lookups and stable references
-  const presentIds = useMemo(
-    () => new Set(documentPresenceArray.map((p) => p.userId)),
-    [documentPresenceArray]
-  );
-  const editingIds = useMemo(
-    () =>
-      new Set(
-        documentPresenceArray.filter((p) => p.isEditing).map((p) => p.userId)
-      ),
-    [documentPresenceArray]
-  );
+  const presentIds = documentPresenceArray.map((p) => p.userId);
+  const editingIds = documentPresenceArray
+    .filter((p) => p.isEditing)
+    .map((p) => p.userId);

  // ensure currently present via websocket are always ordered first
-  const documentViews = useMemo(
-    () => views.inDocument(document.id),
-    [views, document.id]
+  const documentViews = views.inDocument(document.id);
+  const sortedViews = sortBy(
+    documentViews,
+    (view) => !presentIds.includes(view.userId)
  );
-  const sortedViews = useMemo(
-    () => sortBy(documentViews, (view) => !presentIds.has(view.userId)),
-    [documentViews, presentIds]
-  );
-  const users = useMemo(
+  const users = React.useMemo(
    () => compact(sortedViews.map((v) => v.user)),
    [sortedViews]
  );

-  // Memoize renderItem for PaginatedList
-  const renderItem = useCallback(
-    (model: User) => {
-      const view = documentViews.find((v) => v.userId === model.id);
-      const isPresent = presentIds.has(model.id);
-      const isEditing = editingIds.has(model.id);
-      const subtitle = isPresent
-        ? isEditing
-          ? t("Currently editing")
-          : t("Currently viewing")
-        : t("Viewed {{ timeAgo }}", {
-            timeAgo: dateToRelative(
-              view ? Date.parse(view.lastViewedAt) : new Date(),
-              {
-                addSuffix: true,
-                locale,
-              }
-            ),
-          });
-      return (
-        <ListItem
-          key={model.id}
-          title={model.name}
-          subtitle={subtitle}
-          image={
-            <Avatar key={model.id} model={model} size={AvatarSize.Large} />
-          }
-          border={false}
-          small
-        />
-      );
-    },
-    [documentViews, presentIds, editingIds, t, locale]
-  );
-
  return (
-    <PaginatedList<User>
-      aria-label={t("Viewers")}
-      items={users}
-      renderItem={renderItem}
-    />
+    <>
+      {isOpen && (
+        <PaginatedList<User>
+          aria-label={t("Viewers")}
+          items={users}
+          renderItem={(model) => {
+            const view = documentViews.find((v) => v.userId === model.id);
+            const isPresent = presentIds.includes(model.id);
+            const isEditing = editingIds.includes(model.id);
+            const subtitle = isPresent
+              ? isEditing
+                ? t("Currently editing")
+                : t("Currently viewing")
+              : t("Viewed {{ timeAgo }}", {
+                  timeAgo: dateToRelative(
+                    view ? Date.parse(view.lastViewedAt) : new Date(),
+                    {
+                      addSuffix: true,
+                      locale,
+                    }
+                  ),
+                });
+            return (
+              <ListItem
+                key={model.id}
+                title={model.name}
+                subtitle={subtitle}
+                image={
+                  <Avatar
+                    key={model.id}
+                    model={model}
+                    size={AvatarSize.Large}
+                  />
+                }
+                border={false}
+                small
+              />
+            );
+          }}
+        />
+      )}
+    </>
  );
 }

@@ -64,12 +64,11 @@ function EditableTitle(
    async (ev) => {
      ev.preventDefault();
      ev.stopPropagation();
-
+      setIsEditing(false);
      const trimmedValue = value.trim();

      if (trimmedValue === originalValue || trimmedValue.length === 0) {
        setValue(originalValue);
-        setIsEditing(false);
        onCancel?.();
        return;
      }
@@ -81,8 +80,6 @@ function EditableTitle(
        setValue(originalValue);
        toast.error(error.message);
        throw error;
-      } finally {
-        setIsEditing(false);
      }
    },
    [originalValue, value, onCancel, onSubmit]
@@ -1,7 +1,9 @@
+import { LocationDescriptor } from "history";
 import { observer } from "mobx-react";
 import {
  TrashIcon,
  ArchiveIcon,
+  EditIcon,
  PublishIcon,
  MoveIcon,
  UnpublishIcon,
@@ -9,28 +11,110 @@ import {
  UserIcon,
  CrossIcon,
 } from "outline-icons";
+import * as React 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 } & (
+  | 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 = React.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 = React.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" &&
+      !isDerivedFromDocument &&
+      !revisionLoadedRef.current
+    ) {
+      await revisions.fetch(event.id, { force: true });
+      revisionLoadedRef.current = true;
+    }
+  };
+
+  switch (event.name) {
+    case "revisions.create":
+      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 +133,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 +165,66 @@ 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" ? (
+    <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.createdAt} relative shorten addSuffix />
      </Text>
    </EventItem>
  );
 };

-export const lineStyle = css`
+const lineStyle = css`
  &::before {
    content: "";
    display: block;
@@ -147,10 +270,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 +293,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,4 +1,4 @@
-import { useState } from "react";
+import React from "react";
 import styled from "styled-components";
 import { fadeIn } from "~/styles/animations";

@@ -21,7 +21,7 @@ type Props = {
 * Wraps children in a <Fade> if loading is true on mount.
 */
 export const ConditionalFade = ({ animate, children }: Props) => {
-  const [isAnimated] = useState(animate);
+  const [isAnimated] = React.useState(animate);
  return isAnimated ? <Fade>{children}</Fade> : <>{children}</>;
 };

@@ -1,7 +1,7 @@
 import deburr from "lodash/deburr";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import { MenuButton } from "reakit/Menu";
+import { useMenuState, MenuButton } from "reakit/Menu";
 import styled from "styled-components";
 import { s } from "@shared/styles";
 import type { FetchPageParams } from "~/stores/base/Store";
@@ -9,7 +9,6 @@ import Button, { Inner } from "~/components/Button";
 import ContextMenu from "~/components/ContextMenu";
 import MenuItem from "~/components/ContextMenu/MenuItem";
 import Text from "~/components/Text";
-import { useMenuState } from "~/hooks/useMenuState";
 import Input, { NativeInput, Outline } from "./Input";
 import PaginatedList, { PaginatedItem } from "./PaginatedList";

@@ -1,3 +1,4 @@
+import * as React from "react";
 import styled from "styled-components";
 import Empty from "~/components/Empty";
 import Fade from "~/components/Fade";
@@ -36,8 +36,8 @@ const Guide: React.FC<Props> = ({

  return (
    <DialogBackdrop {...dialog}>
-      {(backdropProps) => (
-        <Backdrop {...backdropProps}>
+      {(props) => (
+        <Backdrop {...props}>
          <Dialog
            {...dialog}
            aria-label={title}
@@ -45,8 +45,8 @@ const Guide: React.FC<Props> = ({
            hideOnEsc
            hide={onRequestClose}
          >
-            {(dialogProps) => (
-              <Scene {...dialogProps} {...rest}>
+            {(props) => (
+              <Scene {...props} {...rest}>
                <Content>
                  {title && <Header>{title}</Header>}
                  {children}
@@ -98,9 +98,7 @@ const Scene = styled.div`
  outline: none;
  opacity: 0;
  transform: translateX(16px);
-  transition:
-    transform 250ms ease,
-    opacity 250ms ease;
+  transition: transform 250ms ease, opacity 250ms ease;

  &[data-enter] {
    opacity: 1;
@@ -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;
@@ -1,5 +1,5 @@
 import { BackIcon } from "outline-icons";
-import * as React from "react";
+import React from "react";
 import styled from "styled-components";
 import { breakpoints, s, hover } from "@shared/styles";
 import { colorPalette } from "@shared/utils/collections";
@@ -193,7 +193,7 @@ const SwitcherButton = styled(NudeButton)<{ panel: Panel }>`
 `;

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

@@ -1,5 +1,5 @@
 import concat from "lodash/concat";
-import * as React from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { EmojiCategory, EmojiSkinTone, IconType } from "@shared/types";
@@ -1,6 +1,6 @@
 import chunk from "lodash/chunk";
 import compact from "lodash/compact";
-import * as React from "react";
+import React from "react";
 import styled from "styled-components";
 import { IconType } from "@shared/types";
 import { IconLibrary } from "@shared/utils/IconLibrary";
@@ -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);
 `;

@@ -1,4 +1,4 @@
-import * as React from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { IconType } from "@shared/types";
@@ -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,6 +1,6 @@
-import { useMemo, useCallback } from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
-import { Menu, MenuButton, MenuItem } from "reakit";
+import { Menu, MenuButton, MenuItem, useMenuState } from "reakit";
 import styled from "styled-components";
 import { depths, s, hover } from "@shared/styles";
 import { EmojiSkinTone } from "@shared/types";
@@ -8,7 +8,6 @@ import { getEmojiVariants } from "@shared/utils/emoji";
 import { Emoji } from "~/components/Emoji";
 import Flex from "~/components/Flex";
 import NudeButton from "~/components/NudeButton";
-import { useMenuState } from "~/hooks/useMenuState";
 import { IconButton } from "./IconButton";

 const SkinTonePicker = ({
@@ -20,13 +19,16 @@ const SkinTonePicker = ({
 }) => {
  const { t } = useTranslation();

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

  const menu = useMenuState({
    placement: "bottom-end",
  });

-  const handleSkinClick = useCallback(
+  const handleSkinClick = React.useCallback(
    (emojiSkin) => {
      menu.hide();
      onChange(emojiSkin);
@@ -34,7 +36,7 @@ const SkinTonePicker = ({
    [menu, onChange]
  );

-  const menuItems = useMemo(
+  const menuItems = React.useMemo(
    () =>
      Object.entries(handEmojiVariants).map(([eskin, emoji]) => (
        <MenuItem {...menu} key={emoji.value}>
@@ -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 = {
@@ -43,7 +45,6 @@ type Props = {
  onChange: (icon: string | null, color: string | null) => void;
  onOpen?: () => void;
  onClose?: () => void;
-  children?: React.ReactNode;
 };

 const IconPicker = ({
@@ -58,16 +59,15 @@ const IconPicker = ({
  onOpen,
  onClose,
  borderOnHover,
-  children,
 }: Props) => {
  const { t } = useTranslation();

  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 +76,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 +109,7 @@ const IconPicker = ({
      setChosenColor(c);

      const icType = determineIconType(icon);
+      // Outline icon set; propagate color change
      if (icType === IconType.SVG) {
        onChange(icon, c);
      }
@@ -125,153 +118,133 @@ 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>
+            {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 +273,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 +304,7 @@ const StyledTab = styled(Tabs.Trigger)<{ $active: boolean }>`
    `}
 `;

-const StyledTabContent = styled(Tabs.Content)`
+const StyledTabPanel = styled(TabPanel)`
  height: 410px;
  overflow-y: auto;
 `;
@@ -1,3 +1,5 @@
+import * as React from "react";
+
 type Props = {
  /** The size of the icon, 24px is default to match standard icons */
  size?: number;
@@ -1,6 +1,7 @@
 import { observer } from "mobx-react";
 import { CollectionIcon, PrivateCollectionIcon } from "outline-icons";
 import { getLuminance } from "polished";
+import * as React from "react";
 import Icon from "@shared/components/Icon";
 import { colorPalette } from "@shared/utils/collections";
 import Collection from "~/models/Collection";
@@ -1,3 +1,5 @@
+import * as React from "react";
+
 type Props = {
  /** The size of the icon, 24px is default to match standard icons */
  size?: number;
@@ -1,3 +1,5 @@
+import * as React from "react";
+
 export function LanguageIcon({ className }: { className?: string }) {
  return (
    <svg
@@ -1,3 +1,5 @@
+import * as React from "react";
+
 type Props = {
  /** The size of the icon, 24px is default to match standard icons */
  size?: number;
@@ -1,3 +1,5 @@
+import * as React from "react";
+
 type Props = {
  /** The size of the icon, 24px is default to match standard icons */
  size?: number;
@@ -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,9 +1,8 @@
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import { MenuButton } from "reakit/Menu";
+import { MenuButton, useMenuState } from "reakit/Menu";
 import styled from "styled-components";
 import { s } from "@shared/styles";
-import { useMenuState } from "~/hooks/useMenuState";
 import lazyWithRetry from "~/utils/lazyWithRetry";
 import ContextMenu from "./ContextMenu";
 import DelayedMount from "./DelayedMount";
@@ -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,402 +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 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 Flex from "./Flex";
 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) => {
-        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
-          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) => {
-        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
-              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 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