test

Add support for SSL in development
2026-06-13 11:25:03 +03:00 · 2023-08-08 23:12:41 -04:00 · 2023-08-08 22:46:31 -04:00
1095 changed files with 25624 additions and 43009 deletions
@@ -1,28 +1,29 @@
 {
  "presets": [
    "@babel/preset-react",
-    "@babel/preset-env",
-    "@babel/preset-typescript"
+    "@babel/preset-typescript",
+    [
+      "@babel/preset-env",
+      {
+        "corejs": {
+          "version": "3",
+          "proposals": true
+        },
+        "useBuiltIns": "usage"
+      }
+    ]
  ],
  "plugins": [
-    "babel-plugin-transform-typescript-metadata",
+    "styled-components",
    [
      "@babel/plugin-proposal-decorators",
      {
        "legacy": true
      }
    ],
-    "@babel/plugin-proposal-class-properties",
-    [
-      "transform-inline-environment-variables",
-      {
-        "include": [
-          "SOURCE_COMMIT",
-          "SOURCE_VERSION"
-        ]
-      }
-    ],
-    "tsconfig-paths-module-resolver"
+    "@babel/plugin-transform-destructuring",
+    "@babel/plugin-transform-regenerator",
+    "transform-class-properties"
  ],
  "env": {
    "production": {
@@ -35,29 +36,13 @@
        ]
      ],
      "ignore": [
-        "**/__mocks__",
        "**/*.test.ts"
      ]
    },
    "development": {
      "ignore": [
-        "**/__mocks__",
        "**/*.test.ts"
      ]
-    },
-    "test": {
-      "presets": [
-        [
-          "@babel/preset-env",
-          {
-            "corejs": {
-              "version": "3",
-              "proposals": true
-            },
-            "useBuiltIns": "usage"
-          }
-        ]
-      ]
    }
  }
 }
@@ -3,7 +3,7 @@ version: 2.1
 defaults: &defaults
  working_directory: ~/outline
  docker:
-    - image: cimg/node:20.10
+    - image: cimg/node:18.12
    - image: cimg/redis:5.0
    - image: cimg/postgres:14.2
      environment:
@@ -36,12 +36,12 @@ jobs:
    steps:
      - checkout
      - restore_cache:
-          key: dependency-cache-v1-{{ checksum "package.json" }}
+          key: dependency-cache-{{ checksum "package.json" }}
      - run:
          name: install-deps
          command: yarn install --frozen-lockfile
      - save_cache:
-          key: dependency-cache-v1-{{ checksum "package.json" }}
+          key: dependency-cache-{{ checksum "package.json" }}
          paths:
            - ./node_modules
  lint:
@@ -49,7 +49,7 @@ jobs:
    steps:
      - checkout
      - restore_cache:
-          key: dependency-cache-v1-{{ checksum "package.json" }}
+          key: dependency-cache-{{ checksum "package.json" }}
      - run:
          name: lint
          command: yarn lint
@@ -58,7 +58,7 @@ jobs:
    steps:
      - checkout
      - restore_cache:
-          key: dependency-cache-v1-{{ checksum "package.json" }}
+          key: dependency-cache-{{ checksum "package.json" }}
      - run:
          name: typescript
          command: yarn tsc
@@ -67,7 +67,7 @@ jobs:
    steps:
      - checkout
      - restore_cache:
-          key: dependency-cache-v1-{{ checksum "package.json" }}
+          key: dependency-cache-{{ checksum "package.json" }}
      - run:
          name: test
          command: yarn test:app
@@ -76,25 +76,22 @@ jobs:
    steps:
      - checkout
      - restore_cache:
-          key: dependency-cache-v1-{{ checksum "package.json" }}
+          key: dependency-cache-{{ checksum "package.json" }}
      - run:
          name: test
          command: yarn test:shared
  test-server:
    <<: *defaults
-    parallelism: 3
    steps:
      - checkout
      - restore_cache:
-          key: dependency-cache-v1-{{ checksum "package.json" }}
+          key: dependency-cache-{{ checksum "package.json" }}
      - run:
          name: migrate
          command: ./node_modules/.bin/sequelize db:migrate --url $DATABASE_URL_TEST
      - run:
          name: test
-          command: |
-            TESTFILES=$(circleci tests glob "server/**/*.test.ts" | circleci tests split)
-            yarn test --maxWorkers=2 $TESTFILES
+          command: yarn test:server --forceExit
  bundle-size:
    <<: *defaults
    environment:
@@ -102,7 +99,7 @@ jobs:
    steps:
      - checkout
      - restore_cache:
-          key: dependency-cache-v1-{{ checksum "package.json" }}
+          key: dependency-cache-{{ checksum "package.json" }}
      - run:
          name: build-vite
          command: yarn vite:build
@@ -145,12 +142,7 @@ jobs:
          command: docker push $BASE_IMAGE_NAME:latest
      - run:
          name: Build and push Docker image
-          command: |
-            if [[ "$CIRCLE_TAG" == *"-"* ]]; then
-              docker buildx build -t $IMAGE_NAME:${CIRCLE_TAG/v/''} --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x --push .
-            else
-              docker buildx build -t $IMAGE_NAME:latest -t $IMAGE_NAME:${CIRCLE_TAG/v/''} --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x --push .
-            fi
+          command: docker buildx build -t $IMAGE_NAME:latest -t $IMAGE_NAME:${CIRCLE_TAG/v/''} --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x --push .

 workflows:
  version: 2
@@ -174,8 +166,9 @@ workflows:
            - build
      - bundle-size:
          requires:
-            - build
-            - types
+            - test-app
+            - test-shared
+            - test-server

  build-docker:
    jobs:
@@ -13,4 +13,5 @@ app.json
 crowdin.yml
 build
 docker-compose.yml
+fakes3
 node_modules
@@ -51,20 +51,10 @@ AWS_REGION=xx-xxxx-x
 AWS_S3_ACCELERATE_URL=
 AWS_S3_UPLOAD_BUCKET_URL=http://s3:4569
 AWS_S3_UPLOAD_BUCKET_NAME=bucket_name_here
+AWS_S3_UPLOAD_MAX_SIZE=26214400
 AWS_S3_FORCE_PATH_STYLE=true
 AWS_S3_ACL=private

-# Specify what storage system to use. Possible value is one of "s3" or "local".
-# 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 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.
-FILE_STORAGE_UPLOAD_MAX_SIZE=262144000

 # –––––––––––––– AUTHENTICATION ––––––––––––––

@@ -193,10 +183,5 @@ RATE_LIMITER_REQUESTS=1000
 RATE_LIMITER_DURATION_WINDOW=60

 # Iframely API config
-# IFRAMELY_URL=
-# IFRAMELY_API_KEY=
-
-# Enable unsafe-inline in script-src CSP directive
-# Setting it to true allows React dev tools add-on in
-# Firefox to successfully detect the project
-DEVELOPMENT_UNSAFE_INLINE_CSP=false
+IFRAMELY_URL=
+IFRAMELY_API_KEY=
@@ -21,7 +21,7 @@
    "eslint-plugin-import",
    "eslint-plugin-node",
    "eslint-plugin-react",
-    "eslint-plugin-lodash"
+    "import"
  ],
  "rules": {
    "eqeqeq": 2,
@@ -37,7 +37,6 @@
      "component": true,
      "html": true
    }],
-    "@typescript-eslint/no-explicit-any": "warn",
    "@typescript-eslint/no-floating-promises": "error",
    "@typescript-eslint/await-thenable": "error",
    "@typescript-eslint/no-misused-promises": [
@@ -56,7 +55,6 @@
    ],
    "padding-line-between-statements": ["error", { "blankLine": "always", "prev": "*", "next": "export" }],
    "lines-between-class-members": ["error", "always", { "exceptAfterSingleLine": true }],
-    "lodash/import-scope": ["warn", "method"],
    "import/no-named-as-default": "off",
    "import/no-named-as-default-member": "off",
    "import/newline-after-import": 2,
@@ -7,7 +7,7 @@ node_modules/*
 npm-debug.log
 stats.json
 .DS_Store
-data/*
+fakes3/*
 .idea
 *.pem
 *.key
@@ -1,6 +1,5 @@
 {
  "workerIdleMemoryLimit": "0.75",
-  "maxWorkers": "50%",
  "projects": [
    {
      "displayName": "server",
@@ -9,11 +8,13 @@
        "^@server/(.*)$": "<rootDir>/server/$1",
        "^@shared/(.*)$": "<rootDir>/shared/$1"
      },
-      "setupFiles": ["<rootDir>/__mocks__/console.js", "<rootDir>/server/test/env.ts"],
+      "setupFiles": [
+        "<rootDir>/__mocks__/console.js",
+        "<rootDir>/server/test/env.ts"
+      ],
      "setupFilesAfterEnv": ["<rootDir>/server/test/setup.ts"],
-      "globalSetup": "<rootDir>/server/test/globalSetup.js",
-      "globalTeardown": "<rootDir>/server/test/globalTeardown.js",
-      "testEnvironment": "node"
+      "testEnvironment": "node",
+      "runner": "@getoutline/jest-runner-serial"
    },
    {
      "displayName": "app",
@@ -5,7 +5,7 @@ ARG APP_PATH
 WORKDIR $APP_PATH

 # ---
-FROM node:20-alpine AS runner
+FROM node:18-alpine AS runner

 RUN apk update && apk add --no-cache curl && apk add --no-cache ca-certificates

@@ -24,16 +24,7 @@ COPY --from=base $APP_PATH/package.json ./package.json

 RUN addgroup -g 1001 -S nodejs && \
  adduser -S nodejs -u 1001 && \
-  chown -R nodejs:nodejs $APP_PATH/build && \
-  mkdir -p /var/lib/outline && \
-	chown -R nodejs:nodejs /var/lib/outline
-
-ENV FILE_STORAGE_LOCAL_ROOT_DIR /var/lib/outline/data
-RUN mkdir -p "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
-  chown -R nodejs:nodejs "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
-  chmod 1777 "$FILE_STORAGE_LOCAL_ROOT_DIR"
-
-VOLUME /var/lib/outline/data
+  chown -R nodejs:nodejs $APP_PATH/build

 USER nodejs

@@ -1,5 +1,5 @@
 ARG APP_PATH=/opt/outline
-FROM node:20-alpine AS deps
+FROM node:18-alpine AS deps

 ARG APP_PATH
 WORKDIR $APP_PATH
@@ -3,7 +3,7 @@ Business Source License 1.1
 Parameters

 Licensor:             General Outline, Inc.
-Licensed Work:        Outline 0.71.0
+Licensed Work:        Outline 0.64.0
                      The Licensed Work is (c) 2020 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:          2027-08-18
+Change Date:          2026-05-23

 Change License:       Apache License, Version 2.0

@@ -1,5 +1,5 @@
 up:
-	docker-compose up -d redis postgres
+	docker-compose up -d redis postgres s3
 	yarn install-local-ssl
 	yarn install --pure-lockfile
 	yarn dev:watch
@@ -8,17 +8,17 @@ build:
 	docker-compose build --pull outline

 test:
-	docker-compose up -d redis postgres
+	docker-compose up -d redis postgres s3
 	yarn sequelize db:drop --env=test
 	yarn sequelize db:create --env=test
-	NODE_ENV=test yarn sequelize db:migrate --env=test
+	yarn sequelize db:migrate --env=test
 	yarn test

 watch:
-	docker-compose up -d redis postgres
+	docker-compose up -d redis postgres s3
 	yarn sequelize db:drop --env=test
 	yarn sequelize db:create --env=test
-	NODE_ENV=test yarn sequelize db:migrate --env=test
+	yarn sequelize db:migrate --env=test
 	yarn test:watch

 destroy:
@@ -96,10 +96,6 @@ Or to run migrations on test database:
 yarn sequelize db:migrate --env test
 ```

-# Activity
-
-![Alt](https://repobeats.axiom.co/api/embed/ff2e4e6918afff1acf9deb72d1ba6b071d586178.svg "Repobeats analytics image")
-
-# License
+## License

 Outline is [BSL 1.1 licensed](LICENSE).
@@ -128,6 +128,11 @@
      "description": "Live web link to your bucket. For CNAMEs, https://yourbucket.example.com",
      "required": false
    },
+    "AWS_S3_UPLOAD_MAX_SIZE": {
+      "description": "Maximum file upload size in bytes",
+      "value": "26214400",
+      "required": false
+    },
    "AWS_S3_FORCE_PATH_STYLE": {
      "description": "Use path-style URL's for connecting to S3 instead of subdomain. This is useful for S3-compatible storage.",
      "value": "true",
@@ -143,11 +148,6 @@
      "description": "S3 canned ACL for document attachments",
      "required": false
    },
-    "FILE_STORAGE_UPLOAD_MAX_SIZE": {
-      "description": "Maximum file upload size in bytes",
-      "value": "26214400",
-      "required": false
-    },
    "SMTP_HOST": {
      "description": "smtp.example.com (optional)",
      "required": false
@@ -2,10 +2,10 @@
  "extends": [
    "../.eslintrc",
    "plugin:react/recommended",
-    "plugin:react-hooks/recommended"
+    "plugin:react-hooks/recommended",
  ],
  "plugins": [
-    "eslint-plugin-react-hooks"
+    "eslint-plugin-react-hooks",
  ],
  "env": {
    "jest": true,
@@ -10,9 +10,9 @@ import {
 import * as React from "react";
 import stores from "~/stores";
 import Collection from "~/models/Collection";
+import CollectionEdit from "~/scenes/CollectionEdit";
+import CollectionNew from "~/scenes/CollectionNew";
 import CollectionPermissions from "~/scenes/CollectionPermissions";
-import { CollectionEdit } from "~/components/Collection/CollectionEdit";
-import { CollectionNew } from "~/components/Collection/CollectionNew";
 import CollectionDeleteDialog from "~/components/CollectionDeleteDialog";
 import DynamicCollectionIcon from "~/components/Icons/CollectionIcon";
 import { createAction } from "~/actions";
@@ -34,11 +34,11 @@ export const openCollection = createAction({
    return collections.map((collection) => ({
      // Note: using url which includes the slug rather than id here to bust
      // cache if the collection is renamed
-      id: collection.path,
+      id: collection.url,
      name: collection.name,
      icon: <ColorCollectionIcon collection={collection} />,
      section: CollectionSection,
-      perform: () => history.push(collection.path),
+      perform: () => history.push(collection.url),
    }));
  },
 });
@@ -103,7 +103,6 @@ export const editCollectionPermissions = createAction({

    stores.dialogs.openModal({
      title: t("Collection permissions"),
-      fullscreen: true,
      content: <CollectionPermissions collectionId={activeCollectionId} />,
    });
  },
@@ -162,10 +161,9 @@ export const unstarCollection = createAction({
 });

 export const deleteCollection = createAction({
-  name: ({ t }) => `${t("Delete")}…`,
+  name: ({ t }) => t("Delete"),
  analyticsName: "Delete collection",
  section: CollectionSection,
-  dangerous: true,
  icon: <TrashIcon />,
  visible: ({ activeCollectionId, stores }) => {
    if (!activeCollectionId) {
@@ -184,6 +182,7 @@ export const deleteCollection = createAction({
    }

    stores.dialogs.openModal({
+      isCentered: true,
      title: t("Delete collection"),
      content: (
        <CollectionDeleteDialog
@@ -1,7 +1,6 @@
-import copy from "copy-to-clipboard";
-import { CopyIcon, ToolsIcon, TrashIcon, UserIcon } from "outline-icons";
+import { ToolsIcon, TrashIcon, UserIcon } from "outline-icons";
 import * as React from "react";
-import { toast } from "sonner";
+import stores from "~/stores";
 import { createAction } from "~/actions";
 import { DeveloperSection } from "~/actions/sections";
 import env from "~/env";
@@ -9,71 +8,6 @@ import { client } from "~/utils/ApiClient";
 import Logger from "~/utils/Logger";
 import { deleteAllDatabases } from "~/utils/developer";

-export const copyId = createAction({
-  name: ({ t }) => t("Copy ID"),
-  icon: <CopyIcon />,
-  keywords: "uuid",
-  section: DeveloperSection,
-  children: ({
-    currentTeamId,
-    currentUserId,
-    activeCollectionId,
-    activeDocumentId,
-  }) => {
-    function copyAndToast(text: string | null | undefined) {
-      if (text) {
-        copy(text);
-        toast.success("Copied to clipboard");
-      }
-    }
-
-    return [
-      createAction({
-        name: "Copy User ID",
-        section: DeveloperSection,
-        icon: <CopyIcon />,
-        visible: () => !!currentUserId,
-        perform: () => copyAndToast(currentUserId),
-      }),
-      createAction({
-        name: "Copy Team ID",
-        section: DeveloperSection,
-        icon: <CopyIcon />,
-        visible: () => !!currentTeamId,
-        perform: () => copyAndToast(currentTeamId),
-      }),
-      createAction({
-        name: "Copy Collection ID",
-        icon: <CopyIcon />,
-        section: DeveloperSection,
-        visible: () => !!activeCollectionId,
-        perform: () => copyAndToast(activeCollectionId),
-      }),
-      createAction({
-        name: "Copy Document ID",
-        icon: <CopyIcon />,
-        section: DeveloperSection,
-        visible: () => !!activeDocumentId,
-        perform: () => copyAndToast(activeDocumentId),
-      }),
-      createAction({
-        name: "Copy Team ID",
-        icon: <CopyIcon />,
-        section: DeveloperSection,
-        visible: () => !!currentTeamId,
-        perform: () => copyAndToast(currentTeamId),
-      }),
-      createAction({
-        name: "Copy Release ID",
-        icon: <CopyIcon />,
-        section: DeveloperSection,
-        visible: () => !!env.RELEASE,
-        perform: () => copyAndToast(env.RELEASE),
-      }),
-    ];
-  },
-});
-
 export const clearIndexedDB = createAction({
  name: ({ t }) => t("Delete IndexedDB cache"),
  icon: <TrashIcon />,
@@ -81,30 +15,24 @@ export const clearIndexedDB = createAction({
  section: DeveloperSection,
  perform: async ({ t }) => {
    await deleteAllDatabases();
-    toast.message(t("IndexedDB cache deleted"));
+    stores.toasts.showToast(t("IndexedDB cache deleted"));
  },
 });

 export const createTestUsers = createAction({
-  name: "Create 10 test users",
+  name: "Create test users",
  icon: <UserIcon />,
  section: DeveloperSection,
  visible: () => env.ENVIRONMENT === "development",
  perform: async () => {
    const count = 10;
-    await client.post("/developer.create_test_users", { count });
-    toast.message(`${count} test users created`);
-  },
-});

-export const createToast = createAction({
-  name: "Create toast",
-  section: DeveloperSection,
-  visible: () => env.ENVIRONMENT === "development",
-  perform: async () => {
-    toast.message("Hello world", {
-      duration: 30000,
-    });
+    try {
+      await client.post("/developer.create_test_users", { count });
+      stores.toasts.showToast(`${count} test users created`);
+    } catch (err) {
+      stores.toasts.showToast(err.message, { type: "error" });
+    }
  },
 });

@@ -114,7 +42,7 @@ export const toggleDebugLogging = createAction({
  section: DeveloperSection,
  perform: async ({ t }) => {
    Logger.debugLoggingEnabled = !Logger.debugLoggingEnabled;
-    toast.message(
+    stores.toasts.showToast(
      Logger.debugLoggingEnabled
        ? t("Debug logging enabled")
        : t("Debug logging disabled")
@@ -128,13 +56,7 @@ export const developer = createAction({
  icon: <ToolsIcon />,
  iconInContextMenu: false,
  section: DeveloperSection,
-  children: [
-    copyId,
-    clearIndexedDB,
-    toggleDebugLogging,
-    createToast,
-    createTestUsers,
-  ],
+  children: [clearIndexedDB, toggleDebugLogging, createTestUsers],
 });

 export const rootDeveloperActions = [developer];
@@ -1,4 +1,3 @@
-import copy from "copy-to-clipboard";
 import invariant from "invariant";
 import {
  DownloadIcon,
@@ -20,25 +19,19 @@ import {
  ArchiveIcon,
  ShuffleIcon,
  HistoryIcon,
-  GraphIcon,
+  LightBulbIcon,
  UnpublishIcon,
  PublishIcon,
  CommentIcon,
-  GlobeIcon,
-  CopyIcon,
 } from "outline-icons";
 import * as React from "react";
-import { toast } from "sonner";
 import { ExportContentType, TeamPreference } from "@shared/types";
-import MarkdownHelper from "@shared/utils/MarkdownHelper";
 import { getEventFiles } from "@shared/utils/files";
 import DocumentDelete from "~/scenes/DocumentDelete";
 import DocumentMove from "~/scenes/DocumentMove";
 import DocumentPermanentDelete from "~/scenes/DocumentPermanentDelete";
 import DocumentPublish from "~/scenes/DocumentPublish";
 import DocumentTemplatizeDialog from "~/components/DocumentTemplatizeDialog";
-import DuplicateDialog from "~/components/DuplicateDialog";
-import SharePopover from "~/components/Sharing";
 import { createAction } from "~/actions";
 import { DocumentSection } from "~/actions/sections";
 import env from "~/env";
@@ -49,8 +42,6 @@ import {
  homePath,
  newDocumentPath,
  searchPath,
-  documentPath,
-  urlify,
 } from "~/utils/routeHelpers";

 export const openDocument = createAction({
@@ -95,48 +86,6 @@ export const createDocument = createAction({
    }),
 });

-export const createDocumentFromTemplate = createAction({
-  name: ({ t }) => t("New from template"),
-  analyticsName: "New document",
-  section: DocumentSection,
-  icon: <NewDocumentIcon />,
-  keywords: "create",
-  visible: ({ currentTeamId, activeDocumentId, stores }) =>
-    !!currentTeamId &&
-    !!activeDocumentId &&
-    !!stores.documents.get(activeDocumentId)?.template &&
-    stores.policies.abilities(currentTeamId).createDocument,
-  perform: ({ activeCollectionId, activeDocumentId, inStarredSection }) =>
-    history.push(
-      newDocumentPath(activeCollectionId, { templateId: activeDocumentId }),
-      {
-        starred: inStarredSection,
-      }
-    ),
-});
-
-export const createNestedDocument = createAction({
-  name: ({ t }) => t("New nested document"),
-  analyticsName: "New document",
-  section: DocumentSection,
-  icon: <NewDocumentIcon />,
-  keywords: "create",
-  visible: ({ currentTeamId, activeDocumentId, stores }) =>
-    !!currentTeamId &&
-    !!activeDocumentId &&
-    stores.policies.abilities(currentTeamId).createDocument &&
-    stores.policies.abilities(activeDocumentId).createChildDocument,
-  perform: ({ activeCollectionId, activeDocumentId, inStarredSection }) =>
-    history.push(
-      newDocumentPath(activeCollectionId, {
-        parentDocumentId: activeDocumentId,
-      }),
-      {
-        starred: inStarredSection,
-      }
-    ),
-});
-
 export const starDocument = createAction({
  name: ({ t }) => t("Star"),
  analyticsName: "Star document",
@@ -199,7 +148,7 @@ export const publishDocument = createAction({
    }
    const document = stores.documents.get(activeDocumentId);
    return (
-      !!document?.isDraft && stores.policies.abilities(activeDocumentId).publish
+      !!document?.isDraft && stores.policies.abilities(activeDocumentId).update
    );
  },
  perform: async ({ activeDocumentId, stores, t }) => {
@@ -216,14 +165,13 @@ export const publishDocument = createAction({
      await document.save(undefined, {
        publish: true,
      });
-      toast.success(
-        t("Published {{ documentName }}", {
-          documentName: document.noun,
-        })
-      );
+      stores.toasts.showToast(t("Document published"), {
+        type: "success",
+      });
    } else if (document) {
      stores.dialogs.openModal({
        title: t("Publish document"),
+        isCentered: true,
        content: <DocumentPublish document={document} />,
      });
    }
@@ -247,17 +195,12 @@ export const unpublishDocument = createAction({
    }

    const document = stores.documents.get(activeDocumentId);
-    if (!document) {
-      return;
-    }

-    await document.unpublish();
+    await document?.unpublish();

-    toast.success(
-      t("Unpublished {{ documentName }}", {
-        documentName: document.noun,
-      })
-    );
+    stores.toasts.showToast(t("Document unpublished"), {
+      type: "success",
+    });
  },
 });

@@ -284,8 +227,12 @@ export const subscribeDocument = createAction({
    }

    const document = stores.documents.get(activeDocumentId);
+
    await document?.subscribe();
-    toast.success(t("Subscribed to document notifications"));
+
+    stores.toasts.showToast(t("Subscribed to document notifications"), {
+      type: "success",
+    });
  },
 });

@@ -315,38 +262,8 @@ export const unsubscribeDocument = createAction({

    await document?.unsubscribe(currentUserId);

-    toast.success(t("Unsubscribed from document notifications"));
-  },
-});
-
-export const shareDocument = createAction({
-  name: ({ t }) => t("Share"),
-  analyticsName: "Share document",
-  section: DocumentSection,
-  icon: <GlobeIcon />,
-  perform: async ({ activeDocumentId, stores, currentUserId, t }) => {
-    if (!activeDocumentId || !currentUserId) {
-      return;
-    }
-
-    const document = stores.documents.get(activeDocumentId);
-    const share = stores.shares.getByDocumentId(activeDocumentId);
-    const sharedParent = stores.shares.getByDocumentParents(activeDocumentId);
-    if (!document) {
-      return;
-    }
-
-    stores.dialogs.openModal({
-      title: t("Share this document"),
-      content: (
-        <SharePopover
-          document={document}
-          share={share}
-          sharedParent={sharedParent}
-          onRequestClose={stores.dialogs.closeAllModals}
-          visible
-        />
-      ),
+    stores.toasts.showToast(t("Unsubscribed from document notifications"), {
+      type: "success",
    });
  },
 });
@@ -386,11 +303,15 @@ export const downloadDocumentAsPDF = createAction({
      return;
    }

-    const id = toast.loading(`${t("Exporting")}…`);
+    const id = stores.toasts.showToast(`${t("Exporting")}…`, {
+      type: "loading",
+      timeout: 30 * 1000,
+    });
+
    const document = stores.documents.get(activeDocumentId);
-    return document
+    document
      ?.download(ExportContentType.Pdf)
-      .finally(() => id && toast.dismiss(id));
+      .finally(() => id && stores.toasts.hideToast(id));
  },
 });

@@ -427,47 +348,6 @@ export const downloadDocument = createAction({
  ],
 });

-export const copyDocumentAsMarkdown = createAction({
-  name: ({ t }) => t("Copy as Markdown"),
-  section: DocumentSection,
-  keywords: "clipboard",
-  visible: ({ activeDocumentId }) => !!activeDocumentId,
-  perform: ({ stores, activeDocumentId, t }) => {
-    const document = activeDocumentId
-      ? stores.documents.get(activeDocumentId)
-      : undefined;
-    if (document) {
-      copy(MarkdownHelper.toMarkdown(document));
-      toast.success(t("Markdown copied to clipboard"));
-    }
-  },
-});
-
-export const copyDocumentLink = createAction({
-  name: ({ t }) => t("Copy link"),
-  section: DocumentSection,
-  keywords: "clipboard",
-  visible: ({ activeDocumentId }) => !!activeDocumentId,
-  perform: ({ stores, activeDocumentId, t }) => {
-    const document = activeDocumentId
-      ? stores.documents.get(activeDocumentId)
-      : undefined;
-    if (document) {
-      copy(urlify(documentPath(document)));
-      toast.success(t("Link copied to clipboard"));
-    }
-  },
-});
-
-export const copyDocument = createAction({
-  name: ({ t }) => t("Copy"),
-  analyticsName: "Copy document",
-  section: DocumentSection,
-  icon: <CopyIcon />,
-  keywords: "clipboard",
-  children: [copyDocumentLink, copyDocumentAsMarkdown],
-});
-
 export const duplicateDocument = createAction({
  name: ({ t, isContextMenu }) =>
    isContextMenu ? t("Duplicate") : t("Duplicate document"),
@@ -476,7 +356,7 @@ export const duplicateDocument = createAction({
  icon: <DuplicateIcon />,
  keywords: "copy",
  visible: ({ activeDocumentId, stores }) =>
-    !!activeDocumentId && stores.policies.abilities(activeDocumentId).duplicate,
+    !!activeDocumentId && stores.policies.abilities(activeDocumentId).update,
  perform: async ({ activeDocumentId, t, stores }) => {
    if (!activeDocumentId) {
      return;
@@ -484,18 +364,11 @@ export const duplicateDocument = createAction({

    const document = stores.documents.get(activeDocumentId);
    invariant(document, "Document must exist");
-
-    stores.dialogs.openModal({
-      title: t("Copy document"),
-      content: (
-        <DuplicateDialog
-          document={document}
-          onSubmit={(response) => {
-            stores.dialogs.closeAllModals();
-            history.push(documentPath(response[0]));
-          }}
-        />
-      ),
+    const duped = await document.duplicate();
+    // when duplicating, go straight to the duplicated document content
+    history.push(duped.url);
+    stores.toasts.showToast(t("Document duplicated"), {
+      type: "success",
    });
  },
 });
@@ -534,13 +407,19 @@ export const pinDocumentToCollection = createAction({
      return;
    }

-    const document = stores.documents.get(activeDocumentId);
-    await document?.pin(document.collectionId);
+    try {
+      const document = stores.documents.get(activeDocumentId);
+      await document?.pin(document.collectionId);

-    const collection = stores.collections.get(activeCollectionId);
+      const collection = stores.collections.get(activeCollectionId);

-    if (!collection || !location.pathname.startsWith(collection?.url)) {
-      toast.success(t("Pinned to collection"));
+      if (!collection || !location.pathname.startsWith(collection?.url)) {
+        stores.toasts.showToast(t("Pinned to collection"));
+      }
+    } catch (err) {
+      stores.toasts.showToast(err.message, {
+        type: "error",
+      });
    }
  },
 });
@@ -573,10 +452,16 @@ export const pinDocumentToHome = createAction({
    }
    const document = stores.documents.get(activeDocumentId);

-    await document?.pin();
+    try {
+      await document?.pin();

-    if (location.pathname !== homePath()) {
-      toast.success(t("Pinned to home"));
+      if (location.pathname !== homePath()) {
+        stores.toasts.showToast(t("Pinned to team home"));
+      }
+    } catch (err) {
+      stores.toasts.showToast(err.message, {
+        type: "error",
+      });
    }
  },
 });
@@ -619,7 +504,7 @@ export const importDocument = createAction({
    return false;
  },
  perform: ({ activeCollectionId, activeDocumentId, stores }) => {
-    const { documents } = stores;
+    const { documents, toasts } = stores;
    const input = document.createElement("input");
    input.type = "file";
    input.accept = documents.importFileTypes.join(", ");
@@ -627,16 +512,23 @@ export const importDocument = createAction({
    input.onchange = async (ev) => {
      const files = getEventFiles(ev);

-      const file = files[0];
-      const document = await documents.import(
-        file,
-        activeDocumentId,
-        activeCollectionId,
-        {
-          publish: true,
-        }
-      );
-      history.push(document.url);
+      try {
+        const file = files[0];
+        const document = await documents.import(
+          file,
+          activeDocumentId,
+          activeCollectionId,
+          {
+            publish: true,
+          }
+        );
+        history.push(document.url);
+      } catch (err) {
+        toasts.showToast(err.message, {
+          type: "error",
+        });
+        throw err;
+      }
    };

    input.click();
@@ -670,6 +562,7 @@ export const createTemplate = createAction({

    stores.dialogs.openModal({
      title: t("Create template"),
+      isCentered: true,
      content: <DocumentTemplatizeDialog documentId={activeDocumentId} />,
    });
  },
@@ -728,6 +621,7 @@ export const moveDocument = createAction({
        title: t("Move {{ documentType }}", {
          documentType: document.noun,
        }),
+        isCentered: true,
        content: <DocumentMove document={document} />,
      });
    }
@@ -753,13 +647,15 @@ export const archiveDocument = createAction({
      }

      await document.archive();
-      toast.success(t("Document archived"));
+      stores.toasts.showToast(t("Document archived"), {
+        type: "success",
+      });
    }
  },
 });

 export const deleteDocument = createAction({
-  name: ({ t }) => `${t("Delete")}…`,
+  name: ({ t }) => t("Delete"),
  analyticsName: "Delete document",
  section: DocumentSection,
  icon: <TrashIcon />,
@@ -781,6 +677,7 @@ export const deleteDocument = createAction({
        title: t("Delete {{ documentName }}", {
          documentName: document.noun,
        }),
+        isCentered: true,
        content: (
          <DocumentDelete
            document={document}
@@ -815,6 +712,7 @@ export const permanentlyDeleteDocument = createAction({
        title: t("Permanently delete {{ documentName }}", {
          documentName: document.noun,
        }),
+        isCentered: true,
        content: (
          <DocumentPermanentDelete
            document={document}
@@ -835,7 +733,8 @@ export const openDocumentComments = createAction({
    const can = stores.policies.abilities(activeDocumentId ?? "");
    return (
      !!activeDocumentId &&
-      can.comment &&
+      can.read &&
+      !can.restore &&
      !!stores.auth.team?.getPreference(TeamPreference.Commenting)
    );
  },
@@ -873,19 +772,10 @@ export const openDocumentInsights = createAction({
  name: ({ t }) => t("Insights"),
  analyticsName: "Open document insights",
  section: DocumentSection,
-  icon: <GraphIcon />,
+  icon: <LightBulbIcon />,
  visible: ({ activeDocumentId, stores }) => {
    const can = stores.policies.abilities(activeDocumentId ?? "");
-    const document = activeDocumentId
-      ? stores.documents.get(activeDocumentId)
-      : undefined;
-
-    return (
-      !!activeDocumentId &&
-      can.read &&
-      !document?.isTemplate &&
-      !document?.isDeleted
-    );
+    return !!activeDocumentId && can.read;
  },
  perform: ({ activeDocumentId, stores }) => {
    if (!activeDocumentId) {
@@ -907,8 +797,6 @@ export const rootDocumentActions = [
  deleteDocument,
  importDocument,
  downloadDocument,
-  copyDocumentLink,
-  copyDocumentAsMarkdown,
  starDocument,
  unstarDocument,
  publishDocument,
@@ -925,5 +813,4 @@ export const rootDocumentActions = [
  openDocumentComments,
  openDocumentHistory,
  openDocumentInsights,
-  shareDocument,
 ];
@@ -6,15 +6,14 @@ import {
  EditIcon,
  OpenIcon,
  SettingsIcon,
+  ShapesIcon,
  KeyboardIcon,
  EmailIcon,
  LogoutIcon,
  ProfileIcon,
  BrowserIcon,
-  ShapesIcon,
 } from "outline-icons";
 import * as React from "react";
-import { isMac } from "@shared/utils/browser";
 import {
  developersUrl,
  changelogUrl,
@@ -27,12 +26,14 @@ import KeyboardShortcuts from "~/scenes/KeyboardShortcuts";
 import { createAction } from "~/actions";
 import { NavigationSection, RecentSearchesSection } from "~/actions/sections";
 import Desktop from "~/utils/Desktop";
+import { isMac } from "~/utils/browser";
 import history from "~/utils/history";
 import isCloudHosted from "~/utils/isCloudHosted";
 import {
  homePath,
  searchPath,
  draftsPath,
+  templatesPath,
  archivePath,
  trashPath,
  settingsPath,
@@ -66,6 +67,15 @@ export const navigateToDrafts = createAction({
  visible: ({ location }) => location.pathname !== draftsPath(),
 });

+export const navigateToTemplates = createAction({
+  name: ({ t }) => t("Templates"),
+  analyticsName: "Navigate to templates",
+  section: NavigationSection,
+  icon: <ShapesIcon />,
+  perform: () => history.push(templatesPath()),
+  visible: ({ location }) => location.pathname !== templatesPath(),
+});
+
 export const navigateToArchive = createAction({
  name: ({ t }) => t("Archive"),
  analyticsName: "Navigate to archive",
@@ -93,7 +103,7 @@ export const navigateToSettings = createAction({
  icon: <SettingsIcon />,
  visible: ({ stores }) =>
    stores.policies.abilities(stores.auth.team?.id || "").update,
-  perform: () => history.push(settingsPath()),
+  perform: () => history.push(settingsPath("details")),
 });

 export const navigateToProfileSettings = createAction({
@@ -105,15 +115,6 @@ export const navigateToProfileSettings = createAction({
  perform: () => history.push(settingsPath()),
 });

-export const navigateToTemplateSettings = createAction({
-  name: ({ t }) => t("Templates"),
-  analyticsName: "Navigate to template settings",
-  section: NavigationSection,
-  iconInContextMenu: false,
-  icon: <ShapesIcon />,
-  perform: () => history.push(settingsPath("templates")),
-});
-
 export const navigateToNotificationSettings = createAction({
  name: ({ t }) => t("Notifications"),
  analyticsName: "Navigate to notification settings",
@@ -215,6 +216,7 @@ export const logout = createAction({
 export const rootNavigationActions = [
  navigateToHome,
  navigateToDrafts,
+  navigateToTemplates,
  navigateToArchive,
  navigateToTrash,
  downloadApp,
@@ -2,7 +2,6 @@ import copy from "copy-to-clipboard";
 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";
 import { createAction } from "~/actions";
 import { RevisionSection } from "~/actions/sections";
@@ -69,7 +68,9 @@ export const copyLinkToRevision = createAction({
    copy(url, {
      format: "text/plain",
      onCopy: () => {
-        toast.message(t("Link copied"));
+        stores.toasts.showToast(t("Link copied"), {
+          type: "info",
+        });
      },
    });
  },
@@ -60,7 +60,6 @@ export const createTeam = createAction({
    user &&
      stores.dialogs.openModal({
        title: t("Create a workspace"),
-        fullscreen: true,
        content: <TeamNew user={user} />,
      });
  },
@@ -17,7 +17,6 @@ export const inviteUser = createAction({
  perform: ({ t }) => {
    stores.dialogs.openModal({
      title: t("Invite people"),
-      fullscreen: true,
      content: <Invite onSubmit={stores.dialogs.closeAllModals} />,
    });
  },
@@ -39,6 +38,7 @@ export const deleteUserActionFactory = (userId: string) =>

      stores.dialogs.openModal({
        title: t("Delete user"),
+        isCentered: true,
        content: (
          <UserDeleteDialog
            user={user}
@@ -1,6 +1,5 @@
-import flattenDeep from "lodash/flattenDeep";
+import { flattenDeep } from "lodash";
 import * as React from "react";
-import { toast } from "sonner";
 import { Optional } from "utility-types";
 import { v4 as uuidv4 } from "uuid";
 import {
@@ -74,7 +73,15 @@ export function actionToMenuItem(
    icon,
    visible,
    dangerous: action.dangerous,
-    onClick: () => performAction(action, context),
+    onClick: () => {
+      try {
+        action.perform?.(context);
+      } catch (err) {
+        context.stores.toasts.showToast(err.message, {
+          type: "error",
+        });
+      }
+    },
    selected: action.selected?.(context),
  };
 }
@@ -108,24 +115,8 @@ export function actionToKBar(
      keywords: action.keywords ?? "",
      shortcut: action.shortcut || [],
      icon: resolvedIcon,
-      perform: action.perform
-        ? () => performAction(action, context)
-        : undefined,
+      perform: action.perform ? () => action.perform?.(context) : undefined,
    },
-  ].concat(
    // @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.
-    children.map((child) => ({ ...child, parent: child.parent ?? action.id }))
-  );
-}
-
-export async function performAction(action: Action, context: ActionContext) {
-  const result = action.perform?.(context);
-
-  if (result instanceof Promise) {
-    return result.catch((err: Error) => {
-      toast.error(err.message);
-    });
-  }
-
-  return result;
+  ].concat(children.map((child) => ({ ...child, parent: action.id })));
 }
@@ -1,8 +1,6 @@
 /* eslint-disable react/prop-types */
 import * as React from "react";
 import Tooltip, { Props as TooltipProps } from "~/components/Tooltip";
-import { performAction } from "~/actions";
-import useIsMounted from "~/hooks/useIsMounted";
 import { Action, ActionContext } from "~/types";

 export type Props = React.HTMLAttributes<HTMLButtonElement> & {
@@ -26,7 +24,6 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
    { action, context, tooltip, hideOnActionDisabled, ...rest }: Props,
    ref: React.Ref<HTMLButtonElement>
  ) {
-    const isMounted = useIsMounted();
    const [executing, setExecuting] = React.useState(false);
    const disabled = rest.disabled;

@@ -63,12 +60,10 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
            ? (ev) => {
                ev.preventDefault();
                ev.stopPropagation();
-                const response = performAction(action, actionContext);
+                const response = action.perform?.(actionContext);
                if (response?.finally) {
                  setExecuting(true);
-                  void response.finally(
-                    () => isMounted() && setExecuting(false)
-                  );
+                  response.finally(() => setExecuting(false));
                }
              }
            : rest.onClick
@@ -1,6 +1,6 @@
 /* eslint-disable prefer-rest-params */
 /* global ga */
-import escape from "lodash/escape";
+import { escape } from "lodash";
 import * as React from "react";
 import { IntegrationService } from "@shared/types";
 import env from "~/env";
@@ -0,0 +1,41 @@
+import * as React from "react";
+
+type Props = {
+  size?: number;
+  fill?: string;
+  className?: string;
+};
+
+function SlackLogo({ size = 34, fill = "#FFF", className }: Props) {
+  return (
+    <svg
+      fill={fill}
+      width={size}
+      height={size}
+      viewBox="0 0 34 34"
+      xmlns="http://www.w3.org/2000/svg"
+      className={className}
+    >
+      <g stroke="none" strokeWidth="1" fillRule="evenodd">
+        <g transform="translate(0.000000, 17.822581)">
+          <path d="M7.23870968,3.61935484 C7.23870968,5.56612903 5.6483871,7.15645161 3.7016129,7.15645161 C1.75483871,7.15645161 0.164516129,5.56612903 0.164516129,3.61935484 C0.164516129,1.67258065 1.75483871,0.0822580645 3.7016129,0.0822580645 L7.23870968,0.0822580645 L7.23870968,3.61935484 Z" />
+          <path d="M9.02096774,3.61935484 C9.02096774,1.67258065 10.6112903,0.0822580645 12.5580645,0.0822580645 C14.5048387,0.0822580645 16.0951613,1.67258065 16.0951613,3.61935484 L16.0951613,12.4758065 C16.0951613,14.4225806 14.5048387,16.0129032 12.5580645,16.0129032 C10.6112903,16.0129032 9.02096774,14.4225806 9.02096774,12.4758065 C9.02096774,12.4758065 9.02096774,3.61935484 9.02096774,3.61935484 Z" />
+        </g>
+        <g>
+          <path d="M12.5580645,7.23870968 C10.6112903,7.23870968 9.02096774,5.6483871 9.02096774,3.7016129 C9.02096774,1.75483871 10.6112903,0.164516129 12.5580645,0.164516129 C14.5048387,0.164516129 16.0951613,1.75483871 16.0951613,3.7016129 L16.0951613,7.23870968 L12.5580645,7.23870968 Z" />
+          <path d="M12.5580645,9.02096774 C14.5048387,9.02096774 16.0951613,10.6112903 16.0951613,12.5580645 C16.0951613,14.5048387 14.5048387,16.0951613 12.5580645,16.0951613 L3.7016129,16.0951613 C1.75483871,16.0951613 0.164516129,14.5048387 0.164516129,12.5580645 C0.164516129,10.6112903 1.75483871,9.02096774 3.7016129,9.02096774 C3.7016129,9.02096774 12.5580645,9.02096774 12.5580645,9.02096774 Z" />
+        </g>
+        <g transform="translate(17.822581, 0.000000)">
+          <path d="M8.93870968,12.5580645 C8.93870968,10.6112903 10.5290323,9.02096774 12.4758065,9.02096774 C14.4225806,9.02096774 16.0129032,10.6112903 16.0129032,12.5580645 C16.0129032,14.5048387 14.4225806,16.0951613 12.4758065,16.0951613 L8.93870968,16.0951613 L8.93870968,12.5580645 Z" />
+          <path d="M7.15645161,12.5580645 C7.15645161,14.5048387 5.56612903,16.0951613 3.61935484,16.0951613 C1.67258065,16.0951613 0.0822580645,14.5048387 0.0822580645,12.5580645 L0.0822580645,3.7016129 C0.0822580645,1.75483871 1.67258065,0.164516129 3.61935484,0.164516129 C5.56612903,0.164516129 7.15645161,1.75483871 7.15645161,3.7016129 L7.15645161,12.5580645 Z" />
+        </g>
+        <g transform="translate(17.822581, 17.822581)">
+          <path d="M3.61935484,8.93870968 C5.56612903,8.93870968 7.15645161,10.5290323 7.15645161,12.4758065 C7.15645161,14.4225806 5.56612903,16.0129032 3.61935484,16.0129032 C1.67258065,16.0129032 0.0822580645,14.4225806 0.0822580645,12.4758065 L0.0822580645,8.93870968 L3.61935484,8.93870968 Z" />
+          <path d="M3.61935484,7.15645161 C1.67258065,7.15645161 0.0822580645,5.56612903 0.0822580645,3.61935484 C0.0822580645,1.67258065 1.67258065,0.0822580645 3.61935484,0.0822580645 L12.4758065,0.0822580645 C14.4225806,0.0822580645 16.0129032,1.67258065 16.0129032,3.61935484 C16.0129032,5.56612903 14.4225806,7.15645161 12.4758065,7.15645161 L3.61935484,7.15645161 Z" />
+        </g>
+      </g>
+    </svg>
+  );
+}
+
+export default SlackLogo;
@@ -2,7 +2,6 @@ import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Redirect } from "react-router-dom";
-import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";
 import { changeLanguage } from "~/utils/language";
 import LoadingIndicator from "./LoadingIndicator";
@@ -14,11 +13,10 @@ type Props = {
 const Authenticated = ({ children }: Props) => {
  const { auth } = useStores();
  const { i18n } = useTranslation();
-  const user = useCurrentUser({ rejectOnEmpty: false });
-  const language = user?.language;
+  const language = auth.user?.language;

-  // 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
+  // Watching for language changes here as this is the earliest point we have
+  // the user available and means we can start loading translations faster
  React.useEffect(() => {
    void changeLanguage(language, i18n);
  }, [i18n, language]);
@@ -12,7 +12,6 @@ import Sidebar from "~/components/Sidebar";
 import SidebarRight from "~/components/Sidebar/Right";
 import SettingsSidebar from "~/components/Sidebar/Settings";
 import type { Editor as TEditor } from "~/editor";
-import useCurrentTeam from "~/hooks/useCurrentTeam";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
 import history from "~/utils/history";
@@ -26,7 +25,6 @@ import {
  matchDocumentInsights,
 } from "~/utils/routeHelpers";
 import Fade from "./Fade";
-import { PortalContext } from "./Portal";

 const DocumentComments = lazyWithRetry(
  () => import("~/scenes/Document/components/Comments")
@@ -46,9 +44,8 @@ type Props = {
 const AuthenticatedLayout: React.FC = ({ children }: Props) => {
  const { ui, auth } = useStores();
  const location = useLocation();
-  const layoutRef = React.useRef<HTMLDivElement>(null);
  const can = usePolicy(ui.activeCollectionId);
-  const team = useCurrentTeam();
+  const { user, team } = auth;
  const documentContext = useLocalStore<DocumentContextValue>(() => ({
    editor: null,
    setEditor: (editor: TEditor) => {
@@ -79,14 +76,16 @@ const AuthenticatedLayout: React.FC = ({ children }: Props) => {
    return <ErrorSuspended />;
  }

-  const sidebar = (
+  const showSidebar = auth.authenticated && user && team;
+
+  const sidebar = showSidebar ? (
    <Fade>
      <Switch>
        <Route path={settingsPath()} component={SettingsSidebar} />
        <Route component={Sidebar} />
      </Switch>
    </Fade>
-  );
+  ) : undefined;

  const showHistory = !!matchPath(location.pathname, {
    path: matchDocumentHistory,
@@ -99,7 +98,7 @@ const AuthenticatedLayout: React.FC = ({ children }: Props) => {
    !showHistory &&
    ui.activeDocumentId &&
    ui.commentsExpanded.includes(ui.activeDocumentId) &&
-    team.getPreference(TeamPreference.Commenting);
+    team?.getPreference(TeamPreference.Commenting);

  const sidebarRight = (
    <AnimatePresence
@@ -122,22 +121,15 @@ const AuthenticatedLayout: React.FC = ({ children }: Props) => {

  return (
    <DocumentContext.Provider value={documentContext}>
-      <PortalContext.Provider value={layoutRef.current}>
-        <Layout
-          title={team.name}
-          sidebar={sidebar}
-          sidebarRight={sidebarRight}
-          ref={layoutRef}
-        >
-          <RegisterKeyDown trigger="n" handler={goToNewDocument} />
-          <RegisterKeyDown trigger="t" handler={goToSearch} />
-          <RegisterKeyDown trigger="/" handler={goToSearch} />
-          {children}
-          <React.Suspense fallback={null}>
-            <CommandBar />
-          </React.Suspense>
-        </Layout>
-      </PortalContext.Provider>
+      <Layout title={team?.name} sidebar={sidebar} sidebarRight={sidebarRight}>
+        <RegisterKeyDown trigger="n" handler={goToNewDocument} />
+        <RegisterKeyDown trigger="t" handler={goToSearch} />
+        <RegisterKeyDown trigger="/" handler={goToSearch} />
+        {children}
+        <React.Suspense fallback={null}>
+          <CommandBar />
+        </React.Suspense>
+      </Layout>
    </DocumentContext.Provider>
  );
 };
@@ -5,7 +5,6 @@ import Initials from "./Initials";

 export enum AvatarSize {
  Small = 16,
-  Toast = 18,
  Medium = 24,
  Large = 32,
  XLarge = 48,
@@ -34,7 +34,7 @@ function AvatarWithPresence({
  return (
    <>
      <Tooltip
-        content={
+        tooltip={
          <Centered>
            <strong>{user.name}</strong> {isCurrentUser && `(${t("You")})`}
            {status && (
@@ -34,17 +34,16 @@ const Link = styled.a`
    fill: ${s("text")};
  }

+  &:hover {
+    background: ${s("sidebarBackground")};
+  }
+
  ${breakpoint("tablet")`
    z-index: ${depths.sidebar + 1};
-    background: ${s("sidebarBackground")};
    position: fixed;
    bottom: 0;
-    right: 0;
+    left: 0;
    padding: 16px;
-
-    &:hover {
-      background: ${s("sidebarControlHoverBackground")};
-    }
  `};
 `;

@@ -171,7 +171,7 @@ const Button = <T extends React.ElementType = "button">(
    danger,
    ...rest
  } = props;
-  const hasText = !!children || value !== undefined;
+  const hasText = children !== undefined || value !== undefined;
  const ic = hideIcon ? undefined : action?.icon ?? icon;
  const hasIcon = ic !== undefined;

@@ -4,7 +4,6 @@ import breakpoint from "styled-components-breakpoint";

 type Props = {
  children?: React.ReactNode;
-  maxWidth?: string;
  withStickyHeader?: boolean;
 };

@@ -19,24 +18,18 @@ const Container = styled.div<Props>`
  `};
 `;

-type ContentProps = { $maxWidth?: string };
-
-const Content = styled.div<ContentProps>`
-  max-width: ${(props) => props.$maxWidth ?? "46em"};
+const Content = styled.div`
+  max-width: 46em;
  margin: 0 auto;

  ${breakpoint("desktopLarge")`
-    max-width: ${(props: ContentProps) => props.$maxWidth ?? "52em"};
+    max-width: 52em;
  `};
 `;

-const CenteredContent: React.FC<Props> = ({
-  children,
-  maxWidth,
-  ...rest
-}: Props) => (
+const CenteredContent: React.FC<Props> = ({ children, ...rest }: Props) => (
  <Container {...rest}>
-    <Content $maxWidth={maxWidth}>{children}</Content>
+    <Content>{children}</Content>
  </Container>
 );

@@ -1,17 +0,0 @@
-import * as React from "react";
-import { useTranslation } from "react-i18next";
-import { changeLanguage } from "~/utils/language";
-
-type Props = {
-  locale: string;
-};
-
-export default function ChangeLanguage({ locale }: Props) {
-  const { i18n } = useTranslation();
-
-  React.useEffect(() => {
-    void changeLanguage(locale, i18n);
-  }, [locale, i18n]);
-
-  return null;
-}
@@ -1,7 +1,4 @@
-import filter from "lodash/filter";
-import isEqual from "lodash/isEqual";
-import sortBy from "lodash/sortBy";
-import uniq from "lodash/uniq";
+import { sortBy, filter, uniq, isEqual } from "lodash";
 import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
@@ -1,32 +0,0 @@
-import { observer } from "mobx-react";
-import * as React from "react";
-import { toast } from "sonner";
-import useStores from "~/hooks/useStores";
-import { CollectionForm, FormData } from "./CollectionForm";
-
-type Props = {
-  collectionId: string;
-  onSubmit: () => void;
-};
-
-export const CollectionEdit = observer(function CollectionEdit_({
-  collectionId,
-  onSubmit,
-}: Props) {
-  const { collections } = useStores();
-  const collection = collections.get(collectionId);
-
-  const handleSubmit = React.useCallback(
-    async (data: FormData) => {
-      try {
-        await collection?.save(data);
-        onSubmit?.();
-      } catch (error) {
-        toast.error(error.message);
-      }
-    },
-    [collection, onSubmit]
-  );
-
-  return <CollectionForm collection={collection} handleSubmit={handleSubmit} />;
-});
@@ -1,168 +0,0 @@
-import { observer } from "mobx-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 { randomElement } from "@shared/random";
-import { CollectionPermission } from "@shared/types";
-import { colorPalette } from "@shared/utils/collections";
-import { CollectionValidation } from "@shared/validations";
-import Collection from "~/models/Collection";
-import Button from "~/components/Button";
-import Flex from "~/components/Flex";
-import IconPicker from "~/components/IconPicker";
-import { IconLibrary } from "~/components/Icons/IconLibrary";
-import Input from "~/components/Input";
-import InputSelectPermission from "~/components/InputSelectPermission";
-import Switch from "~/components/Switch";
-import Text from "~/components/Text";
-import useBoolean from "~/hooks/useBoolean";
-import useCurrentTeam from "~/hooks/useCurrentTeam";
-
-export interface FormData {
-  name: string;
-  icon: string;
-  color: string;
-  sharing: boolean;
-  permission: CollectionPermission | undefined;
-}
-
-export const CollectionForm = observer(function CollectionForm_({
-  handleSubmit,
-  collection,
-}: {
-  handleSubmit: (data: FormData) => void;
-  collection?: Collection;
-}) {
-  const team = useCurrentTeam();
-  const { t } = useTranslation();
-  const [hasOpenedIconPicker, setHasOpenedIconPicker] = useBoolean(false);
-  const {
-    register,
-    handleSubmit: formHandleSubmit,
-    formState,
-    watch,
-    control,
-    setValue,
-    setFocus,
-  } = useForm<FormData>({
-    mode: "all",
-    defaultValues: {
-      name: collection?.name ?? "",
-      icon: collection?.icon,
-      sharing: collection?.sharing ?? true,
-      permission: collection?.permission,
-      color: collection?.color ?? randomElement(colorPalette),
-    },
-  });
-
-  const values = watch();
-
-  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) {
-      setValue(
-        "icon",
-        IconLibrary.findIconByKeyword(values.name) ??
-          values.icon ??
-          "collection"
-      );
-    }
-  }, [values.name]);
-
-  const handleIconPickerChange = React.useCallback(
-    (color: string, icon: string) => {
-      if (icon !== values.icon) {
-        setFocus("name");
-      }
-
-      setValue("color", color);
-      setValue("icon", icon);
-    },
-    [setFocus, setValue, values.icon]
-  );
-
-  return (
-    <form onSubmit={formHandleSubmit(handleSubmit)}>
-      <Text as="p">
-        <Trans>
-          Collections are used to group documents and choose permissions
-        </Trans>
-        .
-      </Text>
-      <Flex gap={8}>
-        <Input
-          type="text"
-          placeholder={t("Name")}
-          {...register("name", {
-            required: true,
-            maxLength: CollectionValidation.maxNameLength,
-          })}
-          prefix={
-            <StyledIconPicker
-              onOpen={setHasOpenedIconPicker}
-              onChange={handleIconPickerChange}
-              initial={values.name[0]}
-              color={values.color}
-              icon={values.icon}
-            />
-          }
-          autoFocus
-          flex
-        />
-      </Flex>
-
-      {/* Following controls are available in create flow, but moved elsewhere for edit */}
-      {!collection && (
-        <Controller
-          control={control}
-          name="permission"
-          render={({ field }) => (
-            <InputSelectPermission
-              ref={field.ref}
-              value={field.value}
-              onChange={(value: CollectionPermission) => {
-                field.onChange(value);
-              }}
-              note={t(
-                "The default access for workspace members, you can share with more users or groups later."
-              )}
-            />
-          )}
-        />
-      )}
-
-      {team.sharing && !collection && (
-        <Switch
-          id="sharing"
-          label={t("Public document sharing")}
-          note={t(
-            "Allow documents within this collection to be shared publicly on the internet."
-          )}
-          {...register("sharing")}
-        />
-      )}
-
-      <Flex justify="flex-end">
-        <Button
-          type="submit"
-          disabled={formState.isSubmitting || !formState.isValid}
-        >
-          {collection
-            ? formState.isSubmitting
-              ? `${t("Saving")}…`
-              : t("Save")
-            : formState.isSubmitting
-            ? `${t("Creating")}…`
-            : t("Create")}
-        </Button>
-      </Flex>
-    </form>
-  );
-});
-
-const StyledIconPicker = styled(IconPicker)`
-  margin-left: 4px;
-  margin-right: 4px;
-`;
@@ -1,32 +0,0 @@
-import { observer } from "mobx-react";
-import * as React from "react";
-import { toast } from "sonner";
-import Collection from "~/models/Collection";
-import useStores from "~/hooks/useStores";
-import history from "~/utils/history";
-import { CollectionForm, FormData } from "./CollectionForm";
-
-type Props = {
-  onSubmit: () => void;
-};
-
-export const CollectionNew = observer(function CollectionNew_({
-  onSubmit,
-}: Props) {
-  const { collections } = useStores();
-  const handleSubmit = React.useCallback(
-    async (data: FormData) => {
-      try {
-        const collection = new Collection(data, collections);
-        await collection.save();
-        onSubmit?.();
-        history.push(collection.path);
-      } catch (error) {
-        toast.error(error.message);
-      }
-    },
-    [collections, onSubmit]
-  );
-
-  return <CollectionForm handleSubmit={handleSubmit} />;
-});
@@ -2,7 +2,6 @@ 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";
 import Collection from "~/models/Collection";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import Text from "~/components/Text";
@@ -23,14 +22,11 @@ function CollectionDeleteDialog({ collection, onSubmit }: Props) {

  const handleSubmit = async () => {
    const redirect = collection.id === ui.activeCollectionId;
-
+    await collection.delete();
+    onSubmit();
    if (redirect) {
      history.push(homePath());
    }
-
-    await collection.delete();
-    onSubmit();
-    toast.success(t("Collection deleted"));
  };

  return (
@@ -41,7 +37,7 @@ function CollectionDeleteDialog({ collection, onSubmit }: Props) {
      danger
    >
      <>
-        <Text as="p" type="secondary">
+        <Text type="secondary">
          <Trans
            defaults="Are you sure about that? Deleting the <em>{{collectionName}}</em> collection is permanent and cannot be restored, however all published documents within will be moved to the trash."
            values={{
@@ -53,7 +49,7 @@ function CollectionDeleteDialog({ collection, onSubmit }: Props) {
          />
        </Text>
        {team.defaultCollectionId === collection.id ? (
-          <Text as="p" type="secondary">
+          <Text type="secondary">
            <Trans
              defaults="Also, <em>{{collectionName}}</em> is being used as the start view – deleting it will reset the start view to the Home page."
              values={{
@@ -3,9 +3,7 @@ import { observer } from "mobx-react";
 import { transparentize } from "polished";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
 import styled from "styled-components";
-import { richExtensions } from "@shared/editor/nodes";
 import { s } from "@shared/styles";
 import Collection from "~/models/Collection";
 import Arrow from "~/components/Arrow";
@@ -13,18 +11,9 @@ import ButtonLink from "~/components/ButtonLink";
 import Editor from "~/components/Editor";
 import LoadingIndicator from "~/components/LoadingIndicator";
 import NudeButton from "~/components/NudeButton";
-import BlockMenuExtension from "~/editor/extensions/BlockMenu";
-import EmojiMenuExtension from "~/editor/extensions/EmojiMenu";
-import HoverPreviewsExtension from "~/editor/extensions/HoverPreviews";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
-
-const extensions = [
-  ...richExtensions,
-  BlockMenuExtension,
-  EmojiMenuExtension,
-  HoverPreviewsExtension,
-];
+import useToasts from "~/hooks/useToasts";

 type Props = {
  collection: Collection;
@@ -32,6 +21,7 @@ type Props = {

 function CollectionDescription({ collection }: Props) {
  const { collections } = useStores();
+  const { showToast } = useToasts();
  const { t } = useTranslation();
  const [isExpanded, setExpanded] = React.useState(false);
  const [isEditing, setEditing] = React.useState(false);
@@ -69,11 +59,15 @@ function CollectionDescription({ collection }: Props) {
          });
          setDirty(false);
        } catch (err) {
-          toast.error(t("Sorry, an error occurred saving the collection"));
+          showToast(
+            t("Sorry, an error occurred saving the collection", {
+              type: "error",
+            })
+          );
          throw err;
        }
      }, 1000),
-    [collection, t]
+    [collection, showToast, t]
  );

  const handleChange = React.useCallback(
@@ -115,7 +109,6 @@ function CollectionDescription({ collection }: Props) {
                readOnly={!isEditing}
                autoFocus={isEditing}
                onBlur={handleStopEditing}
-                extensions={extensions}
                maxLength={1000}
                embedsDisabled
                canUpdate
@@ -177,7 +170,7 @@ const MaxHeight = styled.div`
  position: relative;
  max-height: 25vh;
  overflow: hidden;
-  margin: 8px -8px -8px;
+  margin: -12px -8px -8px;
  padding: 8px;

  &[data-editing="true"],
@@ -11,26 +11,39 @@ import SearchActions from "~/components/SearchActions";
 import rootActions from "~/actions/root";
 import useCommandBarActions from "~/hooks/useCommandBarActions";
 import useSettingsActions from "~/hooks/useSettingsActions";
-import useTemplateActions from "~/hooks/useTemplateActions";
+import { CommandBarAction } from "~/types";

 function CommandBar() {
  const { t } = useTranslation();
  const settingsActions = useSettingsActions();
-  const templateActions = useTemplateActions();
  const commandBarActions = React.useMemo(
-    () => [...rootActions, templateActions, settingsActions],
-    [settingsActions, templateActions]
+    () => [...rootActions, settingsActions],
+    [settingsActions]
  );

  useCommandBarActions(commandBarActions);

+  const { rootAction } = useKBar((state) => ({
+    rootAction: state.currentRootActionId
+      ? (state.actions[
+          state.currentRootActionId
+        ] as unknown as CommandBarAction)
+      : undefined,
+  }));
+
  return (
    <>
      <KBarPortal>
        <Positioner>
          <Animator>
            <SearchActions />
-            <SearchInput defaultPlaceholder={t("Type a command or search")} />
+            <SearchInput
+              placeholder={`${
+                rootAction?.placeholder ||
+                rootAction?.name ||
+                t("Type a command or search")
+              }…`}
+            />
            <CommandBarResults />
          </Animator>
        </Positioner>
@@ -70,7 +83,6 @@ const SearchInput = styled(KBarSearch)`
  &:disabled,
  &::placeholder {
    color: ${s("placeholder")};
-    opacity: 1;
  }
 `;

@@ -62,7 +62,7 @@ function CommandBarItem(
              {index > 0 ? (
                <>
                  {" "}
-                  <Text size="xsmall" type="secondary">
+                  <Text size="xsmall" as="span" type="secondary">
                    then
                  </Text>{" "}
                </>
@@ -1,11 +1,11 @@
 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";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import Text from "~/components/Text";
 import useStores from "~/hooks/useStores";
+import useToasts from "~/hooks/useToasts";

 type Props = {
  comment: Comment;
@@ -14,6 +14,7 @@ type Props = {

 function CommentDeleteDialog({ comment, onSubmit }: Props) {
  const { comments } = useStores();
+  const { showToast } = useToasts();
  const { t } = useTranslation();
  const hasChildComments = comments.inThread(comment.id).length > 1;

@@ -22,7 +23,7 @@ function CommentDeleteDialog({ comment, onSubmit }: Props) {
      await comment.delete();
      onSubmit?.();
    } catch (err) {
-      toast.error(err.message);
+      showToast(err.message, { type: "error" });
    }
  };

@@ -33,7 +34,7 @@ function CommentDeleteDialog({ comment, onSubmit }: Props) {
      savingText={`${t("Deleting")}…`}
      danger
    >
-      <Text as="p" type="secondary">
+      <Text type="secondary">
        {hasChildComments ? (
          <Trans>
            Are you sure you want to permanently delete this entire comment
@@ -1,11 +1,10 @@
 import { observer } from "mobx-react";
 import * as React from "react";
-import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
 import Button from "~/components/Button";
 import Flex from "~/components/Flex";
 import Text from "~/components/Text";
 import useStores from "~/hooks/useStores";
+import useToasts from "~/hooks/useToasts";

 type Props = {
  /** Callback when the dialog is submitted */
@@ -30,8 +29,8 @@ const ConfirmationDialog: React.FC<Props> = ({
  disabled = false,
 }: Props) => {
  const [isSaving, setIsSaving] = React.useState(false);
-  const { t } = useTranslation();
  const { dialogs } = useStores();
+  const { showToast } = useToasts();

  const handleSubmit = React.useCallback(
    async (ev: React.SyntheticEvent) => {
@@ -41,31 +40,30 @@ const ConfirmationDialog: React.FC<Props> = ({
        await onSubmit();
        dialogs.closeAllModals();
      } catch (err) {
-        toast.error(err.message);
+        showToast(err.message, {
+          type: "error",
+        });
      } finally {
        setIsSaving(false);
      }
    },
-    [onSubmit, dialogs]
+    [onSubmit, dialogs, showToast]
  );

  return (
-    <form onSubmit={handleSubmit}>
-      <Flex gap={12} column>
+    <Flex column>
+      <form onSubmit={handleSubmit}>
        <Text type="secondary">{children}</Text>
-
-        <Flex justify="flex-end">
-          <Button
-            type="submit"
-            disabled={isSaving || disabled}
-            danger={danger}
-            autoFocus
-          >
-            {isSaving && savingText ? savingText : submitText ?? t("Confirm")}
-          </Button>
-        </Flex>
-      </Flex>
-    </form>
+        <Button
+          type="submit"
+          disabled={isSaving || disabled}
+          danger={danger}
+          autoFocus
+        >
+          {isSaving && savingText ? savingText : submitText}
+        </Button>
+      </form>
+    </Flex>
  );
 };

@@ -14,48 +14,15 @@ function ConnectionStatus() {
  const theme = useTheme();
  const { t } = useTranslation();

-  const codeToMessage = {
-    1009: {
-      title: t("Document is too large"),
-      body: t(
-        "This document has reached the maximum size and can no longer be edited"
-      ),
-    },
-    4401: {
-      title: t("Authentication failed"),
-      body: t("Please try logging out and back in again"),
-    },
-    4403: {
-      title: t("Authorization failed"),
-      body: t("You may have lost access to this document, try reloading"),
-    },
-    4503: {
-      title: t("Too many users connected to document"),
-      body: t("Your edits will sync once other users leave the document"),
-    },
-  };
-
-  const message = ui.multiplayerErrorCode
-    ? codeToMessage[ui.multiplayerErrorCode]
-    : undefined;
-
  return ui.multiplayerStatus === "connecting" ||
    ui.multiplayerStatus === "disconnected" ? (
    <Tooltip
-      content={
-        message ? (
-          <Centered>
-            <strong>{message.title}</strong>
-            <br />
-            {message.body}
-          </Centered>
-        ) : (
-          <Centered>
-            <strong>{t("Server connection lost")}</strong>
-            <br />
-            {t("Edits you make will sync once you’re online")}
-          </Centered>
-        )
+      tooltip={
+        <Centered>
+          <strong>{t("Server connection lost")}</strong>
+          <br />
+          {t("Edits you make will sync once you’re online")}
+        </Centered>
      }
      placement="bottom"
    >
@@ -9,7 +9,6 @@ type Props = Omit<React.HTMLAttributes<HTMLSpanElement>, "ref" | "onChange"> & {
  readOnly?: boolean;
  onClick?: React.MouseEventHandler<HTMLDivElement>;
  onChange?: (text: string) => void;
-  onFocus?: React.FocusEventHandler<HTMLSpanElement> | undefined;
  onBlur?: React.FocusEventHandler<HTMLSpanElement> | undefined;
  onInput?: React.FormEventHandler<HTMLSpanElement> | undefined;
  onKeyDown?: React.KeyboardEventHandler<HTMLSpanElement> | undefined;
@@ -36,7 +35,6 @@ const ContentEditable = React.forwardRef(function _ContentEditable(
    disabled,
    onChange,
    onInput,
-    onFocus,
    onBlur,
    onKeyDown,
    value,
@@ -145,13 +143,11 @@ const ContentEditable = React.forwardRef(function _ContentEditable(
  );

  return (
-    <div className={className} dir={dir} onClick={onClick} tabIndex={-1}>
-      {children}
+    <div className={className} dir={dir} onClick={onClick}>
      <Content
        ref={contentRef}
        contentEditable={!disabled && !readOnly}
        onInput={wrappedEvent(onInput)}
-        onFocus={wrappedEvent(onFocus)}
        onBlur={wrappedEvent(onBlur)}
        onKeyDown={wrappedEvent(onKeyDown)}
        onPaste={handlePaste}
@@ -162,6 +158,7 @@ const ContentEditable = React.forwardRef(function _ContentEditable(
      >
        {innerValue}
      </Content>
+      {children}
    </div>
  );
 });
@@ -5,7 +5,7 @@ import { mergeRefs } from "react-merge-refs";
 import { MenuItem as BaseMenuItem } from "reakit/Menu";
 import styled, { css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
-import MenuIconWrapper from "./MenuIconWrapper";
+import MenuIconWrapper from "../MenuIconWrapper";

 type Props = {
  id?: string;
@@ -2,17 +2,17 @@ import * as React from "react";
 import { useMousePosition } from "~/hooks/useMousePosition";

 type Positions = {
-  /** Sub-menu x */
+  /* Sub-menu x */
  x: number;
-  /** Sub-menu y */
+  /* Sub-menu y */
  y: number;
-  /** Sub-menu height */
+  /* Sub-menu height */
  h: number;
-  /** Sub-menu width */
+  /* Sub-menu width */
  w: number;
-  /** Mouse x */
+  /* Mouse x */
  mouseX: number;
-  /** Mouse y */
+  /* Mouse y */
  mouseY: number;
 };

@@ -9,8 +9,8 @@ import {
  MenuStateReturn,
 } from "reakit/Menu";
 import styled, { useTheme } from "styled-components";
-import MenuIconWrapper from "~/components/ContextMenu/MenuIconWrapper";
 import Flex from "~/components/Flex";
+import MenuIconWrapper from "~/components/MenuIconWrapper";
 import { actionToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import {
@@ -201,7 +201,7 @@ function Template({ items, actions, context, ...menu }: Props) {
        }

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

        const _exhaustiveCheck: never = item;
@@ -46,8 +46,6 @@ type Props = MenuStateReturn & {
  onClose?: () => void;
  /** Called when the context menu is clicked. */
  onClick?: (ev: React.MouseEvent) => void;
-  /** The maximum width of the context menu. */
-  maxWidth?: number;
  children?: React.ReactNode;
 };

@@ -59,6 +57,11 @@ const ContextMenu: React.FC<Props> = ({
  ...rest
 }: Props) => {
  const previousVisible = usePrevious(rest.visible);
+  const maxHeight = useMenuHeight({
+    visible: rest.visible,
+    elementRef: rest.unstable_disclosureRef,
+  });
+  const backgroundRef = React.useRef<HTMLDivElement>(null);
  const { ui } = useStores();
  const { t } = useTranslation();
  const { setIsMenuOpen } = useMenuContext();
@@ -96,6 +99,21 @@ const ContextMenu: React.FC<Props> = ({
    t,
  ]);

+  // We must manually manage scroll lock for iOS support so that the scrollable
+  // element can be passed into body-scroll-lock. See:
+  // https://github.com/ariakit/ariakit/issues/469
+  React.useEffect(() => {
+    const scrollElement = backgroundRef.current;
+    if (rest.visible && scrollElement && !isSubMenu) {
+      disableBodyScroll(scrollElement, {
+        reserveScrollBarGap: true,
+      });
+    }
+    return () => {
+      scrollElement && !isSubMenu && enableBodyScroll(scrollElement);
+    };
+  }, [isSubMenu, rest.visible]);
+
  // Perf win – don't render anything until the menu has been opened
  if (!rest.visible && !previousVisible) {
    return null;
@@ -106,98 +124,51 @@ const ContextMenu: React.FC<Props> = ({
  return (
    <>
      <Menu hideOnClickOutside={!isMobile} preventBodyScroll={false} {...rest}>
-        {(props) => (
-          <InnerContextMenu
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            menuProps={props as any}
-            {...rest}
-            isSubMenu={isSubMenu}
-          >
-            {children}
-          </InnerContextMenu>
-        )}
+        {(props) => {
+          // kind of hacky, but this is an effective way of telling which way
+          // the menu will _actually_ be placed when taking into account screen
+          // positioning.
+          const topAnchor = props.style?.top === "0";
+          // @ts-expect-error ts-migrate(2339) FIXME: Property 'placement' does not exist on type 'Extra... Remove this comment to see the full error message
+          const rightAnchor = props.placement === "bottom-end";
+
+          return (
+            <>
+              {isMobile && (
+                <Backdrop
+                  onClick={(ev) => {
+                    ev.preventDefault();
+                    ev.stopPropagation();
+                    rest.hide?.();
+                  }}
+                />
+              )}
+              <Position {...props}>
+                <Background
+                  dir="auto"
+                  topAnchor={topAnchor}
+                  rightAnchor={rightAnchor}
+                  ref={backgroundRef}
+                  hiddenScrollbars
+                  style={
+                    topAnchor
+                      ? {
+                          maxHeight,
+                        }
+                      : undefined
+                  }
+                >
+                  {rest.visible || rest.animating ? children : null}
+                </Background>
+              </Position>
+            </>
+          );
+        }}
      </Menu>
    </>
  );
 };

-type InnerContextMenuProps = MenuStateReturn & {
-  isSubMenu: boolean;
-  menuProps: { style?: React.CSSProperties; placement: string };
-  children: React.ReactNode;
-  maxWidth?: number;
-};
-
-/**
- * Inner context menu allows deferring expensive window measurement hooks etc
- * until the menu is actually opened.
- */
-const InnerContextMenu = (props: InnerContextMenuProps) => {
-  const { menuProps } = props;
-  // kind of hacky, but this is an effective way of telling which way
-  // the menu will _actually_ be placed when taking into account screen
-  // positioning.
-  const topAnchor =
-    menuProps.style?.top === "0" || menuProps.style?.position === "fixed";
-  const rightAnchor = menuProps.placement === "bottom-end";
-  const backgroundRef = React.useRef<HTMLDivElement>(null);
-  const isMobile = useMobile();
-
-  const maxHeight = useMenuHeight({
-    visible: props.visible,
-    elementRef: props.unstable_disclosureRef,
-  });
-
-  // We must manually manage scroll lock for iOS support so that the scrollable
-  // element can be passed into body-scroll-lock. See:
-  // https://github.com/ariakit/ariakit/issues/469
-  React.useEffect(() => {
-    const scrollElement = backgroundRef.current;
-    if (props.visible && scrollElement && !props.isSubMenu) {
-      disableBodyScroll(scrollElement, {
-        reserveScrollBarGap: true,
-      });
-    }
-    return () => {
-      scrollElement && !props.isSubMenu && enableBodyScroll(scrollElement);
-    };
-  }, [props.isSubMenu, props.visible]);
-
-  const style =
-    topAnchor && !isMobile
-      ? {
-          maxHeight,
-        }
-      : undefined;
-
-  return (
-    <>
-      {isMobile && (
-        <Backdrop
-          onClick={(ev) => {
-            ev.preventDefault();
-            ev.stopPropagation();
-            props.hide?.();
-          }}
-        />
-      )}
-      <Position {...menuProps}>
-        <Background
-          dir="auto"
-          maxWidth={props.maxWidth}
-          topAnchor={topAnchor}
-          rightAnchor={rightAnchor}
-          ref={backgroundRef}
-          hiddenScrollbars
-          style={style}
-        >
-          {props.visible || props.animating ? props.children : null}
-        </Background>
-      </Position>
-    </>
-  );
-};
-
 export default ContextMenu;

 export const Backdrop = styled.div`
@@ -232,7 +203,6 @@ export const Position = styled.div`
 type BackgroundProps = {
  topAnchor?: boolean;
  rightAnchor?: boolean;
-  maxWidth?: number;
  theme: DefaultTheme;
 };

@@ -258,8 +228,7 @@ export const Background = styled(Scrollable)<BackgroundProps>`
      props.topAnchor ? fadeAndSlideDown : fadeAndSlideUp} 200ms ease;
    transform-origin: ${(props: BackgroundProps) =>
      props.rightAnchor ? "75%" : "25%"} 0;
-    max-width: ${(props: BackgroundProps) => props.maxWidth ?? 276}px;
-    max-height: 100vh;
+    max-width: 276px;
    background: ${(props: BackgroundProps) => props.theme.menuBackground};
    box-shadow: ${(props: BackgroundProps) => props.theme.menuShadow};
  `};
@@ -1,6 +1,5 @@
 import copy from "copy-to-clipboard";
 import * as React from "react";
-import { mergeRefs } from "react-merge-refs";
 import env from "~/env";

 type Props = {
@@ -10,40 +9,32 @@ type Props = {
  onCopy?: () => void;
 };

-function CopyToClipboard(props: Props, ref: React.Ref<HTMLElement>) {
-  const { text, onCopy, children, ...rest } = props;
+class CopyToClipboard extends React.PureComponent<Props> {
+  onClick = (ev: React.SyntheticEvent) => {
+    const { text, onCopy, children } = this.props;
+    const elem = React.Children.only(children);

-  const onClick = React.useCallback(
-    (ev: React.MouseEvent<HTMLElement>) => {
-      const elem = React.Children.only(children);
+    copy(text, {
+      debug: env.ENVIRONMENT !== "production",
+      format: "text/plain",
+    });

-      copy(text, {
-        debug: env.ENVIRONMENT !== "production",
-        format: "text/plain",
-      });
+    onCopy?.();

-      onCopy?.();
+    if (elem && elem.props && typeof elem.props.onClick === "function") {
+      elem.props.onClick(ev);
+    }
+  };

-      if (elem && elem.props && typeof elem.props.onClick === "function") {
-        elem.props.onClick(ev);
-      }
-    },
-    [children, onCopy, text]
-  );
+  render() {
+    const { text, onCopy, children, ...rest } = this.props;
+    const elem = React.Children.only(children);
+    if (!elem) {
+      return null;
+    }

-  const elem = React.Children.only(children);
-  if (!elem) {
-    return null;
+    return React.cloneElement(elem, { ...rest, onClick: this.onClick });
  }
-
-  return React.cloneElement(elem, {
-    ...rest,
-    ref:
-      "ref" in elem
-        ? mergeRefs([elem.ref as React.MutableRefObject<HTMLElement>, ref])
-        : ref,
-    onClick,
-  });
 }

-export default React.forwardRef(CopyToClipboard);
+export default CopyToClipboard;
@@ -1,13 +1,13 @@
 import { HomeIcon } from "outline-icons";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
 import { Optional } from "utility-types";
 import Flex from "~/components/Flex";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
 import InputSelect from "~/components/InputSelect";
 import { IconWrapper } from "~/components/Sidebar/components/SidebarLink";
 import useStores from "~/hooks/useStores";
+import useToasts from "~/hooks/useToasts";

 type DefaultCollectionInputSelectProps = Optional<
  React.ComponentProps<typeof InputSelect>
@@ -25,6 +25,7 @@ const DefaultCollectionInputSelect = ({
  const { collections } = useStores();
  const [fetching, setFetching] = useState(false);
  const [fetchError, setFetchError] = useState();
+  const { showToast } = useToasts();

  React.useEffect(() => {
    async function fetchData() {
@@ -35,8 +36,11 @@ const DefaultCollectionInputSelect = ({
            limit: 100,
          });
        } catch (error) {
-          toast.error(
-            t("Collections could not be loaded, please reload the app")
+          showToast(
+            t("Collections could not be loaded, please reload the app"),
+            {
+              type: "error",
+            }
          );
          setFetchError(error);
        } finally {
@@ -45,7 +49,7 @@ const DefaultCollectionInputSelect = ({
      }
    }
    void fetchData();
-  }, [fetchError, t, fetching, collections]);
+  }, [showToast, fetchError, t, fetching, collections]);

  const options = React.useMemo(
    () =>
@@ -1,10 +1,10 @@
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
-import { toast } from "sonner";
 import KeyboardShortcuts from "~/scenes/KeyboardShortcuts";
 import { useDesktopTitlebar } from "~/hooks/useDesktopTitlebar";
 import useStores from "~/hooks/useStores";
+import useToasts from "~/hooks/useToasts";
 import Desktop from "~/utils/Desktop";

 export default function DesktopEventHandler() {
@@ -12,7 +12,7 @@ export default function DesktopEventHandler() {
  const { t } = useTranslation();
  const history = useHistory();
  const { dialogs } = useStores();
-  const hasDisabledUpdateMessage = React.useRef(false);
+  const { showToast } = useToasts();

  React.useEffect(() => {
    Desktop.bridge?.redirect((path: string, replace = false) => {
@@ -24,16 +24,11 @@ export default function DesktopEventHandler() {
    });

    Desktop.bridge?.updateDownloaded(() => {
-      if (hasDisabledUpdateMessage.current) {
-        return;
-      }
-
-      hasDisabledUpdateMessage.current = true;
-      toast.message("An update is ready to install.", {
-        duration: Infinity,
-        dismissible: true,
+      showToast("An update is ready to install.", {
+        type: "info",
+        timeout: Infinity,
        action: {
-          label: t("Install now"),
+          text: "Install now",
          onClick: () => {
            void Desktop.bridge?.restartAndInstall();
          },
@@ -55,7 +50,7 @@ export default function DesktopEventHandler() {
        content: <KeyboardShortcuts />,
      });
    });
-  }, [t, history, dialogs]);
+  }, [t, history, dialogs, showToast]);

  return null;
 }
@@ -22,7 +22,7 @@ function Dialogs() {
        <Modal
          key={id}
          isOpen={modal.isOpen}
-          fullscreen={modal.fullscreen ?? false}
+          isCentered={modal.isCentered}
          onRequestClose={() => dialogs.closeModal(id)}
          title={modal.title}
        >
@@ -12,10 +12,9 @@ import { MenuInternalLink } from "~/types";
 import {
  archivePath,
  collectionPath,
-  settingsPath,
+  templatesPath,
  trashPath,
 } from "~/utils/routeHelpers";
-import EmojiIcon from "./Icons/EmojiIcon";

 type Props = {
  children?: React.ReactNode;
@@ -44,12 +43,12 @@ function useCategory(document: Document): MenuInternalLink | null {
    };
  }

-  if (document.template) {
+  if (document.isTemplate) {
    return {
      type: "route",
      icon: <ShapesIcon />,
      title: t("Templates"),
-      to: settingsPath("templates"),
+      to: templatesPath(),
    };
  }

@@ -68,10 +67,6 @@ const DocumentBreadcrumb: React.FC<Props> = ({
    ? collections.get(document.collectionId)
    : undefined;

-  React.useEffect(() => {
-    void document.loadRelations();
-  }, [document]);
-
  let collectionNode: MenuInternalLink | undefined;

  if (collection) {
@@ -79,18 +74,22 @@ const DocumentBreadcrumb: React.FC<Props> = ({
      type: "route",
      title: collection.name,
      icon: <CollectionIcon collection={collection} expanded />,
-      to: collectionPath(collection.path),
+      to: collectionPath(collection.url),
    };
-  } else if (document.isCollectionDeleted) {
+  } else if (document.collectionId && !collection) {
    collectionNode = {
      type: "route",
      title: t("Deleted Collection"),
      icon: undefined,
-      to: "",
+      to: collectionPath("deleted-collection"),
    };
  }

-  const path = document.pathTo;
+  const path = React.useMemo(
+    () => collection?.pathToDocument(document.id).slice(0, -1) || [],
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [collection, document, document.collectionId, document.parentDocumentId]
+  );

  const items = React.useMemo(() => {
    const output = [];
@@ -103,16 +102,10 @@ const DocumentBreadcrumb: React.FC<Props> = ({
      output.push(collectionNode);
    }

-    path.slice(0, -1).forEach((node: NavigationNode) => {
+    path.forEach((node: NavigationNode) => {
      output.push({
        type: "route",
-        title: node.emoji ? (
-          <>
-            <EmojiIcon emoji={node.emoji} /> {node.title}
-          </>
-        ) : (
-          node.title
-        ),
+        title: node.title,
        to: node.url,
      });
    });
@@ -127,7 +120,7 @@ const DocumentBreadcrumb: React.FC<Props> = ({
    return (
      <>
        {collection?.name}
-        {path.slice(0, -1).map((node: NavigationNode) => (
+        {path.map((node: NavigationNode) => (
          <React.Fragment key={node.id}>
            <SmallSlash />
            {node.title}
@@ -111,12 +111,11 @@ function DocumentCard(props: Props) {

            {document.emoji ? (
              <Squircle color={theme.slateLight}>
-                <EmojiIcon emoji={document.emoji} size={24} />
+                <EmojiIcon emoji={document.emoji} size={26} />
              </Squircle>
            ) : (
              <Squircle color={collection?.color}>
                {collection?.icon &&
-                collection?.icon !== "letter" &&
                collection?.icon !== "collection" &&
                !pin?.collectionId ? (
                  <CollectionIcon collection={collection} color="white" />
@@ -145,7 +144,7 @@ function DocumentCard(props: Props) {
          {canUpdatePin && (
            <Actions dir={document.dir} gap={4}>
              {!isDragging && pin && (
-                <Tooltip content={t("Unpin")}>
+                <Tooltip tooltip={t("Unpin")}>
                  <PinButton onClick={handleUnpin} aria-label={t("Unpin")}>
                    <CloseIcon />
                  </PinButton>
@@ -280,8 +279,8 @@ const Heading = styled.h3`
  overflow: hidden;

  color: ${s("text")};
-  font-family: ${s("fontFamily")};
-  font-weight: 500;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
+    Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
 `;

 export default observer(DocumentCard);
@@ -1,6 +1,5 @@
 import * as React from "react";
 import { Editor } from "~/editor";
-import useIdle from "~/hooks/useIdle";

 export type DocumentContextValue = {
  /** The current editor instance for this document. */
@@ -17,21 +16,4 @@ const DocumentContext = React.createContext<DocumentContextValue>({

 export const useDocumentContext = () => React.useContext(DocumentContext);

-const activityEvents = [
-  "click",
-  "mousemove",
-  "DOMMouseScroll",
-  "mousewheel",
-  "mousedown",
-  "touchstart",
-  "touchmove",
-  "focus",
-];
-
-export const useEditingFocus = () => {
-  const { editor } = useDocumentContext();
-  const isIdle = useIdle(3000, activityEvents);
-  return isIdle && !!editor?.view.hasFocus();
-};
-
 export default DocumentContext;
@@ -1,10 +1,5 @@
 import FuzzySearch from "fuzzy-search";
-import concat from "lodash/concat";
-import difference from "lodash/difference";
-import fill from "lodash/fill";
-import filter from "lodash/filter";
-import includes from "lodash/includes";
-import map from "lodash/map";
+import { includes, difference, concat, filter, map, fill } from "lodash";
 import { observer } from "mobx-react";
 import { StarredIcon, DocumentIcon } from "outline-icons";
 import * as React from "react";
@@ -15,6 +10,7 @@ import scrollIntoView from "smooth-scroll-into-view-if-needed";
 import styled, { useTheme } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import { NavigationNode } from "@shared/types";
+import parseTitle from "@shared/utils/parseTitle";
 import DocumentExplorerNode from "~/components/DocumentExplorerNode";
 import DocumentExplorerSearchResult from "~/components/DocumentExplorerSearchResult";
 import Flex from "~/components/Flex";
@@ -204,86 +200,84 @@ function DocumentExplorer({ onSubmit, onSelect, items }: Props) {
    }
  };

-  const ListItem = observer(
-    ({
-      index,
-      data,
-      style,
-    }: {
-      index: number;
-      data: NavigationNode[];
-      style: React.CSSProperties;
-    }) => {
-      const node = data[index];
-      const isCollection = node.type === "collection";
-      let icon, title: string, emoji: string | undefined, path;
+  const ListItem = ({
+    index,
+    data,
+    style,
+  }: {
+    index: number;
+    data: NavigationNode[];
+    style: React.CSSProperties;
+  }) => {
+    const node = data[index];
+    const isCollection = node.type === "collection";
+    let icon, title, path;

-      if (isCollection) {
-        const col = collections.get(node.collectionId as string);
-        icon = col && (
-          <CollectionIcon collection={col} expanded={isExpanded(index)} />
-        );
-        title = node.title;
+    if (isCollection) {
+      const col = collections.get(node.collectionId as string);
+      icon = col && (
+        <CollectionIcon collection={col} expanded={isExpanded(index)} />
+      );
+      title = node.title;
+    } else {
+      const doc = documents.get(node.id);
+      const { strippedTitle, emoji } = parseTitle(node.title);
+      title = strippedTitle;
+
+      if (emoji) {
+        icon = <EmojiIcon emoji={emoji} />;
+      } else if (doc?.isStarred) {
+        icon = <StarredIcon color={theme.yellow} />;
      } else {
-        const doc = documents.get(node.id);
-        emoji = doc?.emoji ?? node.emoji;
-        title = doc?.title ?? node.title;
-
-        if (emoji) {
-          icon = <EmojiIcon emoji={emoji} />;
-        } else if (doc?.isStarred) {
-          icon = <StarredIcon color={theme.yellow} />;
-        } else {
-          icon = <DocumentIcon color={theme.textSecondary} />;
-        }
-
-        path = ancestors(node)
-          .map((a) => a.title)
-          .join(" / ");
+        icon = <DocumentIcon color={theme.textSecondary} />;
      }

-      return searchTerm ? (
-        <DocumentExplorerSearchResult
-          selected={isSelected(index)}
-          active={activeNode === index}
-          style={{
-            ...style,
-            top: (style.top as number) + VERTICAL_PADDING,
-            left: (style.left as number) + HORIZONTAL_PADDING,
-            width: `calc(${style.width} - ${HORIZONTAL_PADDING * 2}px)`,
-          }}
-          onPointerMove={() => setActiveNode(index)}
-          onClick={() => toggleSelect(index)}
-          icon={icon}
-          title={title}
-          path={path}
-        />
-      ) : (
-        <DocumentExplorerNode
-          style={{
-            ...style,
-            top: (style.top as number) + VERTICAL_PADDING,
-            left: (style.left as number) + HORIZONTAL_PADDING,
-            width: `calc(${style.width} - ${HORIZONTAL_PADDING * 2}px)`,
-          }}
-          onPointerMove={() => setActiveNode(index)}
-          onClick={() => toggleSelect(index)}
-          onDisclosureClick={(ev) => {
-            ev.stopPropagation();
-            toggleCollapse(index);
-          }}
-          selected={isSelected(index)}
-          active={activeNode === index}
-          expanded={isExpanded(index)}
-          icon={icon}
-          title={title}
-          depth={node.depth as number}
-          hasChildren={hasChildren(index)}
-          ref={itemRefs[index]}
-        />
-      );
+      path = ancestors(node)
+        .map((a) => parseTitle(a.title).strippedTitle)
+        .join(" / ");
    }
-  );
+
+    return searchTerm ? (
+      <DocumentExplorerSearchResult
+        selected={isSelected(index)}
+        active={activeNode === index}
+        style={{
+          ...style,
+          top: (style.top as number) + VERTICAL_PADDING,
+          left: (style.left as number) + HORIZONTAL_PADDING,
+          width: `calc(${style.width} - ${HORIZONTAL_PADDING * 2}px)`,
+        }}
+        onPointerMove={() => setActiveNode(index)}
+        onClick={() => toggleSelect(index)}
+        icon={icon}
+        title={title}
+        path={path}
+      />
+    ) : (
+      <DocumentExplorerNode
+        style={{
+          ...style,
+          top: (style.top as number) + VERTICAL_PADDING,
+          left: (style.left as number) + HORIZONTAL_PADDING,
+          width: `calc(${style.width} - ${HORIZONTAL_PADDING * 2}px)`,
+        }}
+        onPointerMove={() => setActiveNode(index)}
+        onClick={() => toggleSelect(index)}
+        onDisclosureClick={(ev) => {
+          ev.stopPropagation();
+          toggleCollapse(index);
+        }}
+        selected={isSelected(index)}
+        active={activeNode === index}
+        expanded={isExpanded(index)}
+        icon={icon}
+        title={title}
+        depth={node.depth as number}
+        hasChildren={hasChildren(index)}
+        ref={itemRefs[index]}
+      />
+    );
+  };

  const focusSearchInput = () => {
    inputSearchRef.current?.focus();
@@ -389,9 +383,7 @@ function DocumentExplorer({ onSubmit, onSelect, items }: Props) {
          </AutoSizer>
        ) : (
          <FlexContainer>
-            <Text as="p" type="secondary">
-              {t("No results found")}.
-            </Text>
+            <Text type="secondary">{t("No results found")}.</Text>
          </FlexContainer>
        )}
      </ListContainer>
@@ -1,4 +1,5 @@
 import { observer } from "mobx-react";
+import { PlusIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
@@ -8,6 +9,7 @@ import breakpoint from "styled-components-breakpoint";
 import { s } from "@shared/styles";
 import Document from "~/models/Document";
 import Badge from "~/components/Badge";
+import Button from "~/components/Button";
 import DocumentMeta from "~/components/DocumentMeta";
 import EventBoundary from "~/components/EventBoundary";
 import Flex from "~/components/Flex";
@@ -16,11 +18,12 @@ import NudeButton from "~/components/NudeButton";
 import StarButton, { AnimatedStar } from "~/components/Star";
 import Tooltip from "~/components/Tooltip";
 import useBoolean from "~/hooks/useBoolean";
+import useCurrentTeam from "~/hooks/useCurrentTeam";
 import useCurrentUser from "~/hooks/useCurrentUser";
+import usePolicy from "~/hooks/usePolicy";
 import DocumentMenu from "~/menus/DocumentMenu";
 import { hover } from "~/styles";
-import { documentPath } from "~/utils/routeHelpers";
-import EmojiIcon from "./Icons/EmojiIcon";
+import { newDocumentPath } from "~/utils/routeHelpers";

 type Props = {
  document: Document;
@@ -48,6 +51,7 @@ function DocumentListItem(
 ) {
  const { t } = useTranslation();
  const user = useCurrentUser();
+  const team = useCurrentTeam();
  const [menuOpen, handleMenuOpen, handleMenuClose] = useBoolean();

  const {
@@ -67,6 +71,8 @@ function DocumentListItem(
    !!document.title.toLowerCase().includes(highlight.toLowerCase());
  const canStar =
    !document.isDraft && !document.isArchived && !document.isTemplate;
+  const can = usePolicy(team);
+  const canCollection = usePolicy(document.collectionId);

  return (
    <CompositeItem
@@ -77,7 +83,7 @@ function DocumentListItem(
      $isStarred={document.isStarred}
      $menuOpen={menuOpen}
      to={{
-        pathname: documentPath(document),
+        pathname: document.url,
        state: {
          title: document.titleWithDefault,
        },
@@ -86,12 +92,6 @@ function DocumentListItem(
    >
      <Content>
        <Heading dir={document.dir}>
-          {document.emoji && (
-            <>
-              <EmojiIcon emoji={document.emoji} size={24} />
-              &nbsp;
-            </>
-          )}
          <Title
            text={document.titleWithDefault}
            highlight={highlight}
@@ -107,7 +107,7 @@ function DocumentListItem(
          )}
          {document.isDraft && showDraft && (
            <Tooltip
-              content={t("Only visible to you")}
+              tooltip={t("Only visible to you")}
              delay={500}
              placement="top"
            >
@@ -135,6 +135,25 @@ function DocumentListItem(
        />
      </Content>
      <Actions>
+        {document.isTemplate &&
+          !document.isArchived &&
+          !document.isDeleted &&
+          can.createDocument &&
+          canCollection.update && (
+            <>
+              <Button
+                as={Link}
+                to={newDocumentPath(document.collectionId, {
+                  templateId: document.id,
+                })}
+                icon={<PlusIcon />}
+                neutral
+              >
+                {t("New doc")}
+              </Button>
+              &nbsp;
+            </>
+          )}
        <DocumentMenu
          document={document}
          showPin={showPin}
@@ -243,8 +262,8 @@ const Heading = styled.h3<{ rtl?: boolean }>`
  margin-bottom: 0.25em;
  white-space: nowrap;
  color: ${s("text")};
-  font-family: ${s("fontFamily")};
-  font-weight: 500;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
+    Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
 `;

 const StarPositioner = styled(Flex)`
@@ -260,8 +279,8 @@ const Title = styled(Highlight)`

 const ResultContext = styled(Highlight)`
  display: block;
-  color: ${s("textSecondary")};
-  font-size: 15px;
+  color: ${s("textTertiary")};
+  font-size: 14px;
  margin-top: -0.25em;
  margin-bottom: 0.25em;
 `;
@@ -3,9 +3,9 @@ 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";
 import ConfirmationDialog from "~/components/ConfirmationDialog";
 import useStores from "~/hooks/useStores";
+import useToasts from "~/hooks/useToasts";
 import { documentPath } from "~/utils/routeHelpers";

 type Props = {
@@ -14,6 +14,7 @@ type Props = {

 function DocumentTemplatizeDialog({ documentId }: Props) {
  const history = useHistory();
+  const { showToast } = useToasts();
  const { t } = useTranslation();
  const { documents } = useStores();
  const document = documents.get(documentId);
@@ -23,9 +24,11 @@ function DocumentTemplatizeDialog({ documentId }: Props) {
    const template = await document?.templatize();
    if (template) {
      history.push(documentPath(template));
-      toast.success(t("Template created, go ahead and customize it"));
+      showToast(t("Template created, go ahead and customize it"), {
+        type: "info",
+      });
    }
-  }, [document, history, t]);
+  }, [document, showToast, history, t]);

  return (
    <ConfirmationDialog
@@ -1,15 +1,13 @@
-import compact from "lodash/compact";
-import sortBy from "lodash/sortBy";
+import { sortBy } from "lodash";
 import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import { dateLocale, dateToRelative } from "@shared/utils/date";
+import { dateToRelative } from "@shared/utils/date";
 import Document from "~/models/Document";
 import User from "~/models/User";
 import Avatar from "~/components/Avatar";
 import ListItem from "~/components/List/Item";
 import PaginatedList from "~/components/PaginatedList";
-import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";

 type Props = {
@@ -20,9 +18,6 @@ type 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())
@@ -36,10 +31,10 @@ function DocumentViews({ document, isOpen }: Props) {
  const documentViews = views.inDocument(document.id);
  const sortedViews = sortBy(
    documentViews,
-    (view) => !presentIds.includes(view.userId)
+    (view) => !presentIds.includes(view.user.id)
  );
  const users = React.useMemo(
-    () => compact(sortedViews.map((v) => v.user)),
+    () => sortedViews.map((v) => v.user),
    [sortedViews]
  );

@@ -50,20 +45,16 @@ function DocumentViews({ document, isOpen }: Props) {
          aria-label={t("Viewers")}
          items={users}
          renderItem={(model: User) => {
-            const view = documentViews.find((v) => v.userId === model.id);
+            const view = documentViews.find((v) => v.user.id === 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 }}", {
+              : t("Viewed {{ timeAgo }} ago", {
                  timeAgo: dateToRelative(
-                    view ? Date.parse(view.lastViewedAt) : new Date(),
-                    {
-                      addSuffix: true,
-                      locale,
-                    }
+                    view ? Date.parse(view.lastViewedAt) : new Date()
                  ),
                });
            return (
@@ -1,73 +0,0 @@
-import { observer } from "mobx-react";
-import * as React from "react";
-import { useTranslation } from "react-i18next";
-import { DocumentValidation } from "@shared/validations";
-import Document from "~/models/Document";
-import ConfirmationDialog from "~/components/ConfirmationDialog";
-import Input from "./Input";
-import Switch from "./Switch";
-import Text from "./Text";
-
-type Props = {
-  /** The original document to duplicate */
-  document: Document;
-  onSubmit: (documents: Document[]) => void;
-};
-
-function DuplicateDialog({ document, onSubmit }: Props) {
-  const { t } = useTranslation();
-  const defaultTitle = t(`Copy of {{ documentName }}`, {
-    documentName: document.title,
-  });
-  const [recursive, setRecursive] = React.useState<boolean>(true);
-  const [title, setTitle] = React.useState<string>(defaultTitle);
-
-  const handleRecursiveChange = React.useCallback(
-    (ev: React.ChangeEvent<HTMLInputElement>) => {
-      setRecursive(ev.target.checked);
-    },
-    []
-  );
-
-  const handleTitleChange = React.useCallback(
-    (ev: React.ChangeEvent<HTMLInputElement>) => {
-      setTitle(ev.target.value);
-    },
-    []
-  );
-
-  const handleSubmit = async () => {
-    const result = await document.duplicate({
-      recursive,
-      title,
-    });
-    onSubmit(result);
-  };
-
-  return (
-    <ConfirmationDialog onSubmit={handleSubmit} submitText={t("Duplicate")}>
-      <Input
-        autoFocus
-        autoSelect
-        name="title"
-        label={t("Title")}
-        onChange={handleTitleChange}
-        maxLength={DocumentValidation.maxTitleLength}
-        defaultValue={defaultTitle}
-      />
-      {document.publishedAt && !document.isTemplate && (
-        <Text size="small">
-          <Switch
-            name="recursive"
-            label={t("Include nested documents")}
-            labelPosition="right"
-            checked={recursive}
-            onChange={handleRecursiveChange}
-          />
-        </Text>
-      )}
-    </ConfirmationDialog>
-  );
-}
-
-export default observer(DuplicateDialog);
@@ -1,11 +1,10 @@
-import deburr from "lodash/deburr";
-import difference from "lodash/difference";
-import sortBy from "lodash/sortBy";
+import { deburr, difference, sortBy } from "lodash";
 import { observer } from "mobx-react";
 import { DOMParser as ProsemirrorDOMParser } from "prosemirror-model";
 import { TextSelection } from "prosemirror-state";
 import * as React from "react";
 import { mergeRefs } from "react-merge-refs";
+import { useHistory } from "react-router-dom";
 import { Optional } from "utility-types";
 import insertFiles from "@shared/editor/commands/insertFiles";
 import { AttachmentPreset } from "@shared/types";
@@ -15,18 +14,22 @@ import { getDataTransferFiles } from "@shared/utils/files";
 import parseDocumentSlug from "@shared/utils/parseDocumentSlug";
 import { isInternalUrl } from "@shared/utils/urls";
 import { AttachmentValidation } from "@shared/validations";
+import Document from "~/models/Document";
 import ClickablePadding from "~/components/ClickablePadding";
 import ErrorBoundary from "~/components/ErrorBoundary";
+import HoverPreview from "~/components/HoverPreview";
 import type { Props as EditorProps, Editor as SharedEditor } from "~/editor";
-import useCurrentUser from "~/hooks/useCurrentUser";
 import useDictionary from "~/hooks/useDictionary";
-import useEditorClickHandlers from "~/hooks/useEditorClickHandlers";
 import useEmbeds from "~/hooks/useEmbeds";
 import useStores from "~/hooks/useStores";
+import useToasts from "~/hooks/useToasts";
 import useUserLocale from "~/hooks/useUserLocale";
 import { NotFoundError } from "~/utils/errors";
 import { uploadFile } from "~/utils/files";
+import { isModKey } from "~/utils/keyboard";
 import lazyWithRetry from "~/utils/lazyWithRetry";
+import { sharedDocumentPath } from "~/utils/routeHelpers";
+import { isHash } from "~/utils/urls";
 import DocumentBreadcrumb from "./DocumentBreadcrumb";

 const LazyLoadedEditor = lazyWithRetry(() => import("~/editor"));
@@ -38,13 +41,14 @@ export type Props = Optional<
  | "onClickLink"
  | "embeds"
  | "dictionary"
+  | "onShowToast"
  | "extensions"
 > & {
  shareId?: string | undefined;
  embedsDisabled?: boolean;
  onHeadingsChange?: (headings: Heading[]) => void;
  onSynced?: () => Promise<void>;
-  onPublish?: (event: React.MouseEvent) => void;
+  onPublish?: (event: React.MouseEvent) => any;
  editorStyle?: React.CSSProperties;
 };

@@ -59,14 +63,27 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
  } = props;
  const userLocale = useUserLocale();
  const locale = dateLocale(userLocale);
-  const { comments, documents } = useStores();
+  const { auth, comments, documents } = useStores();
+  const { showToast } = useToasts();
  const dictionary = useDictionary();
  const embeds = useEmbeds(!shareId);
+  const history = useHistory();
  const localRef = React.useRef<SharedEditor>();
-  const preferences = useCurrentUser({ rejectOnEmpty: false })?.preferences;
+  const preferences = auth.user?.preferences;
  const previousHeadings = React.useRef<Heading[] | null>(null);
+  const [activeLinkElement, setActiveLink] =
+    React.useState<HTMLAnchorElement | null>(null);
  const previousCommentIds = React.useRef<string[]>();

+  const handleLinkActive = React.useCallback((element: HTMLAnchorElement) => {
+    setActiveLink(element);
+    return false;
+  }, []);
+
+  const handleLinkInactive = React.useCallback(() => {
+    setActiveLink(null);
+  }, []);
+
  const handleSearchLink = React.useCallback(
    async (term: string) => {
      if (isInternalUrl(term)) {
@@ -103,7 +120,7 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
      const results = await documents.searchTitles(term);

      return sortBy(
-        results.map(({ document }) => ({
+        results.map((document: Document) => ({
          title: document.title,
          subtitle: <DocumentBreadcrumb document={document} onlyText />,
          url: document.url,
@@ -116,7 +133,7 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
            : 1
      );
    },
-    [locale, documents]
+    [documents]
  );

  const handleUploadFile = React.useCallback(
@@ -130,7 +147,47 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
    [id]
  );

-  const { handleClickLink } = useEditorClickHandlers({ shareId });
+  const handleClickLink = React.useCallback(
+    (href: string, event: MouseEvent) => {
+      // on page hash
+      if (isHash(href)) {
+        window.location.href = href;
+        return;
+      }
+
+      if (isInternalUrl(href) && !isModKey(event) && !event.shiftKey) {
+        // relative
+        let navigateTo = href;
+
+        // probably absolute
+        if (href[0] !== "/") {
+          try {
+            const url = new URL(href);
+            navigateTo = url.pathname + url.hash;
+          } catch (err) {
+            navigateTo = href;
+          }
+        }
+
+        // Link to our own API should be opened in a new tab, not in the app
+        if (navigateTo.startsWith("/api/")) {
+          window.open(href, "_blank");
+          return;
+        }
+
+        // If we're navigating to an internal document link then prepend the
+        // share route to the URL so that the document is loaded in context
+        if (shareId && navigateTo.includes("/doc/")) {
+          navigateTo = sharedDocumentPath(shareId, navigateTo);
+        }
+
+        history.push(navigateTo);
+      } else if (href) {
+        window.open(href, "_blank");
+      }
+    },
+    [history, shareId]
+  );

  const focusAtEnd = React.useCallback(() => {
    localRef?.current?.focusAtEnd();
@@ -176,10 +233,11 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
        (file) => !AttachmentValidation.imageContentTypes.includes(file.type)
      );

-      return insertFiles(view, event, pos, files, {
+      insertFiles(view, event, pos, files, {
        uploadFile: handleUploadFile,
        onFileUploadStart: props.onFileUploadStart,
        onFileUploadStop: props.onFileUploadStop,
+        onShowToast: showToast,
        dictionary,
        isAttachment,
      });
@@ -190,6 +248,7 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
      props.onFileUploadStop,
      dictionary,
      handleUploadFile,
+      showToast,
    ]
  );

@@ -273,10 +332,12 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
        <LazyLoadedEditor
          ref={mergeRefs([ref, localRef, handleRefChanged])}
          uploadFile={handleUploadFile}
+          onShowToast={showToast}
          embeds={embeds}
          userPreferences={preferences}
          dictionary={dictionary}
          {...props}
+          onHoverLink={handleLinkActive}
          onClickLink={handleClickLink}
          onSearchLink={handleSearchLink}
          onChange={handleChange}
@@ -291,6 +352,12 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
            minHeight={props.editorStyle.paddingBottom}
          />
        )}
+        {activeLinkElement && !shareId && (
+          <HoverPreview
+            element={activeLinkElement}
+            onClose={handleLinkInactive}
+          />
+        )}
      </>
    </ErrorBoundary>
  );
@@ -1,23 +0,0 @@
-import styled from "styled-components";
-import Button from "~/components/Button";
-import { hover } from "~/styles";
-import Flex from "../Flex";
-
-export const EmojiButton = styled(Button)`
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 32px;
-  height: 32px;
-
-  &: ${hover},
-  &:active,
-  &[aria-expanded= "true"] {
-    opacity: 1 !important;
-  }
-`;
-
-export const Emoji = styled(Flex)<{ size?: number }>`
-  line-height: 1.6;
-  ${(props) => (props.size ? `font-size: ${props.size}px` : "")}
-`;
@@ -1,269 +0,0 @@
-import data from "@emoji-mart/data";
-import Picker from "@emoji-mart/react";
-import { SmileyIcon } from "outline-icons";
-import * as React from "react";
-import { useTranslation } from "react-i18next";
-import { usePopoverState, PopoverDisclosure } from "reakit/Popover";
-import styled, { useTheme } from "styled-components";
-import { depths, s } from "@shared/styles";
-import { toRGB } from "@shared/utils/color";
-import Button from "~/components/Button";
-import Popover from "~/components/Popover";
-import useStores from "~/hooks/useStores";
-import useUserLocale from "~/hooks/useUserLocale";
-import { Emoji, EmojiButton } from "./components";
-
-/* Locales supported by emoji-mart */
-const supportedLocales = [
-  "en",
-  "ar",
-  "be",
-  "cs",
-  "de",
-  "es",
-  "fa",
-  "fi",
-  "fr",
-  "hi",
-  "it",
-  "ja",
-  "kr",
-  "nl",
-  "pl",
-  "pt",
-  "ru",
-  "sa",
-  "tr",
-  "uk",
-  "vi",
-  "zh",
-];
-
-/**
- * React hook to derive emoji picker's theme from UI theme
- *
- * @returns {string} Theme to use for emoji picker
- */
-function usePickerTheme(): string {
-  const { ui } = useStores();
-  const { theme } = ui;
-
-  if (theme === "system") {
-    return "auto";
-  }
-
-  return theme;
-}
-
-type Props = {
-  /** The selected emoji, if any */
-  value?: string | null;
-  /** Callback when an emoji is selected */
-  onChange: (emoji: string | null) => void | Promise<void>;
-  /** Callback when the picker is opened */
-  onOpen?: () => void;
-  /** Callback when the picker is closed */
-  onClose?: () => void;
-  /** Callback when the picker is clicked outside of */
-  onClickOutside: () => void;
-  /** Whether to auto focus the search input on open */
-  autoFocus?: boolean;
-  /** Class name to apply to the trigger button */
-  className?: string;
-};
-
-function EmojiPicker({
-  value,
-  onOpen,
-  onClose,
-  onChange,
-  onClickOutside,
-  autoFocus,
-  className,
-}: Props) {
-  const { t } = useTranslation();
-  const pickerTheme = usePickerTheme();
-  const theme = useTheme();
-  const locale = useUserLocale(true) ?? "en";
-
-  const popover = usePopoverState({
-    placement: "bottom-start",
-    modal: true,
-    unstable_offset: [0, 0],
-  });
-
-  const [emojisPerLine, setEmojisPerLine] = React.useState(9);
-
-  const pickerRef = React.useRef<HTMLDivElement>(null);
-
-  React.useEffect(() => {
-    if (popover.visible) {
-      onOpen?.();
-    } else {
-      onClose?.();
-    }
-  }, [popover.visible, onOpen, onClose]);
-
-  React.useEffect(() => {
-    if (popover.visible && pickerRef.current) {
-      // 28 is picker's observed width when perLine is set to 0
-      // and 36 is the default emojiButtonSize
-      // Ref: https://github.com/missive/emoji-mart#options--props
-      setEmojisPerLine(Math.floor((pickerRef.current.clientWidth - 28) / 36));
-    }
-  }, [popover.visible]);
-
-  const handleEmojiChange = React.useCallback(
-    async (emoji) => {
-      popover.hide();
-      await onChange(emoji ? emoji.native : null);
-    },
-    [popover, onChange]
-  );
-
-  const handleClick = React.useCallback(
-    (ev: React.MouseEvent) => {
-      ev.stopPropagation();
-      if (popover.visible) {
-        popover.hide();
-      } else {
-        popover.show();
-      }
-    },
-    [popover]
-  );
-
-  const handleClickOutside = React.useCallback(() => {
-    // It was observed that onClickOutside got triggered
-    // even when the picker wasn't open or opened at all.
-    // Hence, this guard here...
-    if (popover.visible) {
-      onClickOutside();
-    }
-  }, [popover.visible, onClickOutside]);
-
-  // Auto focus search input when picker is opened
-  React.useLayoutEffect(() => {
-    if (autoFocus && popover.visible) {
-      requestAnimationFrame(() => {
-        const searchInput = pickerRef.current
-          ?.querySelector("em-emoji-picker")
-          ?.shadowRoot?.querySelector(
-            "input[type=search]"
-          ) as HTMLInputElement | null;
-        searchInput?.focus();
-      });
-    }
-  }, [autoFocus, popover.visible]);
-
-  return (
-    <>
-      <PopoverDisclosure {...popover}>
-        {(props) => (
-          <EmojiButton
-            {...props}
-            className={className}
-            onClick={handleClick}
-            icon={
-              value ? (
-                <Emoji size={32} align="center" justify="center">
-                  {value}
-                </Emoji>
-              ) : (
-                <StyledSmileyIcon size={32} color={theme.textTertiary} />
-              )
-            }
-            neutral
-            borderOnHover
-          />
-        )}
-      </PopoverDisclosure>
-      <PickerPopover
-        {...popover}
-        tabIndex={0}
-        // This prevents picker from closing when any of its
-        // children are focused, e.g, clicking on search bar or
-        // a click on skin tone button
-        onClick={(e) => e.stopPropagation()}
-        width={352}
-        aria-label={t("Emoji Picker")}
-      >
-        {popover.visible && (
-          <>
-            {value && (
-              <RemoveButton neutral onClick={() => handleEmojiChange(null)}>
-                {t("Remove")}
-              </RemoveButton>
-            )}
-            <PickerStyles ref={pickerRef}>
-              <Picker
-                // https://github.com/missive/emoji-mart/issues/800
-                locale={
-                  locale === "ko"
-                    ? "kr"
-                    : supportedLocales.includes(locale)
-                    ? locale
-                    : "en"
-                }
-                data={data}
-                onEmojiSelect={handleEmojiChange}
-                theme={pickerTheme}
-                previewPosition="none"
-                perLine={emojisPerLine}
-                onClickOutside={handleClickOutside}
-              />
-            </PickerStyles>
-          </>
-        )}
-      </PickerPopover>
-    </>
-  );
-}
-
-const StyledSmileyIcon = styled(SmileyIcon)`
-  flex-shrink: 0;
-
-  @media print {
-    display: none;
-  }
-`;
-
-const RemoveButton = styled(Button)`
-  margin-left: -12px;
-  margin-bottom: 8px;
-  border-radius: 6px;
-  height: 24px;
-  font-size: 13px;
-
-  > :first-child {
-    min-height: unset;
-    line-height: unset;
-  }
-`;
-
-const PickerPopover = styled(Popover)`
-  z-index: ${depths.popover};
-  > :first-child {
-    padding-top: 8px;
-    padding-bottom: 0;
-    max-height: 488px;
-    overflow: unset;
-  }
-`;
-
-const PickerStyles = styled.div`
-  margin-left: -24px;
-  margin-right: -24px;
-  em-emoji-picker {
-    --shadow: none;
-    --font-family: ${s("fontFamily")};
-    --rgb-background: ${(props) => toRGB(props.theme.menuBackground)};
-    --rgb-accent: ${(props) => toRGB(props.theme.accent)};
-    --border-radius: 6px;
-    margin-left: auto;
-    margin-right: auto;
-    min-height: 443px;
-  }
-`;
-
-export default EmojiPicker;
@@ -82,7 +82,7 @@ class ErrorBoundary extends React.Component<Props> {
                </h1>
              </>
            )}
-            <Text as="p" type="secondary">
+            <Text type="secondary">
              <Trans>
                Sorry, part of the application failed to load. This may be
                because it was updated since you opened the tab or because of a
@@ -106,7 +106,7 @@ class ErrorBoundary extends React.Component<Props> {
              </h1>
            </>
          )}
-          <Text as="p" type="secondary">
+          <Text type="secondary">
            <Trans
              defaults="Sorry, an unrecoverable error occurred{{notified}}. Please try reloading the page, it may have been a temporary glitch."
              values={{
@@ -121,11 +121,11 @@ class ErrorBoundary extends React.Component<Props> {
            <Button onClick={this.handleReload}>{t("Reload")}</Button>{" "}
            {this.showDetails ? (
              <Button onClick={this.handleReportBug} neutral>
-                <Trans>Report a bug</Trans>…
+                <Trans>Report a Bug</Trans>…
              </Button>
            ) : (
              <Button onClick={this.handleShowDetails} neutral>
-                <Trans>Show detail</Trans>…
+                <Trans>Show Detail</Trans>…
              </Button>
            )}
          </p>
@@ -1,7 +1,6 @@
 import { observer } from "mobx-react";
 import * as React from "react";
 import { Trans, useTranslation } from "react-i18next";
-import { toast } from "sonner";
 import styled from "styled-components";
 import { FileOperationFormat, NotificationEventType } from "@shared/types";
 import Collection from "~/models/Collection";
@@ -11,8 +10,7 @@ import Text from "~/components/Text";
 import env from "~/env";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";
-import history from "~/utils/history";
-import { settingsPath } from "~/utils/routeHelpers";
+import useToasts from "~/hooks/useToasts";

 type Props = {
  collection?: Collection;
@@ -26,6 +24,7 @@ function ExportDialog({ collection, onSubmit }: Props) {
  const [includeAttachments, setIncludeAttachments] =
    React.useState<boolean>(true);
  const user = useCurrentUser();
+  const { showToast } = useToasts();
  const { collections } = useStores();
  const { t } = useTranslation();
  const appName = env.APP_NAME;
@@ -47,22 +46,11 @@ function ExportDialog({ collection, onSubmit }: Props) {
  const handleSubmit = async () => {
    if (collection) {
      await collection.export(format, includeAttachments);
-      toast.success(t("Export started"), {
-        description: t(`Your file will be available in {{ location }} soon`, {
-          location: `"${t("Settings")} > ${t("Export")}"`,
-        }),
-        action: {
-          label: t("View"),
-          onClick: () => {
-            history.push(settingsPath("export"));
-          },
-        },
-      });
    } else {
      await collections.export(format, includeAttachments);
-      toast.success(t("Export started"));
    }
    onSubmit();
+    showToast(t("Export started"), { type: "success" });
  };

  const items = [
@@ -95,7 +83,7 @@ function ExportDialog({ collection, onSubmit }: Props) {
  return (
    <ConfirmationDialog onSubmit={handleSubmit} submitText={t("Export")}>
      {collection && (
-        <Text as="p">
+        <Text>
          <Trans
            defaults="Exporting the collection <em>{{collectionName}}</em> may take some time."
            values={{
@@ -120,7 +108,7 @@ function ExportDialog({ collection, onSubmit }: Props) {
              onChange={handleFormatChange}
            />
            <div>
-              <Text as="p" size="small" weight="bold">
+              <Text size="small" weight="bold">
                {item.title}
              </Text>
              <Text size="small">{item.description}</Text>
@@ -137,7 +125,7 @@ function ExportDialog({ collection, onSubmit }: Props) {
          onChange={handleIncludeAttachmentsChange}
        />
        <div>
-          <Text as="p" size="small" weight="bold">
+          <Text size="small" weight="bold">
            {t("Include attachments")}
          </Text>
          <Text size="small">
@@ -32,12 +32,9 @@ function Facepile({
          </span>
        </More>
      )}
-      {users
-        .filter(Boolean)
-        .slice(0, limit)
-        .map((user) => (
-          <AvatarWrapper key={user.id}>{renderAvatar(user)}</AvatarWrapper>
-        ))}
+      {users.slice(0, limit).map((user) => (
+        <AvatarWrapper key={user.id}>{renderAvatar(user)}</AvatarWrapper>
+      ))}
    </Avatars>
  );
 }
@@ -80,7 +80,7 @@ const Note = styled(Text)`
  margin-bottom: 0;
  line-height: 1.2em;
  font-size: 14px;
-  font-weight: 500;
+  font-weight: 400;
  color: ${s("textTertiary")};
 `;

@@ -1,4 +1,4 @@
-import throttle from "lodash/throttle";
+import { throttle } from "lodash";
 import { observer } from "mobx-react";
 import { MenuIcon } from "outline-icons";
 import { transparentize } from "polished";
@@ -6,7 +6,6 @@ import * as React from "react";
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import { depths, s } from "@shared/styles";
-import { supportsPassiveListener } from "@shared/utils/browser";
 import Button from "~/components/Button";
 import Fade from "~/components/Fade";
 import Flex from "~/components/Flex";
@@ -15,16 +14,16 @@ import useMobile from "~/hooks/useMobile";
 import useStores from "~/hooks/useStores";
 import { draggableOnDesktop, fadeOnDesktopBackgrounded } from "~/styles";
 import Desktop from "~/utils/Desktop";
+import { supportsPassiveListener } from "~/utils/browser";

 type Props = {
  left?: React.ReactNode;
  title: React.ReactNode;
  actions?: React.ReactNode;
  hasSidebar?: boolean;
-  className?: string;
 };

-function Header({ left, title, actions, hasSidebar, className }: Props) {
+function Header({ left, title, actions, hasSidebar }: Props) {
  const { ui } = useStores();
  const isMobile = useMobile();
  const hasMobileSidebar = hasSidebar && isMobile;
@@ -55,7 +54,6 @@ function Header({ left, title, actions, hasSidebar, className }: Props) {
    <Wrapper
      align="center"
      shrink={false}
-      className={className}
      $passThrough={passThrough}
      $insetTitleAdjust={ui.sidebarIsClosed && Desktop.hasInsetTitlebar()}
    >
@@ -1,10 +1,9 @@
 import styled from "styled-components";

-const Heading = styled.h1<{ as?: string; centered?: boolean }>`
+const Heading = styled.h1<{ centered?: boolean }>`
  display: flex;
  align-items: center;
  user-select: none;
-  ${(props) => (props.as ? "" : "margin-top: 6vh; font-weight: 600;")}
  ${(props) => (props.centered ? "text-align: center;" : "")}
 `;

@@ -1,7 +1,8 @@
-import escapeRegExp from "lodash/escapeRegExp";
+import { escapeRegExp } from "lodash";
 import * as React from "react";
 import replace from "string-replace-to-array";
 import styled from "styled-components";
+import { s } from "@shared/styles";

 type Props = React.HTMLAttributes<HTMLSpanElement> & {
  highlight: (string | null | undefined) | RegExp;
@@ -43,9 +44,9 @@ function Highlight({
 }

 export const Mark = styled.mark`
-  color: inherit;
-  background: transparent;
-  font-weight: 600;
+  background: ${s("searchHighlight")};
+  border-radius: 2px;
+  padding: 0 2px;
 `;

 export default Highlight;
@@ -4,7 +4,7 @@ import styled, { css } from "styled-components";
 import { s } from "@shared/styles";
 import Text from "~/components/Text";

-export const CARD_MARGIN = 10;
+export const CARD_MARGIN = 16;

 const NUMBER_OF_LINES = 10;

@@ -17,7 +17,7 @@ const StyledText = styled(Text)`
 `;

 export const Preview = styled(Link)`
-  cursor: ${(props: { as?: string }) =>
+  cursor: ${(props: any) =>
    props.as === "div" ? "default" : "var(--pointer)"};
  border-radius: 4px;
  box-shadow: 0 30px 90px -20px rgba(0, 0, 0, 0.3),
@@ -2,14 +2,13 @@ import { m } from "framer-motion";
 import * as React from "react";
 import { Portal } from "react-portal";
 import styled from "styled-components";
-import { depths } from "@shared/styles";
+import { depths, s } from "@shared/styles";
 import { UnfurlType } from "@shared/types";
 import LoadingIndicator from "~/components/LoadingIndicator";
 import useEventListener from "~/hooks/useEventListener";
 import useKeyDown from "~/hooks/useKeyDown";
 import useMobile from "~/hooks/useMobile";
 import useOnClickOutside from "~/hooks/useOnClickOutside";
-import usePrevious from "~/hooks/usePrevious";
 import useRequest from "~/hooks/useRequest";
 import useStores from "~/hooks/useStores";
 import { client } from "~/utils/ApiClient";
@@ -18,77 +17,131 @@ import HoverPreviewDocument from "./HoverPreviewDocument";
 import HoverPreviewLink from "./HoverPreviewLink";
 import HoverPreviewMention from "./HoverPreviewMention";

+const DELAY_OPEN = 300;
 const DELAY_CLOSE = 600;
-const POINTER_HEIGHT = 22;
-const POINTER_WIDTH = 22;

 type Props = {
-  /** The HTML element that is being hovered over, or null if none. */
-  element: HTMLElement | null;
-  /** A callback on close of the hover preview. */
+  /* The HTML element that is being hovered over */
+  element: HTMLAnchorElement;
+  /* A callback on close of the hover preview */
  onClose: () => void;
 };

-enum Direction {
-  UP,
-  DOWN,
-}
-
-function HoverPreviewDesktop({ element, onClose }: Props) {
-  const url = element?.getAttribute("href") || element?.dataset.url;
-  const previousUrl = usePrevious(url, true);
+function HoverPreviewInternal({ element, onClose }: Props) {
+  const url = element.href || element.dataset.url;
  const [isVisible, setVisible] = React.useState(false);
  const timerClose = React.useRef<ReturnType<typeof setTimeout>>();
+  const timerOpen = React.useRef<ReturnType<typeof setTimeout>>();
  const cardRef = React.useRef<HTMLDivElement>(null);
-  const { cardLeft, cardTop, pointerLeft, pointerTop, pointerDir } =
-    useHoverPosition({
-      cardRef,
-      element,
-      isVisible,
-    });
+  const stores = useStores();
+  const [cardLeft, setCardLeft] = React.useState(0);
+  const [cardTop, setCardTop] = React.useState(0);
+  const [pointerOffset, setPointerOffset] = React.useState(0);
+
+  React.useLayoutEffect(() => {
+    if (isVisible && cardRef.current) {
+      const elem = element.getBoundingClientRect();
+      const card = cardRef.current.getBoundingClientRect();
+
+      const top = elem.bottom + window.scrollY;
+      setCardTop(top);
+
+      let left = elem.left;
+      let pointerOffset = elem.width / 2;
+      if (left + card.width > window.innerWidth) {
+        // shift card leftwards by the amount it went out of screen
+        let shiftBy = left + card.width - window.innerWidth;
+        // shift a littler further to leave some margin between card and window boundary
+        shiftBy += CARD_MARGIN;
+        left -= shiftBy;
+
+        // shift pointer rightwards by same amount so as to position it back correctly
+        pointerOffset += shiftBy;
+      }
+      setCardLeft(left);
+
+      setPointerOffset(pointerOffset);
+    }
+  }, [isVisible, element]);
+
+  const { data, request, loading } = useRequest(
+    React.useCallback(
+      () =>
+        client.post("/urls.unfurl", {
+          url,
+          documentId: stores.ui.activeDocumentId,
+        }),
+      [url, stores.ui.activeDocumentId]
+    )
+  );
+
+  React.useEffect(() => {
+    if (url) {
+      stopOpenTimer();
+      setVisible(false);
+
+      void request();
+    }
+  }, [url, request]);
+
+  const stopOpenTimer = () => {
+    if (timerOpen.current) {
+      clearTimeout(timerOpen.current);
+      timerOpen.current = undefined;
+    }
+  };

  const closePreview = React.useCallback(() => {
-    setVisible(false);
-    onClose();
-  }, [onClose]);
-
-  const stopCloseTimer = React.useCallback(() => {
-    if (timerClose.current) {
-      clearTimeout(timerClose.current);
-      timerClose.current = undefined;
+    if (isVisible) {
+      stopOpenTimer();
+      setVisible(false);
+      onClose();
    }
-  }, []);
+  }, [isVisible, onClose]);

-  const startCloseTimer = React.useCallback(() => {
-    timerClose.current = setTimeout(closePreview, DELAY_CLOSE);
-  }, [closePreview]);
-
-  // Open and close the preview when the element changes.
-  React.useEffect(() => {
-    if (element) {
-      setVisible(true);
-    } else {
-      startCloseTimer();
-    }
-  }, [startCloseTimer, element]);
-
-  // Close the preview on Escape, scroll, or click outside.
  useOnClickOutside(cardRef, closePreview);
  useKeyDown("Escape", closePreview);
  useEventListener("scroll", closePreview, window, { capture: true });

-  // Ensure that the preview stays open while the user is hovering over the card.
+  const stopCloseTimer = () => {
+    if (timerClose.current) {
+      clearTimeout(timerClose.current);
+      timerClose.current = undefined;
+    }
+  };
+
+  const startOpenTimer = () => {
+    if (!timerOpen.current) {
+      timerOpen.current = setTimeout(() => setVisible(true), DELAY_OPEN);
+    }
+  };
+
+  const startCloseTimer = React.useCallback(() => {
+    stopOpenTimer();
+    timerClose.current = setTimeout(closePreview, DELAY_CLOSE);
+  }, [closePreview]);
+
  React.useEffect(() => {
    const card = cardRef.current;

-    if (isVisible) {
+    if (data) {
+      startOpenTimer();
+
      if (card) {
        card.addEventListener("mouseenter", stopCloseTimer);
        card.addEventListener("mouseleave", startCloseTimer);
      }
+
+      element.addEventListener("mouseout", startCloseTimer);
+      element.addEventListener("mouseover", stopCloseTimer);
+      element.addEventListener("mouseover", startOpenTimer);
    }

    return () => {
+      element.removeEventListener("mouseout", startCloseTimer);
+      element.removeEventListener("mouseover", stopCloseTimer);
+      element.removeEventListener("mouseover", startOpenTimer);
+
      if (card) {
        card.removeEventListener("mouseenter", stopCloseTimer);
        card.removeEventListener("mouseleave", startCloseTimer);
@@ -96,83 +149,7 @@ function HoverPreviewDesktop({ element, onClose }: Props) {

      stopCloseTimer();
    };
-  }, [element, startCloseTimer, isVisible, stopCloseTimer]);
-
-  const displayUrl = url ?? previousUrl;
-
-  if (!isVisible || !displayUrl) {
-    return null;
-  }
-
-  return (
-    <Portal>
-      <Position top={cardTop} left={cardLeft} ref={cardRef} aria-hidden>
-        <DataLoader url={displayUrl}>
-          {(data) => (
-            <Animate
-              initial={{ opacity: 0, y: -20, pointerEvents: "none" }}
-              animate={{ opacity: 1, y: 0, pointerEvents: "auto" }}
-            >
-              {data.type === UnfurlType.Mention ? (
-                <HoverPreviewMention
-                  url={data.thumbnailUrl}
-                  title={data.title}
-                  info={data.meta.info}
-                  color={data.meta.color}
-                />
-              ) : data.type === UnfurlType.Document ? (
-                <HoverPreviewDocument
-                  id={data.meta.id}
-                  url={data.url}
-                  title={data.title}
-                  description={data.description}
-                  info={data.meta.info}
-                />
-              ) : (
-                <HoverPreviewLink
-                  url={data.url}
-                  thumbnailUrl={data.thumbnailUrl}
-                  title={data.title}
-                  description={data.description}
-                />
-              )}
-              <Pointer
-                top={pointerTop}
-                left={pointerLeft}
-                direction={pointerDir}
-              />
-            </Animate>
-          )}
-        </DataLoader>
-      </Position>
-    </Portal>
-  );
-}
-
-function DataLoader({
-  url,
-  children,
-}: {
-  url: string;
-  children: (data: any) => React.ReactNode;
-}) {
-  const { ui } = useStores();
-  const { data, request, loading } = useRequest(
-    React.useCallback(
-      () =>
-        client.post("/urls.unfurl", {
-          url,
-          documentId: ui.activeDocumentId,
-        }),
-      [url, ui.activeDocumentId]
-    )
-  );
-
-  React.useEffect(() => {
-    if (url) {
-      void request();
-    }
-  }, [url, request]);
+  }, [element, startCloseTimer, data]);

  if (loading) {
    return <LoadingIndicator />;
@@ -182,7 +159,46 @@ function DataLoader({
    return null;
  }

-  return <>{children(data)}</>;
+  return (
+    <Portal>
+      <Position top={cardTop} left={cardLeft} aria-hidden>
+        {isVisible ? (
+          <Animate
+            initial={{ opacity: 0, y: -20, pointerEvents: "none" }}
+            animate={{ opacity: 1, y: 0, pointerEvents: "auto" }}
+          >
+            {data.type === UnfurlType.Mention ? (
+              <HoverPreviewMention
+                ref={cardRef}
+                url={data.thumbnailUrl}
+                title={data.title}
+                info={data.meta.info}
+                color={data.meta.color}
+              />
+            ) : data.type === UnfurlType.Document ? (
+              <HoverPreviewDocument
+                ref={cardRef}
+                id={data.meta.id}
+                url={data.url}
+                title={data.title}
+                description={data.description}
+                info={data.meta.info}
+              />
+            ) : (
+              <HoverPreviewLink
+                ref={cardRef}
+                url={data.url}
+                thumbnailUrl={data.thumbnailUrl}
+                title={data.title}
+                description={data.description}
+              />
+            )}
+            <Pointer offset={pointerOffset} />
+          </Animate>
+        ) : null}
+      </Position>
+    </Portal>
+  );
 }

 function HoverPreview({ element, ...rest }: Props) {
@@ -191,64 +207,7 @@ function HoverPreview({ element, ...rest }: Props) {
    return null;
  }

-  return <HoverPreviewDesktop {...rest} element={element} />;
-}
-
-function useHoverPosition({
-  cardRef,
-  element,
-  isVisible,
-}: {
-  cardRef: React.RefObject<HTMLDivElement>;
-  element: HTMLElement | null;
-  isVisible: boolean;
-}) {
-  const [cardLeft, setCardLeft] = React.useState(0);
-  const [cardTop, setCardTop] = React.useState(0);
-  const [pointerLeft, setPointerLeft] = React.useState(0);
-  const [pointerTop, setPointerTop] = React.useState(0);
-  const [pointerDir, setPointerDir] = React.useState(Direction.UP);
-
-  React.useLayoutEffect(() => {
-    if (isVisible && element && cardRef.current) {
-      const elem = element.getBoundingClientRect();
-      const card = cardRef.current.getBoundingClientRect();
-
-      let cTop = elem.bottom + window.scrollY + CARD_MARGIN;
-      let pTop = -POINTER_HEIGHT;
-      let pDir = Direction.UP;
-      if (cTop + card.height > window.innerHeight + window.scrollY) {
-        // shift card upwards if it goes out of screen
-        const bottom = elem.top + window.scrollY;
-        cTop = bottom - card.height;
-        // shift a little further to leave some margin between card and element boundary
-        cTop -= CARD_MARGIN;
-        // pointer should be shifted downwards to align with card's bottom
-        pTop = card.height;
-        pDir = Direction.DOWN;
-      }
-      setCardTop(cTop);
-      setPointerTop(pTop);
-      setPointerDir(pDir);
-
-      let cLeft = elem.left;
-      let pLeft = elem.width / 2;
-      if (cLeft + card.width > window.innerWidth) {
-        // shift card leftwards by the amount it went out of screen
-        let shiftBy = cLeft + card.width - window.innerWidth;
-        // shift a little further to leave some margin between card and window boundary
-        shiftBy += CARD_MARGIN;
-        cLeft -= shiftBy;
-
-        // shift pointer rightwards by same amount so as to position it back correctly
-        pLeft += shiftBy;
-      }
-      setCardLeft(cLeft);
-      setPointerLeft(pLeft);
-    }
-  }, [isVisible, cardRef, element]);
-
-  return { cardLeft, cardTop, pointerLeft, pointerTop, pointerDir };
+  return <HoverPreviewInternal {...rest} element={element} />;
 }

 const Animate = styled(m.div)`
@@ -258,6 +217,7 @@ const Animate = styled(m.div)`
 `;

 const Position = styled.div<{ fixed?: boolean; top?: number; left?: number }>`
+  margin-top: 10px;
  position: ${({ fixed }) => (fixed ? "fixed" : "absolute")};
  z-index: ${depths.hoverPreview};
  display: flex;
@@ -267,11 +227,11 @@ const Position = styled.div<{ fixed?: boolean; top?: number; left?: number }>`
  ${({ left }) => (left !== undefined ? `left: ${left}px` : "")};
 `;

-const Pointer = styled.div<{ top: number; left: number; direction: Direction }>`
-  top: ${(props) => props.top}px;
-  left: ${(props) => props.left}px;
-  width: ${POINTER_WIDTH}px;
-  height: ${POINTER_HEIGHT}px;
+const Pointer = styled.div<{ offset: number }>`
+  top: -22px;
+  left: ${(props) => props.offset}px;
+  width: 22px;
+  height: 22px;
  position: absolute;
  transform: translateX(-50%);
  pointer-events: none;
@@ -281,26 +241,20 @@ const Pointer = styled.div<{ top: number; left: number; direction: Direction }>`
    content: "";
    display: inline-block;
    position: absolute;
-    ${({ direction }) => (direction === Direction.UP ? "bottom: 0" : "top: 0")};
-    ${({ direction }) => (direction === Direction.UP ? "right: 0" : "left: 0")};
+    bottom: 0;
+    right: 0;
  }

  &:before {
    border: 8px solid transparent;
-    ${({ direction, theme }) =>
-      direction === Direction.UP
-        ? `border-bottom-color: ${theme.menuBorder || "rgba(0, 0, 0, 0.1)"}`
-        : `border-top-color: ${theme.menuBorder || "rgba(0, 0, 0, 0.1)"}`};
-    ${({ direction }) =>
-      direction === Direction.UP ? "right: -1px" : "left: -1px"};
+    border-bottom-color: ${(props) =>
+      props.theme.menuBorder || "rgba(0, 0, 0, 0.1)"};
+    right: -1px;
  }

  &:after {
    border: 7px solid transparent;
-    ${({ direction, theme }) =>
-      direction === Direction.UP
-        ? `border-bottom-color: ${theme.menuBackground}`
-        : `border-top-color: ${theme.menuBackground}`};
+    border-bottom-color: ${s("menuBackground")};
  }
 `;

@@ -26,9 +26,9 @@ const HoverPreviewLink = React.forwardRef(function _HoverPreviewLink(
 ) {
  return (
    <Preview as="a" href={url} target="_blank" rel="noopener noreferrer">
-      <Flex column ref={ref}>
+      <Flex column>
        {thumbnailUrl ? <Thumbnail src={thumbnailUrl} alt={""} /> : null}
-        <Card>
+        <Card ref={ref}>
          <CardContent>
            <Flex column>
              <Title>{title}</Title>
@@ -1,140 +1,263 @@
+import {
+  BookmarkedIcon,
+  BicycleIcon,
+  CollectionIcon,
+  CoinsIcon,
+  AcademicCapIcon,
+  BeakerIcon,
+  BuildingBlocksIcon,
+  CameraIcon,
+  CloudIcon,
+  CodeIcon,
+  EditIcon,
+  EmailIcon,
+  EyeIcon,
+  GlobeIcon,
+  InfoIcon,
+  ImageIcon,
+  LeafIcon,
+  LightBulbIcon,
+  MathIcon,
+  MoonIcon,
+  NotepadIcon,
+  PadlockIcon,
+  PaletteIcon,
+  PromoteIcon,
+  QuestionMarkIcon,
+  SportIcon,
+  SunIcon,
+  TargetIcon,
+  TerminalIcon,
+  ToolsIcon,
+  VehicleIcon,
+  WarningIcon,
+  DatabaseIcon,
+  SmileyIcon,
+  LightningIcon,
+} from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import { PopoverDisclosure, usePopoverState } from "reakit";
-import { MenuItem } from "reakit/Menu";
+import { useMenuState, MenuButton, MenuItem } from "reakit/Menu";
 import styled, { useTheme } from "styled-components";
+import breakpoint from "styled-components-breakpoint";
+import { s } from "@shared/styles";
 import { colorPalette } from "@shared/utils/collections";
+import ContextMenu from "~/components/ContextMenu";
 import Flex from "~/components/Flex";
+import { LabelText } from "~/components/Input";
 import NudeButton from "~/components/NudeButton";
 import Text from "~/components/Text";
-import useOnClickOutside from "~/hooks/useOnClickOutside";
 import lazyWithRetry from "~/utils/lazyWithRetry";
 import DelayedMount from "./DelayedMount";
-import { IconLibrary } from "./Icons/IconLibrary";
-import Popover from "./Popover";

-const icons = IconLibrary.mapping;
+const style = {
+  width: 30,
+  height: 30,
+};

 const TwitterPicker = lazyWithRetry(
  () => import("react-color/lib/components/twitter/Twitter")
 );

+export const icons = {
+  academicCap: {
+    component: AcademicCapIcon,
+    keywords: "learn teach lesson guide tutorial onboarding training",
+  },
+  bicycle: {
+    component: BicycleIcon,
+    keywords: "bicycle bike cycle",
+  },
+  beaker: {
+    component: BeakerIcon,
+    keywords: "lab research experiment test",
+  },
+  buildingBlocks: {
+    component: BuildingBlocksIcon,
+    keywords: "app blocks product prototype",
+  },
+  bookmark: {
+    component: BookmarkedIcon,
+    keywords: "bookmark",
+  },
+  collection: {
+    component: CollectionIcon,
+    keywords: "collection",
+  },
+  coins: {
+    component: CoinsIcon,
+    keywords: "coins money finance sales income revenue cash",
+  },
+  camera: {
+    component: CameraIcon,
+    keywords: "photo picture",
+  },
+  cloud: {
+    component: CloudIcon,
+    keywords: "cloud service aws infrastructure",
+  },
+  code: {
+    component: CodeIcon,
+    keywords: "developer api code development engineering programming",
+  },
+  database: {
+    component: DatabaseIcon,
+    keywords: "server ops database",
+  },
+  email: {
+    component: EmailIcon,
+    keywords: "email at",
+  },
+  eye: {
+    component: EyeIcon,
+    keywords: "eye view",
+  },
+  globe: {
+    component: GlobeIcon,
+    keywords: "world translate",
+  },
+  info: {
+    component: InfoIcon,
+    keywords: "info information",
+  },
+  image: {
+    component: ImageIcon,
+    keywords: "image photo picture",
+  },
+  leaf: {
+    component: LeafIcon,
+    keywords: "leaf plant outdoors nature ecosystem climate",
+  },
+  lightbulb: {
+    component: LightBulbIcon,
+    keywords: "lightbulb idea",
+  },
+  lightning: {
+    component: LightningIcon,
+    keywords: "lightning fast zap",
+  },
+  math: {
+    component: MathIcon,
+    keywords: "math formula",
+  },
+  moon: {
+    component: MoonIcon,
+    keywords: "night moon dark",
+  },
+  notepad: {
+    component: NotepadIcon,
+    keywords: "journal notepad write notes",
+  },
+  padlock: {
+    component: PadlockIcon,
+    keywords: "padlock private security authentication authorization auth",
+  },
+  palette: {
+    component: PaletteIcon,
+    keywords: "design palette art brand",
+  },
+  pencil: {
+    component: EditIcon,
+    keywords: "copy writing post blog",
+  },
+  promote: {
+    component: PromoteIcon,
+    keywords: "marketing promotion",
+  },
+  question: {
+    component: QuestionMarkIcon,
+    keywords: "question help support faq",
+  },
+  sun: {
+    component: SunIcon,
+    keywords: "day sun weather",
+  },
+  sport: {
+    component: SportIcon,
+    keywords: "sport outdoor racket game",
+  },
+  smiley: {
+    component: SmileyIcon,
+    keywords: "emoji smiley happy",
+  },
+  target: {
+    component: TargetIcon,
+    keywords: "target goal sales",
+  },
+  terminal: {
+    component: TerminalIcon,
+    keywords: "terminal code",
+  },
+  tools: {
+    component: ToolsIcon,
+    keywords: "tool settings",
+  },
+  vehicle: {
+    component: VehicleIcon,
+    keywords: "truck car travel transport",
+  },
+  warning: {
+    component: WarningIcon,
+    keywords: "warning alert error",
+  },
+};
+
 type Props = {
  onOpen?: () => void;
  onClose?: () => void;
  onChange: (color: string, icon: string) => void;
-  initial: string;
  icon: string;
  color: string;
-  className?: string;
 };

-function IconPicker({
-  onOpen,
-  onClose,
-  icon,
-  initial,
-  color,
-  onChange,
-  className,
-}: Props) {
+function IconPicker({ onOpen, onClose, icon, color, onChange }: Props) {
  const { t } = useTranslation();
  const theme = useTheme();
-  const popover = usePopoverState({
-    gutter: 0,
-    placement: "bottom",
+  const menu = useMenuState({
    modal: true,
+    placement: "bottom-end",
  });

-  React.useEffect(() => {
-    if (popover.visible) {
-      onOpen?.();
-    } else {
-      onClose?.();
-    }
-  }, [onOpen, onClose, popover.visible]);
-
-  const styles = React.useMemo(
-    () => ({
-      default: {
-        body: {
-          padding: 0,
-          marginRight: -8,
-        },
-        hash: {
-          color: theme.text,
-          background: theme.inputBorder,
-        },
-        swatch: {
-          cursor: "var(--cursor-pointer)",
-        },
-        input: {
-          color: theme.text,
-          boxShadow: `inset 0 0 0 1px ${theme.inputBorder}`,
-          background: "transparent",
-        },
-      },
-    }),
-    [theme]
-  );
-
-  // Custom click outside handling rather than using `hideOnClickOutside` from reakit so that we can
-  // prevent event bubbling.
-  useOnClickOutside(
-    popover.unstable_popoverRef,
-    (event) => {
-      if (popover.visible) {
-        event.stopPropagation();
-        event.preventDefault();
-        popover.hide();
-      }
-    },
-    { capture: true }
-  );
-
  return (
-    <>
-      <PopoverDisclosure {...popover}>
+    <Wrapper>
+      <Label>
+        <LabelText>{t("Icon")}</LabelText>
+      </Label>
+      <MenuButton {...menu}>
        {(props) => (
-          <NudeButton
-            aria-label={t("Show menu")}
-            className={className}
-            {...props}
-          >
+          <Button aria-label={t("Show menu")} {...props}>
            <Icon
-              as={IconLibrary.getComponent(icon || "collection")}
+              as={icons[icon || "collection"].component}
              color={color}
-            >
-              {initial}
-            </Icon>
-          </NudeButton>
+              size={30}
+            />
+          </Button>
        )}
-      </PopoverDisclosure>
-      <Popover
-        {...popover}
-        width={388}
+      </MenuButton>
+      <ContextMenu
+        {...menu}
+        onOpen={onOpen}
+        onClose={onClose}
        aria-label={t("Choose icon")}
-        hideOnClickOutside={false}
      >
        <Icons>
          {Object.keys(icons).map((name, index) => (
-            <MenuItem key={name} onClick={() => onChange(color, name)}>
+            <MenuItem
+              key={name}
+              onClick={() => onChange(color, name)}
+              {...menu}
+            >
              {(props) => (
                <IconButton
                  style={
                    {
+                      ...style,
                      "--delay": `${index * 8}ms`,
                    } as React.CSSProperties
                  }
                  {...props}
                >
-                  <Icon
-                    as={IconLibrary.getComponent(name)}
-                    color={color}
-                    size={30}
-                  >
-                    {initial}
-                  </Icon>
+                  <Icon as={icons[name].component} color={color} size={30} />
                </IconButton>
              )}
            </MenuItem>
@@ -153,12 +276,28 @@ function IconPicker({
              onChange={(color) => onChange(color.hex, icon)}
              colors={colorPalette}
              triangle="hide"
-              styles={styles}
+              styles={{
+                default: {
+                  body: {
+                    padding: 0,
+                    marginRight: -8,
+                  },
+                  hash: {
+                    color: theme.text,
+                    background: theme.inputBorder,
+                  },
+                  input: {
+                    color: theme.text,
+                    boxShadow: `inset 0 0 0 1px ${theme.inputBorder}`,
+                    background: "transparent",
+                  },
+                },
+              }}
            />
          </React.Suspense>
        </Colors>
-      </Popover>
-    </>
+      </ContextMenu>
+    </Wrapper>
  );
 }

@@ -171,12 +310,25 @@ const Colors = styled(Flex)`
  padding: 8px;
 `;

+const Label = styled.label`
+  display: block;
+`;
+
 const Icons = styled.div`
  padding: 8px;
+
+  ${breakpoint("tablet")`
+    width: 276px;
+  `};
+`;
+
+const Button = styled(NudeButton)`
+  border: 1px solid ${s("inputBorder")};
+  width: 32px;
+  height: 32px;
 `;

 const IconButton = styled(NudeButton)`
-  vertical-align: top;
  border-radius: 4px;
  margin: 0px 6px 6px 0px;
  width: 30px;
@@ -189,4 +341,9 @@ const ColorPicker = styled(TwitterPicker)`
  width: 100% !important;
 `;

+const Wrapper = styled("div")`
+  display: inline-block;
+  position: relative;
+`;
+
 export default IconPicker;
@@ -3,9 +3,9 @@ import { CollectionIcon } from "outline-icons";
 import { getLuminance } from "polished";
 import * as React from "react";
 import Collection from "~/models/Collection";
+import { icons } from "~/components/IconPicker";
 import useStores from "~/hooks/useStores";
 import Logger from "~/utils/Logger";
-import { IconLibrary } from "./IconLibrary";

 type Props = {
  /** The collection to show an icon for */
@@ -38,12 +38,8 @@ function ResolvedCollectionIcon({

  if (collection.icon && collection.icon !== "collection") {
    try {
-      const Component = IconLibrary.getComponent(collection.icon);
-      return (
-        <Component color={color} size={size}>
-          {collection.initial}
-        </Component>
-      );
+      const Component = icons[collection.icon].component;
+      return <Component color={color} size={size} />;
    } catch (error) {
      Logger.warn("Failed to render custom icon", {
        icon: collection.icon,
@@ -2,9 +2,9 @@ import * as React from "react";
 import styled from "styled-components";

 type Props = {
-  /** The emoji to render */
+  /* The emoji to render */
  emoji: string;
-  /** The size of the emoji, 24px is default to match standard icons */
+  /* The size of the emoji, 24px is default to match standard icons */
  size?: number;
 };

@@ -29,5 +29,5 @@ const Span = styled.span<{ $size: number }>`
  width: ${(props) => props.$size}px;
  height: ${(props) => props.$size}px;
  text-indent: -0.15em;
-  font-size: ${(props) => props.$size - 10}px;
+  font-size: 14px;
 `;
@@ -1,315 +0,0 @@
-import intersection from "lodash/intersection";
-import {
-  BookmarkedIcon,
-  BicycleIcon,
-  AcademicCapIcon,
-  BeakerIcon,
-  BuildingBlocksIcon,
-  BrowserIcon,
-  CollectionIcon,
-  CoinsIcon,
-  CameraIcon,
-  CarrotIcon,
-  FlameIcon,
-  HashtagIcon,
-  GraphIcon,
-  InternetIcon,
-  LibraryIcon,
-  PlaneIcon,
-  RamenIcon,
-  CloudIcon,
-  CodeIcon,
-  EditIcon,
-  EmailIcon,
-  EyeIcon,
-  GlobeIcon,
-  InfoIcon,
-  IceCreamIcon,
-  ImageIcon,
-  LeafIcon,
-  LightBulbIcon,
-  MathIcon,
-  MoonIcon,
-  NotepadIcon,
-  TeamIcon,
-  PadlockIcon,
-  PaletteIcon,
-  PromoteIcon,
-  QuestionMarkIcon,
-  SportIcon,
-  SunIcon,
-  ShapesIcon,
-  TargetIcon,
-  TerminalIcon,
-  ToolsIcon,
-  VehicleIcon,
-  WarningIcon,
-  DatabaseIcon,
-  SmileyIcon,
-  LightningIcon,
-  ClockIcon,
-  DoneIcon,
-  FeedbackIcon,
-  ServerRackIcon,
-  ThumbsUpIcon,
-  TruckIcon,
-} from "outline-icons";
-import LetterIcon from "./LetterIcon";
-
-export class IconLibrary {
-  /**
-   * Get the component for a given icon name
-   *
-   * @param icon The name of the icon
-   * @returns The component for the icon
-   */
-  public static getComponent(icon: string) {
-    return this.mapping[icon].component;
-  }
-
-  /**
-   * Find an icon by keyword. This is useful for searching for an icon based on a user's input.
-   *
-   * @param keyword The keyword to search for
-   * @returns The name of the icon that matches the keyword, or undefined if no match is found
-   */
-  public static findIconByKeyword(keyword: string) {
-    const keys = Object.keys(this.mapping);
-
-    for (const key of keys) {
-      const icon = this.mapping[key];
-      const keywords = icon.keywords.split(" ");
-      const namewords = keyword.toLocaleLowerCase().split(" ");
-      const matches = intersection(namewords, keywords);
-
-      if (matches.length > 0) {
-        return key;
-      }
-    }
-
-    return undefined;
-  }
-
-  /**
-   * A map of all icons available to end users in the app. This does not include icons that are used
-   * internally only, which can be imported from `outline-icons` directly.
-   */
-  public static mapping = {
-    academicCap: {
-      component: AcademicCapIcon,
-      keywords: "learn teach lesson guide tutorial onboarding training",
-    },
-    bicycle: {
-      component: BicycleIcon,
-      keywords: "bicycle bike cycle",
-    },
-    beaker: {
-      component: BeakerIcon,
-      keywords: "lab research experiment test",
-    },
-    buildingBlocks: {
-      component: BuildingBlocksIcon,
-      keywords: "app blocks product prototype",
-    },
-    bookmark: {
-      component: BookmarkedIcon,
-      keywords: "bookmark",
-    },
-    browser: {
-      component: BrowserIcon,
-      keywords: "browser web app",
-    },
-    collection: {
-      component: CollectionIcon,
-      keywords: "collection",
-    },
-    coins: {
-      component: CoinsIcon,
-      keywords: "coins money finance sales income revenue cash",
-    },
-    camera: {
-      component: CameraIcon,
-      keywords: "photo picture",
-    },
-    carrot: {
-      component: CarrotIcon,
-      keywords: "food vegetable produce",
-    },
-    clock: {
-      component: ClockIcon,
-      keywords: "time",
-    },
-    cloud: {
-      component: CloudIcon,
-      keywords: "cloud service aws infrastructure",
-    },
-    code: {
-      component: CodeIcon,
-      keywords: "developer api code development engineering programming",
-    },
-    database: {
-      component: DatabaseIcon,
-      keywords: "server ops database",
-    },
-    done: {
-      component: DoneIcon,
-      keywords: "checkmark success complete finished",
-    },
-    email: {
-      component: EmailIcon,
-      keywords: "email at",
-    },
-    eye: {
-      component: EyeIcon,
-      keywords: "eye view",
-    },
-    feedback: {
-      component: FeedbackIcon,
-      keywords: "faq help support",
-    },
-    flame: {
-      component: FlameIcon,
-      keywords: "fire flame hot",
-    },
-    graph: {
-      component: GraphIcon,
-      keywords: "chart analytics data",
-    },
-    globe: {
-      component: GlobeIcon,
-      keywords: "world translate",
-    },
-    hashtag: {
-      component: HashtagIcon,
-      keywords: "social media tag",
-    },
-    info: {
-      component: InfoIcon,
-      keywords: "info information",
-    },
-    icecream: {
-      component: IceCreamIcon,
-      keywords: "food dessert cone scoop",
-    },
-    image: {
-      component: ImageIcon,
-      keywords: "image photo picture",
-    },
-    internet: {
-      component: InternetIcon,
-      keywords: "network global globe world",
-    },
-    leaf: {
-      component: LeafIcon,
-      keywords: "leaf plant outdoors nature ecosystem climate",
-    },
-    library: {
-      component: LibraryIcon,
-      keywords: "library collection archive",
-    },
-    lightbulb: {
-      component: LightBulbIcon,
-      keywords: "lightbulb idea",
-    },
-    lightning: {
-      component: LightningIcon,
-      keywords: "lightning fast zap",
-    },
-    letter: {
-      component: LetterIcon,
-      keywords: "letter",
-    },
-    math: {
-      component: MathIcon,
-      keywords: "math formula",
-    },
-    moon: {
-      component: MoonIcon,
-      keywords: "night moon dark",
-    },
-    notepad: {
-      component: NotepadIcon,
-      keywords: "journal notepad write notes",
-    },
-    padlock: {
-      component: PadlockIcon,
-      keywords: "padlock private security authentication authorization auth",
-    },
-    palette: {
-      component: PaletteIcon,
-      keywords: "design palette art brand",
-    },
-    pencil: {
-      component: EditIcon,
-      keywords: "copy writing post blog",
-    },
-    plane: {
-      component: PlaneIcon,
-      keywords: "airplane travel flight trip vacation",
-    },
-    promote: {
-      component: PromoteIcon,
-      keywords: "marketing promotion",
-    },
-    ramen: {
-      component: RamenIcon,
-      keywords: "soup food noodle bowl meal",
-    },
-    question: {
-      component: QuestionMarkIcon,
-      keywords: "question help support faq",
-    },
-    server: {
-      component: ServerRackIcon,
-      keywords: "ops infra server",
-    },
-    sun: {
-      component: SunIcon,
-      keywords: "day sun weather",
-    },
-    shapes: {
-      component: ShapesIcon,
-      keywords: "blocks toy",
-    },
-    sport: {
-      component: SportIcon,
-      keywords: "sport outdoor racket game",
-    },
-    smiley: {
-      component: SmileyIcon,
-      keywords: "emoji smiley happy",
-    },
-    target: {
-      component: TargetIcon,
-      keywords: "target goal sales",
-    },
-    team: {
-      component: TeamIcon,
-      keywords: "team building organization office",
-    },
-    terminal: {
-      component: TerminalIcon,
-      keywords: "terminal code",
-    },
-    thumbsup: {
-      component: ThumbsUpIcon,
-      keywords: "like social favorite upvote",
-    },
-    truck: {
-      component: TruckIcon,
-      keywords: "truck transport vehicle",
-    },
-    tools: {
-      component: ToolsIcon,
-      keywords: "tool settings",
-    },
-    vehicle: {
-      component: VehicleIcon,
-      keywords: "truck car travel transport",
-    },
-    warning: {
-      component: WarningIcon,
-      keywords: "warning alert error",
-    },
-  };
-}
@@ -1,32 +0,0 @@
-import * as React from "react";
-
-export function LanguageIcon({ className }: { className?: string }) {
-  return (
-    <svg
-      width="32"
-      height="32"
-      viewBox="0 0 32 32"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      className={className}
-    >
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M21 18H16L14 16V6C14 4.89543 14.8954 4 16 4H28C29.1046 4 30 4.89543 30 6V16C30 17.1046 29.1046 18 28 18H27L25.4142 19.5858C24.6332 20.3668 23.3668 20.3668 22.5858 19.5858L21 18ZM16 15.1716V6H28V16H27H26.1716L25.5858 16.5858L24 18.1716L22.4142 16.5858L21.8284 16H21H16.8284L16 15.1716Z"
-        fill="currentColor"
-      />
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M16 13H4C2.89543 13 2 13.8954 2 15V25C2 26.1046 2.89543 27 4 27H5L6.58579 28.5858C7.36684 29.3668 8.63316 29.3668 9.41421 28.5858L11 27H16C17.1046 27 18 26.1046 18 25V15C18 13.8954 17.1046 13 16 13ZM9 17L6 16.9681C6 16.9681 5 17.016 5 18C5 18.984 6 19 6 19H8.5H10C10 19 9.57627 20.1885 8.38983 21.0831C7.20339 21.9777 5.7197 23 5.7197 23C5.7197 23 4.99153 23.6054 5.5 24.5C6.00847 25.3946 7 24.8403 7 24.8403L9.74576 22.8722L11.9492 24.6614C11.9492 24.6614 12.6271 25.3771 13.3051 24.4825C13.9831 23.5879 13.3051 23.0512 13.3051 23.0512L11.1017 21.262C11.1017 21.262 11.5 21 12 20L12.5 19H14C14 19 15 19.0319 15 18C15 16.9681 14 16.9681 14 16.9681L11 17V16C11 16 11.0169 15 10 15C8.98305 15 9 16 9 16V17Z"
-        fill="currentColor"
-      />
-      <path
-        d="M23.6672 12.5221L23.5526 12.1816H23.1934H20.8818H20.5215L20.4075 12.5235L20.082 13.5H19.2196L21.2292 8.10156H21.8774L21.5587 9.06116L20.7633 11.4562L20.5449 12.1138H21.2378H22.8374H23.5327L23.3114 11.4546L22.5072 9.05959L22.1855 8.10156H22.768L24.7887 13.5H23.9964L23.6672 12.5221Z"
-        fill="currentColor"
-        stroke="currentColor"
-      />
-    </svg>
-  );
-}
@@ -1,35 +0,0 @@
-import * as React from "react";
-import styled from "styled-components";
-import { s } from "@shared/styles";
-import Squircle from "../Squircle";
-
-type Props = {
-  /** The width and height of the icon, including standard padding. */
-  size?: number;
-  children: React.ReactNode;
-};
-
-/**
- * A squircle shaped icon with a letter inside, used for collections.
- */
-const LetterIcon = ({ children, size = 24, ...rest }: Props) => (
-  <LetterIconWrapper $size={size}>
-    <Squircle size={Math.round(size * 0.66)} {...rest}>
-      {children}
-    </Squircle>
-  </LetterIconWrapper>
-);
-
-const LetterIconWrapper = styled.div<{ $size: number }>`
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: ${({ $size }) => $size}px;
-  height: ${({ $size }) => $size}px;
-
-  font-weight: 700;
-  font-size: ${({ $size }) => $size / 2}px;
-  color: ${s("background")};
-`;
-
-export default LetterIcon;
@@ -5,7 +5,7 @@ type Props = {
  size?: number;
  /** The color of the icon, defaults to the current text color */
  color?: string;
-  /** Whether the safe area should be removed and have graphic across full size */
+  /* Whether the safe area should be removed and have graphic across full size */
  cover?: boolean;
 };

@@ -1,5 +1,4 @@
 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";
@@ -8,14 +7,10 @@ import Flex from "~/components/Flex";
 import Text from "~/components/Text";
 import { undraggableOnDesktop } from "~/styles";

-export const NativeTextarea = styled.textarea<{
-  hasIcon?: boolean;
-  hasPrefix?: boolean;
-}>`
+const RealTextarea = styled.textarea<{ hasIcon?: boolean }>`
  border: 0;
  flex: 1;
-  padding: 8px 12px 8px
-    ${(props) => (props.hasPrefix ? 0 : props.hasIcon ? "8px" : "12px")};
+  padding: 8px 12px 8px ${(props) => (props.hasIcon ? "8px" : "12px")};
  outline: none;
  background: none;
  color: ${s("text")};
@@ -23,18 +18,13 @@ export const NativeTextarea = styled.textarea<{
  &:disabled,
  &::placeholder {
    color: ${s("placeholder")};
-    opacity: 1;
  }
 `;

-export const NativeInput = styled.input<{
-  hasIcon?: boolean;
-  hasPrefix?: boolean;
-}>`
+const RealInput = styled.input<{ hasIcon?: boolean }>`
  border: 0;
  flex: 1;
-  padding: 8px 12px 8px
-    ${(props) => (props.hasPrefix ? 0 : props.hasIcon ? "8px" : "12px")};
+  padding: 8px 12px 8px ${(props) => (props.hasIcon ? "8px" : "12px")};
  outline: none;
  background: none;
  color: ${s("text")};
@@ -48,7 +38,6 @@ export const NativeInput = styled.input<{
  &:disabled,
  &::placeholder {
    color: ${s("placeholder")};
-    opacity: 1;
  }

  &:-webkit-autofill,
@@ -66,7 +55,7 @@ export const NativeInput = styled.input<{
  `};
 `;

-export const Wrapper = styled.div<{
+const Wrapper = styled.div<{
  flex?: boolean;
  short?: boolean;
  minHeight?: number;
@@ -121,11 +110,9 @@ export const LabelText = styled.div`
  display: inline-block;
 `;

-export interface Props
-  extends Omit<
-    React.InputHTMLAttributes<HTMLInputElement | HTMLTextAreaElement>,
-    "prefix"
-  > {
+export type Props = React.InputHTMLAttributes<
+  HTMLInputElement | HTMLTextAreaElement
+> & {
  type?: "text" | "email" | "checkbox" | "search" | "textarea";
  labelHidden?: boolean;
  label?: string;
@@ -133,25 +120,19 @@ export interface Props
  short?: boolean;
  margin?: string | number;
  error?: string;
-  /** Optional component that appears inside the input before the textarea and any icon */
-  prefix?: React.ReactNode;
-  /** Optional icon that appears inside the input before the textarea */
  icon?: React.ReactNode;
-  /** Like autoFocus, but also select any text in the input */
-  autoSelect?: boolean;
-  /** Callback is triggered with the CMD+Enter keyboard combo */
+  /* Callback is triggered with the CMD+Enter keyboard combo */
  onRequestSubmit?: (
    ev: React.KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>
  ) => unknown;
  onFocus?: (ev: React.SyntheticEvent) => unknown;
  onBlur?: (ev: React.SyntheticEvent) => unknown;
-}
+};

 function Input(
  props: Props,
  ref: React.RefObject<HTMLInputElement | HTMLTextAreaElement>
 ) {
-  const internalRef = React.useRef<HTMLInputElement | HTMLTextAreaElement>();
  const [focused, setFocused] = React.useState(false);

  const handleBlur = (ev: React.SyntheticEvent) => {
@@ -184,12 +165,6 @@ function Input(
    }
  };

-  React.useEffect(() => {
-    if (props.autoSelect && internalRef.current) {
-      internalRef.current.select();
-    }
-  }, [props.autoSelect, internalRef]);
-
  const {
    type = "text",
    icon,
@@ -199,7 +174,6 @@ function Input(
    className,
    short,
    flex,
-    prefix,
    labelHidden,
    onFocus,
    onBlur,
@@ -220,32 +194,23 @@ function Input(
            wrappedLabel
          ))}
        <Outline focused={focused} margin={margin}>
-          {prefix}
          {icon && <IconWrapper>{icon}</IconWrapper>}
          {type === "textarea" ? (
-            <NativeTextarea
-              ref={mergeRefs([
-                internalRef,
-                ref as React.RefObject<HTMLTextAreaElement>,
-              ])}
+            <RealTextarea
+              ref={ref as React.RefObject<HTMLTextAreaElement>}
              onBlur={handleBlur}
              onFocus={handleFocus}
              onKeyDown={handleKeyDown}
              hasIcon={!!icon}
-              hasPrefix={!!prefix}
              {...rest}
            />
          ) : (
-            <NativeInput
-              ref={mergeRefs([
-                internalRef,
-                ref as React.RefObject<HTMLInputElement>,
-              ])}
+            <RealInput
+              ref={ref as React.RefObject<HTMLInputElement>}
              onBlur={handleBlur}
              onFocus={handleFocus}
              onKeyDown={handleKeyDown}
              hasIcon={!!icon}
-              hasPrefix={!!prefix}
              type={type}
              {...rest}
            />
@@ -255,9 +220,9 @@ function Input(
      </label>
      {error && (
        <TextWrapper>
-          <Text type="danger" size="xsmall">
+          <StyledText type="danger" size="xsmall">
            {error}
-          </Text>
+          </StyledText>
        </TextWrapper>
      )}
    </Wrapper>
@@ -270,4 +235,8 @@ export const TextWrapper = styled.span`
  margin-top: -16px;
 `;

+export const StyledText = styled(Text)`
+  margin-bottom: 0;
+`;
+
 export default React.forwardRef(Input);
@@ -0,0 +1,63 @@
+import { observer } from "mobx-react";
+import * as React from "react";
+import { Trans } from "react-i18next";
+import styled from "styled-components";
+import Editor from "~/components/Editor";
+import { LabelText, Outline } from "~/components/Input";
+import Text from "~/components/Text";
+
+type Props = {
+  label: string;
+  minHeight?: number;
+  maxHeight?: number;
+  readOnly?: boolean;
+};
+
+function InputRich({ label, minHeight, maxHeight, ...rest }: Props) {
+  const [focused, setFocused] = React.useState<boolean>(false);
+  const handleBlur = React.useCallback(() => {
+    setFocused(false);
+  }, []);
+  const handleFocus = React.useCallback(() => {
+    setFocused(true);
+  }, []);
+
+  return (
+    <>
+      <LabelText>{label}</LabelText>
+      <StyledOutline
+        maxHeight={maxHeight}
+        minHeight={minHeight}
+        focused={focused}
+      >
+        <React.Suspense
+          fallback={
+            <Text type="secondary">
+              <Trans>Loading editor</Trans>…
+            </Text>
+          }
+        >
+          <Editor onBlur={handleBlur} onFocus={handleFocus} grow {...rest} />
+        </React.Suspense>
+      </StyledOutline>
+    </>
+  );
+}
+
+const StyledOutline = styled(Outline)<{
+  minHeight?: number;
+  maxHeight?: number;
+  focused?: boolean;
+}>`
+  display: block;
+  padding: 8px 12px;
+  min-height: ${({ minHeight }) => (minHeight ? `${minHeight}px` : "0")};
+  max-height: ${({ maxHeight }) => (maxHeight ? `${maxHeight}px` : "auto")};
+  overflow-y: auto;
+
+  > * {
+    display: block;
+  }
+`;
+
+export default observer(InputRich);
@@ -14,7 +14,6 @@ import Button, { 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,
@@ -43,25 +42,14 @@ export type Props = {
  labelHidden?: boolean;
  icon?: React.ReactNode;
  options: Option[];
-  /** @deprecated Removing soon, do not use. */
  note?: React.ReactNode;
  onChange?: (value: string | null) => void;
 };

-export interface InputSelectRef {
-  value: string | null;
-  focus: () => void;
-  blur: () => void;
-}
-
-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 InputSelect = (props: Props) => {
  const {
    value = null,
    label,
@@ -74,7 +62,6 @@ const InputSelect = (props: Props, ref: React.RefObject<InputSelectRef>) => {
    disabled,
    note,
    icon,
-    nude,
    ...rest
  } = props;

@@ -84,9 +71,9 @@ const InputSelect = (props: Props, ref: React.RefObject<InputSelectRef>) => {
    selectedValue: value,
  });

-  const popover = useSelectPopover({
+  const popOver = useSelectPopover({
    ...select,
-    hideOnClickOutside: false,
+    hideOnClickOutside: true,
    preventBodyScroll: true,
    disabled,
  });
@@ -115,35 +102,6 @@ const InputSelect = (props: Props, ref: React.RefObject<InputSelectRef>) => {
    (option) => option.value === select.selectedValue
  );

-  // Custom click outside handling rather than using `hideOnClickOutside` from reakit so that we can
-  // prevent event bubbling.
-  useOnClickOutside(
-    contentRef,
-    (event) => {
-      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;
-    select.setSelectedValue(value);
-  }, [value]);
-
  React.useEffect(() => {
    if (previousValue.current === select.selectedValue) {
      return;
@@ -180,7 +138,6 @@ const InputSelect = (props: Props, ref: React.RefObject<InputSelectRef>) => {
              disclosure
              className={className}
              icon={icon}
-              $nude={nude}
              {...props}
            >
              {getOptionFromValue(options, select.selectedValue)?.label || (
@@ -189,8 +146,12 @@ const InputSelect = (props: Props, ref: React.RefObject<InputSelectRef>) => {
            </StyledButton>
          )}
        </Select>
-        <SelectPopover {...select} {...popover} aria-label={ariaLabel}>
-          {(props: InnerProps) => {
+        <SelectPopover {...select} {...popOver} aria-label={ariaLabel}>
+          {(
+            props: React.HTMLAttributes<HTMLDivElement> & {
+              placement: Placement;
+            }
+          ) => {
            const topAnchor = props.style?.top === "0";
            const rightAnchor = props.placement === "bottom-end";

@@ -202,7 +163,6 @@ const InputSelect = (props: Props, ref: React.RefObject<InputSelectRef>) => {
                  topAnchor={topAnchor}
                  rightAnchor={rightAnchor}
                  hiddenScrollbars
-                  maxWidth={400}
                  style={
                    maxHeight && topAnchor
                      ? {
@@ -240,7 +200,7 @@ const InputSelect = (props: Props, ref: React.RefObject<InputSelectRef>) => {
        </SelectPopover>
      </Wrapper>
      {note && (
-        <Text as="p" type="secondary" size="small">
+        <Text type="secondary" size="small">
          {note}
        </Text>
      )}
@@ -263,7 +223,7 @@ const Spacer = styled.div`
  flex-shrink: 0;
 `;

-const StyledButton = styled(Button)<{ $nude?: boolean }>`
+const StyledButton = styled(Button)<{ nude?: boolean }>`
  font-weight: normal;
  text-transform: none;
  margin-bottom: 16px;
@@ -276,7 +236,7 @@ const StyledButton = styled(Button)<{ $nude?: boolean }>`
  }

  ${(props) =>
-    props.$nude &&
+    props.nude &&
    css`
      border-color: transparent;
      box-shadow: none;
@@ -284,8 +244,8 @@ const StyledButton = styled(Button)<{ $nude?: boolean }>`

  ${Inner} {
    line-height: 28px;
-    padding-left: 12px;
-    padding-right: 4px;
+    padding-left: 16px;
+    padding-right: 8px;
  }

  svg {
@@ -307,7 +267,7 @@ const Wrapper = styled.label<{ short?: boolean }>`
  max-width: ${(props) => (props.short ? "350px" : "100%")};
 `;

-export const Positioner = styled(Position)`
+const Positioner = styled(Position)`
  &.focus-visible {
    ${StyledSelectOption} {
      &[aria-selected="true"] {
@@ -324,4 +284,4 @@ export const Positioner = styled(Position)`
  }
 `;

-export default React.forwardRef(InputSelect);
+export default InputSelect;
@@ -2,35 +2,36 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { $Diff } from "utility-types";
 import { CollectionPermission } from "@shared/types";
-import { EmptySelectValue } from "~/types";
-import InputSelect, { Props, Option, InputSelectRef } from "./InputSelect";
+import InputSelect, { Props, Option } from "./InputSelect";

-function InputSelectPermission(
+export default function InputSelectPermission(
  props: $Diff<
    Props,
    {
      options: Array<Option>;
      ariaLabel: string;
    }
-  >,
-  ref: React.RefObject<InputSelectRef>
+  >
 ) {
  const { value, onChange, ...rest } = props;
  const { t } = useTranslation();
  const handleChange = React.useCallback(
    (value) => {
-      onChange?.(value === EmptySelectValue ? null : value);
+      if (value === "no_access") {
+        value = "";
+      }
+
+      onChange?.(value);
    },
    [onChange]
  );

  return (
    <InputSelect
-      ref={ref}
-      label={t("Permission")}
+      label={t("Default access")}
      options={[
        {
-          label: t("Can edit"),
+          label: t("View and edit"),
          value: CollectionPermission.ReadWrite,
        },
        {
@@ -39,15 +40,13 @@ function InputSelectPermission(
        },
        {
          label: t("No access"),
-          value: EmptySelectValue,
+          value: "no_access",
        },
      ]}
      ariaLabel={t("Default access")}
-      value={value || EmptySelectValue}
+      value={value || "no_access"}
      onChange={handleChange}
      {...rest}
    />
  );
 }
-
-export default React.forwardRef(InputSelectPermission);
@@ -0,0 +1,39 @@
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import { $Diff } from "utility-types";
+import InputSelect, { Props, Option } from "~/components/InputSelect";
+
+const InputSelectRole = (
+  props: $Diff<
+    Props,
+    {
+      options: Array<Option>;
+      ariaLabel: string;
+    }
+  >
+) => {
+  const { t } = useTranslation();
+  return (
+    <InputSelect
+      label={t("Role")}
+      options={[
+        {
+          label: t("Member"),
+          value: "member",
+        },
+        {
+          label: t("Viewer"),
+          value: "viewer",
+        },
+        {
+          label: t("Admin"),
+          value: "admin",
+        },
+      ]}
+      ariaLabel={t("Role")}
+      {...props}
+    />
+  );
+};
+
+export default InputSelectRole;
@@ -1,7 +1,7 @@
 import styled from "styled-components";

 type Props = {
-  /** Set to true if displaying a single symbol character to disable monospace */
+  /* Set to true if displaying a single symbol character to disable monospace */
  symbol?: boolean;
 };

@@ -1,7 +1,6 @@
-import { m } from "framer-motion";
-import find from "lodash/find";
+import { find } from "lodash";
 import * as React from "react";
-import { useTranslation } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { languages, languageOptions } from "@shared/i18n";
 import ButtonLink from "~/components/ButtonLink";
@@ -10,20 +9,49 @@ import env from "~/env";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";
 import { detectLanguage } from "~/utils/language";
-import { LanguageIcon } from "./Icons/LanguageIcon";
-import Text from "./Text";
+
+function Icon({ className }: { className?: string }) {
+  return (
+    <svg
+      width="32"
+      height="32"
+      viewBox="0 0 32 32"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      className={className}
+    >
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M21 18H16L14 16V6C14 4.89543 14.8954 4 16 4H28C29.1046 4 30 4.89543 30 6V16C30 17.1046 29.1046 18 28 18H27L25.4142 19.5858C24.6332 20.3668 23.3668 20.3668 22.5858 19.5858L21 18ZM16 15.1716V6H28V16H27H26.1716L25.5858 16.5858L24 18.1716L22.4142 16.5858L21.8284 16H21H16.8284L16 15.1716Z"
+        fill="#2B2F35"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M16 13H4C2.89543 13 2 13.8954 2 15V25C2 26.1046 2.89543 27 4 27H5L6.58579 28.5858C7.36684 29.3668 8.63316 29.3668 9.41421 28.5858L11 27H16C17.1046 27 18 26.1046 18 25V15C18 13.8954 17.1046 13 16 13ZM9 17L6 16.9681C6 16.9681 5 17.016 5 18C5 18.984 6 19 6 19H8.5H10C10 19 9.57627 20.1885 8.38983 21.0831C7.20339 21.9777 5.7197 23 5.7197 23C5.7197 23 4.99153 23.6054 5.5 24.5C6.00847 25.3946 7 24.8403 7 24.8403L9.74576 22.8722L11.9492 24.6614C11.9492 24.6614 12.6271 25.3771 13.3051 24.4825C13.9831 23.5879 13.3051 23.0512 13.3051 23.0512L11.1017 21.262C11.1017 21.262 11.5 21 12 20L12.5 19H14C14 19 15 19.0319 15 18C15 16.9681 14 16.9681 14 16.9681L11 17V16C11 16 11.0169 15 10 15C8.98305 15 9 16 9 16V17Z"
+        fill="#2B2F35"
+      />
+      <path
+        d="M23.6672 12.5221L23.5526 12.1816H23.1934H20.8818H20.5215L20.4075 12.5235L20.082 13.5H19.2196L21.2292 8.10156H21.8774L21.5587 9.06116L20.7633 11.4562L20.5449 12.1138H21.2378H22.8374H23.5327L23.3114 11.4546L22.5072 9.05959L22.1855 8.10156H22.768L24.7887 13.5H23.9964L23.6672 12.5221Z"
+        fill="#2B2F35"
+        stroke="#2B2F35"
+      />
+    </svg>
+  );
+}

 export default function LanguagePrompt() {
-  const { ui } = useStores();
+  const { auth, ui } = useStores();
  const { t } = useTranslation();
  const user = useCurrentUser();
  const language = detectLanguage();

-  if (
-    language === "en_US" ||
-    language === user.language ||
-    !languages.includes(language)
-  ) {
+  if (language === "en_US" || language === user.language) {
+    return null;
+  }
+
+  if (!languages.includes(language)) {
    return null;
  }

@@ -32,23 +60,24 @@ export default function LanguagePrompt() {
  const appName = env.APP_NAME;

  return (
-    <Wrapper
-      animate={{ opacity: 1, y: 0 }}
-      exit={{ opacity: 0, y: -20 }}
-      transition={{ duration: 0.2 }}
-    >
-      <Flex align="center" gap={12}>
+    <Wrapper>
+      <Flex align="center">
        <LanguageIcon />
        <span>
-          <Text>
-            {appName} is available in your language – {optionLabel}, would you
-            like to change?
-          </Text>
+          <Trans>
+            {{ appName }} is available in your language{" "}
+            {{
+              optionLabel,
+            }}
+            , would you like to change?
+          </Trans>
          <br />
          <Link
            onClick={async () => {
              ui.setLanguagePromptDismissed();
-              await user.save({ language });
+              await auth.updateUser({
+                language,
+              });
            }}
          >
            {t("Change Language")}
@@ -61,17 +90,16 @@ export default function LanguagePrompt() {
  );
 }

-const Wrapper = styled(m.p)`
-  color: ${(props) => props.theme.text};
-  border: 1px solid ${(props) => props.theme.divider};
-  padding: 20px;
-  margin-top: 12px;
-  border-radius: 8px;
+const Wrapper = styled.p`
+  background: ${(props) => props.theme.brand.marine};
+  color: ${(props) => props.theme.almostBlack};
+  padding: 10px 12px;
+  margin-top: 24px;
+  border-radius: 4px;
  position: relative;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);

  a {
-    color: ${(props) => props.theme.text};
+    color: ${(props) => props.theme.almostBlack};
    font-weight: 500;
  }

@@ -81,11 +109,14 @@ const Wrapper = styled(m.p)`
 `;

 const Link = styled(ButtonLink)`
-  cursor: var(--cursor-pointer);
-  color: ${(props) => props.theme.text};
+  color: ${(props) => props.theme.almostBlack};
  font-weight: 500;

  &:hover {
    text-decoration: underline;
  }
 `;
+
+const LanguageIcon = styled(Icon)`
+  margin-right: 12px;
+`;
@@ -22,10 +22,12 @@ type Props = {
  sidebarRight?: React.ReactNode;
 };

-const Layout = React.forwardRef(function Layout_(
-  { title, children, sidebar, sidebarRight }: Props,
-  ref: React.RefObject<HTMLDivElement>
-) {
+const Layout: React.FC<Props> = ({
+  title,
+  children,
+  sidebar,
+  sidebarRight,
+}: Props) => {
  const { ui } = useStores();
  const sidebarCollapsed = !sidebar || ui.sidebarIsClosed;

@@ -38,7 +40,7 @@ const Layout = React.forwardRef(function Layout_(
  });

  return (
-    <Container column auto ref={ref}>
+    <Container column auto>
      <Helmet>
        <title>{title ? title : env.APP_NAME}</title>
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -73,7 +75,7 @@ const Layout = React.forwardRef(function Layout_(
      </Container>
    </Container>
  );
-});
+};

 const Container = styled(Flex)`
  background: ${s("background")};
@@ -6,23 +6,13 @@ import Flex from "~/components/Flex";
 import NavLink from "~/components/NavLink";

 export type Props = Omit<React.HTMLAttributes<HTMLAnchorElement>, "title"> & {
-  /** An icon or image to display to the left of the list item */
  image?: React.ReactNode;
-  /** An internal location to navigate to on click, if provided the list item will have hover styles */
  to?: LocationDescriptor;
-  /** An optional click handler, if provided the list item will have hover styles */
-  onClick?: React.MouseEventHandler<HTMLAnchorElement>;
-  /** Whether to match the location exactly */
  exact?: boolean;
-  /** The title of the list item */
  title: React.ReactNode;
-  /** The subtitle of the list item, displayed below the title */
  subtitle?: React.ReactNode;
-  /** Actions to display to the right of the list item */
  actions?: React.ReactNode;
-  /** Whether to display a border below the list item */
  border?: boolean;
-  /** Whether to display the list item in a compact style */
  small?: boolean;
 };

@@ -84,12 +74,10 @@ const ListItem = (
 const Wrapper = styled.a<{
  $small?: boolean;
  $border?: boolean;
-  onClick?: React.MouseEventHandler<HTMLAnchorElement>;
  to?: LocationDescriptor;
 }>`
  display: flex;
  padding: ${(props) => (props.$border === false ? 0 : "8px 0")};
-  min-height: 32px;
  margin: ${(props) =>
    props.$border === false ? (props.$small ? "8px 0" : "16px 0") : 0};
  border-bottom: 1px solid
@@ -100,13 +88,7 @@ const Wrapper = styled.a<{
    border-bottom: 0;
  }

-  &:hover {
-    background: ${(props) =>
-      props.onClick ? props.theme.secondaryBackground : "inherit"};
-  }
-
-  cursor: ${(props) =>
-    props.to || props.onClick ? "var(--pointer)" : "default"};
+  cursor: ${({ to }) => (to ? "var(--pointer)" : "default")};
 `;

 const Image = styled(Flex)`
@@ -144,7 +126,6 @@ const Subtitle = styled.p<{ $small?: boolean; $selected?: boolean }>`
 export const Actions = styled(Flex)<{ $selected?: boolean }>`
  align-self: center;
  justify-content: center;
-  flex-shrink: 0;
  color: ${(props) =>
    props.$selected ? props.theme.white : props.theme.textSecondary};
 `;
@@ -1,4 +1,4 @@
-import times from "lodash/times";
+import { times } from "lodash";
 import * as React from "react";
 import styled from "styled-components";
 import Fade from "~/components/Fade";
@@ -20,7 +20,7 @@ function eachMinute(fn: () => void) {
  };
 }

-export type Props = {
+type Props = {
  children?: React.ReactNode;
  dateTime: string;
  tooltipDelay?: number;
@@ -79,7 +79,7 @@ const LocaleTime: React.FC<Props> = ({
        });

  return (
-    <Tooltip content={tooltipContent} delay={tooltipDelay} placement="bottom">
+    <Tooltip tooltip={tooltipContent} delay={tooltipDelay} placement="bottom">
      <time dateTime={dateTime}>{children || content}</time>
    </Tooltip>
  );
@@ -1,13 +1,11 @@
 import styled from "styled-components";
-import { s } from "@shared/styles";

 const MenuIconWrapper = styled.span`
  width: 24px;
  height: 24px;
  margin-right: 6px;
  margin-left: -4px;
-  color: ${s("textSecondary")};
-  flex-shrink: 0;
+  color: ${({ theme }) => theme.textSecondary};
 `;

 export default MenuIconWrapper;
@@ -1,21 +0,0 @@
-import * as React from "react";
-import styled from "styled-components";
-import useMobile from "~/hooks/useMobile";
-
-type Props = {
-  children: React.ReactNode;
-};
-
-const MobileWrapper = styled.div`
-  width: 100vw;
-  height: 100vh;
-  overflow: auto;
-  -webkit-overflow-scrolling: touch;
-`;
-
-const MobileScrollWrapper = ({ children }: Props) => {
-  const isMobile = useMobile();
-  return isMobile ? <MobileWrapper>{children}</MobileWrapper> : <>{children}</>;
-};
-
-export default MobileScrollWrapper;
@@ -23,7 +23,7 @@ let openModals = 0;
 type Props = {
  children?: React.ReactNode;
  isOpen: boolean;
-  fullscreen?: boolean;
+  isCentered?: boolean;
  title?: React.ReactNode;
  onRequestClose: () => void;
 };
@@ -31,7 +31,7 @@ type Props = {
 const Modal: React.FC<Props> = ({
  children,
  isOpen,
-  fullscreen = true,
+  isCentered,
  title = "Untitled",
  onRequestClose,
 }: Props) => {
@@ -68,17 +68,41 @@ const Modal: React.FC<Props> = ({
  return (
    <DialogBackdrop {...dialog}>
      {(props) => (
-        <Backdrop $fullscreen={fullscreen} {...props}>
+        <Backdrop $isCentered={isCentered} {...props}>
          <Dialog
            {...dialog}
            aria-label={typeof title === "string" ? title : undefined}
            preventBodyScroll
            hideOnEsc
-            hideOnClickOutside={!fullscreen}
+            hideOnClickOutside={!!isCentered}
            hide={onRequestClose}
          >
            {(props) =>
-              fullscreen || isMobile ? (
+              isCentered && !isMobile ? (
+                <Small {...props}>
+                  <Centered
+                    onClick={(ev) => ev.stopPropagation()}
+                    column
+                    reverse
+                  >
+                    <SmallContent shadow>
+                      <ErrorBoundary component="div">{children}</ErrorBoundary>
+                    </SmallContent>
+                    <Header>
+                      {title && (
+                        <Text as="span" size="large">
+                          {title}
+                        </Text>
+                      )}
+                      <Text as="span" size="large">
+                        <NudeButton onClick={onRequestClose}>
+                          <CloseIcon />
+                        </NudeButton>
+                      </Text>
+                    </Header>
+                  </Centered>
+                </Small>
+              ) : (
                <Fullscreen
                  $nested={!!depth}
                  style={
@@ -92,11 +116,7 @@ const Modal: React.FC<Props> = ({
                >
                  <Content>
                    <Centered onClick={(ev) => ev.stopPropagation()} column>
-                      {title && (
-                        <Text size="xlarge" weight="bold">
-                          {title}
-                        </Text>
-                      )}
+                      {title && <h1>{title}</h1>}
                      <ErrorBoundary>{children}</ErrorBoundary>
                    </Centered>
                  </Content>
@@ -105,27 +125,9 @@ const Modal: React.FC<Props> = ({
                  </Close>
                  <Back onClick={onRequestClose}>
                    <BackIcon size={32} />
-                    <Text>{t("Back")} </Text>
+                    <Text as="span">{t("Back")} </Text>
                  </Back>
                </Fullscreen>
-              ) : (
-                <Small {...props}>
-                  <Centered
-                    onClick={(ev) => ev.stopPropagation()}
-                    column
-                    reverse
-                  >
-                    <SmallContent shadow>
-                      <ErrorBoundary component="div">{children}</ErrorBoundary>
-                    </SmallContent>
-                    <Header>
-                      {title && <Text size="large">{title}</Text>}
-                      <NudeButton onClick={onRequestClose}>
-                        <CloseIcon />
-                      </NudeButton>
-                    </Header>
-                  </Centered>
-                </Small>
              )
            }
          </Dialog>
@@ -135,16 +137,16 @@ const Modal: React.FC<Props> = ({
  );
 };

-const Backdrop = styled(Flex)<{ $fullscreen?: boolean }>`
+const Backdrop = styled(Flex)<{ $isCentered?: boolean }>`
  position: fixed;
  top: 0;
  left: 0;
  right: 0;
  bottom: 0;
  background-color: ${(props) =>
-    props.$fullscreen
-      ? transparentize(0.25, props.theme.background)
-      : props.theme.modalBackdrop} !important;
+    props.$isCentered
+      ? props.theme.modalBackdrop
+      : transparentize(0.25, props.theme.background)} !important;
  z-index: ${depths.modalOverlay};
  transition: opacity 50ms ease-in-out;
  opacity: 0;
@@ -188,7 +190,7 @@ const Fullscreen = styled.div<FullscreenProps>`

 const Content = styled(Scrollable)`
  width: 100%;
-  padding: 8vh 12px;
+  padding: 8vh 32px;

  ${breakpoint("tablet")`
    padding: 13vh 2rem 2rem;
@@ -257,7 +259,7 @@ const Small = styled.div`
  margin: auto auto;
  width: 30vw;
  min-width: 350px;
-  max-width: 450px;
+  max-width: 500px;
  z-index: ${depths.modal};
  display: flex;
  justify-content: center;
@@ -1,4 +1,4 @@
-import { LocationDescriptor, LocationDescriptorObject } from "history";
+import { LocationDescriptor } from "history";
 import * as React from "react";
 import { match, NavLink, Route } from "react-router-dom";

@@ -9,20 +9,10 @@ type Props = React.ComponentProps<typeof NavLink> & {
          [x: string]: string | undefined;
        }>
      | boolean
-      | null,
-    location: LocationDescriptorObject
+      | null
  ) => React.ReactNode;
-  /**
-   * If true, the tab will only be active if the path matches exactly.
-   */
  exact?: boolean;
-  /**
-   * CSS properties to apply to the link when it is active.
-   */
  activeStyle?: React.CSSProperties;
-  /**
-   * The path to match against the current location.
-   */
  to: LocationDescriptor;
 };

@@ -35,10 +25,7 @@ function NavLinkWithChildrenFunc(
      {({ match, location }) => (
        <NavLink {...rest} to={to} exact={exact} ref={ref}>
          {children
-            ? children(
-                rest.isActive ? rest.isActive(match, location) : match,
-                location
-              )
+            ? children(rest.isActive ? rest.isActive(match, location) : match)
            : null}
        </NavLink>
      )}
@@ -11,7 +11,7 @@ type Props = {
 };

 const Notice: React.FC<Props> = ({ children, icon, description }: Props) => (
-  <Container as="div">
+  <Container>
    <Flex as="span" gap={8}>
      {icon}
      <span>
@@ -1,18 +1,19 @@
 import { observer } from "mobx-react";
 import { SubscribeIcon } from "outline-icons";
 import * as React from "react";
-import styled from "styled-components";
+import styled, { useTheme } from "styled-components";
 import { s } from "@shared/styles";
 import useStores from "~/hooks/useStores";
 import Relative from "../Sidebar/components/Relative";

 const NotificationIcon = () => {
  const { notifications } = useStores();
+  const theme = useTheme();
  const count = notifications.approximateUnreadCount;

  return (
    <Relative style={{ height: 24 }}>
-      <SubscribeIcon />
+      <SubscribeIcon color={theme.textTertiary} />
      {count > 0 && <Badge />}
    </Relative>
  );
@@ -14,7 +14,6 @@ import { AvatarSize } from "../Avatar/Avatar";
 import Flex from "../Flex";
 import Text from "../Text";
 import Time from "../Time";
-import { UnreadBadge } from "../UnreadBadge";

 type Props = {
  notification: Notification;
@@ -41,18 +40,20 @@ function NotificationListItem({ notification, onNavigate }: Props) {
  };

  return (
-    <StyledLink to={notification.path ?? ""} onClick={handleClick}>
+    <Link to={notification.path} onClick={handleClick}>
      <Container gap={8} $unread={!notification.viewedAt}>
        <StyledAvatar model={notification.actor} size={AvatarSize.Large} />
        <Flex column>
          <Text as="div" size="small">
-            <Text weight="bold">
+            <Text as="span" weight="bold">
              {notification.actor?.name ?? t("Unknown")}
            </Text>{" "}
            {notification.eventText(t)}{" "}
-            <Text weight="bold">{notification.subject}</Text>
+            <Text as="span" weight="bold">
+              {notification.subject}
+            </Text>
          </Text>
-          <Text type="tertiary" size="xsmall">
+          <Text as="span" type="tertiary" size="xsmall">
            <Time
              dateTime={notification.createdAt}
              tooltipDelay={1000}
@@ -66,18 +67,12 @@ function NotificationListItem({ notification, onNavigate }: Props) {
            />
          )}
        </Flex>
-        {notification.viewedAt ? null : <UnreadBadge style={{ right: 20 }} />}
+        {notification.viewedAt ? null : <Unread />}
      </Container>
-    </StyledLink>
+    </Link>
  );
 }

-const StyledLink = styled(Link)`
-  display: block;
-  margin: 0 8px;
-  cursor: var(--pointer);
-`;
-
 const StyledCommentEditor = styled(CommentEditor)`
  font-size: 0.9em;
  margin-top: 4px;
@@ -92,13 +87,24 @@ const StyledAvatar = styled(Avatar)`
 const Container = styled(Flex)<{ $unread: boolean }>`
  position: relative;
  padding: 8px 12px;
-  padding-right: 40px;
+  margin: 0 8px;
  border-radius: 4px;

  &:${hover},
  &:active {
    background: ${s("listItemHoverBackground")};
+    cursor: var(--pointer);
  }
 `;

+const Unread = styled.div`
+  width: 8px;
+  height: 8px;
+  background: ${s("accent")};
+  border-radius: 8px;
+  align-self: center;
+  position: absolute;
+  right: 20px;
+`;
+
 export default observer(NotificationListItem);
@@ -22,7 +22,7 @@ import Tooltip from "../Tooltip";
 import NotificationListItem from "./NotificationListItem";

 type Props = {
-  /** Callback when the notification panel wants to close. */
+  /* Callback when the notification panel wants to close. */
  onRequestClose: () => void;
 };

@@ -58,13 +58,13 @@ function Notifications(
          </Text>
          <Text color="textSecondary" as={Flex} gap={8}>
            {notifications.approximateUnreadCount > 0 && (
-              <Tooltip delay={500} content={t("Mark all as read")}>
+              <Tooltip delay={500} tooltip={t("Mark all as read")}>
                <Button action={markNotificationsAsRead} context={context}>
                  <MarkAsReadIcon />
                </Button>
              </Tooltip>
            )}
-            <Tooltip delay={500} content={t("Settings")}>
+            <Tooltip delay={500} tooltip={t("Settings")}>
              <Button action={navigateToNotificationSettings} context={context}>
                <SettingsIcon />
              </Button>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tom Moor	8e9beac59f	test	2023-08-08 23:12:41 -04:00
Tom Moor	a0f7c76405	Add support for SSL in development	2023-08-08 22:46:31 -04:00