fix: Migration integer -> number

fix: Guard editing state

.babelrc

@@ -12,7 +12,7 @@
         "legacy": true
       }
     ],
-    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-transform-class-properties",
     [
       "transform-inline-environment-variables",
       {
@@ -60,4 +60,4 @@
       ]
     }
   }
-}
+}

.circleci/config.yml

@@ -126,7 +126,7 @@ jobs:
             docker buildx install
             docker context create docker-multiarch
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            docker buildx create --name docker-multiarch --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x docker-multiarch
+            docker buildx create --name docker-multiarch --platform linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x docker-multiarch
             docker buildx inspect --builder docker-multiarch --bootstrap
             docker buildx use docker-multiarch
       - run:
@@ -142,9 +142,9 @@ jobs:
           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 .
+              docker buildx build -t $IMAGE_NAME:${CIRCLE_TAG/v/''} --platform linux/amd64,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 .
+              docker buildx build -t $IMAGE_NAME:latest -t $IMAGE_NAME:${CIRCLE_TAG/v/''} --platform linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x --push .
             fi
 
 workflows:

.env.sample

@@ -127,6 +127,26 @@ GITHUB_APP_NAME=
 GITHUB_APP_ID=
 GITHUB_APP_PRIVATE_KEY=
 
+# To configure Discord auth, you'll need to create a Discord Application at
+# => https://discord.com/developers/applications/
+#
+# When configuring the Client ID, add a redirect URL under "OAuth2":
+# https://<URL>/auth/discord.callback
+DISCORD_CLIENT_ID=
+DISCORD_CLIENT_SECRET=
+
+# DISCORD_SERVER_ID should be the ID of the Discord server that Outline is
+# integrated with. 
+# Used to verify that the user is a member of the server as well as server
+# metadata such as nicknames, server icon and name.
+DISCORD_SERVER_ID=
+
+# DISCORD_SERVER_ROLES should be a comma separated list of role IDs that are
+# allowed to access Outline. If this is not set, all members of the server
+# will be allowed to access Outline.
+# DISCORD_SERVER_ID and DISCORD_SERVER_ROLES must be set together.
+DISCORD_SERVER_ROLES=
+
 # –––––––––––––––– OPTIONAL ––––––––––––––––
 
 # Base64 encoded private key and certificate for HTTPS termination. This is only
@@ -169,6 +189,10 @@ SLACK_VERIFICATION_TOKEN=your_token
 SLACK_APP_ID=A0XXXXXXX
 SLACK_MESSAGE_ACTIONS=true
 
+# For Dropbox integration, follow these instructions to get the key https://www.dropbox.com/developers/embedder#setup
+# and do not forget to whitelist your domain name in the app settings
+DROPBOX_APP_KEY=
+
 # Optionally enable Sentry (sentry.io) to track errors and performance,
 # and optionally add a Sentry proxy tunnel for bypassing ad blockers in the UI:
 # https://docs.sentry.io/platforms/javascript/troubleshooting/#using-the-tunnel-option)

.eslintrc

@@ -41,6 +41,7 @@
     "@typescript-eslint/no-shadow": [
       "warn",
       {
+        "allow": ["transaction"],
         "hoist": "all",
         "ignoreTypeValueShadow": true
       }
@@ -139,4 +140,4 @@
       "typescript": {}
     }
   }
-}
+}

.github/no-response.yml

@@ -1,7 +1,7 @@
 # Configuration for probot-no-response - https://github.com/probot/no-response
 
 # Number of days of inactivity before an Issue is closed for lack of response
-daysUntilClose: 14
+daysUntilClose: 7
 
 # Label requiring a response
 responseRequiredLabel: more information needed

Dockerfile

@@ -1,19 +1,17 @@
 ARG APP_PATH=/opt/outline
-FROM outlinewiki/outline-base as base
+FROM outlinewiki/outline-base AS base
 
 ARG APP_PATH
 WORKDIR $APP_PATH
 
 # ---
-FROM node:20-alpine AS runner
-
-RUN apk update && apk add --no-cache curl && apk add --no-cache ca-certificates
+FROM node:20-slim AS runner
 
 LABEL org.opencontainers.image.source="https://github.com/outline/outline"
 
 ARG APP_PATH
 WORKDIR $APP_PATH
-ENV NODE_ENV production
+ENV NODE_ENV=production
 
 COPY --from=base $APP_PATH/build ./build
 COPY --from=base $APP_PATH/server ./server
@@ -22,13 +20,14 @@ COPY --from=base $APP_PATH/.sequelizerc ./.sequelizerc
 COPY --from=base $APP_PATH/node_modules ./node_modules
 COPY --from=base $APP_PATH/package.json ./package.json
 
-RUN addgroup -g 1001 -S nodejs && \
-  adduser -S nodejs -u 1001 && \
+# Create a non-root user compatible with Debian and BusyBox based images
+RUN addgroup --gid 1001 nodejs && \
+  adduser --uid 1001 --ingroup nodejs nodejs && \
   chown -R nodejs:nodejs $APP_PATH/build && \
   mkdir -p /var/lib/outline && \
 	chown -R nodejs:nodejs /var/lib/outline
 
-ENV FILE_STORAGE_LOCAL_ROOT_DIR /var/lib/outline/data
+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"

Dockerfile.base

@@ -1,11 +1,15 @@
 ARG APP_PATH=/opt/outline
-FROM node:20-alpine AS deps
+FROM node:20-slim AS deps
 
 ARG APP_PATH
 WORKDIR $APP_PATH
 COPY ./package.json ./yarn.lock ./
 COPY ./patches ./patches
 
+RUN  apt-get update \
+  && apt-get install -y wget \
+  && rm -rf /var/lib/apt/lists/*
+
 RUN yarn install --no-optional --frozen-lockfile --network-timeout 1000000 && \
   yarn cache clean
 
@@ -17,3 +21,6 @@ RUN rm -rf node_modules
 
 RUN yarn install --production=true --frozen-lockfile --network-timeout 1000000 && \
   yarn cache clean
+
+ENV PORT=3000
+HEALTHCHECK CMD wget -qO- http://localhost:${PORT}/_health | grep -q "OK" || exit 1

app/actions/definitions/apiKeys.tsx

@@ -1,7 +1,7 @@
 import { PlusIcon } from "outline-icons";
 import * as React from "react";
 import stores from "~/stores";
-import APIKeyNew from "~/scenes/APIKeyNew";
+import ApiKeyNew from "~/scenes/ApiKeyNew";
 import { createAction } from "..";
 import { SettingsSection } from "../sections";
 
@@ -19,7 +19,7 @@ export const createApiKey = createAction({
 
     stores.dialogs.openModal({
       title: t("New API key"),
-      content: <APIKeyNew onSubmit={stores.dialogs.closeAllModals} />,
+      content: <ApiKeyNew onSubmit={stores.dialogs.closeAllModals} />,
     });
   },
 });

app/actions/definitions/collections.tsx

@@ -4,6 +4,7 @@ import {
   PadlockIcon,
   PlusIcon,
   SearchIcon,
+  ShapesIcon,
   StarredIcon,
   TrashIcon,
   UnstarredIcon,
@@ -21,7 +22,7 @@ import { createAction } from "~/actions";
 import { CollectionSection } from "~/actions/sections";
 import { setPersistedState } from "~/hooks/usePersistedState";
 import history from "~/utils/history";
-import { searchPath } from "~/utils/routeHelpers";
+import { newTemplatePath, searchPath } from "~/utils/routeHelpers";
 
 const ColorCollectionIcon = ({ collection }: { collection: Collection }) => (
   <DynamicCollectionIcon collection={collection} />
@@ -111,6 +112,7 @@ export const editCollectionPermissions = createAction({
 
     stores.dialogs.openModal({
       title: t("Share this collection"),
+      style: { marginBottom: -12 },
       content: (
         <SharePopover
           collection={collection}
@@ -127,7 +129,9 @@ export const searchInCollection = createAction({
   analyticsName: "Search collection",
   section: CollectionSection,
   icon: <SearchIcon />,
-  visible: ({ activeCollectionId }) => !!activeCollectionId,
+  visible: ({ activeCollectionId }) =>
+    !!activeCollectionId &&
+    stores.policies.abilities(activeCollectionId).readDocument,
   perform: ({ activeCollectionId }) => {
     history.push(searchPath(undefined, { collectionId: activeCollectionId }));
   },
@@ -220,6 +224,27 @@ export const deleteCollection = createAction({
   },
 });
 
+export const createTemplate = createAction({
+  name: ({ t }) => t("New template"),
+  analyticsName: "New template",
+  section: CollectionSection,
+  icon: <ShapesIcon />,
+  keywords: "new create template",
+  visible: ({ activeCollectionId, stores }) =>
+    !!(
+      !!activeCollectionId &&
+      stores.policies.abilities(activeCollectionId).createDocument
+    ),
+  perform: ({ activeCollectionId, event }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+    event?.preventDefault();
+    event?.stopPropagation();
+    history.push(newTemplatePath(activeCollectionId));
+  },
+});
+
 export const rootCollectionActions = [
   openCollection,
   createCollection,

app/actions/definitions/comments.tsx

@@ -0,0 +1,90 @@
+import { DoneIcon, TrashIcon } from "outline-icons";
+import * as React from "react";
+import { toast } from "sonner";
+import stores from "~/stores";
+import Comment from "~/models/Comment";
+import CommentDeleteDialog from "~/components/CommentDeleteDialog";
+import history from "~/utils/history";
+import { createAction } from "..";
+import { DocumentSection } from "../sections";
+
+export const deleteCommentFactory = ({
+  comment,
+  onDelete,
+}: {
+  comment: Comment;
+  onDelete: () => void;
+}) =>
+  createAction({
+    name: ({ t }) => `${t("Delete")}…`,
+    analyticsName: "Delete comment",
+    section: DocumentSection,
+    icon: <TrashIcon />,
+    keywords: "trash",
+    dangerous: true,
+    visible: () => stores.policies.abilities(comment.id).delete,
+    perform: ({ t, event }) => {
+      event?.preventDefault();
+      event?.stopPropagation();
+
+      stores.dialogs.openModal({
+        title: t("Delete comment"),
+        content: <CommentDeleteDialog comment={comment} onSubmit={onDelete} />,
+      });
+    },
+  });
+
+export const resolveCommentFactory = ({
+  comment,
+  onResolve,
+}: {
+  comment: Comment;
+  onResolve: () => void;
+}) =>
+  createAction({
+    name: ({ t }) => t("Mark as resolved"),
+    analyticsName: "Resolve thread",
+    section: DocumentSection,
+    icon: <DoneIcon outline />,
+    visible: () =>
+      stores.policies.abilities(comment.id).resolve &&
+      stores.policies.abilities(comment.documentId).update,
+    perform: async ({ t }) => {
+      await comment.resolve();
+
+      history.replace({
+        ...history.location,
+        state: null,
+      });
+
+      onResolve();
+      toast.success(t("Thread resolved"));
+    },
+  });
+
+export const unresolveCommentFactory = ({
+  comment,
+  onUnresolve,
+}: {
+  comment: Comment;
+  onUnresolve: () => void;
+}) =>
+  createAction({
+    name: ({ t }) => t("Mark as unresolved"),
+    analyticsName: "Unresolve thread",
+    section: DocumentSection,
+    icon: <DoneIcon outline />,
+    visible: () =>
+      stores.policies.abilities(comment.id).unresolve &&
+      stores.policies.abilities(comment.documentId).update,
+    perform: async () => {
+      await comment.unresolve();
+
+      history.replace({
+        ...history.location,
+        state: null,
+      });
+
+      onUnresolve();
+    },
+  });

app/actions/definitions/dataAttributes.tsx

@@ -0,0 +1,25 @@
+import { PlusIcon } from "outline-icons";
+import * as React from "react";
+import stores from "~/stores";
+import { DataAttributeNew } from "~/components/DataAttribute/DataAttributeNew";
+import { createAction } from "..";
+import { SettingsSection } from "../sections";
+
+export const createDataAttribute = createAction({
+  name: ({ t }) => t("New attribute"),
+  analyticsName: "New attribute",
+  section: SettingsSection,
+  icon: <PlusIcon />,
+  keywords: "create",
+  visible: () =>
+    stores.policies.abilities(stores.auth.team?.id || "").createDataAttribute,
+  perform: ({ t, event }) => {
+    event?.preventDefault();
+    event?.stopPropagation();
+
+    stores.dialogs.openModal({
+      title: t("New attribute"),
+      content: <DataAttributeNew onSubmit={stores.dialogs.closeAllModals} />,
+    });
+  },
+});

app/actions/definitions/documents.tsx

@@ -37,10 +37,10 @@ import DocumentMove from "~/scenes/DocumentMove";
 import DocumentPermanentDelete from "~/scenes/DocumentPermanentDelete";
 import DocumentPublish from "~/scenes/DocumentPublish";
 import DeleteDocumentsInTrash from "~/scenes/Trash/components/DeleteDocumentsInTrash";
-import DocumentTemplatizeDialog from "~/components/DocumentTemplatizeDialog";
 import DuplicateDialog from "~/components/DuplicateDialog";
 import SharePopover from "~/components/Sharing/Document";
 import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
+import DocumentTemplatizeDialog from "~/components/TemplatizeDialog";
 import { createAction } from "~/actions";
 import { DocumentSection, TrashSection } from "~/actions/sections";
 import env from "~/env";
@@ -51,11 +51,11 @@ import {
   documentHistoryPath,
   homePath,
   newDocumentPath,
+  newNestedDocumentPath,
   searchPath,
   documentPath,
   urlify,
   trashPath,
-  newTemplatePath,
 } from "~/utils/routeHelpers";
 
 export const openDocument = createAction({
@@ -141,15 +141,10 @@ export const createNestedDocument = createAction({
     !!activeDocumentId &&
     stores.policies.abilities(currentTeamId).createDocument &&
     stores.policies.abilities(activeDocumentId).createChildDocument,
-  perform: ({ activeCollectionId, activeDocumentId, inStarredSection }) =>
-    history.push(
-      newDocumentPath(activeCollectionId, {
-        parentDocumentId: activeDocumentId,
-      }),
-      {
-        starred: inStarredSection,
-      }
-    ),
+  perform: ({ activeDocumentId, inStarredSection }) =>
+    history.push(newNestedDocumentPath(activeDocumentId), {
+      starred: inStarredSection,
+    }),
 });
 
 export const starDocument = createAction({
@@ -228,7 +223,7 @@ export const publishDocument = createAction({
       return;
     }
 
-    if (document?.collectionId) {
+    if (document?.collectionId || document?.template) {
       await document.save(undefined, {
         publish: true,
       });
@@ -353,6 +348,7 @@ export const shareDocument = createAction({
     }
 
     stores.dialogs.openModal({
+      style: { marginBottom: -12 },
       title: t("Share this document"),
       content: (
         <SharePopover
@@ -677,37 +673,34 @@ export const importDocument = createAction({
   },
 });
 
-export const createTemplate = createAction({
-  name: ({ t, activeDocumentId }) =>
-    activeDocumentId ? t("Templatize") : t("New template"),
+export const createTemplateFromDocument = createAction({
+  name: ({ t }) => t("Templatize"),
   analyticsName: "Templatize document",
   section: DocumentSection,
   icon: <ShapesIcon />,
   keywords: "new create template",
   visible: ({ activeCollectionId, activeDocumentId, stores }) => {
-    if (activeDocumentId) {
-      const document = stores.documents.get(activeDocumentId);
-      if (document?.isTemplate || !document?.isActive) {
-        return false;
-      }
+    const document = activeDocumentId
+      ? stores.documents.get(activeDocumentId)
+      : undefined;
+    if (document?.isTemplate || !document?.isActive) {
+      return false;
     }
     return !!(
       !!activeCollectionId &&
-      stores.policies.abilities(activeCollectionId).update
+      stores.policies.abilities(activeCollectionId).updateDocument
     );
   },
-  perform: ({ activeCollectionId, activeDocumentId, stores, t, event }) => {
+  perform: ({ activeDocumentId, stores, t, event }) => {
+    if (!activeDocumentId) {
+      return;
+    }
     event?.preventDefault();
     event?.stopPropagation();
-
-    if (activeDocumentId) {
-      stores.dialogs.openModal({
-        title: t("Create template"),
-        content: <DocumentTemplatizeDialog documentId={activeDocumentId} />,
-      });
-    } else if (activeCollectionId) {
-      history.push(newTemplatePath(activeCollectionId));
-    }
+    stores.dialogs.openModal({
+      title: t("Create template"),
+      content: <DocumentTemplatizeDialog documentId={activeDocumentId} />,
+    });
   },
 });
 
@@ -742,11 +735,50 @@ export const searchDocumentsForQuery = (searchQuery: string) =>
     visible: ({ location }) => location.pathname !== searchPath(),
   });
 
-export const moveDocument = createAction({
-  name: ({ t }) => t("Move"),
+export const moveTemplateToWorkspace = createAction({
+  name: ({ t }) => t("Move to workspace"),
+  analyticsName: "Move template to workspace",
+  section: DocumentSection,
+  icon: <MoveIcon />,
+  iconInContextMenu: false,
+  visible: ({ activeDocumentId, stores }) => {
+    if (!activeDocumentId) {
+      return false;
+    }
+    const document = stores.documents.get(activeDocumentId);
+    if (!document || !document.template || document.isWorkspaceTemplate) {
+      return false;
+    }
+    return !!stores.policies.abilities(activeDocumentId).move;
+  },
+  perform: async ({ activeDocumentId, stores }) => {
+    if (activeDocumentId) {
+      const document = stores.documents.get(activeDocumentId);
+      if (!document) {
+        return;
+      }
+
+      await document.move({
+        collectionId: null,
+      });
+    }
+  },
+});
+
+export const moveDocumentToCollection = createAction({
+  name: ({ activeDocumentId, stores, t }) => {
+    if (!activeDocumentId) {
+      return t("Move");
+    }
+    const document = stores.documents.get(activeDocumentId);
+    return document?.template && document?.collectionId
+      ? t("Move to collection")
+      : t("Move");
+  },
   analyticsName: "Move document",
   section: DocumentSection,
   icon: <MoveIcon />,
+  iconInContextMenu: false,
   visible: ({ activeDocumentId, stores }) => {
     if (!activeDocumentId) {
       return false;
@@ -770,6 +802,44 @@ export const moveDocument = createAction({
   },
 });
 
+export const moveDocument = createAction({
+  name: ({ t }) => t("Move"),
+  analyticsName: "Move document",
+  section: DocumentSection,
+  icon: <MoveIcon />,
+  visible: ({ activeDocumentId, stores }) => {
+    if (!activeDocumentId) {
+      return false;
+    }
+    const document = stores.documents.get(activeDocumentId);
+    // Don't show the button if this is a non-workspace template.
+    if (!document || (document.template && !document.isWorkspaceTemplate)) {
+      return false;
+    }
+    return !!stores.policies.abilities(activeDocumentId).move;
+  },
+  perform: moveDocumentToCollection.perform,
+});
+
+export const moveTemplate = createAction({
+  name: ({ t }) => t("Move"),
+  analyticsName: "Move document",
+  section: DocumentSection,
+  icon: <MoveIcon />,
+  visible: ({ activeDocumentId, stores }) => {
+    if (!activeDocumentId) {
+      return false;
+    }
+    const document = stores.documents.get(activeDocumentId);
+    // Don't show the menu if this is not a template (or) a workspace template.
+    if (!document || !document.template || document.isWorkspaceTemplate) {
+      return false;
+    }
+    return !!stores.policies.abilities(activeDocumentId).move;
+  },
+  children: [moveTemplateToWorkspace, moveDocumentToCollection],
+});
+
 export const archiveDocument = createAction({
   name: ({ t }) => t("Archive"),
   analyticsName: "Archive document",
@@ -991,7 +1061,7 @@ export const rootDocumentActions = [
   openDocument,
   archiveDocument,
   createDocument,
-  createTemplate,
+  createTemplateFromDocument,
   deleteDocument,
   importDocument,
   downloadDocument,
@@ -1004,7 +1074,8 @@ export const rootDocumentActions = [
   subscribeDocument,
   unsubscribeDocument,
   duplicateDocument,
-  moveDocument,
+  moveTemplateToWorkspace,
+  moveDocumentToCollection,
   openRandomDocument,
   permanentlyDeleteDocument,
   permanentlyDeleteDocumentsInTrash,

app/components/Analytics.tsx

@@ -2,13 +2,14 @@
 /* global ga */
 import escape from "lodash/escape";
 import * as React from "react";
-import { IntegrationService } from "@shared/types";
+import { IntegrationService, PublicEnv } from "@shared/types";
 import env from "~/env";
 
 type Props = {
   children?: React.ReactNode;
 };
 
+// TODO: Refactor this component to allow injection from plugins
 const Analytics: React.FC = ({ children }: Props) => {
   // Google Analytics 3
   React.useEffect(() => {
@@ -43,12 +44,16 @@ const Analytics: React.FC = ({ children }: Props) => {
   React.useEffect(() => {
     const measurementIds = [];
 
-    if (env.analytics.service === IntegrationService.GoogleAnalytics) {
-      measurementIds.push(escape(env.analytics.settings?.measurementId));
-    }
     if (env.GOOGLE_ANALYTICS_ID?.startsWith("G-")) {
       measurementIds.push(env.GOOGLE_ANALYTICS_ID);
     }
+
+    (env.analytics as PublicEnv["analytics"]).forEach((integration) => {
+      if (integration.service === IntegrationService.GoogleAnalytics) {
+        measurementIds.push(escape(integration.settings?.measurementId));
+      }
+    });
+
     if (measurementIds.length === 0) {
       return;
     }
@@ -75,6 +80,32 @@ const Analytics: React.FC = ({ children }: Props) => {
     document.getElementsByTagName("head")[0]?.appendChild(script);
   }, []);
 
+  // Matomo
+  React.useEffect(() => {
+    (env.analytics as PublicEnv["analytics"]).forEach((integration) => {
+      if (integration.service !== IntegrationService.Matomo) {
+        return;
+      }
+
+      // @ts-expect-error - Matomo global variable
+      const _paq = (window._paq = window._paq || []);
+      _paq.push(["trackPageView"]);
+      _paq.push(["enableLinkTracking"]);
+      (function () {
+        const u = integration.settings?.instanceUrl;
+        _paq.push(["setTrackerUrl", u + "matomo.php"]);
+        _paq.push(["setSiteId", integration.settings?.measurementId]);
+        const d = document,
+          g = d.createElement("script"),
+          s = d.getElementsByTagName("script")[0];
+        g.type = "text/javascript";
+        g.async = true;
+        g.src = u + "matomo.js";
+        s.parentNode?.insertBefore(g, s);
+      })();
+    });
+  }, []);
+
   return <>{children}</>;
 };
 

app/components/ArrowKeyNavigation.tsx

@@ -1,54 +1,50 @@
+import { RovingTabIndexProvider } from "@getoutline/react-roving-tabindex";
 import { observer } from "mobx-react";
 import * as React from "react";
-import {
-  useCompositeState,
-  Composite,
-  CompositeStateReturn,
-} from "reakit/Composite";
 
 type Props = React.HTMLAttributes<HTMLDivElement> & {
-  children: (composite: CompositeStateReturn) => React.ReactNode;
+  children: () => React.ReactNode;
   onEscape?: (ev: React.KeyboardEvent<HTMLDivElement>) => void;
+  items: unknown[];
 };
 
 function ArrowKeyNavigation(
-  { children, onEscape, ...rest }: Props,
+  { children, onEscape, items, ...rest }: Props,
   ref: React.RefObject<HTMLDivElement>
 ) {
-  const composite = useCompositeState();
-
   const handleKeyDown = React.useCallback(
-    (ev) => {
+    (ev: React.KeyboardEvent<HTMLDivElement>) => {
       if (onEscape) {
         if (ev.nativeEvent.isComposing) {
           return;
         }
 
         if (ev.key === "Escape") {
+          ev.preventDefault();
           onEscape(ev);
         }
 
         if (
           ev.key === "ArrowUp" &&
-          composite.currentId === composite.items[0].id
+          // If the first item is focused and the user presses ArrowUp
+          ev.currentTarget.firstElementChild === document.activeElement
         ) {
           onEscape(ev);
         }
       }
     },
-    [composite.currentId, composite.items, onEscape]
+    [onEscape]
   );
 
   return (
-    <Composite
-      {...rest}
-      {...composite}
-      onKeyDown={handleKeyDown}
-      role="menu"
-      ref={ref}
+    <RovingTabIndexProvider
+      options={{ focusOnClick: true, direction: "both" }}
+      items={items}
     >
-      {children(composite)}
-    </Composite>
+      <div {...rest} onKeyDown={handleKeyDown} ref={ref}>
+        {children()}
+      </div>
+    </RovingTabIndexProvider>
   );
 }
 

app/components/Button.tsx

@@ -25,7 +25,7 @@ const RealButton = styled(ActionButton)<RealProps>`
   background: ${s("accent")};
   color: ${s("accentText")};
   box-shadow: rgba(0, 0, 0, 0.2) 0px 1px 2px;
-  border-radius: 4px;
+  border-radius: 6px;
   font-size: 14px;
   font-weight: 500;
   height: 32px;
@@ -49,8 +49,8 @@ const RealButton = styled(ActionButton)<RealProps>`
   &:disabled {
     cursor: default;
     pointer-events: none;
-    color: ${(props) => transparentize(0.5, props.theme.accentText)};
-    background: ${(props) => lighten(0.2, props.theme.accent)};
+    color: ${(props) => transparentize(0.3, props.theme.accentText)};
+    background: ${(props) => transparentize(0.1, props.theme.accent)};
 
     svg {
       fill: ${(props) => props.theme.white50};

app/components/Collection/CollectionForm.tsx

@@ -11,19 +11,22 @@ 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 Icon from "~/components/Icon";
 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";
+import { EmptySelectValue } from "~/types";
 import { Feature, FeatureFlags } from "~/utils/FeatureFlags";
 
+const IconPicker = React.lazy(() => import("~/components/IconPicker"));
+
 export interface FormData {
   name: string;
   icon: string;
-  color: string;
+  color: string | null;
   sharing: boolean;
   permission: CollectionPermission | undefined;
 }
@@ -37,7 +40,16 @@ export const CollectionForm = observer(function CollectionForm_({
 }) {
   const team = useCurrentTeam();
   const { t } = useTranslation();
+
   const [hasOpenedIconPicker, setHasOpenedIconPicker] = useBoolean(false);
+
+  const iconColor = React.useMemo(
+    () => collection?.color ?? randomElement(colorPalette),
+    [collection?.color]
+  );
+
+  const fallbackIcon = <Icon value="collection" color={iconColor} />;
+
   const {
     register,
     handleSubmit: formHandleSubmit,
@@ -53,7 +65,7 @@ export const CollectionForm = observer(function CollectionForm_({
       icon: collection?.icon,
       sharing: collection?.sharing ?? true,
       permission: collection?.permission,
-      color: collection?.color ?? randomElement(colorPalette),
+      color: iconColor,
     },
   });
 
@@ -70,20 +82,20 @@ export const CollectionForm = observer(function CollectionForm_({
           "collection"
       );
     }
-  }, [values.name, collection]);
+  }, [collection, hasOpenedIconPicker, setValue, values.name, values.icon]);
 
   React.useEffect(() => {
     setTimeout(() => setFocus("name", { shouldSelect: true }), 100);
   }, [setFocus]);
 
-  const handleIconPickerChange = React.useCallback(
-    (color: string, icon: string) => {
+  const handleIconChange = React.useCallback(
+    (icon: string, color: string | null) => {
       if (icon !== values.icon) {
         setFocus("name");
       }
 
-      setValue("color", color);
       setValue("icon", icon);
+      setValue("color", color);
     },
     [setFocus, setValue, values.icon]
   );
@@ -105,13 +117,16 @@ export const CollectionForm = observer(function CollectionForm_({
             maxLength: CollectionValidation.maxNameLength,
           })}
           prefix={
-            <StyledIconPicker
-              onOpen={setHasOpenedIconPicker}
-              onChange={handleIconPickerChange}
-              initial={values.name[0]}
-              color={values.color}
-              icon={values.icon}
-            />
+            <React.Suspense fallback={fallbackIcon}>
+              <StyledIconPicker
+                icon={values.icon}
+                color={values.color ?? iconColor}
+                initial={values.name[0]}
+                popoverPosition="right"
+                onOpen={setHasOpenedIconPicker}
+                onChange={handleIconChange}
+              />
+            </React.Suspense>
           }
           autoComplete="off"
           autoFocus
@@ -128,8 +143,10 @@ export const CollectionForm = observer(function CollectionForm_({
             <InputSelectPermission
               ref={field.ref}
               value={field.value}
-              onChange={(value: CollectionPermission) => {
-                field.onChange(value);
+              onChange={(
+                value: CollectionPermission | typeof EmptySelectValue
+              ) => {
+                field.onChange(value === EmptySelectValue ? null : value);
               }}
               note={t(
                 "The default access for workspace members, you can share with more users or groups later."

app/components/ContextMenu/MenuItem.tsx

@@ -1,16 +1,17 @@
 import { LocationDescriptor } from "history";
 import { CheckmarkIcon } from "outline-icons";
-import { ellipsis } from "polished";
+import { ellipsis, transparentize } from "polished";
 import * as React from "react";
 import { mergeRefs } from "react-merge-refs";
 import { MenuItem as BaseMenuItem } from "reakit/Menu";
 import styled, { css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
+import Text from "../Text";
 import MenuIconWrapper from "./MenuIconWrapper";
 
 type Props = {
   id?: string;
-  onClick?: (event: React.SyntheticEvent) => void | Promise<void>;
+  onClick?: (event: React.MouseEvent) => void | Promise<void>;
   active?: boolean;
   selected?: boolean;
   disabled?: boolean;
@@ -21,7 +22,7 @@ type Props = {
   as?: string | React.ComponentType<any>;
   hide?: () => void;
   level?: number;
-  icon?: React.ReactElement;
+  icon?: React.ReactElement | null;
   children?: React.ReactNode;
   ref?: React.LegacyRef<HTMLButtonElement> | undefined;
 };
@@ -42,30 +43,31 @@ const MenuItem = (
 ) => {
   const content = React.useCallback(
     (props) => {
+      // Preventing default mousedown otherwise menu items do not work in Firefox,
+      // which triggers the hideOnClickOutside handler first via mousedown – hiding
+      // and un-rendering the menu contents.
+      const preventDefault = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+      };
+
       const handleClick = async (ev: React.MouseEvent) => {
         hide?.();
 
         if (onClick) {
-          ev.preventDefault();
+          preventDefault(ev);
           await onClick(ev);
         }
       };
 
-      // Preventing default mousedown otherwise menu items do not work in Firefox,
-      // which triggers the hideOnClickOutside handler first via mousedown – hiding
-      // and un-rendering the menu contents.
-      const handleMouseDown = (ev: React.MouseEvent) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-      };
-
       return (
         <MenuAnchor
           {...props}
           $active={active}
           as={onClick ? "button" : as}
           onClick={handleClick}
-          onMouseDown={handleMouseDown}
+          onPointerDown={preventDefault}
+          onMouseDown={preventDefault}
           ref={mergeRefs([
             ref,
             props.ref as React.RefObject<HTMLAnchorElement>,
@@ -160,6 +162,10 @@ export const MenuAnchorCSS = css<MenuAnchorProps>`
         color: ${props.theme.accentText};
         fill: ${props.theme.accentText};
       }
+
+      ${Text} {
+        color: ${transparentize(0.5, props.theme.accentText)};
+      }
     }
   }
   `}

app/components/ContextMenu/Template.tsx

@@ -30,6 +30,7 @@ type Props = Omit<MenuStateReturn, "items"> & {
   actions?: (Action | MenuSeparator | MenuHeading)[];
   context?: Partial<ActionContext>;
   items?: TMenuItem[];
+  showIcons?: boolean;
 };
 
 const Disclosure = styled(ExpandedIcon)`
@@ -98,7 +99,7 @@ export function filterTemplateItems(items: TMenuItem[]): TMenuItem[] {
     });
 }
 
-function Template({ items, actions, context, ...menu }: Props) {
+function Template({ items, actions, context, showIcons, ...menu }: Props) {
   const ctx = useActionContext({
     isContextMenu: true,
   });
@@ -124,7 +125,8 @@ function Template({ items, actions, context, ...menu }: Props) {
         if (
           iconIsPresentInAnyMenuItem &&
           item.type !== "separator" &&
-          item.type !== "heading"
+          item.type !== "heading" &&
+          showIcons !== false
         ) {
           item.icon = item.icon || <MenuIconWrapper aria-hidden />;
         }
@@ -138,7 +140,7 @@ function Template({ items, actions, context, ...menu }: Props) {
               key={index}
               disabled={item.disabled}
               selected={item.selected}
-              icon={item.icon}
+              icon={showIcons !== false ? item.icon : undefined}
               {...menu}
             >
               {item.title}
@@ -156,7 +158,7 @@ function Template({ items, actions, context, ...menu }: Props) {
               selected={item.selected}
               level={item.level}
               target={item.href.startsWith("#") ? undefined : "_blank"}
-              icon={item.icon}
+              icon={showIcons !== false ? item.icon : undefined}
               {...menu}
             >
               {item.title}
@@ -174,7 +176,7 @@ function Template({ items, actions, context, ...menu }: Props) {
               selected={item.selected}
               dangerous={item.dangerous}
               key={index}
-              icon={item.icon}
+              icon={showIcons !== false ? item.icon : undefined}
               {...menu}
             >
               {item.title}
@@ -190,7 +192,12 @@ function Template({ items, actions, context, ...menu }: Props) {
               id={`${item.title}-${index}`}
               templateItems={item.items}
               parentMenuState={menu}
-              title={<Title title={item.title} icon={item.icon} />}
+              title={
+                <Title
+                  title={item.title}
+                  icon={showIcons !== false ? item.icon : undefined}
+                />
+              }
               {...menu}
             />
           );

app/components/DataAttribute/DataAttributeEdit.tsx

@@ -0,0 +1,34 @@
+import { observer } from "mobx-react";
+import * as React from "react";
+import { toast } from "sonner";
+import DataAttribute from "~/models/DataAttribute";
+import { DataAttributeForm, FormData } from "./DataAttributeForm";
+
+type Props = {
+  dataAttribute: DataAttribute;
+  onSubmit: () => void;
+};
+
+export const DataAttributeEdit = observer(function DataAttributeEdit_({
+  dataAttribute,
+  onSubmit,
+}: Props) {
+  const handleSubmit = React.useCallback(
+    async (data: FormData) => {
+      try {
+        await dataAttribute.save(data);
+        onSubmit?.();
+      } catch (error) {
+        toast.error(error.message);
+      }
+    },
+    [dataAttribute, onSubmit]
+  );
+
+  return (
+    <DataAttributeForm
+      dataAttribute={dataAttribute}
+      handleSubmit={handleSubmit}
+    />
+  );
+});

app/components/DataAttribute/DataAttributeForm.tsx

@@ -0,0 +1,212 @@
+import { observer } from "mobx-react";
+import { CloseIcon, PlusIcon } from "outline-icons";
+import * as React from "react";
+import { Controller, useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
+import styled, { useTheme } from "styled-components";
+import {
+  DataAttributeDataType,
+  type DataAttributeOptions,
+} from "@shared/models/types";
+import { DataAttributeValidation } from "@shared/validations";
+import type DataAttribute from "~/models/DataAttribute";
+import Button from "~/components/Button";
+import Flex from "~/components/Flex";
+import Input from "~/components/Input";
+import { DataAttributesHelper } from "~/utils/DataAttributesHelper";
+import InputSelect from "../InputSelect";
+import NudeButton from "../NudeButton";
+
+type Props = {
+  handleSubmit: (data: FormData) => void;
+  dataAttribute?: DataAttribute;
+};
+
+export interface FormData {
+  name: string;
+  description?: string;
+  dataType: DataAttributeDataType;
+  options?: DataAttributeOptions;
+}
+
+export const DataAttributeForm = observer(function DataAttributeForm_({
+  handleSubmit,
+  dataAttribute,
+}: Props) {
+  const theme = useTheme();
+  const { t } = useTranslation();
+  const {
+    register,
+    handleSubmit: formHandleSubmit,
+    formState,
+    watch,
+    control,
+    setFocus,
+    setValue,
+  } = useForm<FormData>({
+    mode: "all",
+    defaultValues: {
+      name: dataAttribute?.name,
+      description: dataAttribute?.description ?? undefined,
+      dataType: dataAttribute?.dataType ?? DataAttributeDataType.String,
+      options: dataAttribute?.options ?? undefined,
+    },
+  });
+  const values = watch();
+  const isEditing = !!dataAttribute;
+
+  React.useEffect(() => {
+    if (isEditing) {
+      return;
+    }
+    setTimeout(() => setFocus("name", { shouldSelect: true }), 100);
+  }, [isEditing, setFocus]);
+
+  return (
+    <form onSubmit={formHandleSubmit(handleSubmit)}>
+      <div>
+        <Controller
+          control={control}
+          name="dataType"
+          render={({ field }) => (
+            <InputSelect
+              ref={field.ref}
+              value={field.value}
+              disabled={isEditing}
+              onChange={(value: DataAttributeDataType) => {
+                field.onChange(value);
+
+                if (value === DataAttributeDataType.List) {
+                  setValue("options", {
+                    options: [
+                      {
+                        value: "",
+                      },
+                      {
+                        value: "",
+                      },
+                    ],
+                  });
+                }
+              }}
+              ariaLabel={t("Format")}
+              label={t("Format")}
+              options={Object.values(DataAttributeDataType).map((dataType) => ({
+                value: dataType,
+                label: DataAttributesHelper.getName(dataType, t),
+              }))}
+              style={{ width: "auto" }}
+            />
+          )}
+        />
+      </div>
+      {values.dataType === DataAttributeDataType.List && (
+        <Options gap={8} column>
+          {values.options?.options?.map((option, index) => (
+            <Flex gap={4} align="center" key={index}>
+              <Input
+                value={option.value}
+                onChange={(event) => {
+                  const newOptions = [...(values.options?.options ?? [])];
+                  newOptions[index] = { value: event.target.value };
+                  setValue("options", { options: newOptions });
+                }}
+                type="text"
+                autoComplete="off"
+                autoFocus={index !== 1}
+                minLength={DataAttributeValidation.minOptionLength}
+                maxLength={DataAttributeValidation.maxOptionLength}
+                margin={0}
+                required
+                flex
+              />
+              <NudeButton
+                disabled={
+                  (values.options?.options?.length ?? 0) <=
+                  DataAttributeValidation.minOptions
+                }
+                onClick={() => {
+                  const newOptions = [...(values.options?.options ?? [])];
+                  newOptions.splice(index, 1);
+                  setValue("options", { options: newOptions });
+                }}
+              >
+                <CloseIcon color={theme.textSecondary} />
+              </NudeButton>
+            </Flex>
+          ))}
+          <div>
+            <Controller
+              control={control}
+              name="options"
+              render={({ field }) => (
+                <Button
+                  neutral
+                  borderOnHover
+                  icon={<PlusIcon size={20} />}
+                  disabled={
+                    (values.options?.options?.length ?? 0) >=
+                    DataAttributeValidation.maxOptions
+                  }
+                  onClick={() => {
+                    field.onChange({
+                      options: [
+                        ...(field.value?.options ?? []),
+                        {
+                          value: "",
+                        },
+                      ],
+                    });
+                  }}
+                >
+                  {t("Add option")}
+                </Button>
+              )}
+            />
+          </div>
+        </Options>
+      )}
+      <Input
+        type="text"
+        label={t("Name")}
+        {...register("name", {
+          required: true,
+          minLength: DataAttributeValidation.minNameLength,
+          maxLength: DataAttributeValidation.maxNameLength,
+        })}
+        autoComplete="off"
+        autoFocus
+        flex
+      />
+      <Input
+        type="text"
+        label={t("Description")}
+        placeholder={t("Optional")}
+        {...register("description", {
+          maxLength: DataAttributeValidation.maxDescriptionLength,
+        })}
+        autoComplete="off"
+        flex
+      />
+      <Flex justify="flex-end">
+        <Button
+          type="submit"
+          disabled={formState.isSubmitting || !formState.isValid}
+        >
+          {dataAttribute
+            ? formState.isSubmitting
+              ? `${t("Saving")}…`
+              : t("Save")
+            : formState.isSubmitting
+            ? `${t("Creating")}…`
+            : t("Create")}
+        </Button>
+      </Flex>
+    </form>
+  );
+});
+
+const Options = styled(Flex)`
+  margin-left: 16px;
+  margin-bottom: 16px;
+`;

app/components/DataAttribute/DataAttributeNew.tsx

@@ -0,0 +1,30 @@
+import { observer } from "mobx-react";
+import * as React from "react";
+import { toast } from "sonner";
+import DataAttribute from "~/models/DataAttribute";
+import useStores from "~/hooks/useStores";
+import { DataAttributeForm, FormData } from "./DataAttributeForm";
+
+type Props = {
+  onSubmit: () => void;
+};
+
+export const DataAttributeNew = observer(function DataAttributeNew_({
+  onSubmit,
+}: Props) {
+  const { dataAttributes } = useStores();
+  const handleSubmit = React.useCallback(
+    async (data: FormData) => {
+      try {
+        const dataAttribute = new DataAttribute(data, dataAttributes);
+        await dataAttribute.save();
+        onSubmit?.();
+      } catch (error) {
+        toast.error(error.message);
+      }
+    },
+    [dataAttributes, onSubmit]
+  );
+
+  return <DataAttributeForm handleSubmit={handleSubmit} />;
+});

app/components/Dialogs.tsx

@@ -25,6 +25,7 @@ function Dialogs() {
           fullscreen={modal.fullscreen ?? false}
           onRequestClose={() => dialogs.closeModal(id)}
           title={modal.title}
+          style={modal.style}
         >
           {modal.content}
         </Modal>

app/components/DocumentBreadcrumb.tsx

@@ -6,6 +6,7 @@ import styled from "styled-components";
 import type { NavigationNode } from "@shared/types";
 import Document from "~/models/Document";
 import Breadcrumb from "~/components/Breadcrumb";
+import Icon from "~/components/Icon";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
 import useStores from "~/hooks/useStores";
 import { MenuInternalLink } from "~/types";
@@ -15,7 +16,6 @@ import {
   settingsPath,
   trashPath,
 } from "~/utils/routeHelpers";
-import EmojiIcon from "./Icons/EmojiIcon";
 
 type Props = {
   children?: React.ReactNode;
@@ -106,9 +106,9 @@ const DocumentBreadcrumb: React.FC<Props> = ({
     path.slice(0, -1).forEach((node: NavigationNode) => {
       output.push({
         type: "route",
-        title: node.emoji ? (
+        title: node.icon ? (
           <>
-            <EmojiIcon emoji={node.emoji} /> {node.title}
+            <StyledIcon value={node.icon} color={node.color} /> {node.title}
           </>
         ) : (
           node.title
@@ -144,6 +144,10 @@ const DocumentBreadcrumb: React.FC<Props> = ({
   );
 };
 
+const StyledIcon = styled(Icon)`
+  margin-right: 2px;
+`;
+
 const SmallSlash = styled(GoToIcon)`
   width: 12px;
   height: 12px;

app/components/DocumentCard.tsx

@@ -9,15 +9,17 @@ import { Link } from "react-router-dom";
 import styled, { useTheme } from "styled-components";
 import Squircle from "@shared/components/Squircle";
 import { s, ellipsis } from "@shared/styles";
+import { IconType } from "@shared/types";
+import { determineIconType } from "@shared/utils/icon";
 import Document from "~/models/Document";
 import Pin from "~/models/Pin";
 import Flex from "~/components/Flex";
+import Icon from "~/components/Icon";
 import NudeButton from "~/components/NudeButton";
 import Time from "~/components/Time";
 import useStores from "~/hooks/useStores";
 import { hover } from "~/styles";
 import CollectionIcon from "./Icons/CollectionIcon";
-import EmojiIcon from "./Icons/EmojiIcon";
 import Text from "./Text";
 import Tooltip from "./Tooltip";
 
@@ -52,6 +54,8 @@ function DocumentCard(props: Props) {
     disabled: !isDraggable || !canUpdatePin,
   });
 
+  const hasEmojiInTitle = determineIconType(document.icon) === IconType.Emoji;
+
   const style = {
     transform: CSS.Transform.toString(transform),
     transition,
@@ -109,12 +113,18 @@ function DocumentCard(props: Props) {
               <path d="M19.5 19.5H6C2.96243 19.5 0.5 17.0376 0.5 14V0.5H0.792893L19.5 19.2071V19.5Z" />
             </Fold>
 
-            {document.emoji ? (
-              <Squircle color={theme.slateLight}>
-                <EmojiIcon emoji={document.emoji} size={24} />
-              </Squircle>
+            {document.icon ? (
+              <DocumentSquircle
+                icon={document.icon}
+                color={document.color ?? undefined}
+              />
             ) : (
-              <Squircle color={collection?.color}>
+              <Squircle
+                color={
+                  collection?.color ??
+                  (!pin?.collectionId ? theme.slateLight : theme.slateDark)
+                }
+              >
                 {collection?.icon &&
                 collection?.icon !== "letter" &&
                 collection?.icon !== "collection" &&
@@ -127,8 +137,8 @@ function DocumentCard(props: Props) {
             )}
             <div>
               <Heading dir={document.dir}>
-                {document.emoji
-                  ? document.titleWithDefault.replace(document.emoji, "")
+                {hasEmojiInTitle
+                  ? document.titleWithDefault.replace(document.icon!, "")
                   : document.titleWithDefault}
               </Heading>
               <DocumentMeta size="xsmall">
@@ -159,6 +169,24 @@ function DocumentCard(props: Props) {
   );
 }
 
+const DocumentSquircle = ({
+  icon,
+  color,
+}: {
+  icon: string;
+  color?: string;
+}) => {
+  const theme = useTheme();
+  const iconType = determineIconType(icon)!;
+  const squircleColor = iconType === IconType.SVG ? color : theme.slateLight;
+
+  return (
+    <Squircle color={squircleColor}>
+      <Icon value={icon} color={theme.white} forceColor />
+    </Squircle>
+  );
+};
+
 const Clock = styled(ClockIcon)`
   flex-shrink: 0;
 `;

app/components/DocumentExplorer.tsx

@@ -18,8 +18,8 @@ import { NavigationNode } from "@shared/types";
 import DocumentExplorerNode from "~/components/DocumentExplorerNode";
 import DocumentExplorerSearchResult from "~/components/DocumentExplorerSearchResult";
 import Flex from "~/components/Flex";
+import Icon from "~/components/Icon";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
-import EmojiIcon from "~/components/Icons/EmojiIcon";
 import { Outline } from "~/components/Input";
 import InputSearch from "~/components/InputSearch";
 import Text from "~/components/Text";
@@ -216,25 +216,30 @@ function DocumentExplorer({ onSubmit, onSelect, items }: Props) {
     }) => {
       const node = data[index];
       const isCollection = node.type === "collection";
-      let icon, title: string, emoji: string | undefined, path;
+      let renderedIcon,
+        title: string,
+        icon: string | undefined,
+        color: string | undefined,
+        path;
 
       if (isCollection) {
         const col = collections.get(node.collectionId as string);
-        icon = col && (
+        renderedIcon = col && (
           <CollectionIcon collection={col} expanded={isExpanded(index)} />
         );
         title = node.title;
       } else {
         const doc = documents.get(node.id);
-        emoji = doc?.emoji ?? node.emoji;
+        icon = doc?.icon ?? node.icon ?? node.emoji;
+        color = doc?.color ?? node.color;
         title = doc?.title ?? node.title;
 
-        if (emoji) {
-          icon = <EmojiIcon emoji={emoji} />;
+        if (icon) {
+          renderedIcon = <Icon value={icon} color={color} />;
         } else if (doc?.isStarred) {
-          icon = <StarredIcon color={theme.yellow} />;
+          renderedIcon = <StarredIcon color={theme.yellow} />;
         } else {
-          icon = <DocumentIcon color={theme.textSecondary} />;
+          renderedIcon = <DocumentIcon color={theme.textSecondary} />;
         }
 
         path = ancestors(node)
@@ -254,7 +259,7 @@ function DocumentExplorer({ onSubmit, onSelect, items }: Props) {
           }}
           onPointerMove={() => setActiveNode(index)}
           onClick={() => toggleSelect(index)}
-          icon={icon}
+          icon={renderedIcon}
           title={title}
           path={path}
         />
@@ -275,7 +280,7 @@ function DocumentExplorer({ onSubmit, onSelect, items }: Props) {
           selected={isSelected(index)}
           active={activeNode === index}
           expanded={isExpanded(index)}
-          icon={icon}
+          icon={renderedIcon}
           title={title}
           depth={node.depth as number}
           hasChildren={hasChildren(index)}

app/components/DocumentExplorerNode.tsx

@@ -120,6 +120,7 @@ export const Node = styled.span<{
       color: ${props.theme.white};
 
       svg {
+        color: ${props.theme.white};
         fill: ${props.theme.white};
       }
     `}

app/components/DocumentListItem.tsx

@@ -1,17 +1,21 @@
+import {
+  useFocusEffect,
+  useRovingTabIndex,
+} from "@getoutline/react-roving-tabindex";
 import { observer } from "mobx-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
-import { CompositeStateReturn, CompositeItem } from "reakit/Composite";
 import styled, { css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
+import EventBoundary from "@shared/components/EventBoundary";
 import { s } from "@shared/styles";
 import Document from "~/models/Document";
 import Badge from "~/components/Badge";
 import DocumentMeta from "~/components/DocumentMeta";
-import EventBoundary from "~/components/EventBoundary";
 import Flex from "~/components/Flex";
 import Highlight from "~/components/Highlight";
+import Icon from "~/components/Icon";
 import NudeButton from "~/components/NudeButton";
 import StarButton, { AnimatedStar } from "~/components/Star";
 import Tooltip from "~/components/Tooltip";
@@ -20,7 +24,6 @@ import useCurrentUser from "~/hooks/useCurrentUser";
 import DocumentMenu from "~/menus/DocumentMenu";
 import { hover } from "~/styles";
 import { documentPath } from "~/utils/routeHelpers";
-import EmojiIcon from "./Icons/EmojiIcon";
 
 type Props = {
   document: Document;
@@ -32,7 +35,7 @@ type Props = {
   showPin?: boolean;
   showDraft?: boolean;
   showTemplate?: boolean;
-} & CompositeStateReturn;
+};
 
 const SEARCH_RESULT_REGEX = /<b\b[^>]*>(.*?)<\/b>/gi;
 
@@ -49,6 +52,15 @@ function DocumentListItem(
   const user = useCurrentUser();
   const [menuOpen, handleMenuOpen, handleMenuClose] = useBoolean();
 
+  let itemRef: React.Ref<HTMLAnchorElement> =
+    React.useRef<HTMLAnchorElement>(null);
+  if (ref) {
+    itemRef = ref;
+  }
+
+  const { focused, ...rovingTabIndex } = useRovingTabIndex(itemRef, false);
+  useFocusEffect(focused, itemRef);
+
   const {
     document,
     showParentDocuments,
@@ -64,13 +76,11 @@ function DocumentListItem(
   const queryIsInTitle =
     !!highlight &&
     !!document.title.toLowerCase().includes(highlight.toLowerCase());
-  const canStar =
-    !document.isDraft && !document.isArchived && !document.isTemplate;
+  const canStar = !document.isArchived && !document.isTemplate;
 
   return (
-    <CompositeItem
-      as={DocumentLink}
-      ref={ref}
+    <DocumentLink
+      ref={itemRef}
       dir={document.dir}
       role="menuitem"
       $isStarred={document.isStarred}
@@ -82,12 +92,13 @@ function DocumentListItem(
         },
       }}
       {...rest}
+      {...rovingTabIndex}
     >
       <Content>
         <Heading dir={document.dir}>
-          {document.emoji && (
+          {document.icon && (
             <>
-              <EmojiIcon emoji={document.emoji} size={24} />
+              <Icon value={document.icon} color={document.color ?? undefined} />
               &nbsp;
             </>
           )}
@@ -99,11 +110,6 @@ function DocumentListItem(
           {document.isBadgedNew && document.createdBy?.id !== user.id && (
             <Badge yellow>{t("New")}</Badge>
           )}
-          {canStar && (
-            <StarPositioner>
-              <StarButton document={document} />
-            </StarPositioner>
-          )}
           {document.isDraft && showDraft && (
             <Tooltip
               content={t("Only visible to you")}
@@ -113,6 +119,11 @@ function DocumentListItem(
               <Badge>{t("Draft")}</Badge>
             </Tooltip>
           )}
+          {canStar && (
+            <StarPositioner>
+              <StarButton document={document} />
+            </StarPositioner>
+          )}
           {document.isTemplate && showTemplate && (
             <Badge primary>{t("Template")}</Badge>
           )}
@@ -142,7 +153,7 @@ function DocumentListItem(
           modal={false}
         />
       </Actions>
-    </CompositeItem>
+    </DocumentLink>
   );
 }
 
@@ -263,6 +274,8 @@ const ResultContext = styled(Highlight)`
   font-size: 15px;
   margin-top: -0.25em;
   margin-bottom: 0.25em;
+  max-height: 90px;
+  overflow: hidden;
 `;
 
 export default observer(React.forwardRef(DocumentListItem));

app/components/DocumentMeta.tsx

@@ -128,15 +128,6 @@ const DocumentMeta: React.FC<Props> = ({
         <Time dateTime={publishedAt} addSuffix />
       </span>
     );
-  } else if (isDraft) {
-    content = (
-      <span>
-        {lastUpdatedByCurrentUser
-          ? t("You saved")
-          : t("{{ userName }} saved", { userName })}{" "}
-        <Time dateTime={updatedAt} addSuffix />
-      </span>
-    );
   } else {
     content = (
       <Modified highlight={modifiedSinceViewed && !lastUpdatedByCurrentUser}>

app/components/DocumentTemplatizeDialog.tsx

@@ -1,49 +0,0 @@
-import invariant from "invariant";
-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 { documentPath } from "~/utils/routeHelpers";
-
-type Props = {
-  documentId: string;
-};
-
-function DocumentTemplatizeDialog({ documentId }: Props) {
-  const history = useHistory();
-  const { t } = useTranslation();
-  const { documents } = useStores();
-  const document = documents.get(documentId);
-  invariant(document, "Document must exist");
-
-  const handleSubmit = React.useCallback(async () => {
-    const template = await document?.templatize();
-    if (template) {
-      history.push(documentPath(template));
-      toast.success(t("Template created, go ahead and customize it"));
-    }
-  }, [document, history, t]);
-
-  return (
-    <ConfirmationDialog
-      onSubmit={handleSubmit}
-      submitText={t("Create template")}
-      savingText={`${t("Creating")}…`}
-    >
-      <Trans
-        defaults="Creating a template from <em>{{titleWithDefault}}</em> is a non-destructive action – we'll make a copy of the document and turn it into a template that can be used as a starting point for new documents."
-        values={{
-          titleWithDefault: document.titleWithDefault,
-        }}
-        components={{
-          em: <strong />,
-        }}
-      />
-    </ConfirmationDialog>
-  );
-}
-
-export default observer(DocumentTemplatizeDialog);

app/components/Editor.tsx

@@ -28,6 +28,7 @@ import { NotFoundError } from "~/utils/errors";
 import { uploadFile } from "~/utils/files";
 import lazyWithRetry from "~/utils/lazyWithRetry";
 import DocumentBreadcrumb from "./DocumentBreadcrumb";
+import Icon from "./Icon";
 
 const LazyLoadedEditor = lazyWithRetry(() => import("~/editor"));
 
@@ -89,6 +90,12 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
               title: document.title,
               subtitle: `Updated ${time}`,
               url: document.url,
+              icon: document.icon ? (
+                <Icon
+                  value={document.icon}
+                  color={document.color ?? undefined}
+                />
+              ) : undefined,
             },
           ];
         } catch (error) {
@@ -107,6 +114,9 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
           title: document.title,
           subtitle: <DocumentBreadcrumb document={document} onlyText />,
           url: document.url,
+          icon: document.icon ? (
+            <Icon value={document.icon} color={document.color ?? undefined} />
+          ) : undefined,
         })),
         (document) =>
           deburr(document.title)

app/components/EmojiPicker/components.tsx

@@ -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` : "")}
-`;

app/components/EmojiPicker/index.tsx

@@ -1,262 +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",
-  "ko",
-  "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
-                locale={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;

app/components/EventListItem.tsx

@@ -11,16 +11,12 @@ import {
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation } from "react-router-dom";
-import { CompositeStateReturn } from "reakit/Composite";
 import styled, { css } from "styled-components";
 import { s } from "@shared/styles";
 import Document from "~/models/Document";
 import Event from "~/models/Event";
 import Avatar from "~/components/Avatar";
-import CompositeItem, {
-  Props as ItemProps,
-} from "~/components/List/CompositeItem";
-import Item, { Actions } from "~/components/List/Item";
+import Item, { Actions, Props as ItemProps } from "~/components/List/Item";
 import Time from "~/components/Time";
 import useStores from "~/hooks/useStores";
 import RevisionMenu from "~/menus/RevisionMenu";
@@ -32,7 +28,7 @@ type Props = {
   document: Document;
   event: Event;
   latest?: boolean;
-} & CompositeStateReturn;
+};
 
 const EventListItem = ({ event, latest, document, ...rest }: Props) => {
   const { t } = useTranslation();
@@ -176,11 +172,7 @@ const BaseItem = React.forwardRef(function _BaseItem(
   { to, ...rest }: ItemProps,
   ref?: React.Ref<HTMLAnchorElement>
 ) {
-  if (to) {
-    return <CompositeListItem to={to} ref={ref} {...rest} />;
-  }
-
-  return <ListItem ref={ref} {...rest} />;
+  return <ListItem to={to} ref={ref} {...rest} />;
 });
 
 const Subtitle = styled.span`
@@ -240,8 +232,4 @@ const ListItem = styled(Item)`
   ${ItemStyle}
 `;
 
-const CompositeListItem = styled(CompositeItem)`
-  ${ItemStyle}
-`;
-
 export default observer(EventListItem);

app/components/GroupListItem.tsx

@@ -5,8 +5,8 @@ import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { MAX_AVATAR_DISPLAY } from "@shared/constants";
 import { s } from "@shared/styles";
-import CollectionGroupMembership from "~/models/CollectionGroupMembership";
 import Group from "~/models/Group";
+import GroupMembership from "~/models/GroupMembership";
 import GroupMembers from "~/scenes/GroupMembers";
 import Facepile from "~/components/Facepile";
 import Flex from "~/components/Flex";
@@ -19,19 +19,19 @@ import NudeButton from "./NudeButton";
 
 type Props = {
   group: Group;
-  membership?: CollectionGroupMembership;
+  membership?: GroupMembership;
   showFacepile?: boolean;
   showAvatar?: boolean;
   renderActions: (params: { openMembersModal: () => void }) => React.ReactNode;
 };
 
 function GroupListItem({ group, showFacepile, renderActions }: Props) {
-  const { groupMemberships } = useStores();
+  const { groupUsers } = useStores();
   const { t } = useTranslation();
   const [membersModalOpen, setMembersModalOpen, setMembersModalClosed] =
     useBoolean();
   const memberCount = group.memberCount;
-  const membershipsInGroup = groupMemberships.inGroup(group.id);
+  const membershipsInGroup = groupUsers.inGroup(group.id);
   const users = membershipsInGroup
     .slice(0, MAX_AVATAR_DISPLAY)
     .map((gm) => gm.user);

app/components/Highlight.tsx

@@ -2,6 +2,7 @@ import escapeRegExp from "lodash/escapeRegExp";
 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,7 +44,7 @@ function Highlight({
 }
 
 export const Mark = styled.mark`
-  color: inherit;
+  color: ${s("text")};
   background: transparent;
   font-weight: 600;
 `;

app/components/HoverPreview/HoverPreviewDocument.tsx

@@ -1,7 +1,9 @@
 import * as React from "react";
+import { richExtensions } from "@shared/editor/nodes";
 import { UnfurlResourceType, UnfurlResponse } from "@shared/types";
 import Editor from "~/components/Editor";
 import Flex from "~/components/Flex";
+import ErrorBoundary from "../ErrorBoundary";
 import {
   Preview,
   Title,
@@ -21,20 +23,23 @@ const HoverPreviewDocument = React.forwardRef(function _HoverPreviewDocument(
     <Preview to={url}>
       <Card ref={ref}>
         <CardContent>
-          <Flex column gap={2}>
-            <Title>{title}</Title>
-            <Info>{lastActivityByViewer}</Info>
-            <Description as="div">
-              <React.Suspense fallback={<div />}>
-                <Editor
-                  key={id}
-                  defaultValue={summary}
-                  embedsDisabled
-                  readOnly
-                />
-              </React.Suspense>
-            </Description>
-          </Flex>
+          <ErrorBoundary showTitle={false} reloadOnChunkMissing={false}>
+            <Flex column gap={2}>
+              <Title>{title}</Title>
+              <Info>{lastActivityByViewer}</Info>
+              <Description as="div">
+                <React.Suspense fallback={<div />}>
+                  <Editor
+                    key={id}
+                    extensions={richExtensions}
+                    defaultValue={summary}
+                    embedsDisabled
+                    readOnly
+                  />
+                </React.Suspense>
+              </Description>
+            </Flex>
+          </ErrorBoundary>
         </CardContent>
       </Card>
     </Preview>

app/components/Icon.tsx

@@ -0,0 +1,130 @@
+import { observer } from "mobx-react";
+import { getLuminance } from "polished";
+import * as React from "react";
+import styled from "styled-components";
+import breakpoint from "styled-components-breakpoint";
+import { randomElement } from "@shared/random";
+import { IconType } from "@shared/types";
+import { IconLibrary } from "@shared/utils/IconLibrary";
+import { colorPalette } from "@shared/utils/collections";
+import { determineIconType } from "@shared/utils/icon";
+import EmojiIcon from "~/components/Icons/EmojiIcon";
+import useStores from "~/hooks/useStores";
+import Logger from "~/utils/Logger";
+import Flex from "./Flex";
+
+export type Props = {
+  /** The icon to render */
+  value: string;
+  /** The color of the icon */
+  color?: string;
+  /** The size of the icon */
+  size?: number;
+  /** The initial to display if the icon is a letter icon */
+  initial?: string;
+  /** Optional additional class name */
+  className?: string;
+  /**
+   * Ensure the color does not change in response to theme and contrast. Should only be
+   * used in color picker UI.
+   */
+  forceColor?: boolean;
+};
+
+const Icon = ({
+  value: icon,
+  color,
+  size = 24,
+  initial,
+  forceColor,
+  className,
+}: Props) => {
+  const iconType = determineIconType(icon);
+
+  if (!iconType) {
+    Logger.warn("Failed to determine icon type", {
+      icon,
+    });
+    return null;
+  }
+
+  try {
+    if (iconType === IconType.SVG) {
+      return (
+        <SVGIcon
+          value={icon}
+          color={color}
+          size={size}
+          initial={initial}
+          className={className}
+          forceColor={forceColor}
+        />
+      );
+    }
+
+    return <EmojiIcon emoji={icon} size={size} className={className} />;
+  } catch (err) {
+    Logger.warn("Failed to render icon", {
+      icon,
+    });
+  }
+
+  return null;
+};
+
+const SVGIcon = observer(
+  ({
+    value: icon,
+    color: inputColor,
+    initial,
+    size,
+    className,
+    forceColor,
+  }: Props) => {
+    const { ui } = useStores();
+
+    let color = inputColor ?? randomElement(colorPalette);
+
+    // If the chosen icon color is very dark then we invert it in dark mode
+    if (!forceColor) {
+      if (ui.resolvedTheme === "dark" && color !== "currentColor") {
+        color = getLuminance(color) > 0.09 ? color : "currentColor";
+      }
+
+      // If the chosen icon color is very light then we invert it in light mode
+      if (ui.resolvedTheme === "light" && color !== "currentColor") {
+        color = getLuminance(color) < 0.9 ? color : "currentColor";
+      }
+    }
+
+    const Component = IconLibrary.getComponent(icon);
+
+    return (
+      <Component color={color} size={size} className={className}>
+        {initial}
+      </Component>
+    );
+  }
+);
+
+export const IconTitleWrapper = styled(Flex)<{ dir?: string }>`
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  top: 3px;
+  height: 40px;
+  width: 40px;
+
+  // Always move above TOC
+  z-index: 1;
+
+  ${(props: { dir?: string }) =>
+    props.dir === "rtl" ? "right: -40px" : "left: -40px"};
+
+  ${breakpoint("desktop")`
+    ${(props: { dir?: string }) =>
+      props.dir === "rtl" ? "right: -44px" : "left: -44px"};
+  `}
+`;
+
+export default Icon;

app/components/IconPicker.tsx

@@ -1,211 +0,0 @@
-import * as React from "react";
-import { useTranslation } from "react-i18next";
-import { PopoverDisclosure, usePopoverState } from "reakit";
-import { MenuItem } from "reakit/Menu";
-import styled, { useTheme } from "styled-components";
-import { IconLibrary } from "@shared/utils/IconLibrary";
-import { colorPalette } from "@shared/utils/collections";
-import Flex from "~/components/Flex";
-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 InputSearch from "./InputSearch";
-import Popover from "./Popover";
-
-const icons = IconLibrary.mapping;
-
-const TwitterPicker = lazyWithRetry(
-  () => import("react-color/lib/components/twitter/Twitter")
-);
-
-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) {
-  const [query, setQuery] = React.useState("");
-  const { t } = useTranslation();
-  const theme = useTheme();
-  const popover = usePopoverState({
-    gutter: 0,
-    placement: "right",
-    modal: true,
-  });
-
-  React.useEffect(() => {
-    if (popover.visible) {
-      onOpen?.();
-    } else {
-      onClose?.();
-      setQuery("");
-    }
-  }, [onOpen, onClose, popover.visible]);
-
-  const filteredIcons = IconLibrary.findIcons(query);
-  const handleFilter = (event: React.ChangeEvent<HTMLInputElement>) => {
-    setQuery(event.target.value.toLowerCase());
-  };
-
-  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 }
-  );
-
-  const iconNames = Object.keys(icons);
-  const delayPerIcon = 250 / iconNames.length;
-
-  return (
-    <>
-      <PopoverDisclosure {...popover}>
-        {(props) => (
-          <NudeButton
-            aria-label={t("Show menu")}
-            className={className}
-            {...props}
-          >
-            <Icon
-              as={IconLibrary.getComponent(icon || "collection")}
-              color={color}
-            >
-              {initial}
-            </Icon>
-          </NudeButton>
-        )}
-      </PopoverDisclosure>
-      <Popover
-        {...popover}
-        width={552}
-        aria-label={t("Choose an icon")}
-        hideOnClickOutside={false}
-      >
-        <Flex column gap={12}>
-          <Text size="large" weight="xbold">
-            {t("Choose an icon")}
-          </Text>
-          <InputSearch
-            value={query}
-            placeholder={`${t("Filter")}…`}
-            onChange={handleFilter}
-            autoFocus
-          />
-          <div>
-            {iconNames.map((name, index) => (
-              <MenuItem key={name} onClick={() => onChange(color, name)}>
-                {(props) => (
-                  <IconButton
-                    style={
-                      {
-                        opacity: query
-                          ? filteredIcons.includes(name)
-                            ? 1
-                            : 0.3
-                          : undefined,
-                        "--delay": `${Math.round(index * delayPerIcon)}ms`,
-                      } as React.CSSProperties
-                    }
-                    {...props}
-                  >
-                    <Icon
-                      as={IconLibrary.getComponent(name)}
-                      color={color}
-                      size={30}
-                    >
-                      {initial}
-                    </Icon>
-                  </IconButton>
-                )}
-              </MenuItem>
-            ))}
-          </div>
-          <Flex>
-            <React.Suspense
-              fallback={
-                <DelayedMount>
-                  <Text>{t("Loading")}…</Text>
-                </DelayedMount>
-              }
-            >
-              <ColorPicker
-                color={color}
-                onChange={(color) => onChange(color.hex, icon)}
-                colors={colorPalette}
-                triangle="hide"
-                styles={styles}
-              />
-            </React.Suspense>
-          </Flex>
-        </Flex>
-      </Popover>
-    </>
-  );
-}
-
-const Icon = styled.svg`
-  transition: color 150ms ease-in-out, fill 150ms ease-in-out;
-  transition-delay: var(--delay);
-`;
-
-const IconButton = styled(NudeButton)`
-  vertical-align: top;
-  border-radius: 4px;
-  margin: 0px 6px 6px 0px;
-  width: 30px;
-  height: 30px;
-`;
-
-const ColorPicker = styled(TwitterPicker)`
-  box-shadow: none !important;
-  background: transparent !important;
-  width: 100% !important;
-`;
-
-export default IconPicker;

app/components/IconPicker/components/ColorPicker.tsx

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

app/components/IconPicker/components/Emoji.tsx

@@ -0,0 +1,8 @@
+import styled from "styled-components";
+import { s } from "@shared/styles";
+
+export const Emoji = styled.span`
+  font-family: ${s("fontFamilyEmoji")};
+  width: 24px;
+  height: 24px;
+`;

app/components/IconPicker/components/EmojiPanel.tsx

@@ -0,0 +1,245 @@
+import concat from "lodash/concat";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import styled from "styled-components";
+import { EmojiCategory, EmojiSkinTone, IconType } from "@shared/types";
+import { getEmojis, getEmojisWithCategory, search } from "@shared/utils/emoji";
+import Flex from "~/components/Flex";
+import InputSearch from "~/components/InputSearch";
+import usePersistedState from "~/hooks/usePersistedState";
+import {
+  FREQUENTLY_USED_COUNT,
+  DisplayCategory,
+  emojiSkinToneKey,
+  emojisFreqKey,
+  lastEmojiKey,
+  sortFrequencies,
+} from "../utils";
+import GridTemplate, { DataNode } from "./GridTemplate";
+import SkinTonePicker from "./SkinTonePicker";
+
+/**
+ * This is needed as a constant for react-window.
+ * Calculated from the heights of TabPanel and InputSearch.
+ */
+const GRID_HEIGHT = 362;
+
+const useEmojiState = () => {
+  const [emojiSkinTone, setEmojiSkinTone] = usePersistedState<EmojiSkinTone>(
+    emojiSkinToneKey,
+    EmojiSkinTone.Default
+  );
+  const [emojisFreq, setEmojisFreq] = usePersistedState<Record<string, number>>(
+    emojisFreqKey,
+    {}
+  );
+  const [lastEmoji, setLastEmoji] = usePersistedState<string | undefined>(
+    lastEmojiKey,
+    undefined
+  );
+
+  const incrementEmojiCount = React.useCallback(
+    (emoji: string) => {
+      emojisFreq[emoji] = (emojisFreq[emoji] ?? 0) + 1;
+      setEmojisFreq({ ...emojisFreq });
+      setLastEmoji(emoji);
+    },
+    [emojisFreq, setEmojisFreq, setLastEmoji]
+  );
+
+  const getFreqEmojis = React.useCallback(() => {
+    const freqs = Object.entries(emojisFreq);
+
+    if (freqs.length > FREQUENTLY_USED_COUNT.Track) {
+      sortFrequencies(freqs).splice(FREQUENTLY_USED_COUNT.Track);
+      setEmojisFreq(Object.fromEntries(freqs));
+    }
+
+    const emojis = sortFrequencies(freqs)
+      .slice(0, FREQUENTLY_USED_COUNT.Get)
+      .map(([emoji, _]) => emoji);
+
+    const isLastPresent = emojis.includes(lastEmoji ?? "");
+    if (lastEmoji && !isLastPresent) {
+      emojis.pop();
+      emojis.push(lastEmoji);
+    }
+
+    return emojis;
+  }, [emojisFreq, setEmojisFreq, lastEmoji]);
+
+  return {
+    emojiSkinTone,
+    setEmojiSkinTone,
+    incrementEmojiCount,
+    getFreqEmojis,
+  };
+};
+
+type Props = {
+  panelWidth: number;
+  query: string;
+  panelActive: boolean;
+  onEmojiChange: (emoji: string) => void;
+  onQueryChange: (query: string) => void;
+};
+
+const EmojiPanel = ({
+  panelWidth,
+  query,
+  panelActive,
+  onEmojiChange,
+  onQueryChange,
+}: Props) => {
+  const { t } = useTranslation();
+
+  const searchRef = React.useRef<HTMLInputElement | null>(null);
+  const scrollableRef = React.useRef<HTMLDivElement | null>(null);
+
+  const {
+    emojiSkinTone: skinTone,
+    setEmojiSkinTone,
+    incrementEmojiCount,
+    getFreqEmojis,
+  } = useEmojiState();
+
+  const freqEmojis = React.useMemo(() => getFreqEmojis(), [getFreqEmojis]);
+
+  const handleFilter = React.useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      onQueryChange(event.target.value);
+    },
+    [onQueryChange]
+  );
+
+  const handleSkinChange = React.useCallback(
+    (emojiSkinTone: EmojiSkinTone) => {
+      setEmojiSkinTone(emojiSkinTone);
+    },
+    [setEmojiSkinTone]
+  );
+
+  const handleEmojiSelection = React.useCallback(
+    ({ id, value }: { id: string; value: string }) => {
+      onEmojiChange(value);
+      incrementEmojiCount(id);
+    },
+    [onEmojiChange, incrementEmojiCount]
+  );
+
+  const isSearch = query !== "";
+  const templateData: DataNode[] = isSearch
+    ? getSearchResults({
+        query,
+        skinTone,
+      })
+    : getAllEmojis({
+        skinTone,
+        freqEmojis,
+      });
+
+  React.useEffect(() => {
+    if (scrollableRef.current) {
+      scrollableRef.current.scrollTop = 0;
+    }
+    searchRef.current?.focus();
+  }, [panelActive]);
+
+  return (
+    <Flex column>
+      <UserInputContainer align="center" gap={12}>
+        <StyledInputSearch
+          ref={searchRef}
+          value={query}
+          placeholder={`${t("Search emoji")}…`}
+          onChange={handleFilter}
+        />
+        <SkinTonePicker skinTone={skinTone} onChange={handleSkinChange} />
+      </UserInputContainer>
+      <GridTemplate
+        ref={scrollableRef}
+        width={panelWidth}
+        height={GRID_HEIGHT}
+        data={templateData}
+        onIconSelect={handleEmojiSelection}
+      />
+    </Flex>
+  );
+};
+
+const getSearchResults = ({
+  query,
+  skinTone,
+}: {
+  query: string;
+  skinTone: EmojiSkinTone;
+}): DataNode[] => {
+  const emojis = search({ query, skinTone });
+  return [
+    {
+      category: DisplayCategory.Search,
+      icons: emojis.map((emoji) => ({
+        type: IconType.Emoji,
+        id: emoji.id,
+        value: emoji.value,
+      })),
+    },
+  ];
+};
+
+const getAllEmojis = ({
+  skinTone,
+  freqEmojis,
+}: {
+  skinTone: EmojiSkinTone;
+  freqEmojis: string[];
+}): DataNode[] => {
+  const emojisWithCategory = getEmojisWithCategory({ skinTone });
+
+  const getFrequentEmojis = (): DataNode => {
+    const emojis = getEmojis({ ids: freqEmojis, skinTone });
+    return {
+      category: DisplayCategory.Frequent,
+      icons: emojis.map((emoji) => ({
+        type: IconType.Emoji,
+        id: emoji.id,
+        value: emoji.value,
+      })),
+    };
+  };
+
+  const getCategoryData = (emojiCategory: EmojiCategory): DataNode => {
+    const emojis = emojisWithCategory[emojiCategory] ?? [];
+    return {
+      category: emojiCategory,
+      icons: emojis.map((emoji) => ({
+        type: IconType.Emoji,
+        id: emoji.id,
+        value: emoji.value,
+      })),
+    };
+  };
+
+  return concat(
+    getFrequentEmojis(),
+    getCategoryData(EmojiCategory.People),
+    getCategoryData(EmojiCategory.Nature),
+    getCategoryData(EmojiCategory.Foods),
+    getCategoryData(EmojiCategory.Activity),
+    getCategoryData(EmojiCategory.Places),
+    getCategoryData(EmojiCategory.Objects),
+    getCategoryData(EmojiCategory.Symbols),
+    getCategoryData(EmojiCategory.Flags)
+  );
+};
+
+const UserInputContainer = styled(Flex)`
+  height: 48px;
+  padding: 6px 12px 0px;
+`;
+
+const StyledInputSearch = styled(InputSearch)`
+  flex-grow: 1;
+`;
+
+export default EmojiPanel;

app/components/IconPicker/components/Grid.tsx

@@ -0,0 +1,61 @@
+import React from "react";
+import { FixedSizeList, ListChildComponentProps } from "react-window";
+import styled from "styled-components";
+
+type Props = {
+  width: number;
+  height: number;
+  data: React.ReactNode[][];
+  columns: number;
+  itemWidth: number;
+};
+
+const Grid = (
+  { width, height, data, columns, itemWidth }: Props,
+  ref: React.Ref<HTMLDivElement>
+) => (
+  <Container
+    outerRef={ref}
+    width={width}
+    height={height}
+    itemCount={data.length}
+    itemSize={itemWidth}
+    itemData={{ data, columns }}
+  >
+    {Row}
+  </Container>
+);
+
+type RowProps = {
+  data: React.ReactNode[][];
+  columns: number;
+};
+
+const Row = ({ index, style, data }: ListChildComponentProps<RowProps>) => {
+  const { data: rows, columns } = data;
+  const row = rows[index];
+
+  return (
+    <RowContainer style={style} columns={columns}>
+      {row}
+    </RowContainer>
+  );
+};
+
+const Container = styled(FixedSizeList<RowProps>)`
+  padding: 0px 12px;
+
+  // Needed for the absolutely positioned children
+  // to respect the VirtualList's padding
+  & > div {
+    position: relative;
+  }
+`;
+
+const RowContainer = styled.div<{ columns: number }>`
+  display: grid;
+  grid-template-columns: ${({ columns }) => `repeat(${columns}, 1fr)`};
+  align-content: center;
+`;
+
+export default React.forwardRef(Grid);

app/components/IconPicker/components/GridTemplate.tsx

@@ -0,0 +1,120 @@
+import chunk from "lodash/chunk";
+import compact from "lodash/compact";
+import React from "react";
+import styled from "styled-components";
+import { IconType } from "@shared/types";
+import { IconLibrary } from "@shared/utils/IconLibrary";
+import Text from "~/components/Text";
+import { TRANSLATED_CATEGORIES } from "../utils";
+import { Emoji } from "./Emoji";
+import Grid from "./Grid";
+import { IconButton } from "./IconButton";
+
+/**
+ * icon/emoji size is 24px; and we add 4px padding on all sides,
+ */
+const BUTTON_SIZE = 32;
+
+type OutlineNode = {
+  type: IconType.SVG;
+  name: string;
+  color: string;
+  initial: string;
+  delay: number;
+};
+
+type EmojiNode = {
+  type: IconType.Emoji;
+  id: string;
+  value: string;
+};
+
+export type DataNode = {
+  category: keyof typeof TRANSLATED_CATEGORIES;
+  icons: (OutlineNode | EmojiNode)[];
+};
+
+type Props = {
+  width: number;
+  height: number;
+  data: DataNode[];
+  onIconSelect: ({ id, value }: { id: string; value: string }) => void;
+};
+
+const GridTemplate = (
+  { width, height, data, onIconSelect }: Props,
+  ref: React.Ref<HTMLDivElement>
+) => {
+  // 24px padding for the Grid Container
+  const itemsPerRow = Math.floor((width - 24) / BUTTON_SIZE);
+
+  const gridItems = compact(
+    data.flatMap((node) => {
+      if (node.icons.length === 0) {
+        return [];
+      }
+
+      const category = (
+        <CategoryName
+          key={node.category}
+          type="tertiary"
+          size="xsmall"
+          weight="bold"
+        >
+          {TRANSLATED_CATEGORIES[node.category]}
+        </CategoryName>
+      );
+
+      const items = node.icons.map((item) => {
+        if (item.type === IconType.SVG) {
+          return (
+            <IconButton
+              key={item.name}
+              onClick={() => onIconSelect({ id: item.name, value: item.name })}
+              delay={item.delay}
+            >
+              <Icon as={IconLibrary.getComponent(item.name)} color={item.color}>
+                {item.initial}
+              </Icon>
+            </IconButton>
+          );
+        }
+
+        return (
+          <IconButton
+            key={item.id}
+            onClick={() => onIconSelect({ id: item.id, value: item.value })}
+          >
+            <Emoji>{item.value}</Emoji>
+          </IconButton>
+        );
+      });
+
+      const chunks = chunk(items, itemsPerRow);
+      return [[category], ...chunks];
+    })
+  );
+
+  return (
+    <Grid
+      ref={ref}
+      width={width}
+      height={height}
+      data={gridItems}
+      columns={itemsPerRow}
+      itemWidth={BUTTON_SIZE}
+    />
+  );
+};
+
+const CategoryName = styled(Text)`
+  grid-column: 1 / -1;
+  padding-left: 6px;
+`;
+
+const Icon = styled.svg`
+  transition: color 150ms ease-in-out, fill 150ms ease-in-out;
+  transition-delay: var(--delay);
+`;
+
+export default React.forwardRef(GridTemplate);

app/components/IconPicker/components/IconButton.tsx

@@ -0,0 +1,15 @@
+import styled from "styled-components";
+import { s } from "@shared/styles";
+import NudeButton from "~/components/NudeButton";
+import { hover } from "~/styles";
+
+export const IconButton = styled(NudeButton)<{ delay?: number }>`
+  width: 32px;
+  height: 32px;
+  padding: 4px;
+  --delay: ${({ delay }) => delay && `${delay}ms`};
+
+  &: ${hover} {
+    background: ${s("listItemHoverBackground")};
+  }
+`;

app/components/IconPicker/components/IconPanel.tsx

@@ -0,0 +1,200 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import styled from "styled-components";
+import { IconType } from "@shared/types";
+import { IconLibrary } from "@shared/utils/IconLibrary";
+import Flex from "~/components/Flex";
+import InputSearch from "~/components/InputSearch";
+import usePersistedState from "~/hooks/usePersistedState";
+import {
+  FREQUENTLY_USED_COUNT,
+  DisplayCategory,
+  iconsFreqKey,
+  lastIconKey,
+  sortFrequencies,
+} from "../utils";
+import ColorPicker from "./ColorPicker";
+import GridTemplate, { DataNode } from "./GridTemplate";
+
+const IconNames = Object.keys(IconLibrary.mapping);
+const TotalIcons = IconNames.length;
+
+/**
+ * This is needed as a constant for react-window.
+ * Calculated from the heights of TabPanel, ColorPicker and InputSearch.
+ */
+const GRID_HEIGHT = 314;
+
+const useIconState = () => {
+  const [iconsFreq, setIconsFreq] = usePersistedState<Record<string, number>>(
+    iconsFreqKey,
+    {}
+  );
+  const [lastIcon, setLastIcon] = usePersistedState<string | undefined>(
+    lastIconKey,
+    undefined
+  );
+
+  const incrementIconCount = React.useCallback(
+    (icon: string) => {
+      iconsFreq[icon] = (iconsFreq[icon] ?? 0) + 1;
+      setIconsFreq({ ...iconsFreq });
+      setLastIcon(icon);
+    },
+    [iconsFreq, setIconsFreq, setLastIcon]
+  );
+
+  const getFreqIcons = React.useCallback(() => {
+    const freqs = Object.entries(iconsFreq);
+
+    if (freqs.length > FREQUENTLY_USED_COUNT.Track) {
+      sortFrequencies(freqs).splice(FREQUENTLY_USED_COUNT.Track);
+      setIconsFreq(Object.fromEntries(freqs));
+    }
+
+    const icons = sortFrequencies(freqs)
+      .slice(0, FREQUENTLY_USED_COUNT.Get)
+      .map(([icon, _]) => icon);
+
+    const isLastPresent = icons.includes(lastIcon ?? "");
+    if (lastIcon && !isLastPresent) {
+      icons.pop();
+      icons.push(lastIcon);
+    }
+
+    return icons;
+  }, [iconsFreq, setIconsFreq, lastIcon]);
+
+  return {
+    incrementIconCount,
+    getFreqIcons,
+  };
+};
+
+type Props = {
+  panelWidth: number;
+  initial: string;
+  color: string;
+  query: string;
+  panelActive: boolean;
+  onIconChange: (icon: string) => void;
+  onColorChange: (icon: string) => void;
+  onQueryChange: (query: string) => void;
+};
+
+const IconPanel = ({
+  panelWidth,
+  initial,
+  color,
+  query,
+  panelActive,
+  onIconChange,
+  onColorChange,
+  onQueryChange,
+}: Props) => {
+  const { t } = useTranslation();
+
+  const searchRef = React.useRef<HTMLInputElement | null>(null);
+  const scrollableRef = React.useRef<HTMLDivElement | null>(null);
+
+  const { incrementIconCount, getFreqIcons } = useIconState();
+
+  const freqIcons = React.useMemo(() => getFreqIcons(), [getFreqIcons]);
+  const totalFreqIcons = freqIcons.length;
+
+  const filteredIcons = React.useMemo(
+    () => IconLibrary.findIcons(query),
+    [query]
+  );
+
+  const isSearch = query !== "";
+  const category = isSearch ? DisplayCategory.Search : DisplayCategory.All;
+  const delayPerIcon = 250 / (TotalIcons + totalFreqIcons);
+
+  const handleFilter = React.useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      onQueryChange(event.target.value);
+    },
+    [onQueryChange]
+  );
+
+  const handleIconSelection = React.useCallback(
+    ({ id, value }: { id: string; value: string }) => {
+      onIconChange(value);
+      incrementIconCount(id);
+    },
+    [onIconChange, incrementIconCount]
+  );
+
+  const baseIcons: DataNode = {
+    category,
+    icons: filteredIcons.map((name, index) => ({
+      type: IconType.SVG,
+      name,
+      color,
+      initial,
+      delay: Math.round((index + totalFreqIcons) * delayPerIcon),
+      onClick: handleIconSelection,
+    })),
+  };
+
+  const templateData: DataNode[] = isSearch
+    ? [baseIcons]
+    : [
+        {
+          category: DisplayCategory.Frequent,
+          icons: freqIcons.map((name, index) => ({
+            type: IconType.SVG,
+            name,
+            color,
+            initial,
+            delay: Math.round((index + totalFreqIcons) * delayPerIcon),
+            onClick: handleIconSelection,
+          })),
+        },
+        baseIcons,
+      ];
+
+  React.useEffect(() => {
+    if (scrollableRef.current) {
+      scrollableRef.current.scrollTop = 0;
+    }
+    searchRef.current?.focus();
+  }, [panelActive]);
+
+  return (
+    <Flex column>
+      <InputSearchContainer align="center">
+        <StyledInputSearch
+          ref={searchRef}
+          value={query}
+          placeholder={`${t("Search icons")}…`}
+          onChange={handleFilter}
+        />
+      </InputSearchContainer>
+      <ColorPicker
+        width={panelWidth}
+        activeColor={color}
+        onSelect={onColorChange}
+      />
+      <GridTemplate
+        ref={scrollableRef}
+        width={panelWidth}
+        height={GRID_HEIGHT}
+        data={templateData}
+        onIconSelect={handleIconSelection}
+      />
+    </Flex>
+  );
+};
+
+const InputSearchContainer = styled(Flex)`
+  height: 48px;
+  padding: 6px 12px 0px;
+`;
+
+const StyledInputSearch = styled(InputSearch)`
+  flex-grow: 1;
+`;
+
+export default IconPanel;

app/components/IconPicker/components/PopoverButton.tsx

@@ -0,0 +1,20 @@
+import styled, { css } from "styled-components";
+import { s } from "@shared/styles";
+import NudeButton from "~/components/NudeButton";
+import { hover } from "~/styles";
+
+export const PopoverButton = styled(NudeButton)<{ $borderOnHover?: boolean }>`
+  &: ${hover},
+  &:active,
+  &[aria-expanded= "true"] {
+    opacity: 1 !important;
+
+    ${({ $borderOnHover }) =>
+      $borderOnHover &&
+      css`
+        background: ${s("buttonNeutralBackground")};
+        box-shadow: rgba(0, 0, 0, 0.07) 0px 1px 2px,
+          ${s("buttonNeutralBorder")} 0 0 0 1px inset;
+      `};
+  }
+`;

app/components/IconPicker/components/SkinTonePicker.tsx

@@ -0,0 +1,92 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { Menu, MenuButton, MenuItem, useMenuState } from "reakit";
+import styled from "styled-components";
+import { depths, s } from "@shared/styles";
+import { EmojiSkinTone } from "@shared/types";
+import { getEmojiVariants } from "@shared/utils/emoji";
+import Flex from "~/components/Flex";
+import NudeButton from "~/components/NudeButton";
+import { hover } from "~/styles";
+import { Emoji } from "./Emoji";
+import { IconButton } from "./IconButton";
+
+const SkinTonePicker = ({
+  skinTone,
+  onChange,
+}: {
+  skinTone: EmojiSkinTone;
+  onChange: (skin: EmojiSkinTone) => void;
+}) => {
+  const { t } = useTranslation();
+
+  const handEmojiVariants = React.useMemo(
+    () => getEmojiVariants({ id: "hand" }),
+    []
+  );
+
+  const menu = useMenuState({
+    placement: "bottom",
+  });
+
+  const handleSkinClick = React.useCallback(
+    (emojiSkin) => {
+      menu.hide();
+      onChange(emojiSkin);
+    },
+    [menu, onChange]
+  );
+
+  const menuItems = React.useMemo(
+    () =>
+      Object.entries(handEmojiVariants).map(([eskin, emoji]) => (
+        <MenuItem {...menu} key={emoji.value}>
+          {(menuprops) => (
+            <IconButton {...menuprops} onClick={() => handleSkinClick(eskin)}>
+              <Emoji>{emoji.value}</Emoji>
+            </IconButton>
+          )}
+        </MenuItem>
+      )),
+    [menu, handEmojiVariants, handleSkinClick]
+  );
+
+  return (
+    <>
+      <MenuButton {...menu}>
+        {(props) => (
+          <StyledMenuButton
+            {...props}
+            aria-label={t("Choose default skin tone")}
+          >
+            {handEmojiVariants[skinTone]!.value}
+          </StyledMenuButton>
+        )}
+      </MenuButton>
+      <Menu {...menu} aria-label={t("Choose default skin tone")}>
+        {(props) => <MenuContainer {...props}>{menuItems}</MenuContainer>}
+      </Menu>
+    </>
+  );
+};
+
+const MenuContainer = styled(Flex)`
+  z-index: ${depths.menu};
+  padding: 4px;
+  border-radius: 4px;
+  background: ${s("menuBackground")};
+  box-shadow: ${s("menuShadow")};
+`;
+
+const StyledMenuButton = styled(NudeButton)`
+  width: 32px;
+  height: 32px;
+  border: 1px solid ${s("inputBorder")};
+  padding: 4px;
+
+  &: ${hover} {
+    border: 1px solid ${s("inputBorderFocused")};
+  }
+`;
+
+export default SkinTonePicker;

app/components/IconPicker/index.tsx

@@ -0,0 +1,312 @@
+import { SmileyIcon } from "outline-icons";
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import {
+  PopoverDisclosure,
+  Tab,
+  TabList,
+  TabPanel,
+  usePopoverState,
+  useTabState,
+} from "reakit";
+import styled, { css } from "styled-components";
+import { s } from "@shared/styles";
+import theme from "@shared/styles/theme";
+import { IconType } from "@shared/types";
+import { determineIconType } from "@shared/utils/icon";
+import Flex from "~/components/Flex";
+import Icon from "~/components/Icon";
+import NudeButton from "~/components/NudeButton";
+import Popover from "~/components/Popover";
+import useMobile from "~/hooks/useMobile";
+import useOnClickOutside from "~/hooks/useOnClickOutside";
+import usePrevious from "~/hooks/usePrevious";
+import useWindowSize from "~/hooks/useWindowSize";
+import { hover } from "~/styles";
+import EmojiPanel from "./components/EmojiPanel";
+import IconPanel from "./components/IconPanel";
+import { PopoverButton } from "./components/PopoverButton";
+
+const TAB_NAMES = {
+  Icon: "icon",
+  Emoji: "emoji",
+} as const;
+
+const POPOVER_WIDTH = 408;
+
+type Props = {
+  icon: string | null;
+  color: string;
+  size?: number;
+  initial?: string;
+  className?: string;
+  popoverPosition: "bottom-start" | "right";
+  allowDelete?: boolean;
+  borderOnHover?: boolean;
+  onChange: (icon: string | null, color: string | null) => void;
+  onOpen?: () => void;
+  onClose?: () => void;
+};
+
+const IconPicker = ({
+  icon,
+  color,
+  size = 24,
+  initial,
+  className,
+  popoverPosition,
+  allowDelete,
+  onChange,
+  onOpen,
+  onClose,
+  borderOnHover,
+}: Props) => {
+  const { t } = useTranslation();
+
+  const { width: windowWidth } = useWindowSize();
+  const isMobile = useMobile();
+
+  const [query, setQuery] = React.useState("");
+  const [chosenColor, setChosenColor] = React.useState(color);
+  const contentRef = React.useRef<HTMLDivElement | null>(null);
+
+  const iconType = determineIconType(icon);
+  const defaultTab = React.useMemo(
+    () =>
+      iconType === IconType.Emoji ? TAB_NAMES["Emoji"] : TAB_NAMES["Icon"],
+    [iconType]
+  );
+
+  const popover = usePopoverState({
+    placement: popoverPosition,
+    modal: true,
+    unstable_offset: [0, 0],
+  });
+  const tab = useTabState({ selectedId: defaultTab });
+  const previouslyVisible = usePrevious(popover.visible);
+
+  const popoverWidth = isMobile ? windowWidth : POPOVER_WIDTH;
+  // In mobile, popover is absolutely positioned to leave 8px on both sides.
+  const panelWidth = isMobile ? windowWidth - 16 : popoverWidth;
+
+  const resetDefaultTab = React.useCallback(() => {
+    tab.select(defaultTab);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [defaultTab]);
+
+  const handleIconChange = React.useCallback(
+    (ic: string) => {
+      popover.hide();
+      const icType = determineIconType(ic);
+      const finalColor = icType === IconType.SVG ? chosenColor : null;
+      onChange(ic, finalColor);
+    },
+    [popover, onChange, chosenColor]
+  );
+
+  const handleIconColorChange = React.useCallback(
+    (c: string) => {
+      setChosenColor(c);
+
+      const icType = determineIconType(icon);
+      // Outline icon set; propagate color change
+      if (icType === IconType.SVG) {
+        onChange(icon, c);
+      }
+    },
+    [icon, onChange]
+  );
+
+  const handleIconRemove = React.useCallback(() => {
+    popover.hide();
+    onChange(null, null);
+  }, [popover, onChange]);
+
+  const handlePopoverButtonClick = React.useCallback(
+    (ev: React.MouseEvent) => {
+      ev.stopPropagation();
+      if (popover.visible) {
+        popover.hide();
+      } else {
+        popover.show();
+      }
+    },
+    [popover]
+  );
+
+  // Popover open effect
+  React.useEffect(() => {
+    if (popover.visible && !previouslyVisible) {
+      onOpen?.();
+    } else if (!popover.visible && previouslyVisible) {
+      onClose?.();
+      setQuery("");
+      resetDefaultTab();
+    }
+  }, [popover.visible, previouslyVisible, onOpen, onClose, resetDefaultTab]);
+
+  // Custom click outside handling rather than using `hideOnClickOutside` from reakit so that we can
+  // prevent event bubbling.
+  useOnClickOutside(
+    contentRef,
+    (event) => {
+      if (
+        popover.visible &&
+        !popover.unstable_disclosureRef.current?.contains(event.target as Node)
+      ) {
+        event.stopPropagation();
+        event.preventDefault();
+        popover.hide();
+      }
+    },
+    { capture: true }
+  );
+
+  return (
+    <>
+      <PopoverDisclosure {...popover}>
+        {(props) => (
+          <PopoverButton
+            {...props}
+            aria-label={t("Show menu")}
+            className={className}
+            size={size}
+            onClick={handlePopoverButtonClick}
+            $borderOnHover={borderOnHover}
+          >
+            {iconType && icon ? (
+              <Icon value={icon} color={color} size={size} initial={initial} />
+            ) : (
+              <StyledSmileyIcon color={theme.placeholder} size={size} />
+            )}
+          </PopoverButton>
+        )}
+      </PopoverDisclosure>
+      <Popover
+        {...popover}
+        ref={contentRef}
+        width={popoverWidth}
+        shrink
+        aria-label={t("Icon Picker")}
+        onClick={(e) => e.stopPropagation()}
+        hideOnClickOutside={false}
+      >
+        <>
+          <TabActionsWrapper justify="space-between" align="center">
+            <TabList {...tab}>
+              <StyledTab
+                {...tab}
+                id={TAB_NAMES["Icon"]}
+                aria-label={t("Icons")}
+                active={tab.selectedId === TAB_NAMES["Icon"]}
+              >
+                {t("Icons")}
+              </StyledTab>
+              <StyledTab
+                {...tab}
+                id={TAB_NAMES["Emoji"]}
+                aria-label={t("Emojis")}
+                active={tab.selectedId === TAB_NAMES["Emoji"]}
+              >
+                {t("Emojis")}
+              </StyledTab>
+            </TabList>
+            {allowDelete && icon && (
+              <RemoveButton onClick={handleIconRemove}>
+                {t("Remove")}
+              </RemoveButton>
+            )}
+          </TabActionsWrapper>
+          <StyledTabPanel {...tab}>
+            <IconPanel
+              panelWidth={panelWidth}
+              initial={initial ?? "?"}
+              color={chosenColor}
+              query={query}
+              panelActive={
+                popover.visible && tab.selectedId === TAB_NAMES["Icon"]
+              }
+              onIconChange={handleIconChange}
+              onColorChange={handleIconColorChange}
+              onQueryChange={setQuery}
+            />
+          </StyledTabPanel>
+          <StyledTabPanel {...tab}>
+            <EmojiPanel
+              panelWidth={panelWidth}
+              query={query}
+              panelActive={
+                popover.visible && tab.selectedId === TAB_NAMES["Emoji"]
+              }
+              onEmojiChange={handleIconChange}
+              onQueryChange={setQuery}
+            />
+          </StyledTabPanel>
+        </>
+      </Popover>
+    </>
+  );
+};
+
+const StyledSmileyIcon = styled(SmileyIcon)`
+  flex-shrink: 0;
+
+  @media print {
+    display: none;
+  }
+`;
+
+const RemoveButton = styled(NudeButton)`
+  width: auto;
+  font-weight: 500;
+  font-size: 14px;
+  color: ${s("textTertiary")};
+  padding: 8px 12px;
+  transition: color 100ms ease-in-out;
+  &: ${hover} {
+    color: ${s("textSecondary")};
+  }
+`;
+
+const TabActionsWrapper = styled(Flex)`
+  padding-left: 12px;
+  border-bottom: 1px solid ${s("inputBorder")};
+`;
+
+const StyledTab = styled(Tab)<{ active: boolean }>`
+  position: relative;
+  font-weight: 500;
+  font-size: 14px;
+  cursor: var(--pointer);
+  background: none;
+  border: 0;
+  padding: 8px 12px;
+  user-select: none;
+  color: ${({ active }) => (active ? s("textSecondary") : s("textTertiary"))};
+  transition: color 100ms ease-in-out;
+
+  &: ${hover} {
+    color: ${s("textSecondary")};
+  }
+
+  ${({ active }) =>
+    active &&
+    css`
+      &:after {
+        content: "";
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        height: 1px;
+        background: ${s("textSecondary")};
+      }
+    `}
+`;
+
+const StyledTabPanel = styled(TabPanel)`
+  height: 410px;
+  overflow-y: auto;
+`;
+
+export default IconPicker;

app/components/IconPicker/utils.ts

@@ -0,0 +1,50 @@
+import i18next from "i18next";
+
+export enum DisplayCategory {
+  All = "All",
+  Frequent = "Frequent",
+  Search = "Search",
+}
+
+export const TRANSLATED_CATEGORIES = {
+  All: i18next.t("All"),
+  Frequent: i18next.t("Frequently Used"),
+  Search: i18next.t("Search Results"),
+  People: i18next.t("Smileys & People"),
+  Nature: i18next.t("Animals & Nature"),
+  Foods: i18next.t("Food & Drink"),
+  Activity: i18next.t("Activity"),
+  Places: i18next.t("Travel & Places"),
+  Objects: i18next.t("Objects"),
+  Symbols: i18next.t("Symbols"),
+  Flags: i18next.t("Flags"),
+};
+
+export const FREQUENTLY_USED_COUNT = {
+  Get: 24,
+  Track: 30,
+};
+
+const STORAGE_KEYS = {
+  Base: "icon-state",
+  EmojiSkinTone: "emoji-skintone",
+  IconsFrequency: "icons-freq",
+  EmojisFrequency: "emojis-freq",
+  LastIcon: "last-icon",
+  LastEmoji: "last-emoji",
+};
+
+const getStorageKey = (key: string) => `${STORAGE_KEYS.Base}.${key}`;
+
+export const emojiSkinToneKey = getStorageKey(STORAGE_KEYS.EmojiSkinTone);
+
+export const iconsFreqKey = getStorageKey(STORAGE_KEYS.IconsFrequency);
+
+export const emojisFreqKey = getStorageKey(STORAGE_KEYS.EmojisFrequency);
+
+export const lastIconKey = getStorageKey(STORAGE_KEYS.LastIcon);
+
+export const lastEmojiKey = getStorageKey(STORAGE_KEYS.LastEmoji);
+
+export const sortFrequencies = (freqs: [string, number][]) =>
+  freqs.sort((a, b) => (a[1] >= b[1] ? -1 : 1));

app/components/Icons/CircleIcon.tsx

@@ -0,0 +1,31 @@
+import * as React from "react";
+
+type Props = {
+  /** The size of the icon, 24px is default to match standard icons */
+  size?: number;
+  /** The color of the icon, defaults to the current text color */
+  color?: string;
+  /** If true, the icon will retain its color in selected menus and other places that attempt to override it */
+  retainColor?: boolean;
+};
+
+export default function CircleIcon({
+  size = 24,
+  color = "currentColor",
+  retainColor,
+  ...rest
+}: Props) {
+  return (
+    <svg
+      fill={color}
+      width={size}
+      height={size}
+      viewBox="0 0 24 24"
+      version="1.1"
+      style={retainColor ? { fill: color } : undefined}
+      {...rest}
+    >
+      <circle xmlns="http://www.w3.org/2000/svg" cx="12" cy="12" r="8" />
+    </svg>
+  );
+}

app/components/Icons/CollectionIcon.tsx

@@ -2,10 +2,10 @@ import { observer } from "mobx-react";
 import { CollectionIcon } from "outline-icons";
 import { getLuminance } from "polished";
 import * as React from "react";
-import { IconLibrary } from "@shared/utils/IconLibrary";
+import { colorPalette } from "@shared/utils/collections";
 import Collection from "~/models/Collection";
+import Icon from "~/components/Icon";
 import useStores from "~/hooks/useStores";
-import Logger from "~/utils/Logger";
 
 type Props = {
   /** The collection to show an icon for */
@@ -16,6 +16,7 @@ type Props = {
   size?: number;
   /** The color of the icon, defaults to the collection color */
   color?: string;
+  className?: string;
 };
 
 function ResolvedCollectionIcon({
@@ -23,35 +24,41 @@ function ResolvedCollectionIcon({
   color: inputColor,
   expanded,
   size,
+  className,
 }: Props) {
   const { ui } = useStores();
 
-  // If the chosen icon color is very dark then we invert it in dark mode
-  // otherwise it will be impossible to see against the dark background.
-  const color =
-    inputColor ||
-    (ui.resolvedTheme === "dark" && collection.color !== "currentColor"
-      ? getLuminance(collection.color) > 0.09
-        ? collection.color
-        : "currentColor"
-      : collection.color);
+  if (!collection.icon || collection.icon === "collection") {
+    // If the chosen icon color is very dark then we invert it in dark mode
+    // otherwise it will be impossible to see against the dark background.
+    const collectionColor = collection.color ?? colorPalette[0];
+    const color =
+      inputColor ||
+      (ui.resolvedTheme === "dark" && collectionColor !== "currentColor"
+        ? getLuminance(collectionColor) > 0.09
+          ? collectionColor
+          : "currentColor"
+        : collectionColor);
 
-  if (collection.icon && collection.icon !== "collection") {
-    try {
-      const Component = IconLibrary.getComponent(collection.icon);
-      return (
-        <Component color={color} size={size}>
-          {collection.initial}
-        </Component>
-      );
-    } catch (error) {
-      Logger.warn("Failed to render custom icon", {
-        icon: collection.icon,
-      });
-    }
+    return (
+      <CollectionIcon
+        color={color}
+        expanded={expanded}
+        size={size}
+        className={className}
+      />
+    );
   }
 
-  return <CollectionIcon color={color} expanded={expanded} size={size} />;
+  return (
+    <Icon
+      value={collection.icon}
+      color={inputColor ?? collection.color ?? undefined}
+      size={size}
+      initial={collection.initial}
+      className={className}
+    />
+  );
 }
 
 export default observer(ResolvedCollectionIcon);

app/components/Icons/EmojiIcon.tsx

@@ -1,11 +1,13 @@
 import * as React from "react";
 import styled from "styled-components";
+import { s } from "@shared/styles";
 
 type Props = {
   /** The emoji to render */
   emoji: string;
   /** The size of the emoji, 24px is default to match standard icons */
   size?: number;
+  className?: string;
 };
 
 /**
@@ -15,19 +17,28 @@ type Props = {
 export default function EmojiIcon({ size = 24, emoji, ...rest }: Props) {
   return (
     <Span $size={size} {...rest}>
-      {emoji}
+      <SVG size={size} emoji={emoji} />
     </Span>
   );
 }
 
 const Span = styled.span<{ $size: number }>`
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-  flex-shrink: 0;
+  font-family: ${s("fontFamilyEmoji")};
+  display: inline-block;
   width: ${(props) => props.$size}px;
   height: ${(props) => props.$size}px;
-  text-indent: -0.15em;
-  font-size: ${(props) => props.$size - 10}px;
 `;
+
+const SVG = ({ size, emoji }: { size: number; emoji: string }) => (
+  <svg width={size} height={size} xmlns="http://www.w3.org/2000/svg">
+    <text
+      x="50%"
+      y={"55%"}
+      dominantBaseline="middle"
+      textAnchor="middle"
+      fontSize={size * 0.7}
+    >
+      {emoji}
+    </text>
+  </svg>
+);

app/components/Input.tsx

@@ -143,8 +143,12 @@ export interface Props
   onRequestSubmit?: (
     ev: React.KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>
   ) => unknown;
-  onFocus?: (ev: React.SyntheticEvent) => unknown;
-  onBlur?: (ev: React.SyntheticEvent) => unknown;
+  onFocus?: (
+    ev: React.SyntheticEvent<HTMLInputElement | HTMLTextAreaElement>
+  ) => unknown;
+  onBlur?: (
+    ev: React.SyntheticEvent<HTMLInputElement | HTMLTextAreaElement>
+  ) => unknown;
 }
 
 function Input(
@@ -154,7 +158,9 @@ function Input(
   const internalRef = React.useRef<HTMLInputElement | HTMLTextAreaElement>();
   const [focused, setFocused] = React.useState(false);
 
-  const handleBlur = (ev: React.SyntheticEvent) => {
+  const handleBlur = (
+    ev: React.SyntheticEvent<HTMLInputElement | HTMLTextAreaElement>
+  ) => {
     setFocused(false);
 
     if (props.onBlur) {
@@ -162,7 +168,9 @@ function Input(
     }
   };
 
-  const handleFocus = (ev: React.SyntheticEvent) => {
+  const handleFocus = (
+    ev: React.SyntheticEvent<HTMLInputElement | HTMLTextAreaElement>
+  ) => {
     setFocused(true);
 
     if (props.onFocus) {

app/components/InputSearchPage.tsx

@@ -11,13 +11,21 @@ import { searchPath } from "~/utils/routeHelpers";
 import Input, { Outline } from "./Input";
 
 type Props = {
+  /** A string representing where the search started, for tracking. */
   source: string;
+  /** Placeholder text for the input. */
   placeholder?: string;
+  /** Label for the input. */
   label?: string;
+  /** Whether the label should be hidden. */
   labelHidden?: boolean;
+  /** An optional ID of a collection to search within. */
   collectionId?: string;
+  /** The current value of the input. */
   value?: string;
+  /** Event handler for when the input value changes. */
   onChange?: (event: React.ChangeEvent<HTMLInputElement>) => unknown;
+  /** Event handler for when a key is pressed. */
   onKeyDown?: (event: React.KeyboardEvent<HTMLInputElement>) => unknown;
 };
 

app/components/InputSelect.tsx

@@ -50,6 +50,13 @@ export type Props = {
   note?: React.ReactNode;
   onChange?: (value: string | null) => void;
   style?: React.CSSProperties;
+  /**
+   * Set to true if this component is rendered inside a Modal.
+   * The Modal will take care of preventing body scroll behaviour.
+   */
+  skipBodyScroll?: boolean;
+  autoFocus?: boolean;
+  placeholder?: string;
 };
 
 export interface InputSelectRef {
@@ -79,6 +86,9 @@ const InputSelect = (props: Props, ref: React.RefObject<InputSelectRef>) => {
     note,
     icon,
     nude,
+    skipBodyScroll,
+    autoFocus,
+    placeholder,
     ...rest
   } = props;
 
@@ -91,7 +101,7 @@ const InputSelect = (props: Props, ref: React.RefObject<InputSelectRef>) => {
   const popover = useSelectPopover({
     ...select,
     hideOnClickOutside: false,
-    preventBodyScroll: true,
+    preventBodyScroll: skipBodyScroll ? false : true,
     disabled,
   });
 
@@ -208,6 +218,7 @@ const InputSelect = (props: Props, ref: React.RefObject<InputSelectRef>) => {
               neutral
               disclosure
               className={className}
+              autoFocus={autoFocus}
               icon={icon}
               $nude={nude}
               {...buttonProps}
@@ -215,12 +226,19 @@ const InputSelect = (props: Props, ref: React.RefObject<InputSelectRef>) => {
               {option ? (
                 labelForOption(option)
               ) : (
-                <Placeholder>Select a {ariaLabel.toLowerCase()}</Placeholder>
+                <Placeholder>
+                  {placeholder ?? `Select a ${ariaLabel.toLowerCase()}`}
+                </Placeholder>
               )}
             </StyledButton>
           )}
         </Select>
-        <SelectPopover {...select} {...popover} aria-label={ariaLabel}>
+        <SelectPopover
+          {...select}
+          {...popover}
+          aria-label={ariaLabel}
+          preventBodyScroll={skipBodyScroll ? false : true}
+        >
           {(popoverProps: InnerProps) => {
             const topAnchor = popoverProps.style?.top === "0";
             const rightAnchor = popoverProps.placement === "bottom-end";

app/components/InputSelectPermission.tsx

@@ -23,15 +23,16 @@ function InputSelectPermission(
       ref={ref}
       label={t("Permission")}
       options={[
-        {
-          label: t("Can edit"),
-          value: CollectionPermission.ReadWrite,
-        },
         {
           label: t("View only"),
           value: CollectionPermission.Read,
         },
         {
+          label: t("Can edit"),
+          value: CollectionPermission.ReadWrite,
+        },
+        {
+          divider: true,
           label: t("No access"),
           value: EmptySelectValue,
         },

app/components/List/CompositeItem.tsx

@@ -1,17 +0,0 @@
-import * as React from "react";
-import {
-  CompositeStateReturn,
-  CompositeItem as BaseCompositeItem,
-} from "reakit/Composite";
-import Item, { Props as ItemProps } from "./Item";
-
-export type Props = ItemProps & CompositeStateReturn;
-
-function CompositeItem(
-  { to, ...rest }: Props,
-  ref?: React.Ref<HTMLAnchorElement>
-) {
-  return <BaseCompositeItem as={Item} to={to} {...rest} ref={ref} />;
-}
-
-export default React.forwardRef(CompositeItem);

app/components/List/Item.tsx

@@ -1,9 +1,15 @@
+import {
+  useFocusEffect,
+  useRovingTabIndex,
+} from "@getoutline/react-roving-tabindex";
 import { LocationDescriptor } from "history";
 import * as React from "react";
+import scrollIntoView from "smooth-scroll-into-view-if-needed";
 import styled, { useTheme } from "styled-components";
 import { s, ellipsis } from "@shared/styles";
 import Flex from "~/components/Flex";
 import NavLink from "~/components/NavLink";
+import { hover } from "~/styles";
 
 export type Props = Omit<React.HTMLAttributes<HTMLAnchorElement>, "title"> & {
   /** An icon or image to display to the left of the list item */
@@ -12,6 +18,8 @@ export type Props = Omit<React.HTMLAttributes<HTMLAnchorElement>, "title"> & {
   to?: LocationDescriptor;
   /** An optional click handler, if provided the list item will have hover styles */
   onClick?: React.MouseEventHandler<HTMLAnchorElement>;
+  /** An optional keydown handler, if provided the list item will have hover styles */
+  onKeyDown?: React.KeyboardEventHandler<HTMLAnchorElement>;
   /** Whether to match the location exactly */
   exact?: boolean;
   /** The title of the list item */
@@ -24,15 +32,50 @@ export type Props = Omit<React.HTMLAttributes<HTMLAnchorElement>, "title"> & {
   border?: boolean;
   /** Whether to display the list item in a compact style */
   small?: boolean;
+  /** Whether to enable keyboard navigation */
+  keyboardNavigation?: boolean;
 };
 
 const ListItem = (
-  { image, title, subtitle, actions, small, border, to, ...rest }: Props,
-  ref?: React.Ref<HTMLAnchorElement>
+  {
+    image,
+    title,
+    subtitle,
+    actions,
+    small,
+    border,
+    to,
+    keyboardNavigation,
+    ...rest
+  }: Props,
+  ref: React.RefObject<HTMLAnchorElement>
 ) => {
   const theme = useTheme();
   const compact = !subtitle;
 
+  let itemRef: React.RefObject<HTMLAnchorElement> =
+    React.useRef<HTMLAnchorElement>(null);
+  if (ref) {
+    itemRef = ref;
+  }
+
+  const { focused, ...rovingTabIndex } = useRovingTabIndex(
+    itemRef,
+    keyboardNavigation || to ? false : true
+  );
+  useFocusEffect(focused, itemRef);
+
+  const handleFocus = React.useCallback(() => {
+    if (itemRef.current) {
+      scrollIntoView(itemRef.current, {
+        scrollMode: "if-needed",
+        behavior: "auto",
+        block: "center",
+        boundary: window.document.body,
+      });
+    }
+  }, [itemRef]);
+
   const content = (selected: boolean) => (
     <>
       {image && <Image>{image}</Image>}
@@ -59,13 +102,30 @@ const ListItem = (
   if (to) {
     return (
       <Wrapper
-        ref={ref}
+        ref={itemRef}
         $border={border}
         $small={small}
         activeStyle={{
           background: theme.accent,
         }}
         {...rest}
+        {...rovingTabIndex}
+        onClick={(ev) => {
+          if (rest.onClick) {
+            rest.onClick(ev);
+          }
+          rovingTabIndex.onClick(ev);
+        }}
+        onKeyDown={(ev) => {
+          if (rest.onKeyDown) {
+            rest.onKeyDown(ev);
+          }
+          rovingTabIndex.onKeyDown(ev);
+        }}
+        onFocus={(ev) => {
+          rovingTabIndex.onFocus(ev);
+          handleFocus();
+        }}
         as={NavLink}
         to={to}
       >
@@ -75,7 +135,26 @@ const ListItem = (
   }
 
   return (
-    <Wrapper ref={ref} $border={border} $small={small} {...rest}>
+    <Wrapper
+      ref={itemRef}
+      $border={border}
+      $small={small}
+      $hover={!!rest.onClick}
+      {...rest}
+      {...rovingTabIndex}
+      onClick={(ev) => {
+        rest.onClick?.(ev);
+        rovingTabIndex.onClick(ev);
+      }}
+      onKeyDown={(ev) => {
+        rest.onKeyDown?.(ev);
+        rovingTabIndex.onKeyDown(ev);
+      }}
+      onFocus={(ev) => {
+        rovingTabIndex.onFocus(ev);
+        handleFocus();
+      }}
+    >
       {content(false)}
     </Wrapper>
   );
@@ -84,6 +163,7 @@ const ListItem = (
 const Wrapper = styled.a<{
   $small?: boolean;
   $border?: boolean;
+  $hover?: boolean;
   onClick?: React.MouseEventHandler<HTMLAnchorElement>;
   to?: LocationDescriptor;
 }>`
@@ -100,9 +180,15 @@ const Wrapper = styled.a<{
     border-bottom: 0;
   }
 
-  &:hover {
+  &:focus-visible {
+    outline: none;
+  }
+
+  &:${hover},
+  &:focus,
+  &:focus-within {
     background: ${(props) =>
-      props.onClick ? props.theme.secondaryBackground : "inherit"};
+      props.$hover ? props.theme.secondaryBackground : "inherit"};
   }
 
   cursor: ${(props) =>

app/components/MobileScrollWrapper.tsx

@@ -1,28 +0,0 @@
-import * as React from "react";
-import styled from "styled-components";
-import useMediaQuery from "~/hooks/useMediaQuery";
-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();
-  const isPrinting = useMediaQuery("print");
-
-  return isMobile && !isPrinting ? (
-    <MobileWrapper>{children}</MobileWrapper>
-  ) : (
-    <>{children}</>
-  );
-};
-
-export default MobileScrollWrapper;

app/components/Modal.tsx

@@ -25,6 +25,7 @@ type Props = {
   isOpen: boolean;
   fullscreen?: boolean;
   title?: React.ReactNode;
+  style?: React.CSSProperties;
   onRequestClose: () => void;
 };
 
@@ -33,6 +34,7 @@ const Modal: React.FC<Props> = ({
   isOpen,
   fullscreen = true,
   title = "Untitled",
+  style,
   onRequestClose,
 }: Props) => {
   const dialog = useDialogState({
@@ -115,7 +117,7 @@ const Modal: React.FC<Props> = ({
                     column
                     reverse
                   >
-                    <SmallContent shadow>
+                    <SmallContent style={style} shadow>
                       <ErrorBoundary component="div">{children}</ErrorBoundary>
                     </SmallContent>
                     <Header>
@@ -254,7 +256,7 @@ const Header = styled(Flex)`
 const Small = styled.div`
   animation: ${fadeAndScaleIn} 250ms ease;
 
-  margin: auto auto;
+  margin: 25vh auto auto auto;
   width: 75vw;
   min-width: 350px;
   max-width: 450px;
@@ -269,7 +271,7 @@ const Small = styled.div`
   outline: none;
 
   ${NudeButton} {
-    &:hover,
+    &:hover:not(:disabled),
     &[aria-expanded="true"] {
       background: ${s("sidebarControlHoverBackground")};
     }

app/components/PageScroll.tsx

@@ -0,0 +1,39 @@
+import * as React from "react";
+import styled from "styled-components";
+import useMediaQuery from "~/hooks/useMediaQuery";
+import useMobile from "~/hooks/useMobile";
+import ScrollContext from "./ScrollContext";
+
+type Props = {
+  children: React.ReactNode;
+};
+
+const MobileWrapper = styled.div`
+  width: 100vw;
+  height: 100vh;
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
+`;
+
+/**
+ * A component that wraps its children in a scrollable container on mobile devices.
+ * This allows us to place a fixed toolbar at the bottom of the page in the document
+ * editor, which would otherwise be obscured by the on-screen keyboard.
+ *
+ * On desktop devices, the children are rendered directly without any wrapping.
+ */
+const PageScroll = ({ children }: Props) => {
+  const isMobile = useMobile();
+  const isPrinting = useMediaQuery("print");
+  const ref = React.useRef<HTMLDivElement>(null);
+
+  return isMobile && !isPrinting ? (
+    <ScrollContext.Provider value={ref}>
+      <MobileWrapper ref={ref}>{children}</MobileWrapper>
+    </ScrollContext.Provider>
+  ) : (
+    <>{children}</>
+  );
+};
+
+export default PageScroll;

app/components/PaginatedDocumentList.tsx

@@ -42,7 +42,7 @@ const PaginatedDocumentList = React.memo<Props>(function PaginatedDocumentList({
       fetch={fetch}
       options={options}
       renderError={(props) => <Error {...props} />}
-      renderItem={(item: Document, _index, compositeProps) => (
+      renderItem={(item: Document, _index) => (
         <DocumentListItem
           key={item.id}
           document={item}
@@ -52,7 +52,6 @@ const PaginatedDocumentList = React.memo<Props>(function PaginatedDocumentList({
           showPublished={showPublished}
           showTemplate={showTemplate}
           showDraft={showDraft}
-          {...compositeProps}
         />
       )}
       {...rest}

app/components/PaginatedEventList.tsx

@@ -30,13 +30,12 @@ const PaginatedEventList = React.memo<Props>(function PaginatedEventList({
       heading={heading}
       fetch={fetch}
       options={options}
-      renderItem={(item: Event, index, compositeProps) => (
+      renderItem={(item: Event, index) => (
         <EventListItem
           key={item.id}
           event={item}
           document={document}
           latest={index === 0}
-          {...compositeProps}
         />
       )}
       renderHeading={(name) => <Heading>{name}</Heading>}

app/components/PaginatedList.tsx

@@ -1,10 +1,9 @@
 import isEqual from "lodash/isEqual";
-import { observable, action } from "mobx";
+import { observable, action, computed } from "mobx";
 import { observer } from "mobx-react";
 import * as React from "react";
 import { withTranslation, WithTranslation } from "react-i18next";
 import { Waypoint } from "react-waypoint";
-import { CompositeStateReturn } from "reakit/Composite";
 import { Pagination } from "@shared/constants";
 import RootStore from "~/stores/RootStore";
 import ArrowKeyNavigation from "~/components/ArrowKeyNavigation";
@@ -30,11 +29,7 @@ type Props<T> = WithTranslation &
     loading?: React.ReactElement;
     items?: T[];
     className?: string;
-    renderItem: (
-      item: T,
-      index: number,
-      compositeProps: CompositeStateReturn
-    ) => React.ReactNode;
+    renderItem: (item: T, index: number) => React.ReactNode;
     renderError?: (options: {
       error: Error;
       retry: () => void;
@@ -44,7 +39,9 @@ type Props<T> = WithTranslation &
   };
 
 @observer
-class PaginatedList<T extends PaginatedItem> extends React.Component<Props<T>> {
+class PaginatedList<T extends PaginatedItem> extends React.PureComponent<
+  Props<T>
+> {
   @observable
   error?: Error;
 
@@ -150,6 +147,11 @@ class PaginatedList<T extends PaginatedItem> extends React.Component<Props<T>> {
     }
   };
 
+  @computed
+  get itemsToRender() {
+    return this.props.items?.slice(0, this.renderCount) ?? [];
+  }
+
   render() {
     const {
       items = [],
@@ -193,11 +195,12 @@ class PaginatedList<T extends PaginatedItem> extends React.Component<Props<T>> {
           aria-label={this.props["aria-label"]}
           onEscape={onEscape}
           className={this.props.className}
+          items={this.itemsToRender}
         >
-          {(composite: CompositeStateReturn) => {
+          {() => {
             let previousHeading = "";
-            return items.slice(0, this.renderCount).map((item, index) => {
-              const children = this.props.renderItem(item, index, composite);
+            return this.itemsToRender.map((item, index) => {
+              const children = this.props.renderItem(item, index);
 
               // If there is no renderHeading method passed then no date
               // headings are rendered

app/components/PlaceholderDocument.tsx

@@ -5,13 +5,17 @@ import Fade from "~/components/Fade";
 import Flex from "~/components/Flex";
 import PlaceholderText from "~/components/PlaceholderText";
 
+type Props = {
+  /** Whether to include a title placeholder. */
+  includeTitle?: boolean;
+  /** Delay before mounting the component. Defaults to 500ms */
+  delay?: number;
+};
+
 export default function PlaceholderDocument({
   includeTitle,
-  delay,
-}: {
-  includeTitle?: boolean;
-  delay?: number;
-}) {
+  delay = 500,
+}: Props) {
   const content = (
     <>
       <PlaceholderText delay={0.2} />

app/components/PluginIcon.tsx

@@ -1,29 +1,37 @@
+import { observer } from "mobx-react";
 import * as React from "react";
 import styled from "styled-components";
-import PluginLoader from "~/utils/PluginLoader";
+import Logger from "~/utils/Logger";
+import { Hook, usePluginValue } from "~/utils/PluginManager";
 
 type Props = {
+  /** The ID of the plugin to render an Icon for. */
   id: string;
+  /** The size of the icon. */
   size?: number;
+  /** The color of the icon. */
   color?: string;
 };
 
+/**
+ * Renders an icon defined in a plugin (Hook.Icon).
+ */
 function PluginIcon({ id, color, size = 24 }: Props) {
-  const plugin = PluginLoader.plugins[id];
-  const Icon = plugin?.icon;
+  const Icon = usePluginValue(Hook.Icon, id);
 
   if (Icon) {
     return (
-      <Wrapper>
+      <IconPosition>
         <Icon size={size} fill={color} />
-      </Wrapper>
+      </IconPosition>
     );
   }
 
+  Logger.warn("No Icon registered for plugin", { id });
   return null;
 }
 
-const Wrapper = styled.div`
+const IconPosition = styled.div`
   display: flex;
   align-items: center;
   justify-content: center;
@@ -32,4 +40,4 @@ const Wrapper = styled.div`
   height: 24px;
 `;
 
-export default PluginIcon;
+export default observer(PluginIcon);

app/components/Popover.tsx

@@ -20,15 +20,18 @@ type Props = PopoverProps & {
   hide: () => void;
 };
 
-const Popover: React.FC<Props> = ({
-  children,
-  shrink,
-  width = 380,
-  scrollable = true,
-  flex,
-  mobilePosition,
-  ...rest
-}: Props) => {
+const Popover = (
+  {
+    children,
+    shrink,
+    width = 380,
+    scrollable = true,
+    flex,
+    mobilePosition,
+    ...rest
+  }: Props,
+  ref: React.Ref<HTMLDivElement>
+) => {
   const isMobile = useMobile();
 
   // Custom Escape handler rather than using hideOnEsc from reakit so we can
@@ -50,6 +53,7 @@ const Popover: React.FC<Props> = ({
     return (
       <Dialog {...rest} modal>
         <Contents
+          ref={ref}
           $shrink={shrink}
           $scrollable={scrollable}
           $flex={flex}
@@ -64,6 +68,7 @@ const Popover: React.FC<Props> = ({
   return (
     <StyledPopover {...rest} hideOnEsc={false} hideOnClickOutside>
       <Contents
+        ref={ref}
         $shrink={shrink}
         $width={width}
         $scrollable={scrollable}
@@ -123,4 +128,4 @@ const Contents = styled.div<ContentsProps>`
   `};
 `;
 
-export default Popover;
+export default React.forwardRef(Popover);

app/components/ScrollContext.ts

@@ -0,0 +1,15 @@
+import * as React from "react";
+
+/**
+ * Context to provide a reference to the scrollable container
+ */
+const ScrollContext = React.createContext<
+  React.RefObject<HTMLDivElement> | undefined
+>(undefined);
+
+/**
+ * Hook to get the scrollable container reference
+ */
+export const useScrollContext = () => React.useContext(ScrollContext);
+
+export default ScrollContext;

app/components/ScrollToTop.ts

@@ -2,6 +2,7 @@
 import * as React from "react";
 import { useLocation } from "react-router-dom";
 import usePrevious from "~/hooks/usePrevious";
+import { useScrollContext } from "./ScrollContext";
 
 type Props = {
   children: JSX.Element;
@@ -10,6 +11,7 @@ type Props = {
 export default function ScrollToTop({ children }: Props) {
   const location = useLocation<{ retainScrollPosition?: boolean }>();
   const previousLocationPathname = usePrevious(location.pathname);
+  const scrollContainerRef = useScrollContext();
 
   React.useEffect(() => {
     if (
@@ -25,8 +27,9 @@ export default function ScrollToTop({ children }: Props) {
     ) {
       return;
     }
-    window.scrollTo(0, 0);
+    (scrollContainerRef?.current || window).scrollTo(0, 0);
   }, [
+    scrollContainerRef,
     location.pathname,
     previousLocationPathname,
     location.state?.retainScrollPosition,

app/components/SearchListItem.tsx

@@ -1,7 +1,10 @@
+import {
+  useFocusEffect,
+  useRovingTabIndex,
+} from "@getoutline/react-roving-tabindex";
 import { observer } from "mobx-react";
 import * as React from "react";
 import { Link } from "react-router-dom";
-import { CompositeItem } from "reakit/Composite";
 import styled, { css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import { s, ellipsis } from "@shared/styles";
@@ -34,10 +37,18 @@ function DocumentListItem(
 ) {
   const { document, highlight, context, shareId, ...rest } = props;
 
+  let itemRef: React.Ref<HTMLAnchorElement> =
+    React.useRef<HTMLAnchorElement>(null);
+  if (ref) {
+    itemRef = ref;
+  }
+
+  const { focused, ...rovingTabIndex } = useRovingTabIndex(itemRef, false);
+  useFocusEffect(focused, itemRef);
+
   return (
-    <CompositeItem
-      as={DocumentLink}
-      ref={ref}
+    <DocumentLink
+      ref={itemRef}
       dir={document.dir}
       to={{
         pathname: shareId
@@ -48,6 +59,13 @@ function DocumentListItem(
         },
       }}
       {...rest}
+      {...rovingTabIndex}
+      onClick={(ev) => {
+        if (rest.onClick) {
+          rest.onClick(ev);
+        }
+        rovingTabIndex.onClick(ev);
+      }}
     >
       <Content>
         <Heading dir={document.dir}>
@@ -66,7 +84,7 @@ function DocumentListItem(
           />
         }
       </Content>
-    </CompositeItem>
+    </DocumentLink>
   );
 }
 

app/components/SearchPopover.tsx

@@ -206,7 +206,7 @@ function SearchPopover({ shareId }: Props) {
             <NoResults>{t("No results for {{query}}", { query })}</NoResults>
           }
           loading={<PlaceholderList count={3} header={{ height: 20 }} />}
-          renderItem={(item: SearchResult, index, compositeProps) => (
+          renderItem={(item: SearchResult, index) => (
             <SearchListItem
               key={item.document.id}
               shareId={shareId}
@@ -215,7 +215,6 @@ function SearchPopover({ shareId }: Props) {
               context={item.context}
               highlight={cachedQuery}
               onClick={handleSearchItemClick}
-              {...compositeProps}
             />
           )}
         />

app/components/Sharing/Collection/CollectionMemberList.tsx

@@ -24,7 +24,7 @@ type Props = {
 };
 
 function CollectionMemberList({ collection, invitedInSession }: Props) {
-  const { memberships, collectionGroupMemberships } = useStores();
+  const { memberships, groupMemberships } = useStores();
   const can = usePolicy(collection);
   const { t } = useTranslation();
   const theme = useTheme();
@@ -39,8 +39,8 @@ function CollectionMemberList({ collection, invitedInSession }: Props) {
 
   const { request: fetchGroupMemberships } = useRequest(
     React.useCallback(
-      () => collectionGroupMemberships.fetchAll({ id: collectionId }),
-      [collectionGroupMemberships, collectionId]
+      () => groupMemberships.fetchAll({ id: collectionId }),
+      [groupMemberships, collectionId]
     )
   );
 
@@ -53,16 +53,16 @@ function CollectionMemberList({ collection, invitedInSession }: Props) {
     () =>
       [
         {
-          label: t("Admin"),
-          value: CollectionPermission.Admin,
+          label: t("View only"),
+          value: CollectionPermission.Read,
         },
         {
           label: t("Can edit"),
           value: CollectionPermission.ReadWrite,
         },
         {
-          label: t("View only"),
-          value: CollectionPermission.Read,
+          label: t("Manage"),
+          value: CollectionPermission.Admin,
         },
         {
           divider: true,
@@ -75,7 +75,7 @@ function CollectionMemberList({ collection, invitedInSession }: Props) {
 
   return (
     <>
-      {collectionGroupMemberships
+      {groupMemberships
         .inCollection(collection.id)
         .sort((a, b) =>
           (
@@ -103,12 +103,12 @@ function CollectionMemberList({ collection, invitedInSession }: Props) {
                     permission: CollectionPermission | typeof EmptySelectValue
                   ) => {
                     if (permission === EmptySelectValue) {
-                      await collectionGroupMemberships.delete({
+                      await groupMemberships.delete({
                         collectionId: collection.id,
                         groupId: membership.groupId,
                       });
                     } else {
-                      await collectionGroupMemberships.create({
+                      await groupMemberships.create({
                         collectionId: collection.id,
                         groupId: membership.groupId,
                         permission,

app/components/Sharing/Collection/SharePopover.tsx

@@ -20,6 +20,7 @@ import useBoolean from "~/hooks/useBoolean";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import useKeyDown from "~/hooks/useKeyDown";
 import usePolicy from "~/hooks/usePolicy";
+import usePrevious from "~/hooks/usePrevious";
 import useStores from "~/hooks/useStores";
 import { EmptySelectValue, Permission } from "~/types";
 import { collectionPath, urlify } from "~/utils/routeHelpers";
@@ -43,8 +44,7 @@ type Props = {
 function SharePopover({ collection, visible, onRequestClose }: Props) {
   const theme = useTheme();
   const team = useCurrentTeam();
-  const { collectionGroupMemberships, users, groups, memberships } =
-    useStores();
+  const { groupMemberships, users, groups, memberships } = useStores();
   const { t } = useTranslation();
   const can = usePolicy(collection);
   const [query, setQuery] = React.useState("");
@@ -56,9 +56,17 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
     CollectionPermission.Read
   );
 
+  const prevPendingIds = usePrevious(pendingIds);
+
+  const suggestionsRef = React.useRef<HTMLDivElement | null>(null);
+  const searchInputRef = React.useRef<HTMLInputElement | null>(null);
+
   useKeyDown(
     "Escape",
     (ev) => {
+      if (!visible) {
+        return;
+      }
       ev.preventDefault();
       ev.stopImmediatePropagation();
 
@@ -94,6 +102,19 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
     }
   }, [visible]);
 
+  React.useEffect(() => {
+    if (prevPendingIds && pendingIds.length > prevPendingIds.length) {
+      setQuery("");
+      searchInputRef.current?.focus();
+    } else if (prevPendingIds && pendingIds.length < prevPendingIds.length) {
+      const firstPending = suggestionsRef.current?.firstElementChild;
+
+      if (firstPending) {
+        (firstPending as HTMLAnchorElement).focus();
+      }
+    }
+  }, [pendingIds, prevPendingIds]);
+
   const handleQuery = React.useCallback(
     (event) => {
       showPicker();
@@ -116,6 +137,39 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
     [setPendingIds]
   );
 
+  const handleKeyDown = React.useCallback(
+    (ev: React.KeyboardEvent<HTMLInputElement>) => {
+      if (ev.nativeEvent.isComposing) {
+        return;
+      }
+      if (ev.key === "ArrowDown" && !ev.shiftKey) {
+        ev.preventDefault();
+
+        if (ev.currentTarget.value) {
+          const length = ev.currentTarget.value.length;
+          const selectionStart = ev.currentTarget.selectionStart || 0;
+          if (selectionStart < length) {
+            ev.currentTarget.selectionStart = length;
+            ev.currentTarget.selectionEnd = length;
+            return;
+          }
+        }
+
+        const firstSuggestion = suggestionsRef.current?.firstElementChild;
+
+        if (firstSuggestion) {
+          (firstSuggestion as HTMLAnchorElement).focus();
+        }
+      }
+    },
+    []
+  );
+
+  const handleEscape = React.useCallback(
+    () => searchInputRef.current?.focus(),
+    []
+  );
+
   const inviteAction = React.useMemo(
     () =>
       createAction({
@@ -151,10 +205,10 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
               }
 
               if (group) {
-                await collectionGroupMemberships.create({
+                await groupMemberships.create({
                   collectionId: collection.id,
                   groupId: group.id,
-                  permission: CollectionPermission.Read,
+                  permission,
                 });
                 return group;
               }
@@ -213,7 +267,7 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
       }),
     [
       collection.id,
-      collectionGroupMemberships,
+      groupMemberships,
       groups,
       hidePicker,
       memberships,
@@ -229,16 +283,16 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
     () =>
       [
         {
-          label: t("Admin"),
-          value: CollectionPermission.Admin,
+          label: t("View only"),
+          value: CollectionPermission.Read,
         },
         {
           label: t("Can edit"),
           value: CollectionPermission.ReadWrite,
         },
         {
-          label: t("View only"),
-          value: CollectionPermission.Read,
+          label: t("Manage"),
+          value: CollectionPermission.Admin,
         },
       ] as Permission[],
     [t]
@@ -289,8 +343,10 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
     <Wrapper>
       {can.update && (
         <SearchInput
+          ref={searchInputRef}
           onChange={handleQuery}
           onClick={showPicker}
+          onKeyDown={handleKeyDown}
           query={query}
           back={backButton}
           action={rightButton}
@@ -298,15 +354,16 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
       )}
 
       {picker && (
-        <div>
-          <Suggestions
-            query={query}
-            collection={collection}
-            pendingIds={pendingIds}
-            addPendingId={handleAddPendingId}
-            removePendingId={handleRemovePendingId}
-          />
-        </div>
+        <Suggestions
+          ref={suggestionsRef}
+          query={query}
+          collection={collection}
+          pendingIds={pendingIds}
+          addPendingId={handleAddPendingId}
+          removePendingId={handleRemovePendingId}
+          onEscape={handleEscape}
+          showGroups
+        />
       )}
 
       <div style={{ display: picker ? "none" : "block" }}>

app/components/Sharing/Document/DocumentMemberListItem.tsx

@@ -51,6 +51,10 @@ const DocumentMemberListItem = ({
       label: t("Can edit"),
       value: DocumentPermission.ReadWrite,
     },
+    {
+      label: t("Manage"),
+      value: DocumentPermission.Admin,
+    },
     {
       divider: true,
       label: t("Remove"),

app/components/Sharing/Document/OtherAccess.tsx

@@ -4,7 +4,8 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { useTheme } from "styled-components";
 import Squircle from "@shared/components/Squircle";
-import { CollectionPermission } from "@shared/types";
+import { CollectionPermission, IconType } from "@shared/types";
+import { determineIconType } from "@shared/utils/icon";
 import type Collection from "~/models/Collection";
 import type Document from "~/models/Document";
 import Flex from "~/components/Flex";
@@ -54,15 +55,7 @@ export const OtherAccess = observer(({ document, children }: Props) => {
             />
           ) : usersInCollection ? (
             <ListItem
-              image={
-                <Squircle color={collection.color} size={AvatarSize.Medium}>
-                  <CollectionIcon
-                    collection={collection}
-                    color={theme.white}
-                    size={16}
-                  />
-                </Squircle>
-              }
+              image={<CollectionSquircle collection={collection} />}
               title={collection.name}
               subtitle={t("Everyone in the collection")}
               actions={<AccessTooltip>{t("Can view")}</AccessTooltip>}
@@ -136,6 +129,24 @@ const AccessTooltip = ({
   );
 };
 
+const CollectionSquircle = ({ collection }: { collection: Collection }) => {
+  const theme = useTheme();
+  const iconType = determineIconType(collection.icon)!;
+  const squircleColor =
+    iconType === IconType.SVG ? collection.color! : theme.slateLight;
+  const iconSize = iconType === IconType.SVG ? 16 : 22;
+
+  return (
+    <Squircle color={squircleColor} size={AvatarSize.Medium}>
+      <CollectionIcon
+        collection={collection}
+        color={theme.white}
+        size={iconSize}
+      />
+    </Squircle>
+  );
+};
+
 function useUsersInCollection(collection?: Collection) {
   const { users, memberships } = useStores();
   const { request } = useRequest(() =>

app/components/Sharing/Document/SharePopover.tsx

@@ -18,6 +18,7 @@ import useBoolean from "~/hooks/useBoolean";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import useKeyDown from "~/hooks/useKeyDown";
 import usePolicy from "~/hooks/usePolicy";
+import usePrevious from "~/hooks/usePrevious";
 import useStores from "~/hooks/useStores";
 import { Permission } from "~/types";
 import { documentPath, urlify } from "~/utils/routeHelpers";
@@ -64,9 +65,17 @@ function SharePopover({
     DocumentPermission.Read
   );
 
+  const prevPendingIds = usePrevious(pendingIds);
+
+  const suggestionsRef = React.useRef<HTMLDivElement | null>(null);
+  const searchInputRef = React.useRef<HTMLInputElement | null>(null);
+
   useKeyDown(
     "Escape",
     (ev) => {
+      if (!visible) {
+        return;
+      }
       ev.preventDefault();
       ev.stopImmediatePropagation();
 
@@ -104,6 +113,19 @@ function SharePopover({
     }
   }, [picker]);
 
+  React.useEffect(() => {
+    if (prevPendingIds && pendingIds.length > prevPendingIds.length) {
+      setQuery("");
+      searchInputRef.current?.focus();
+    } else if (prevPendingIds && pendingIds.length < prevPendingIds.length) {
+      const firstPending = suggestionsRef.current?.firstElementChild;
+
+      if (firstPending) {
+        (firstPending as HTMLAnchorElement).focus();
+      }
+    }
+  }, [pendingIds, prevPendingIds]);
+
   const inviteAction = React.useMemo(
     () =>
       createAction({
@@ -199,16 +221,53 @@ function SharePopover({
     [setPendingIds]
   );
 
+  const handleKeyDown = React.useCallback(
+    (ev: React.KeyboardEvent<HTMLInputElement>) => {
+      if (ev.nativeEvent.isComposing) {
+        return;
+      }
+      if (ev.key === "ArrowDown" && !ev.shiftKey) {
+        ev.preventDefault();
+
+        if (ev.currentTarget.value) {
+          const length = ev.currentTarget.value.length;
+          const selectionStart = ev.currentTarget.selectionStart || 0;
+          if (selectionStart < length) {
+            ev.currentTarget.selectionStart = length;
+            ev.currentTarget.selectionEnd = length;
+            return;
+          }
+        }
+
+        const firstSuggestion = suggestionsRef.current?.firstElementChild;
+
+        if (firstSuggestion) {
+          (firstSuggestion as HTMLAnchorElement).focus();
+        }
+      }
+    },
+    []
+  );
+
+  const handleEscape = React.useCallback(
+    () => searchInputRef.current?.focus(),
+    []
+  );
+
   const permissions = React.useMemo(
     () =>
       [
+        {
+          label: t("View only"),
+          value: DocumentPermission.Read,
+        },
         {
           label: t("Can edit"),
           value: DocumentPermission.ReadWrite,
         },
         {
-          label: t("View only"),
-          value: DocumentPermission.Read,
+          label: t("Manage"),
+          value: DocumentPermission.Admin,
         },
       ] as Permission[],
     [t]
@@ -259,8 +318,10 @@ function SharePopover({
     <Wrapper>
       {can.manageUsers && (
         <SearchInput
+          ref={searchInputRef}
           onChange={handleQuery}
           onClick={showPicker}
+          onKeyDown={handleKeyDown}
           query={query}
           back={backButton}
           action={rightButton}
@@ -268,15 +329,15 @@ function SharePopover({
       )}
 
       {picker && (
-        <div>
-          <Suggestions
-            document={document}
-            query={query}
-            pendingIds={pendingIds}
-            addPendingId={handleAddPendingId}
-            removePendingId={handleRemovePendingId}
-          />
-        </div>
+        <Suggestions
+          ref={suggestionsRef}
+          document={document}
+          query={query}
+          pendingIds={pendingIds}
+          addPendingId={handleAddPendingId}
+          removePendingId={handleRemovePendingId}
+          onEscape={handleEscape}
+        />
       )}
 
       <div style={{ display: picker ? "none" : "block" }}>

app/components/Sharing/components/ListItem.tsx

@@ -15,7 +15,9 @@ export const ListItem = styled(BaseListItem).attrs({
   padding: 6px 16px;
   border-radius: 8px;
 
-  &: ${hover} ${InviteIcon} {
+  &: ${hover} ${InviteIcon},
+  &:focus ${InviteIcon},
+  &:focus-within ${InviteIcon} {
     opacity: 1;
   }
 `;

app/components/Sharing/components/SearchInput.tsx

@@ -1,6 +1,7 @@
 import { AnimatePresence } from "framer-motion";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import { mergeRefs } from "react-merge-refs";
 import Flex from "~/components/Flex";
 import useMobile from "~/hooks/useMobile";
 import Input, { NativeInput } from "../../Input";
@@ -10,13 +11,18 @@ type Props = {
   query: string;
   onChange: React.ChangeEventHandler;
   onClick: React.MouseEventHandler;
+  onKeyDown: React.KeyboardEventHandler;
   back: React.ReactNode;
   action: React.ReactNode;
 };
 
-export function SearchInput({ onChange, onClick, query, back, action }: Props) {
+export const SearchInput = React.forwardRef(function _SearchInput(
+  { onChange, onClick, onKeyDown, query, back, action }: Props,
+  ref: React.Ref<HTMLInputElement>
+) {
   const { t } = useTranslation();
   const inputRef = React.useRef<HTMLInputElement>(null);
+
   const isMobile = useMobile();
 
   const focusInput = React.useCallback(
@@ -39,6 +45,7 @@ export function SearchInput({ onChange, onClick, query, back, action }: Props) {
         value={query}
         onChange={onChange}
         onClick={onClick}
+        onKeyDown={onKeyDown}
         autoFocus
         margin={0}
         flex
@@ -52,15 +59,16 @@ export function SearchInput({ onChange, onClick, query, back, action }: Props) {
         {back}
         <NativeInput
           key="input"
-          ref={inputRef}
+          ref={mergeRefs([inputRef, ref])}
           placeholder={`${t("Add or invite")}…`}
           value={query}
           onChange={onChange}
           onClick={onClick}
+          onKeyDown={onKeyDown}
           style={{ padding: "6px 0" }}
         />
         {action}
       </AnimatePresence>
     </HeaderInput>
   );
-}
+});

app/components/Sharing/components/Suggestions.tsx

@@ -1,4 +1,5 @@
 import { isEmail } from "class-validator";
+import concat from "lodash/concat";
 import { observer } from "mobx-react";
 import { CheckmarkIcon, CloseIcon, GroupIcon } from "outline-icons";
 import * as React from "react";
@@ -11,11 +12,14 @@ import Collection from "~/models/Collection";
 import Document from "~/models/Document";
 import Group from "~/models/Group";
 import User from "~/models/User";
+import ArrowKeyNavigation from "~/components/ArrowKeyNavigation";
 import Avatar from "~/components/Avatar";
 import { AvatarSize, IAvatar } from "~/components/Avatar/Avatar";
 import Empty from "~/components/Empty";
 import Placeholder from "~/components/List/Placeholder";
+import Scrollable from "~/components/Scrollable";
 import useCurrentUser from "~/hooks/useCurrentUser";
+import useMaxHeight from "~/hooks/useMaxHeight";
 import useStores from "~/hooks/useStores";
 import useThrottledCallback from "~/hooks/useThrottledCallback";
 import { hover } from "~/styles";
@@ -40,23 +44,34 @@ type Props = {
   removePendingId: (id: string) => void;
   /** Show group suggestions. */
   showGroups?: boolean;
+  /** Handles escape from suggestions list */
+  onEscape?: (ev: React.KeyboardEvent<HTMLDivElement>) => void;
 };
 
 export const Suggestions = observer(
-  ({
-    document,
-    collection,
-    query,
-    pendingIds,
-    addPendingId,
-    removePendingId,
-    showGroups,
-  }: Props) => {
+  React.forwardRef(function _Suggestions(
+    {
+      document,
+      collection,
+      query,
+      pendingIds,
+      addPendingId,
+      removePendingId,
+      showGroups,
+      onEscape,
+    }: Props,
+    ref: React.Ref<HTMLDivElement>
+  ) {
     const neverRenderedList = React.useRef(false);
     const { users, groups } = useStores();
     const { t } = useTranslation();
     const user = useCurrentUser();
     const theme = useTheme();
+    const containerRef = React.useRef<HTMLDivElement | null>(null);
+    const maxHeight = useMaxHeight({
+      elementRef: containerRef,
+      maxViewportPercentage: 70,
+    });
 
     const fetchUsersByQuery = useThrottledCallback(
       (query: string) => {
@@ -92,7 +107,7 @@ export const Suggestions = observer(
           : collection
           ? users.notInCollection(collection.id, query)
           : users.orderedData
-      ).filter((u) => u.id !== user.id && !u.isSuspended);
+      ).filter((u) => !u.isSuspended);
 
       if (isEmail(query)) {
         filtered.push(getSuggestionForEmail(query));
@@ -107,6 +122,8 @@ export const Suggestions = observer(
       getSuggestionForEmail,
       users,
       users.orderedData,
+      groups,
+      groups.orderedData,
       document?.id,
       document?.members,
       collection?.id,
@@ -174,34 +191,65 @@ export const Suggestions = observer(
     neverRenderedList.current = false;
 
     return (
-      <>
-        {pending.map((suggestion) => (
-          <PendingListItem
-            {...getListItemProps(suggestion)}
-            key={suggestion.id}
-            onClick={() => removePendingId(suggestion.id)}
-            actions={
-              <>
-                <InvitedIcon />
-                <RemoveIcon />
-              </>
-            }
-          />
-        ))}
-        {pending.length > 0 &&
-          (suggestionsWithPending.length > 0 || isEmpty) && <Separator />}
-        {suggestionsWithPending.map((suggestion) => (
-          <ListItem
-            {...getListItemProps(suggestion as User)}
-            key={suggestion.id}
-            onClick={() => addPendingId(suggestion.id)}
-            actions={<InviteIcon />}
-          />
-        ))}
-        {isEmpty && <Empty style={{ marginTop: 22 }}>{t("No matches")}</Empty>}
-      </>
+      <ScrollableContainer
+        ref={containerRef}
+        hiddenScrollbars
+        style={{ maxHeight }}
+      >
+        <ArrowKeyNavigation
+          ref={ref}
+          onEscape={onEscape}
+          aria-label={t("Suggestions for invitation")}
+          items={concat(pending, suggestionsWithPending)}
+        >
+          {() => [
+            ...pending.map((suggestion) => (
+              <PendingListItem
+                keyboardNavigation
+                {...getListItemProps(suggestion)}
+                key={suggestion.id}
+                onClick={() => removePendingId(suggestion.id)}
+                onKeyDown={(ev) => {
+                  if (ev.key === "Enter") {
+                    ev.preventDefault();
+                    ev.stopPropagation();
+                    removePendingId(suggestion.id);
+                  }
+                }}
+                actions={
+                  <>
+                    <InvitedIcon />
+                    <RemoveIcon />
+                  </>
+                }
+              />
+            )),
+            pending.length > 0 &&
+              (suggestionsWithPending.length > 0 || isEmpty) && <Separator />,
+            ...suggestionsWithPending.map((suggestion) => (
+              <ListItem
+                keyboardNavigation
+                {...getListItemProps(suggestion as User)}
+                key={suggestion.id}
+                onClick={() => addPendingId(suggestion.id)}
+                onKeyDown={(ev) => {
+                  if (ev.key === "Enter") {
+                    ev.preventDefault();
+                    ev.stopPropagation();
+                    addPendingId(suggestion.id);
+                  }
+                }}
+                actions={<InviteIcon />}
+              />
+            )),
+            isEmpty && (
+              <Empty style={{ marginTop: 22 }}>{t("No matches")}</Empty>
+            ),
+          ]}
+        </ArrowKeyNavigation>
+      </ScrollableContainer>
     );
-  }
+  })
 );
 
 const InvitedIcon = styled(CheckmarkIcon)`
@@ -228,3 +276,8 @@ const Separator = styled.div`
   border-top: 1px dashed ${s("divider")};
   margin: 12px 0;
 `;
+
+const ScrollableContainer = styled(Scrollable)`
+  padding: 12px 24px;
+  margin: -12px -24px;
+`;

app/components/Sidebar/App.tsx

@@ -55,7 +55,7 @@ function AppSidebar() {
   );
 
   return (
-    <Sidebar ref={handleSidebarRef}>
+    <Sidebar hidden={!ui.readyToShow} ref={handleSidebarRef}>
       <HistoryNavigation />
       {dndArea && (
         <DndProvider backend={HTML5Backend} options={html5Options}>

app/components/Sidebar/Right.tsx

@@ -50,7 +50,8 @@ function Right({ children, border, className }: Props) {
     }
   }, []);
 
-  const handleMouseDown = React.useCallback(() => {
+  const handleMouseDown = React.useCallback((event) => {
+    event.preventDefault();
     setResizing(true);
   }, []);
 

app/components/Sidebar/Shared.tsx

@@ -29,7 +29,7 @@ function SharedSidebar({ rootNode, shareId }: Props) {
 
   return (
     <Sidebar>
-      {team && (
+      {team?.name && (
         <SidebarButton
           title={team.name}
           image={<TeamLogo model={team} size={32} alt={t("Logo")} />}

app/components/Sidebar/Sidebar.tsx

@@ -24,11 +24,12 @@ const ANIMATION_MS = 250;
 
 type Props = {
   children: React.ReactNode;
+  hidden?: boolean;
   className?: string;
 };
 
 const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
-  { children, className }: Props,
+  { children, hidden = false, className }: Props,
   ref: React.RefObject<HTMLDivElement>
 ) {
   const [isCollapsing, setCollapsing] = React.useState(false);
@@ -93,6 +94,7 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
 
   const handleMouseDown = React.useCallback(
     (event) => {
+      event.preventDefault();
       setOffset(event.pageX - width);
       setResizing(true);
       setAnimating(false);
@@ -142,8 +144,11 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
 
   React.useEffect(() => {
     if (isResizing) {
+      document.body.style.cursor = "col-resize";
       document.addEventListener("mousemove", handleDrag);
       document.addEventListener("mouseup", handleStopDrag);
+    } else {
+      document.body.style.cursor = "initial";
     }
 
     return () => {
@@ -178,6 +183,7 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
       <Container
         ref={ref}
         style={style}
+        $hidden={hidden}
         $isHovering={isHovering}
         $isAnimating={isAnimating}
         $isSmallerThanMinimum={isSmallerThanMinimum}
@@ -249,6 +255,7 @@ type ContainerProps = {
   $isSmallerThanMinimum: boolean;
   $isHovering: boolean;
   $collapsed: boolean;
+  $hidden: boolean;
 };
 
 const hoverStyles = (props: ContainerProps) => `
@@ -267,13 +274,14 @@ const hoverStyles = (props: ContainerProps) => `
 `;
 
 const Container = styled(Flex)<ContainerProps>`
+  opacity: ${(props) => (props.$hidden ? 0 : 1)};
   position: fixed;
   top: 0;
   bottom: 0;
   width: 100%;
   background: ${s("sidebarBackground")};
-  transition: box-shadow 100ms ease-in-out, opacity 100ms ease-in-out,
-    transform 100ms ease-out,
+  transition: box-shadow 150ms ease-in-out, opacity 150ms ease-in-out,
+    transform 150ms ease-out,
     ${s("backgroundTransition")}
       ${(props: ContainerProps) =>
         props.$isAnimating ? `,width ${ANIMATION_MS}ms ease-out` : ""};
@@ -316,7 +324,7 @@ const Container = styled(Flex)<ContainerProps>`
 
       & > div {
         opacity: 1;
-      }    
+      }
     }
   `};
 `;

app/components/Sidebar/components/CollectionLink.tsx

@@ -100,7 +100,7 @@ const CollectionLink: React.FC<Props> = ({
           ),
         });
       } else {
-        await documents.move(id, collection.id);
+        await documents.move({ documentId: id, collectionId: collection.id });
 
         if (!expanded) {
           onDisclosureClick();

app/components/Sidebar/components/CollectionLinkChildren.tsx

@@ -52,7 +52,11 @@ function CollectionLinkChildren({
       if (!collection) {
         return;
       }
-      void documents.move(item.id, collection.id, undefined, 0);
+      void documents.move({
+        documentId: item.id,
+        collectionId: collection.id,
+        index: 0,
+      });
     },
     collect: (monitor) => ({
       isOverReorder: !!monitor.isOver(),

app/components/Sidebar/components/DocumentLink.tsx

@@ -14,13 +14,14 @@ import { DocumentValidation } from "@shared/validations";
 import Collection from "~/models/Collection";
 import Document from "~/models/Document";
 import Fade from "~/components/Fade";
+import Icon from "~/components/Icon";
 import NudeButton from "~/components/NudeButton";
 import Tooltip from "~/components/Tooltip";
 import useBoolean from "~/hooks/useBoolean";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
 import DocumentMenu from "~/menus/DocumentMenu";
-import { newDocumentPath } from "~/utils/routeHelpers";
+import { newNestedDocumentPath } from "~/utils/routeHelpers";
 import DropCursor from "./DropCursor";
 import DropToImport from "./DropToImport";
 import EditableTitle, { RefHandle } from "./EditableTitle";
@@ -142,6 +143,8 @@ function InnerDocumentLink(
   const isMoving = documents.movingDocumentId === node.id;
   const manualSort = collection?.sort.field === "index";
   const can = policies.abilities(node.id);
+  const icon = document?.icon || node.icon || node.emoji;
+  const color = document?.color || node.color;
 
   // Draggable
   const [{ isDragging }, drag, preview] = useDrag({
@@ -149,6 +152,7 @@ function InnerDocumentLink(
     item: () => ({
       ...node,
       depth,
+      icon: icon ? <Icon value={icon} color={color} /> : undefined,
       active: isActiveDocument,
       collectionId: collection?.id || "",
     }),
@@ -183,7 +187,11 @@ function InnerDocumentLink(
       if (!collection) {
         return;
       }
-      await documents.move(item.id, collection.id, node.id);
+      await documents.move({
+        documentId: item.id,
+        collectionId: collection.id,
+        parentDocumentId: node.id,
+      });
       setExpanded(true);
     },
     canDrop: (item, monitor) =>
@@ -245,11 +253,21 @@ function InnerDocumentLink(
       }
 
       if (expanded) {
-        void documents.move(item.id, collection.id, node.id, 0);
+        void documents.move({
+          documentId: item.id,
+          collectionId: collection.id,
+          parentDocumentId: node.id,
+          index: 0,
+        });
         return;
       }
 
-      void documents.move(item.id, collection.id, parentId, index + 1);
+      void documents.move({
+        documentId: item.id,
+        collectionId: collection.id,
+        parentDocumentId: parentId,
+        index: index + 1,
+      });
     },
     collect: (monitor) => ({
       isOverReorder: monitor.isOver(),
@@ -279,9 +297,8 @@ function InnerDocumentLink(
     node,
   ]);
 
-  const title =
-    (activeDocument?.id === node.id ? activeDocument.title : node.title) ||
-    t("Untitled");
+  const doc = documents.get(node.id);
+  const title = doc?.title || node.title || t("Untitled");
 
   const isExpanded = expanded && !isDragging;
   const hasChildren = nodeChildren.length > 0;
@@ -324,7 +341,7 @@ function InnerDocumentLink(
                     starred: inStarredSection,
                   },
                 }}
-                emoji={document?.emoji || node.emoji}
+                icon={icon && <Icon value={icon} color={color} />}
                 label={
                   <EditableTitle
                     title={title}
@@ -359,9 +376,7 @@ function InnerDocumentLink(
                             type={undefined}
                             aria-label={t("New nested document")}
                             as={Link}
-                            to={newDocumentPath(document.collectionId, {
-                              parentDocumentId: document.id,
-                            })}
+                            to={newNestedDocumentPath(document.id)}
                           >
                             <PlusIcon />
                           </NudeButton>

app/components/Sidebar/components/SharedDocumentLink.tsx

@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { NavigationNode } from "@shared/types";
 import Collection from "~/models/Collection";
 import Document from "~/models/Document";
+import Icon from "~/components/Icon";
 import useStores from "~/hooks/useStores";
 import { sharedDocumentPath } from "~/utils/routeHelpers";
 import { descendants } from "~/utils/tree";
@@ -100,6 +101,8 @@ function DocumentLink(
     (activeDocument?.id === node.id ? activeDocument.title : node.title) ||
     t("Untitled");
 
+  const icon = node.icon ?? node.emoji;
+
   return (
     <>
       <SidebarLink
@@ -111,7 +114,7 @@ function DocumentLink(
         }}
         expanded={hasChildDocuments && depth !== 0 ? expanded : undefined}
         onDisclosureClick={handleDisclosureClick}
-        emoji={node.emoji}
+        icon={icon && <Icon value={icon} color={node.color} />}
         label={title}
         depth={depth}
         exact={false}

app/components/Sidebar/components/SharedWithMeLink.tsx

@@ -2,7 +2,8 @@ import fractionalIndex from "fractional-index";
 import { observer } from "mobx-react";
 import * as React from "react";
 import styled from "styled-components";
-import { NotificationEventType } from "@shared/types";
+import { IconType, NotificationEventType } from "@shared/types";
+import { determineIconType } from "@shared/utils/icon";
 import UserMembership from "~/models/UserMembership";
 import Fade from "~/components/Fade";
 import useBoolean from "~/hooks/useBoolean";
@@ -78,10 +79,11 @@ function SharedWithMeLink({ userMembership }: Props) {
       return null;
     }
 
-    const { emoji } = document;
-    const label = emoji
-      ? document.title.replace(emoji, "")
-      : document.titleWithDefault;
+    const { icon: docIcon } = document;
+    const label =
+      determineIconType(docIcon) === IconType.Emoji
+        ? document.title.replace(docIcon!, "")
+        : document.titleWithDefault;
     const collection = document.collectionId
       ? collections.get(document.collectionId)
       : undefined;

app/components/Sidebar/components/SidebarLink.tsx

@@ -2,10 +2,9 @@ import { LocationDescriptor } from "history";
 import * as React from "react";
 import styled, { useTheme, css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
+import EventBoundary from "@shared/components/EventBoundary";
 import { s } from "@shared/styles";
 import { NavigationNode } from "@shared/types";
-import EventBoundary from "~/components/EventBoundary";
-import EmojiIcon from "~/components/Icons/EmojiIcon";
 import NudeButton from "~/components/NudeButton";
 import { UnreadBadge } from "~/components/UnreadBadge";
 import useUnmount from "~/hooks/useUnmount";
@@ -27,7 +26,6 @@ type Props = Omit<NavLinkProps, "to"> & {
   onClickIntent?: () => void;
   onDisclosureClick?: React.MouseEventHandler<HTMLButtonElement>;
   icon?: React.ReactNode;
-  emoji?: string | null;
   label?: React.ReactNode;
   menu?: React.ReactNode;
   unreadBadge?: boolean;
@@ -52,7 +50,6 @@ function SidebarLink(
     onClick,
     onClickIntent,
     to,
-    emoji,
     label,
     active,
     isActiveDrop,
@@ -142,7 +139,6 @@ function SidebarLink(
             />
           )}
           {icon && <IconWrapper>{icon}</IconWrapper>}
-          {emoji && <EmojiIcon emoji={emoji} />}
           <Label>{label}</Label>
           {unreadBadge && <UnreadBadge />}
         </Content>

app/components/Sidebar/components/useSidebarLabelAndIcon.tsx

@@ -1,7 +1,7 @@
 import { DocumentIcon } from "outline-icons";
 import * as React from "react";
+import Icon from "~/components/Icon";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
-import EmojiIcon from "~/components/Icons/EmojiIcon";
 import useStores from "~/hooks/useStores";
 
 interface SidebarItem {
@@ -21,7 +21,11 @@ export function useSidebarLabelAndIcon(
     if (document) {
       return {
         label: document.titleWithDefault,
-        icon: document.emoji ? <EmojiIcon emoji={document.emoji} /> : icon,
+        icon: document.icon ? (
+          <Icon value={document.icon} color={document.color ?? undefined} />
+        ) : (
+          icon
+        ),
       };
     }
   }

app/components/TemplatizeDialog/Label.tsx

@@ -0,0 +1,22 @@
+import React from "react";
+import styled from "styled-components";
+import Flex from "~/components/Flex";
+
+const Label = ({ icon, value }: { icon: React.ReactNode; value: string }) => (
+  <Flex align="center" gap={4}>
+    <IconWrapper>{icon}</IconWrapper>
+    {value}
+  </Flex>
+);
+
+const IconWrapper = styled.span`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 24px;
+  width: 24px;
+  overflow: hidden;
+  flex-shrink: 0;
+`;
+
+export default Label;

app/components/TemplatizeDialog/SelectLocation.tsx

@@ -0,0 +1,113 @@
+import { observer } from "mobx-react";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { toast } from "sonner";
+import { AvatarSize } from "~/components/Avatar/Avatar";
+import CollectionIcon from "~/components/Icons/CollectionIcon";
+import InputSelect, { Option } from "~/components/InputSelect";
+import TeamLogo from "~/components/TeamLogo";
+import useCurrentTeam from "~/hooks/useCurrentTeam";
+import usePolicy from "~/hooks/usePolicy";
+import useRequest from "~/hooks/useRequest";
+import useStores from "~/hooks/useStores";
+import Label from "./Label";
+
+type Props = {
+  /** Collection ID to select by default. */
+  defaultCollectionId?: string | null;
+  /** Callback to be called when a collection is selected. */
+  onSelect: (collectionId: string | null) => void;
+};
+
+const SelectLocation = ({ defaultCollectionId, onSelect }: Props) => {
+  const { t } = useTranslation();
+  const team = useCurrentTeam();
+  const { collections, policies } = useStores();
+  const can = usePolicy(team);
+
+  const { loading, error } = useRequest(
+    React.useCallback(async () => {
+      if (!collections.isLoaded) {
+        await collections.fetchAll({
+          limit: 100,
+        });
+      }
+    }, [collections])
+  );
+
+  const workspaceOption: Option | null = can.createTemplate
+    ? {
+        label: (
+          <Label
+            icon={<TeamLogo model={team} size={AvatarSize.Toast} />}
+            value={t("Workspace")}
+          />
+        ),
+        value: "workspace",
+      }
+    : null;
+
+  const collectionOptions: Option[] = React.useMemo(
+    () =>
+      collections.orderedData.reduce<Option[]>((memo, collection) => {
+        const canCollection = policies.abilities(collection.id);
+
+        if (canCollection.createDocument) {
+          memo.push({
+            label: (
+              <Label
+                icon={<CollectionIcon collection={collection} />}
+                value={collection.name}
+              />
+            ),
+            value: collection.id,
+          });
+        }
+
+        return memo;
+      }, []),
+    [collections.orderedData, policies]
+  );
+
+  const options: Option[] = workspaceOption
+    ? collectionOptions.length
+      ? [
+          workspaceOption,
+          ...collectionOptions.map((opt, idx) => {
+            if (idx !== 0) {
+              return opt;
+            }
+            opt.divider = true;
+            return opt;
+          }),
+        ]
+      : [workspaceOption]
+    : collectionOptions;
+
+  const handleSelection = React.useCallback(
+    (value: string | null) => {
+      onSelect(value === "workspace" ? null : value);
+    },
+    [onSelect]
+  );
+
+  if (error) {
+    toast.error(t("Collections could not be loaded, please reload the app"));
+  }
+
+  if (loading || !options.length) {
+    return null;
+  }
+
+  return (
+    <InputSelect
+      value={defaultCollectionId ?? "workspace"}
+      options={options}
+      onChange={handleSelection}
+      ariaLabel={t("Location")}
+      label={t("Location")}
+    />
+  );
+};
+
+export default observer(SelectLocation);

app/components/TemplatizeDialog/index.tsx

@@ -0,0 +1,82 @@
+import invariant from "invariant";
+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 Flex from "~/components/Flex";
+import Switch from "~/components/Switch";
+import useStores from "~/hooks/useStores";
+import { documentPath } from "~/utils/routeHelpers";
+import SelectLocation from "./SelectLocation";
+
+type Props = {
+  documentId: string;
+};
+
+function DocumentTemplatizeDialog({ documentId }: Props) {
+  const history = useHistory();
+  const { t } = useTranslation();
+  const { documents } = useStores();
+  const document = documents.get(documentId);
+  invariant(document, "Document must exist");
+
+  const [publish, setPublish] = React.useState(true);
+  const [collectionId, setCollectionId] = React.useState(
+    document.collectionId ?? null
+  );
+
+  const handlePublishChange = React.useCallback(
+    (ev: React.ChangeEvent<HTMLInputElement>) => {
+      setPublish(ev.target.checked);
+    },
+    []
+  );
+
+  const handleSubmit = React.useCallback(async () => {
+    const template = await document?.templatize({
+      collectionId,
+      publish,
+    });
+    if (template) {
+      history.push(documentPath(template));
+      toast.success(t("Template created, go ahead and customize it"));
+    }
+  }, [t, document, history, collectionId, publish]);
+
+  return (
+    <ConfirmationDialog
+      onSubmit={handleSubmit}
+      submitText={t("Create template")}
+      savingText={`${t("Creating")}…`}
+    >
+      <Flex column gap={12}>
+        <div>
+          <Trans
+            defaults="Creating a template from <em>{{titleWithDefault}}</em> is a non-destructive action – we'll make a copy of the document and turn it into a template that can be used as a starting point for new documents."
+            values={{
+              titleWithDefault: document.titleWithDefault,
+            }}
+            components={{
+              em: <strong />,
+            }}
+          />
+        </div>
+        <SelectLocation
+          defaultCollectionId={collectionId}
+          onSelect={setCollectionId}
+        />
+        <Switch
+          name="publish"
+          label={t("Published")}
+          note={t("Enable other members to use the template immediately")}
+          checked={publish}
+          onChange={handlePublishChange}
+        />
+      </Flex>
+    </ConfirmationDialog>
+  );
+}
+
+export default observer(DocumentTemplatizeDialog);

app/components/WebsocketProvider.tsx

@@ -10,6 +10,7 @@ import { FileOperationState, FileOperationType } from "@shared/types";
 import RootStore from "~/stores/RootStore";
 import Collection from "~/models/Collection";
 import Comment from "~/models/Comment";
+import DataAttribute from "~/models/DataAttribute";
 import Document from "~/models/Document";
 import FileOperation from "~/models/FileOperation";
 import Group from "~/models/Group";
@@ -82,6 +83,7 @@ class WebsocketProvider extends React.Component<Props> {
     this.socket.authenticated = false;
     const {
       auth,
+      dataAttributes,
       documents,
       collections,
       groups,
@@ -290,6 +292,27 @@ class WebsocketProvider extends React.Component<Props> {
       }
     );
 
+    this.socket.on(
+      "dataAttributes.create",
+      (event: PartialWithId<DataAttribute>) => {
+        dataAttributes.add(event);
+      }
+    );
+
+    this.socket.on(
+      "dataAttributes.update",
+      (event: PartialWithId<DataAttribute>) => {
+        dataAttributes.add(event);
+      }
+    );
+
+    this.socket.on(
+      "dataAttributes.delete",
+      (event: WebsocketEntityDeletedEvent) => {
+        dataAttributes.remove(event.modelId);
+      }
+    );
+
     this.socket.on("comments.create", (event: PartialWithId<Comment>) => {
       comments.add(event);
     });

app/editor/components/EmojiMenu.tsx

@@ -1,11 +1,7 @@
-import data, { type Emoji as TEmoji } from "@emoji-mart/data";
-import { init, Data } from "emoji-mart";
-import FuzzySearch from "fuzzy-search";
 import capitalize from "lodash/capitalize";
-import sortBy from "lodash/sortBy";
 import React from "react";
 import { emojiMartToGemoji, snakeCase } from "@shared/editor/lib/emoji";
-import { isMac } from "@shared/utils/browser";
+import { search as emojiSearch } from "@shared/utils/emoji";
 import EmojiMenuItem from "./EmojiMenuItem";
 import SuggestionsMenu, {
   Props as SuggestionsMenuProps,
@@ -19,13 +15,6 @@ type Emoji = {
   attrs: { markup: string; "data-name": string };
 };
 
-init({
-  data,
-  noCountryFlags: isMac() ? false : undefined,
-});
-
-let searcher: FuzzySearch<TEmoji>;
-
 type Props = Omit<
   SuggestionsMenuProps<Emoji>,
   "renderMenuItem" | "items" | "embeds" | "trigger"
@@ -34,36 +23,26 @@ type Props = Omit<
 const EmojiMenu = (props: Props) => {
   const { search = "" } = props;
 
-  if (!searcher) {
-    searcher = new FuzzySearch(Object.values(Data.emojis), ["search"], {
-      caseSensitive: false,
-      sort: true,
-    });
-  }
+  const items = React.useMemo(
+    () =>
+      emojiSearch({ query: search })
+        .map((item) => {
+          // We snake_case the shortcode for backwards compatability with gemoji to
+          // avoid multiple formats being written into documents.
+          const shortcode = snakeCase(emojiMartToGemoji[item.id] || item.id);
+          const emoji = item.value;
 
-  const items = React.useMemo(() => {
-    const n = search.toLowerCase();
-
-    return sortBy(searcher.search(n), (item) => {
-      const nlc = item.name.toLowerCase();
-      return nlc === n ? -1 : nlc.startsWith(n) ? 0 : 1;
-    })
-      .map((item) => {
-        // We snake_case the shortcode for backwards compatability with gemoji to
-        // avoid multiple formats being written into documents.
-        const shortcode = snakeCase(emojiMartToGemoji[item.id] || item.id);
-        const emoji = item.skins[0].native;
-
-        return {
-          name: "emoji",
-          title: emoji,
-          description: capitalize(item.name.toLowerCase()),
-          emoji,
-          attrs: { markup: shortcode, "data-name": shortcode },
-        };
-      })
-      .slice(0, 15);
-  }, [search]);
+          return {
+            name: "emoji",
+            title: emoji,
+            description: capitalize(item.name.toLowerCase()),
+            emoji,
+            attrs: { markup: shortcode, "data-name": shortcode },
+          };
+        })
+        .slice(0, 15),
+    [search]
+  );
 
   return (
     <SuggestionsMenu

app/editor/components/FloatingToolbar.tsx

@@ -5,6 +5,7 @@ import { Portal as ReactPortal } from "react-portal";
 import styled, { css } from "styled-components";
 import { isCode } from "@shared/editor/lib/isCode";
 import { findParentNode } from "@shared/editor/queries/findParentNode";
+import { EditorStyleHelper } from "@shared/editor/styles/EditorStyleHelper";
 import { depths, s } from "@shared/styles";
 import { Portal } from "~/components/Portal";
 import useComponentSize from "~/hooks/useComponentSize";
@@ -131,10 +132,10 @@ function usePosition({
   if (isImageSelection) {
     const element = view.nodeDOM(selection.from);
 
-    // Images are wrapped which impacts positioning - need to traverse through
-    // p > span > div.image
-    const imageElement = (element as HTMLElement).getElementsByTagName(
-      "img"
+    // Images are wrapped which impacts positioning - need to get the element
+    // specifically tagged as the handle
+    const imageElement = (element as HTMLElement).getElementsByClassName(
+      EditorStyleHelper.imageHandle
     )[0];
     const { left, top, width } = imageElement.getBoundingClientRect();
 

app/editor/components/LinkEditor.tsx

@@ -26,6 +26,7 @@ import Tooltip from "./Tooltip";
 export type SearchResult = {
   title: string;
   subtitle?: React.ReactNode;
+  icon?: React.ReactNode;
   url: string;
 };
 
@@ -359,7 +360,7 @@ class LinkEditor extends React.Component<Props, State> {
                     key={result.url}
                     title={result.title}
                     subtitle={result.subtitle}
-                    icon={<DocumentIcon />}
+                    icon={result.icon ?? <DocumentIcon />}
                     onPointerMove={() => this.handleFocusLink(index)}
                     onClick={this.handleSelectLink(result.url, result.title)}
                     selected={index === selectedIndex}

app/editor/components/LinkSearchResult.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import scrollIntoView from "smooth-scroll-into-view-if-needed";
-import styled from "styled-components";
+import styled, { css } from "styled-components";
 import { s, ellipsis } from "@shared/styles";
 
 type Props = React.HTMLAttributes<HTMLDivElement> & {
@@ -60,7 +60,15 @@ const IconWrapper = styled.span<{ selected: boolean }>`
   margin-right: 4px;
   height: 24px;
   opacity: 0.8;
-  color: ${(props) => (props.selected ? s("accentText") : s("textSecondary"))};
+
+  ${(props) =>
+    props.selected &&
+    css`
+      svg {
+        fill: ${s("accentText")};
+        color: ${s("accentText")};
+      }
+    `};
 `;
 
 const ListItem = styled.div<{

app/editor/components/SelectionToolbar.tsx

@@ -3,10 +3,10 @@ import { EditorState, NodeSelection, TextSelection } from "prosemirror-state";
 import * as React from "react";
 import createAndInsertLink from "@shared/editor/commands/createAndInsertLink";
 import filterExcessSeparators from "@shared/editor/lib/filterExcessSeparators";
-import getMarkRange from "@shared/editor/queries/getMarkRange";
-import isInCode from "@shared/editor/queries/isInCode";
-import isMarkActive from "@shared/editor/queries/isMarkActive";
-import isNodeActive from "@shared/editor/queries/isNodeActive";
+import { getMarkRange } from "@shared/editor/queries/getMarkRange";
+import { isInCode } from "@shared/editor/queries/isInCode";
+import { isMarkActive } from "@shared/editor/queries/isMarkActive";
+import { isNodeActive } from "@shared/editor/queries/isNodeActive";
 import { getColumnIndex, getRowIndex } from "@shared/editor/queries/table";
 import { MenuItem } from "@shared/editor/types";
 import { creatingUrlPrefix } from "@shared/utils/urls";

app/editor/components/SuggestionsMenu.tsx

@@ -67,7 +67,7 @@ export type Props<T extends MenuItem = MenuItem> = {
     index: number,
     options: {
       selected: boolean;
-      onClick: () => void;
+      onClick: (event: React.SyntheticEvent) => void;
     }
   ) => React.ReactNode;
   filterable?: boolean;
@@ -78,6 +78,10 @@ function SuggestionsMenu<T extends MenuItem>(props: Props<T>) {
   const { view, commands } = useEditor();
   const dictionary = useDictionary();
   const hasActivated = React.useRef(false);
+  const pointerRef = React.useRef<{ clientX: number; clientY: number }>({
+    clientX: 0,
+    clientY: 0,
+  });
   const menuRef = React.useRef<HTMLDivElement>(null);
   const inputRef = React.useRef<HTMLInputElement>(null);
   const [position, setPosition] = React.useState<Position>(defaultPosition);
@@ -344,6 +348,9 @@ function SuggestionsMenu<T extends MenuItem>(props: Props<T>) {
   const handleFilesPicked = async (
     event: React.ChangeEvent<HTMLInputElement>
   ) => {
+    // Re-focus the editor as it loses focus when file picker is opened on iOS
+    view.focus();
+
     const { uploadFile, onFileUploadStart, onFileUploadStop } = props;
     const files = getEventFiles(event);
     const parent = findParentNode((node) => !!node)(view.state.selection);
@@ -576,7 +583,23 @@ function SuggestionsMenu<T extends MenuItem>(props: Props<T>) {
                     return null;
                   }
 
-                  const handlePointer = () => {
+                  const handlePointerMove = (ev: React.PointerEvent) => {
+                    if (
+                      selectedIndex !== index &&
+                      // Safari triggers pointermove with identical coordinates when the pointer has not moved.
+                      // This causes the menu selection to flicker when the pointer is over the menu but not moving.
+                      (pointerRef.current.clientX !== ev.clientX ||
+                        pointerRef.current.clientY !== ev.clientY)
+                    ) {
+                      setSelectedIndex(index);
+                    }
+                    pointerRef.current = {
+                      clientX: ev.clientX,
+                      clientY: ev.clientY,
+                    };
+                  };
+
+                  const handlePointerDown = () => {
                     if (selectedIndex !== index) {
                       setSelectedIndex(index);
                     }
@@ -585,8 +608,8 @@ function SuggestionsMenu<T extends MenuItem>(props: Props<T>) {
                   return (
                     <ListItem
                       key={index}
-                      onPointerMove={handlePointer}
-                      onPointerDown={handlePointer}
+                      onPointerMove={handlePointerMove}
+                      onPointerDown={handlePointerDown}
                     >
                       {props.renderMenuItem(item as any, index, {
                         selected: index === selectedIndex,