Only redirect if viewing doc

* share: add `allowIndexing`

## Ticket
Closes 7486

* i18n: follow existing no-punctuation style

.circleci/config.yml

@@ -108,8 +108,7 @@ jobs:
     executor: docker-publisher
     steps:
       - checkout
-      - setup_remote_docker:
-          version: 20.10.6
+      - setup_remote_docker
       - run:
           name: Install Docker buildx
           command: |

app/actions/definitions/collections.tsx

@@ -1,8 +1,10 @@
 import {
+  ArchiveIcon,
   CollectionIcon,
   EditIcon,
   PadlockIcon,
   PlusIcon,
+  RestoreIcon,
   SearchIcon,
   ShapesIcon,
   StarredIcon,
@@ -10,11 +12,13 @@ import {
   UnstarredIcon,
 } from "outline-icons";
 import * as React from "react";
+import { toast } from "sonner";
 import stores from "~/stores";
 import Collection from "~/models/Collection";
 import { CollectionEdit } from "~/components/Collection/CollectionEdit";
 import { CollectionNew } from "~/components/Collection/CollectionNew";
 import CollectionDeleteDialog from "~/components/CollectionDeleteDialog";
+import ConfirmationDialog from "~/components/ConfirmationDialog";
 import DynamicCollectionIcon from "~/components/Icons/CollectionIcon";
 import SharePopover from "~/components/Sharing/Collection/SharePopover";
 import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
@@ -129,9 +133,20 @@ export const searchInCollection = createAction({
   analyticsName: "Search collection",
   section: ActiveCollectionSection,
   icon: <SearchIcon />,
-  visible: ({ activeCollectionId }) =>
-    !!activeCollectionId &&
-    stores.policies.abilities(activeCollectionId).readDocument,
+  visible: ({ activeCollectionId }) => {
+    if (!activeCollectionId) {
+      return false;
+    }
+
+    const collection = stores.collections.get(activeCollectionId);
+
+    if (!collection?.isActive) {
+      return false;
+    }
+
+    return stores.policies.abilities(activeCollectionId).readDocument;
+  },
+
   perform: ({ activeCollectionId }) => {
     history.push(searchPath(undefined, { collectionId: activeCollectionId }));
   },
@@ -190,6 +205,72 @@ export const unstarCollection = createAction({
   },
 });
 
+export const archiveCollection = createAction({
+  name: ({ t }) => `${t("Archive")}…`,
+  analyticsName: "Archive collection",
+  section: CollectionSection,
+  icon: <ArchiveIcon />,
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return false;
+    }
+    return !!stores.policies.abilities(activeCollectionId).archive;
+  },
+  perform: async ({ activeCollectionId, stores, t }) => {
+    const { dialogs, collections } = stores;
+    if (!activeCollectionId) {
+      return;
+    }
+    const collection = collections.get(activeCollectionId);
+    if (!collection) {
+      return;
+    }
+
+    dialogs.openModal({
+      title: t("Archive collection"),
+      content: (
+        <ConfirmationDialog
+          onSubmit={async () => {
+            await collection.archive();
+            toast.success(t("Collection archived"));
+          }}
+          submitText={t("Archive")}
+          savingText={`${t("Archiving")}…`}
+        >
+          {t(
+            "Archiving this collection will also archive all documents within it. Documents from the collection will no longer be visible in search results."
+          )}
+        </ConfirmationDialog>
+      ),
+    });
+  },
+});
+
+export const restoreCollection = createAction({
+  name: ({ t }) => t("Restore"),
+  analyticsName: "Restore collection",
+  section: CollectionSection,
+  icon: <RestoreIcon />,
+  visible: ({ activeCollectionId, stores }) => {
+    if (!activeCollectionId) {
+      return false;
+    }
+    return !!stores.policies.abilities(activeCollectionId).restore;
+  },
+  perform: async ({ activeCollectionId, stores, t }) => {
+    if (!activeCollectionId) {
+      return;
+    }
+    const collection = stores.collections.get(activeCollectionId);
+    if (!collection) {
+      return;
+    }
+
+    await collection.restore();
+    toast.success(t("Collection restored"));
+  },
+});
+
 export const deleteCollection = createAction({
   name: ({ t }) => `${t("Delete")}…`,
   analyticsName: "Delete collection",

app/actions/definitions/comments.tsx

@@ -1,9 +1,10 @@
-import { DoneIcon, TrashIcon } from "outline-icons";
+import { DoneIcon, SmileyIcon, TrashIcon } from "outline-icons";
 import * as React from "react";
 import { toast } from "sonner";
 import stores from "~/stores";
 import Comment from "~/models/Comment";
 import CommentDeleteDialog from "~/components/CommentDeleteDialog";
+import ViewReactionsDialog from "~/components/Reactions/ViewReactionsDialog";
 import history from "~/utils/history";
 import { createAction } from "..";
 import { DocumentSection } from "../sections";
@@ -88,3 +89,27 @@ export const unresolveCommentFactory = ({
       onUnresolve();
     },
   });
+
+export const viewCommentReactionsFactory = ({
+  comment,
+}: {
+  comment: Comment;
+}) =>
+  createAction({
+    name: ({ t }) => `${t("View reactions")}`,
+    analyticsName: "View comment reactions",
+    section: DocumentSection,
+    icon: <SmileyIcon />,
+    visible: () =>
+      stores.policies.abilities(comment.id).read &&
+      comment.reactions.length > 0,
+    perform: ({ t, event }) => {
+      event?.preventDefault();
+      event?.stopPropagation();
+
+      stores.dialogs.openModal({
+        title: t("Reactions"),
+        content: <ViewReactionsDialog model={comment} />,
+      });
+    },
+  });

app/actions/definitions/documents.tsx

@@ -28,6 +28,7 @@ import {
   EyeIcon,
   PadlockIcon,
   GlobeIcon,
+  LogoutIcon,
 } from "outline-icons";
 import * as React from "react";
 import { toast } from "sonner";
@@ -37,6 +38,7 @@ import {
   NavigationNode,
 } from "@shared/types";
 import { getEventFiles } from "@shared/utils/files";
+import UserMembership from "~/models/UserMembership";
 import DocumentDelete from "~/scenes/DocumentDelete";
 import DocumentMove from "~/scenes/DocumentMove";
 import DocumentPermanentDelete from "~/scenes/DocumentPermanentDelete";
@@ -358,8 +360,6 @@ export const shareDocument = createAction({
     }
 
     const document = stores.documents.get(activeDocumentId);
-    const share = stores.shares.getByDocumentId(activeDocumentId);
-    const sharedParent = stores.shares.getByDocumentParents(activeDocumentId);
     if (!document) {
       return;
     }
@@ -370,8 +370,6 @@ export const shareDocument = createAction({
       content: (
         <SharePopover
           document={document}
-          share={share}
-          sharedParent={sharedParent}
           onRequestClose={stores.dialogs.closeAllModals}
           visible
         />
@@ -1123,6 +1121,42 @@ export const toggleViewerInsights = createAction({
   },
 });
 
+export const leaveDocument = createAction({
+  name: ({ t }) => t("Leave document"),
+  analyticsName: "Leave document",
+  section: ActiveDocumentSection,
+  icon: <LogoutIcon />,
+  visible: ({ currentUserId, activeDocumentId, stores }) => {
+    const membership = stores.userMemberships.orderedData.find(
+      (m) => m.documentId === activeDocumentId && m.userId === currentUserId
+    );
+
+    return !!membership;
+  },
+  perform: async ({ t, location, currentUserId, activeDocumentId, stores }) => {
+    if (!activeDocumentId) {
+      return;
+    }
+
+    const document = stores.documents.get(activeDocumentId);
+
+    try {
+      if (document && location.pathname.startsWith(document.path)) {
+        history.push(homePath());
+      }
+
+      await stores.userMemberships.delete({
+        documentId: activeDocumentId,
+        userId: currentUserId,
+      } as UserMembership);
+
+      toast.success(t("You have left the shared document"));
+    } catch (err) {
+      toast.error(t("Could not leave document"));
+    }
+  },
+});
+
 export const rootDocumentActions = [
   openDocument,
   archiveDocument,
@@ -1141,6 +1175,7 @@ export const rootDocumentActions = [
   subscribeDocument,
   unsubscribeDocument,
   duplicateDocument,
+  leaveDocument,
   moveTemplateToWorkspace,
   moveDocumentToCollection,
   openRandomDocument,

app/actions/definitions/navigation.tsx

@@ -91,6 +91,15 @@ export const navigateToSettings = createAction({
   perform: () => history.push(settingsPath()),
 });
 
+export const navigateToWorkspaceSettings = createAction({
+  name: ({ t }) => t("Settings"),
+  analyticsName: "Navigate to workspace settings",
+  section: NavigationSection,
+  icon: <SettingsIcon />,
+  visible: () => stores.policies.abilities(stores.auth.team?.id || "").update,
+  perform: () => history.push(settingsPath("details")),
+});
+
 export const navigateToProfileSettings = createAction({
   name: ({ t }) => t("Profile"),
   analyticsName: "Navigate to profile settings",

app/components/Button.tsx

@@ -1,5 +1,5 @@
 import { LocationDescriptor } from "history";
-import { ExpandedIcon } from "outline-icons";
+import { DisclosureIcon } from "outline-icons";
 import { darken, lighten, transparentize } from "polished";
 import * as React from "react";
 import styled from "styled-components";
@@ -189,10 +189,14 @@ const Button = <T extends React.ElementType = "button">(
       <Inner hasIcon={hasIcon} hasText={hasText} disclosure={disclosure}>
         {hasIcon && ic}
         {hasText && <Label hasIcon={hasIcon}>{children || value}</Label>}
-        {disclosure && <ExpandedIcon />}
+        {disclosure && <StyledDisclosureIcon />}
       </Inner>
     </RealButton>
   );
 };
 
+const StyledDisclosureIcon = styled(DisclosureIcon)`
+  opacity: 0.8;
+`;
+
 export default React.forwardRef(Button);

app/components/CollectionBreadcrumb.tsx

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

app/components/CollectionDescription.tsx

@@ -226,7 +226,7 @@ const Input = styled.div`
   }
 
   &[data-editing="true"] {
-    background: ${s("secondaryBackground")};
+    background: ${s("backgroundSecondary")};
   }
 
   .block-menu-trigger,

app/components/CommandBar/CommandBar.tsx

@@ -77,7 +77,10 @@ const SearchInput = styled(KBarSearch)`
   border: none;
   background: ${s("menuBackground")};
   color: ${s("text")};
-  border-bottom: 1px solid ${s("inputBorder")};
+
+  &:not(:last-child) {
+    border-bottom: 1px solid ${s("inputBorder")};
+  }
 
   &:disabled,
   &::placeholder {

app/components/CommandBar/CommandBarResults.tsx

@@ -7,6 +7,10 @@ import CommandBarItem from "./CommandBarItem";
 export default function CommandBarResults() {
   const { results, rootActionId } = useMatches();
 
+  if (results.length === 0) {
+    return null;
+  }
+
   return (
     <Container>
       <KBarResults

app/components/ConfirmMoveDialog.tsx

@@ -21,11 +21,13 @@ function ConfirmMoveDialog({ collection, item, ...rest }: Props) {
   const { documents, dialogs, collections } = useStores();
   const { t } = useTranslation();
   const prevCollection = collections.get(item.collectionId!);
-  const accessMapping = {
-    [CollectionPermission.ReadWrite]: t("view and edit access"),
-    [CollectionPermission.Read]: t("view only access"),
-    null: t("no access"),
-  };
+  const accessMapping: Record<Partial<CollectionPermission> | "null", string> =
+    {
+      [CollectionPermission.Admin]: t("manage access"),
+      [CollectionPermission.ReadWrite]: t("view and edit access"),
+      [CollectionPermission.Read]: t("view only access"),
+      null: t("no access"),
+    };
 
   const handleSubmit = async () => {
     await documents.move({

app/components/ConnectionStatus.tsx

@@ -35,7 +35,7 @@ function ConnectionStatus() {
   };
 
   const message = ui.multiplayerErrorCode
-    ? codeToMessage[ui.multiplayerErrorCode]
+    ? codeToMessage[ui.multiplayerErrorCode as keyof typeof codeToMessage]
     : undefined;
 
   return ui.multiplayerStatus === "connecting" ||

app/components/DocumentContext.tsx

@@ -11,6 +11,9 @@ class DocumentContext {
   /** The editor instance for this document */
   editor?: Editor;
 
+  @observable
+  isEditorInitialized: boolean = false;
+
   @observable
   headings: Heading[] = [];
 
@@ -31,6 +34,11 @@ class DocumentContext {
     this.updateState();
   };
 
+  @action
+  setEditorInitialized = (initialized: boolean) => {
+    this.isEditorInitialized = initialized;
+  };
+
   @action
   updateState = () => {
     this.updateHeadings();

app/components/Editor.tsx

@@ -98,7 +98,7 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
       }
 
       // default search for anything that doesn't look like a URL
-      const results = await documents.searchTitles(term);
+      const results = await documents.searchTitles({ query: term });
 
       return sortBy(
         results.map(({ document }) => ({
@@ -255,6 +255,7 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
     <ErrorBoundary component="div" reloadOnChunkMissing>
       <>
         <LazyLoadedEditor
+          key={props.extensions?.length || 0}
           ref={mergeRefs([ref, localRef, handleRefChanged])}
           uploadFile={handleUploadFile}
           embeds={embeds}
@@ -267,11 +268,11 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
           placeholder={props.placeholder || ""}
           defaultValue={props.defaultValue || ""}
         />
-        {props.editorStyle?.paddingBottom && !props.readOnly && (
+        {props.editorStyle?.paddingBottom && (
           <ClickablePadding
-            onClick={focusAtEnd}
-            onDrop={handleDrop}
-            onDragOver={handleDragOver}
+            onClick={props.readOnly ? undefined : focusAtEnd}
+            onDrop={props.readOnly ? undefined : handleDrop}
+            onDragOver={props.readOnly ? undefined : handleDragOver}
             minHeight={props.editorStyle.paddingBottom}
           />
         )}

app/components/Emoji.tsx

@@ -0,0 +1,20 @@
+import styled from "styled-components";
+import { s } from "@shared/styles";
+
+type Props = {
+  /** Width of the containing element. */
+  width?: number | string;
+  /** Height of the containing element. */
+  height?: number | string;
+  /** Controls the rendered emoji size. */
+  size?: number;
+};
+
+export const Emoji = styled.span<Props>`
+  font-family: ${s("fontFamilyEmoji")};
+  width: ${({ width }) =>
+    typeof width === "string" ? width : width ? `${width}px` : "auto"};
+  height: ${({ height }) =>
+    typeof height === "string" ? height : height ? `${height}px` : "auto"};
+  font-size: ${({ size }) => size && `${size}px`};
+`;

app/components/ErrorBoundary.tsx

@@ -138,7 +138,7 @@ class ErrorBoundary extends React.Component<Props> {
 }
 
 const Pre = styled.pre`
-  background: ${s("secondaryBackground")};
+  background: ${s("backgroundSecondary")};
   padding: 16px;
   border-radius: 4px;
   font-size: 12px;

app/components/GroupListItem.tsx

@@ -75,7 +75,7 @@ const Image = styled(Flex)`
   justify-content: center;
   width: 32px;
   height: 32px;
-  background: ${s("secondaryBackground")};
+  background: ${s("backgroundSecondary")};
   border-radius: 32px;
 `;
 

app/components/Header.tsx

@@ -16,6 +16,8 @@ import useStores from "~/hooks/useStores";
 import { draggableOnDesktop, fadeOnDesktopBackgrounded } from "~/styles";
 import Desktop from "~/utils/Desktop";
 
+export const HEADER_HEIGHT = 64;
+
 type Props = {
   left?: React.ReactNode;
   title: React.ReactNode;
@@ -130,7 +132,7 @@ const Wrapper = styled(Flex)<WrapperProps>`
   padding: 12px;
   transition: all 100ms ease-out;
   transform: translate3d(0, 0, 0);
-  min-height: 64px;
+  min-height: ${HEADER_HEIGHT}px;
   justify-content: flex-start;
   ${draggableOnDesktop()}
 

app/components/HoverPreview/Components.tsx

@@ -61,7 +61,7 @@ export const Label = styled(Text).attrs({ size: "xsmall", weight: "bold" })<{
   color?: string;
 }>`
   background-color: ${(props) =>
-    props.color ?? props.theme.secondaryBackground};
+    props.color ?? props.theme.backgroundSecondary};
   color: ${(props) =>
     props.color ? getTextColor(props.color) : props.theme.text};
   width: fit-content;

app/components/HoverPreview/HoverPreview.tsx

@@ -125,6 +125,7 @@ function HoverPreviewDesktop({ element, data, dataLoading, onClose }: Props) {
                 avatarUrl={data.avatarUrl}
                 color={data.color}
                 lastActive={data.lastActive}
+                email={data.email}
               />
             ) : data.type === UnfurlResourceType.Document ? (
               <HoverPreviewDocument

app/components/HoverPreview/HoverPreviewMention.tsx

@@ -7,7 +7,7 @@ import { Preview, Title, Info, Card, CardContent } from "./Components";
 type Props = Omit<UnfurlResponse[UnfurlResourceType.Mention], "type">;
 
 const HoverPreviewMention = React.forwardRef(function _HoverPreviewMention(
-  { avatarUrl, name, lastActive, color }: Props,
+  { avatarUrl, name, lastActive, color, email }: Props,
   ref: React.Ref<HTMLDivElement>
 ) {
   return (
@@ -25,6 +25,7 @@ const HoverPreviewMention = React.forwardRef(function _HoverPreviewMention(
             />
             <Flex column gap={2} justify="center">
               <Title>{name}</Title>
+              {email && <Info>{email}</Info>}
               <Info>{lastActive}</Info>
             </Flex>
           </Flex>

app/components/IconPicker/components/Emoji.tsx

@@ -1,8 +0,0 @@
-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

@@ -18,11 +18,7 @@ import {
 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 GRID_HEIGHT = 410;
 
 const useEmojiState = () => {
   const [emojiSkinTone, setEmojiSkinTone] = usePersistedState<EmojiSkinTone>(
@@ -80,6 +76,7 @@ type Props = {
   panelWidth: number;
   query: string;
   panelActive: boolean;
+  height?: number;
   onEmojiChange: (emoji: string) => void;
   onQueryChange: (query: string) => void;
 };
@@ -90,6 +87,7 @@ const EmojiPanel = ({
   panelActive,
   onEmojiChange,
   onQueryChange,
+  height = GRID_HEIGHT,
 }: Props) => {
   const { t } = useTranslation();
 
@@ -159,7 +157,7 @@ const EmojiPanel = ({
       <GridTemplate
         ref={scrollableRef}
         width={panelWidth}
-        height={GRID_HEIGHT}
+        height={height - 48}
         data={templateData}
         onIconSelect={handleEmojiSelection}
       />

app/components/IconPicker/components/GridTemplate.tsx

@@ -4,9 +4,9 @@ import React from "react";
 import styled from "styled-components";
 import { IconType } from "@shared/types";
 import { IconLibrary } from "@shared/utils/IconLibrary";
+import { Emoji } from "~/components/Emoji";
 import Text from "~/components/Text";
 import { TRANSLATED_CATEGORIES } from "../utils";
-import { Emoji } from "./Emoji";
 import Grid from "./Grid";
 import { IconButton } from "./IconButton";
 
@@ -71,7 +71,7 @@ const GridTemplate = (
             <IconButton
               key={item.name}
               onClick={() => onIconSelect({ id: item.name, value: item.name })}
-              delay={item.delay}
+              style={{ "--delay": `${item.delay}ms` } as React.CSSProperties}
             >
               <Icon as={IconLibrary.getComponent(item.name)} color={item.color}>
                 {item.initial}
@@ -85,7 +85,9 @@ const GridTemplate = (
             key={item.id}
             onClick={() => onIconSelect({ id: item.id, value: item.value })}
           >
-            <Emoji>{item.value}</Emoji>
+            <Emoji width={24} height={24}>
+              {item.value}
+            </Emoji>
           </IconButton>
         );
       });

app/components/IconPicker/components/IconButton.tsx

@@ -7,7 +7,6 @@ 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/SkinTonePicker.tsx

@@ -5,10 +5,10 @@ import styled from "styled-components";
 import { depths, s } from "@shared/styles";
 import { EmojiSkinTone } from "@shared/types";
 import { getEmojiVariants } from "@shared/utils/emoji";
+import { Emoji } from "~/components/Emoji";
 import Flex from "~/components/Flex";
 import NudeButton from "~/components/NudeButton";
 import { hover } from "~/styles";
-import { Emoji } from "./Emoji";
 import { IconButton } from "./IconButton";
 
 const SkinTonePicker = ({
@@ -26,7 +26,7 @@ const SkinTonePicker = ({
   );
 
   const menu = useMenuState({
-    placement: "bottom",
+    placement: "bottom-end",
   });
 
   const handleSkinClick = React.useCallback(
@@ -43,7 +43,9 @@ const SkinTonePicker = ({
         <MenuItem {...menu} key={emoji.value}>
           {(menuprops) => (
             <IconButton {...menuprops} onClick={() => handleSkinClick(eskin)}>
-              <Emoji>{emoji.value}</Emoji>
+              <Emoji width={24} height={24}>
+                {emoji.value}
+              </Emoji>
             </IconButton>
           )}
         </MenuItem>

app/components/IconPicker/index.tsx

@@ -82,6 +82,7 @@ const IconPicker = ({
     modal: true,
     unstable_offset: [0, 0],
   });
+  const { hide, show, visible } = popover;
   const tab = useTabState({ selectedId: defaultTab });
   const previouslyVisible = usePrevious(popover.visible);
 
@@ -96,12 +97,12 @@ const IconPicker = ({
 
   const handleIconChange = React.useCallback(
     (ic: string) => {
-      popover.hide();
+      hide();
       const icType = determineIconType(ic);
       const finalColor = icType === IconType.SVG ? chosenColor : null;
       onChange(ic, finalColor);
     },
-    [popover, onChange, chosenColor]
+    [hide, onChange, chosenColor]
   );
 
   const handleIconColorChange = React.useCallback(
@@ -118,32 +119,32 @@ const IconPicker = ({
   );
 
   const handleIconRemove = React.useCallback(() => {
-    popover.hide();
+    hide();
     onChange(null, null);
-  }, [popover, onChange]);
+  }, [hide, onChange]);
 
   const handlePopoverButtonClick = React.useCallback(
     (ev: React.MouseEvent) => {
       ev.stopPropagation();
-      if (popover.visible) {
-        popover.hide();
+      if (visible) {
+        hide();
       } else {
-        popover.show();
+        show();
       }
     },
-    [popover]
+    [hide, show, visible]
   );
 
   // Popover open effect
   React.useEffect(() => {
-    if (popover.visible && !previouslyVisible) {
+    if (visible && !previouslyVisible) {
       onOpen?.();
-    } else if (!popover.visible && previouslyVisible) {
+    } else if (!visible && previouslyVisible) {
       onClose?.();
       setQuery("");
       resetDefaultTab();
     }
-  }, [popover.visible, previouslyVisible, onOpen, onClose, resetDefaultTab]);
+  }, [visible, previouslyVisible, onOpen, onClose, resetDefaultTab]);
 
   // Custom click outside handling rather than using `hideOnClickOutside` from reakit so that we can
   // prevent event bubbling.
@@ -198,7 +199,7 @@ const IconPicker = ({
                 {...tab}
                 id={TAB_NAMES["Icon"]}
                 aria-label={t("Icons")}
-                active={tab.selectedId === TAB_NAMES["Icon"]}
+                $active={tab.selectedId === TAB_NAMES["Icon"]}
               >
                 {t("Icons")}
               </StyledTab>
@@ -206,7 +207,7 @@ const IconPicker = ({
                 {...tab}
                 id={TAB_NAMES["Emoji"]}
                 aria-label={t("Emojis")}
-                active={tab.selectedId === TAB_NAMES["Emoji"]}
+                $active={tab.selectedId === TAB_NAMES["Emoji"]}
               >
                 {t("Emojis")}
               </StyledTab>
@@ -273,7 +274,7 @@ const TabActionsWrapper = styled(Flex)`
   border-bottom: 1px solid ${s("inputBorder")};
 `;
 
-const StyledTab = styled(Tab)<{ active: boolean }>`
+const StyledTab = styled(Tab)<{ $active: boolean }>`
   position: relative;
   font-weight: 500;
   font-size: 14px;
@@ -282,15 +283,15 @@ const StyledTab = styled(Tab)<{ active: boolean }>`
   border: 0;
   padding: 8px 12px;
   user-select: none;
-  color: ${({ active }) => (active ? s("textSecondary") : s("textTertiary"))};
+  color: ${({ $active }) => ($active ? s("textSecondary") : s("textTertiary"))};
   transition: color 100ms ease-in-out;
 
   &: ${hover} {
     color: ${s("textSecondary")};
   }
 
-  ${({ active }) =>
-    active &&
+  ${({ $active }) =>
+    $active &&
     css`
       &:after {
         content: "";

app/components/InputSelect.tsx

@@ -10,7 +10,7 @@ import * as React from "react";
 import { VisuallyHidden } from "reakit/VisuallyHidden";
 import styled, { css } from "styled-components";
 import { s } from "@shared/styles";
-import Button, { Inner } from "~/components/Button";
+import Button, { Props as ButtonProps, Inner } from "~/components/Button";
 import Text from "~/components/Text";
 import useMenuHeight from "~/hooks/useMenuHeight";
 import useMobile from "~/hooks/useMobile";
@@ -33,7 +33,7 @@ export type Option = {
   divider?: boolean;
 };
 
-export type Props = {
+export type Props = Omit<ButtonProps<any>, "onChange"> & {
   id?: string;
   name?: string;
   value?: string | null;
@@ -313,7 +313,7 @@ const StyledButton = styled(Button)<{ $nude?: boolean }>`
   margin-bottom: 16px;
   display: block;
   width: 100%;
-  cursor: default;
+  cursor: var(--pointer);
 
   &:hover:not(:disabled) {
     background: ${s("buttonNeutralBackground")};

app/components/InputSelectPermission.tsx

@@ -1,6 +1,8 @@
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import styled from "styled-components";
 import { $Diff } from "utility-types";
+import { s } from "@shared/styles";
 import { CollectionPermission } from "@shared/types";
 import { EmptySelectValue } from "~/types";
 import InputSelect, { Props, Option, InputSelectRef } from "./InputSelect";
@@ -19,7 +21,7 @@ function InputSelectPermission(
   const { t } = useTranslation();
 
   return (
-    <InputSelect
+    <Select
       ref={ref}
       label={t("Permission")}
       options={[
@@ -45,4 +47,8 @@ function InputSelectPermission(
   );
 }
 
+const Select = styled(InputSelect)`
+  color: ${s("textSecondary")};
+`;
+
 export default React.forwardRef(InputSelectPermission);

app/components/List/Item.tsx

@@ -192,7 +192,7 @@ const Wrapper = styled.a<{
   &:focus,
   &:focus-within {
     background: ${(props) =>
-      props.$hover ? props.theme.secondaryBackground : "inherit"};
+      props.$hover ? props.theme.backgroundSecondary : "inherit"};
   }
 
   cursor: ${(props) =>

app/components/LocaleTime.tsx

@@ -39,12 +39,15 @@ const LocaleTime: React.FC<Props> = ({
   relative,
   tooltipDelay,
 }: Props) => {
-  const userLocale: string = useUserLocale() || "";
-  const dateFormatLong = {
+  const userLocale = useUserLocale();
+  const dateFormatLong: Record<string, string> = {
     en_US: "MMMM do, yyyy h:mm a",
     fr_FR: "'Le 'd MMMM yyyy 'à' H:mm",
   };
-  const formatLocaleLong = dateFormatLong[userLocale] ?? "MMMM do, yyyy h:mm a";
+  const formatLocaleLong =
+    (userLocale ? dateFormatLong[userLocale] : undefined) ??
+    "MMMM do, yyyy h:mm a";
+  // @ts-expect-error fallback to formatLocaleLong
   const formatLocale = format?.[userLocale] ?? formatLocaleLong;
   const [_, setMinutesMounted] = React.useState(0); // eslint-disable-line @typescript-eslint/no-unused-vars
   const callback = React.useRef<() => void>();

app/components/Notifications/Notifications.tsx

@@ -24,13 +24,15 @@ import NotificationListItem from "./NotificationListItem";
 type Props = {
   /** Callback when the notification panel wants to close. */
   onRequestClose: () => void;
+  /** Whether the panel is open or not. */
+  isOpen: boolean;
 };
 
 /**
  * A panel containing a list of notifications and controls to manage them.
  */
 function Notifications(
-  { onRequestClose }: Props,
+  { onRequestClose, isOpen }: Props,
   ref: React.RefObject<HTMLDivElement>
 ) {
   const context = useActionContext();
@@ -72,7 +74,7 @@ function Notifications(
             <PaginatedList
               fetch={notifications.fetchPage}
               options={{ archived: false }}
-              items={notifications.orderedData}
+              items={isOpen ? notifications.orderedData : undefined}
               renderItem={(item: Notification) => (
                 <NotificationListItem
                   key={item.id}

app/components/Notifications/NotificationsPopover.tsx

@@ -40,7 +40,11 @@ const NotificationsPopover: React.FC = ({ children }: Props) => {
         shrink
         flex
       >
-        <Notifications onRequestClose={popover.hide} ref={scrollableRef} />
+        <Notifications
+          onRequestClose={popover.hide}
+          isOpen={popover.visible}
+          ref={scrollableRef}
+        />
       </StyledPopover>
     </>
   );

app/components/PaginatedList.tsx

@@ -19,7 +19,8 @@ export interface PaginatedItem {
 }
 
 type Props<T> = WithTranslation &
-  RootStore & {
+  RootStore &
+  React.HTMLAttributes<HTMLDivElement> & {
     fetch?: (
       options: Record<string, any> | undefined
     ) => Promise<T[] | undefined> | undefined;

app/components/Reactions/Reaction.tsx

@@ -0,0 +1,173 @@
+import { observer } from "mobx-react";
+import { transparentize } from "polished";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import styled, { css } from "styled-components";
+import { s } from "@shared/styles";
+import type { ReactionSummary } from "@shared/types";
+import { getEmojiId } from "@shared/utils/emoji";
+import User from "~/models/User";
+import { Emoji } from "~/components/Emoji";
+import Flex from "~/components/Flex";
+import NudeButton from "~/components/NudeButton";
+import Text from "~/components/Text";
+import Tooltip from "~/components/Tooltip";
+import useCurrentUser from "~/hooks/useCurrentUser";
+import { hover } from "~/styles";
+
+type Props = {
+  /** Thin reaction data - contains the emoji & active user ids for this reaction. */
+  reaction: ReactionSummary;
+  /** Users who reacted using this emoji. */
+  reactedUsers: User[];
+  /** Whether the emoji button should be disabled (prevents add/remove events). */
+  disabled: boolean;
+  /** Callback when the user intends to add the reaction. */
+  onAddReaction: (emoji: string) => Promise<void>;
+  /** Callback when the user intends to remove the reaction. */
+  onRemoveReaction: (emoji: string) => Promise<void>;
+};
+
+const useTooltipContent = ({
+  reactedUsers,
+  currUser,
+  emoji,
+  active,
+}: {
+  reactedUsers: User[];
+  currUser: User;
+  emoji: string;
+  active: boolean;
+}) => {
+  const { t } = useTranslation();
+
+  if (!reactedUsers.length) {
+    return;
+  }
+
+  const transformedEmoji = `:${getEmojiId(emoji)}:`;
+
+  switch (reactedUsers.length) {
+    case 1: {
+      return t("{{ username }} reacted with {{ emoji }}", {
+        username: active ? t("You") : reactedUsers[0].name,
+        emoji: transformedEmoji,
+      });
+    }
+
+    case 2: {
+      const firstUsername = active ? t("You") : reactedUsers[0].name;
+      const secondUsername = active
+        ? reactedUsers.find((user) => user.id !== currUser.id)?.name
+        : reactedUsers[1].name;
+
+      return t(
+        "{{ firstUsername }} and {{ secondUsername }} reacted with {{ emoji }}",
+        {
+          firstUsername,
+          secondUsername,
+          emoji: transformedEmoji,
+        }
+      );
+    }
+
+    default: {
+      const firstUsername = active ? t("You") : reactedUsers[0].name;
+      const count = reactedUsers.length - 1;
+
+      return t(
+        "{{ firstUsername }} and {{ count }} others reacted with {{ emoji }}",
+        {
+          firstUsername,
+          count,
+          emoji: transformedEmoji,
+        }
+      );
+    }
+  }
+};
+
+const Reaction: React.FC<Props> = ({
+  reaction,
+  reactedUsers,
+  disabled,
+  onAddReaction,
+  onRemoveReaction,
+}) => {
+  const user = useCurrentUser();
+
+  const active = reaction.userIds.includes(user.id);
+
+  const tooltipContent = useTooltipContent({
+    reactedUsers,
+    currUser: user,
+    emoji: reaction.emoji,
+    active,
+  });
+
+  const handleClick = React.useCallback(
+    (event: React.SyntheticEvent<HTMLButtonElement>) => {
+      event.stopPropagation();
+      active
+        ? void onRemoveReaction(reaction.emoji)
+        : void onAddReaction(reaction.emoji);
+    },
+    [reaction, active, onAddReaction, onRemoveReaction]
+  );
+
+  const DisplayedEmoji = React.useMemo(
+    () => (
+      <EmojiButton disabled={disabled} $active={active} onClick={handleClick}>
+        <Flex gap={6} justify="center" align="center">
+          <Emoji size={15}>{reaction.emoji}</Emoji>
+          <Count weight="xbold">{reaction.userIds.length}</Count>
+        </Flex>
+      </EmojiButton>
+    ),
+    [reaction.emoji, reaction.userIds, disabled, active, handleClick]
+  );
+
+  return tooltipContent ? (
+    <Tooltip content={tooltipContent} delay={250} placement="bottom">
+      {DisplayedEmoji}
+    </Tooltip>
+  ) : (
+    <>{DisplayedEmoji}</>
+  );
+};
+
+const EmojiButton = styled(NudeButton)<{
+  $active: boolean;
+  disabled: boolean;
+}>`
+  width: auto;
+  height: 28px;
+  padding: 6px;
+  border-radius: 12px;
+  transition: ${s("backgroundTransition")};
+  background: ${s("backgroundTertiary")};
+  pointer-events: ${({ disabled }) => disabled && "none"};
+
+  &: ${hover} {
+    background: ${s("backgroundQuaternary")};
+  }
+
+  ${(props) =>
+    props.$active &&
+    css`
+      background: ${transparentize(0.7, props.theme.accent)};
+
+      &: ${hover} {
+        background: ${transparentize(0.5, props.theme.accent)};
+      }
+    `}
+`;
+
+const Count = styled(Text)`
+  font-size: 11px;
+  color: ${s("buttonNeutralText")};
+  padding-right: 1px;
+  font-variant-numeric: tabular-nums;
+`;
+
+export default observer(Reaction);

app/components/Reactions/ReactionList.tsx

@@ -0,0 +1,87 @@
+import compact from "lodash/compact";
+import { observer } from "mobx-react";
+import React from "react";
+import Comment from "~/models/Comment";
+import useHover from "~/hooks/useHover";
+import useStores from "~/hooks/useStores";
+import Logger from "~/utils/Logger";
+import Flex from "../Flex";
+import { ResizingHeightContainer } from "../ResizingHeightContainer";
+import Reaction from "./Reaction";
+
+type Props = {
+  /** Model for which to show the reactions. */
+  model: Comment;
+  /** Callback when the user intends to add a reaction. */
+  onAddReaction: (emoji: string) => Promise<void>;
+  /** Callback when the user intends to remove a reaction. */
+  onRemoveReaction: (emoji: string) => Promise<void>;
+  /** classname generated by styled-components. */
+  className?: string;
+  /** Picker to render as the last element */
+  picker?: React.ReactElement;
+};
+
+const ReactionList: React.FC<Props> = ({
+  model,
+  onAddReaction,
+  onRemoveReaction,
+  className,
+  picker,
+}) => {
+  const { users } = useStores();
+  const listRef = React.useRef<HTMLDivElement>(null);
+
+  const hovered = useHover({
+    ref: listRef,
+    duration: 250,
+  });
+
+  React.useEffect(() => {
+    const loadReactedUsersData = async () => {
+      try {
+        await model.loadReactedUsersData();
+      } catch (err) {
+        Logger.warn("Could not prefetch reaction data");
+      }
+    };
+
+    if (hovered) {
+      void loadReactedUsersData();
+    }
+  }, [hovered, model]);
+
+  const hasReactions = !!model.reactions.length;
+  const style = React.useMemo(() => {
+    if (hasReactions) {
+      return { minHeight: 28 };
+    }
+    return undefined;
+  }, [hasReactions]);
+
+  return (
+    <ResizingHeightContainer style={style}>
+      <Flex ref={listRef} className={className} align="center" gap={6} wrap>
+        {model.reactions.map((reaction) => {
+          const reactedUsers = compact(
+            reaction.userIds.map((id) => users.get(id))
+          );
+
+          return (
+            <Reaction
+              key={reaction.emoji}
+              reaction={reaction}
+              reactedUsers={reactedUsers}
+              disabled={model.isResolved}
+              onAddReaction={onAddReaction}
+              onRemoveReaction={onRemoveReaction}
+            />
+          );
+        })}
+        {picker}
+      </Flex>
+    </ResizingHeightContainer>
+  );
+};
+
+export default observer(ReactionList);

app/components/Reactions/ReactionPicker.tsx

@@ -0,0 +1,158 @@
+import { ReactionIcon } from "outline-icons";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { PopoverDisclosure, usePopoverState } from "reakit";
+import styled from "styled-components";
+import EventBoundary from "@shared/components/EventBoundary";
+import Flex from "~/components/Flex";
+import NudeButton from "~/components/NudeButton";
+import PlaceholderText from "~/components/PlaceholderText";
+import Popover from "~/components/Popover";
+import useMobile from "~/hooks/useMobile";
+import useOnClickOutside from "~/hooks/useOnClickOutside";
+import useWindowSize from "~/hooks/useWindowSize";
+
+const EmojiPanel = React.lazy(
+  () => import("~/components/IconPicker/components/EmojiPanel")
+);
+
+type Props = {
+  /** Callback when an emoji is selected by the user. */
+  onSelect: (emoji: string) => Promise<void>;
+  /** Callback when the picker is opened. */
+  onOpen?: () => void;
+  /** Callback when the picker is closed. */
+  onClose?: () => void;
+  /** Optional classname. */
+  className?: string;
+  size?: number;
+};
+
+const ReactionPicker: React.FC<Props> = ({
+  onSelect,
+  onOpen,
+  onClose,
+  className,
+  size,
+}) => {
+  const { t } = useTranslation();
+  const popover = usePopoverState({
+    modal: true,
+    unstable_offset: [0, 0],
+    placement: "bottom-end",
+  });
+
+  const { width: windowWidth } = useWindowSize();
+  const isMobile = useMobile();
+
+  const [query, setQuery] = React.useState("");
+  const contentRef = React.useRef<HTMLDivElement | null>(null);
+
+  const popoverWidth = isMobile ? windowWidth : 300;
+  // In mobile, popover is absolutely positioned to leave 8px on both sides.
+  const panelWidth = isMobile ? windowWidth - 16 : popoverWidth;
+  const { toggle, hide } = popover;
+  const handlePopoverButtonClick = React.useCallback(
+    (ev: React.MouseEvent) => {
+      ev.stopPropagation();
+      toggle();
+    },
+    [toggle]
+  );
+
+  const handleEmojiSelect = React.useCallback(
+    (emoji: string) => {
+      hide();
+      void onSelect(emoji);
+    },
+    [hide, onSelect]
+  );
+
+  // Popover open effect
+  React.useEffect(() => {
+    if (popover.visible) {
+      onOpen?.();
+    } else {
+      onClose?.();
+    }
+  }, [popover.visible, onOpen, onClose]);
+
+  // 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("Reaction picker")}
+            className={className}
+            onClick={handlePopoverButtonClick}
+            size={size}
+          >
+            <ReactionIcon size={22} />
+          </PopoverButton>
+        )}
+      </PopoverDisclosure>
+      <Popover
+        {...popover}
+        ref={contentRef}
+        width={popoverWidth}
+        shrink
+        aria-label={t("Reaction picker")}
+        onClick={(e) => e.stopPropagation()}
+        hideOnClickOutside={false}
+      >
+        {popover.visible && (
+          <React.Suspense fallback={<Placeholder />}>
+            <EventBoundary>
+              <EmojiPanel
+                height={300}
+                panelWidth={panelWidth}
+                query={query}
+                onEmojiChange={handleEmojiSelect}
+                onQueryChange={setQuery}
+                panelActive
+              />
+            </EventBoundary>
+          </React.Suspense>
+        )}
+      </Popover>
+    </>
+  );
+};
+
+const Placeholder = React.memo(
+  () => (
+    <Flex column gap={6} style={{ height: "300px", padding: "6px 12px" }}>
+      <Flex gap={8}>
+        <PlaceholderText height={32} minWidth={90} />
+        <PlaceholderText height={32} width={32} />
+      </Flex>
+      <PlaceholderText height={24} width={120} />
+    </Flex>
+  ),
+  () => true
+);
+Placeholder.displayName = "ReactionPickerPlaceholder";
+
+const PopoverButton = styled(NudeButton)`
+  border-radius: 50%;
+`;
+
+export default ReactionPicker;

app/components/Reactions/ViewReactionsDialog.tsx

@@ -0,0 +1,146 @@
+import compact from "lodash/compact";
+import { observer } from "mobx-react";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { Tab, TabPanel, useTabState } from "reakit";
+import { toast } from "sonner";
+import styled, { css } from "styled-components";
+import { s } from "@shared/styles";
+import Comment from "~/models/Comment";
+import { Avatar, AvatarSize } from "~/components/Avatar";
+import { Emoji } from "~/components/Emoji";
+import Flex from "~/components/Flex";
+import PlaceholderText from "~/components/PlaceholderText";
+import Text from "~/components/Text";
+import useStores from "~/hooks/useStores";
+import { hover } from "~/styles";
+
+type Props = {
+  /** Model for which to show the reactions. */
+  model: Comment;
+};
+
+const ViewReactionsDialog: React.FC<Props> = ({ model }) => {
+  const { t } = useTranslation();
+  const { users } = useStores();
+  const tab = useTabState();
+  const { reactedUsersLoaded } = model;
+
+  React.useEffect(() => {
+    const loadReactedUsersData = async () => {
+      try {
+        await model.loadReactedUsersData();
+      } catch (err) {
+        toast.error(t("Could not load reactions"));
+      }
+    };
+
+    void loadReactedUsersData();
+  }, [t, model]);
+
+  if (!reactedUsersLoaded) {
+    return <PlaceHolder />;
+  }
+
+  return (
+    <>
+      <TabActionsWrapper>
+        {model.reactions.map((reaction) => (
+          <StyledTab
+            {...tab}
+            key={reaction.emoji}
+            id={reaction.emoji}
+            aria-label={t("Reaction")}
+            $active={tab.selectedId === reaction.emoji}
+          >
+            <Emoji size={16}>{reaction.emoji}</Emoji>
+          </StyledTab>
+        ))}
+      </TabActionsWrapper>
+      {model.reactions.map((reaction) => {
+        const reactedUsers = compact(
+          reaction.userIds.map((id) => users.get(id))
+        );
+
+        return (
+          <StyledTabPanel {...tab} key={reaction.emoji}>
+            {reactedUsers.map((user) => (
+              <UserInfo key={user.name} align="center" gap={8}>
+                <Avatar model={user} size={AvatarSize.Medium} />
+                <Text size="medium">{user.name}</Text>
+              </UserInfo>
+            ))}
+          </StyledTabPanel>
+        );
+      })}
+    </>
+  );
+};
+
+const PlaceHolder = React.memo(
+  () => (
+    <>
+      <TabActionsWrapper gap={8} style={{ paddingBottom: "10px" }}>
+        <PlaceholderText width={40} height={32} />
+        <PlaceholderText width={40} height={32} />
+      </TabActionsWrapper>
+      <UserInfo align="center" gap={12}>
+        <PlaceholderText width={AvatarSize.Medium} height={AvatarSize.Medium} />
+        <PlaceholderText height={34} />
+      </UserInfo>
+      <UserInfo align="center" gap={12}>
+        <PlaceholderText width={AvatarSize.Medium} height={AvatarSize.Medium} />
+        <PlaceholderText height={34} />
+      </UserInfo>
+    </>
+  ),
+  () => true
+);
+PlaceHolder.displayName = "ViewReactionsPlaceholder";
+
+const TabActionsWrapper = styled(Flex)`
+  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;
+  border-radius: 4px 4px 0 0;
+  padding: 8px 12px 10px;
+  user-select: none;
+  transition: background-color 100ms ease;
+
+  &: ${hover} {
+    background-color: ${s("listItemHoverBackground")};
+  }
+
+  ${({ $active }) =>
+    $active &&
+    css`
+      &:after {
+        content: "";
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        height: 1px;
+        background: ${s("textSecondary")};
+      }
+    `}
+`;
+
+const StyledTabPanel = styled(TabPanel)`
+  height: 300px;
+  padding: 5px 0;
+  overflow-y: auto;
+`;
+
+const UserInfo = styled(Flex)`
+  padding: 10px 8px;
+`;
+
+export default observer(ViewReactionsDialog);

app/components/SearchPopover.tsx

@@ -19,9 +19,10 @@ import SearchListItem from "./SearchListItem";
 
 interface Props extends React.HTMLAttributes<HTMLInputElement> {
   shareId: string;
+  className?: string;
 }
 
-function SearchPopover({ shareId }: Props) {
+function SearchPopover({ shareId, className }: Props) {
   const { t } = useTranslation();
   const { documents } = useStores();
   const focusRef = React.useRef<HTMLElement | null>(null);
@@ -54,7 +55,8 @@ function SearchPopover({ shareId }: Props) {
   const performSearch = React.useCallback(
     async ({ query, ...options }) => {
       if (query?.length > 0) {
-        const response = await documents.search(query, {
+        const response = await documents.search({
+          query,
           shareId,
           ...options,
         });
@@ -186,6 +188,7 @@ function SearchPopover({ shareId }: Props) {
             onChange={handleSearchInputChange}
             onFocus={handleSearchInputFocus}
             onKeyDown={handleKeyDown}
+            className={className}
           />
         )}
       </PopoverDisclosure>

app/components/Sharing/Document/PublicAccess.tsx

@@ -1,13 +1,13 @@
-import invariant from "invariant";
 import debounce from "lodash/debounce";
 import isEmpty from "lodash/isEmpty";
 import { observer } from "mobx-react";
-import { CopyIcon, GlobeIcon, InfoIcon } from "outline-icons";
+import { CopyIcon, GlobeIcon, InfoIcon, QuestionMarkIcon } from "outline-icons";
 import * as React from "react";
 import { Trans, useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { toast } from "sonner";
 import styled, { useTheme } from "styled-components";
+import Flex from "@shared/components/Flex";
 import Squircle from "@shared/components/Squircle";
 import { s } from "@shared/styles";
 import { UrlHelper } from "@shared/utils/UrlHelper";
@@ -17,7 +17,6 @@ import Input, { NativeInput } from "~/components/Input";
 import Switch from "~/components/Switch";
 import env from "~/env";
 import usePolicy from "~/hooks/usePolicy";
-import useStores from "~/hooks/useStores";
 import { AvatarSize } from "../../Avatar";
 import CopyToClipboard from "../../CopyToClipboard";
 import NudeButton from "../../NudeButton";
@@ -39,7 +38,6 @@ type Props = {
 };
 
 function PublicAccess({ document, share, sharedParent }: Props) {
-  const { shares } = useStores();
   const { t } = useTranslation();
   const theme = useTheme();
   const [validationError, setValidationError] = React.useState("");
@@ -53,20 +51,30 @@ function PublicAccess({ document, share, sharedParent }: Props) {
     setUrlId(share?.urlId);
   }, [share?.urlId]);
 
+  const handleIndexingChanged = React.useCallback(
+    async (event) => {
+      try {
+        await share?.save({
+          allowIndexing: event.currentTarget.checked,
+        });
+      } catch (err) {
+        toast.error(err.message);
+      }
+    },
+    [share]
+  );
+
   const handlePublishedChange = React.useCallback(
     async (event) => {
-      const share = shares.getByDocumentId(document.id);
-      invariant(share, "Share must exist");
-
       try {
-        await share.save({
+        await share?.save({
           published: event.currentTarget.checked,
         });
       } catch (err) {
         toast.error(err.message);
       }
     },
-    [document.id, shares]
+    [share]
   );
 
   const handleUrlChange = React.useMemo(
@@ -159,6 +167,32 @@ function PublicAccess({ document, share, sharedParent }: Props) {
       />
 
       <ResizingHeightContainer>
+        {share?.published && (
+          <ListItem
+            title={
+              <Text type="tertiary" as={Flex}>
+                {t("Search engine indexing")}&nbsp;
+                <Tooltip
+                  content={t(
+                    "Disable this setting to discourage search engines from indexing the page"
+                  )}
+                >
+                  <QuestionMarkIcon size={18} />
+                </Tooltip>
+              </Text>
+            }
+            actions={
+              <Switch
+                aria-label={t("Search engine indexing")}
+                checked={share?.allowIndexing ?? false}
+                onChange={handleIndexingChanged}
+                width={26}
+                height={14}
+              />
+            }
+          />
+        )}
+
         {sharedParent?.published ? (
           <ShareLinkInput type="text" disabled defaultValue={shareUrl}>
             {copyButton}

app/components/Sharing/Document/SharePopover.tsx

@@ -8,7 +8,6 @@ import { toast } from "sonner";
 import { DocumentPermission } from "@shared/types";
 import Document from "~/models/Document";
 import Group from "~/models/Group";
-import Share from "~/models/Share";
 import User from "~/models/User";
 import { Avatar, GroupAvatar, AvatarSize } from "~/components/Avatar";
 import NudeButton from "~/components/NudeButton";
@@ -32,26 +31,19 @@ import { AccessControlList } from "./AccessControlList";
 type Props = {
   /** The document to share. */
   document: Document;
-  /** The existing share model, if any. */
-  share: Share | null | undefined;
-  /** The existing share parent model, if any. */
-  sharedParent: Share | null | undefined;
   /** Callback fired when the popover requests to be closed. */
   onRequestClose: () => void;
   /** Whether the popover is visible. */
   visible: boolean;
 };
 
-function SharePopover({
-  document,
-  share,
-  sharedParent,
-  onRequestClose,
-  visible,
-}: Props) {
+function SharePopover({ document, onRequestClose, visible }: Props) {
   const team = useCurrentTeam();
   const { t } = useTranslation();
   const can = usePolicy(document);
+  const { shares } = useStores();
+  const share = shares.getByDocumentId(document.id);
+  const sharedParent = shares.getByDocumentParents(document.id);
   const [hasRendered, setHasRendered] = React.useState(visible);
   const { users, userMemberships, groups, groupMemberships } = useStores();
   const [query, setQuery] = React.useState("");

app/components/Sidebar/App.tsx

@@ -94,38 +94,40 @@ function AppSidebar() {
               </SidebarButton>
             )}
           </OrganizationMenu>
-          <Section>
-            <SidebarLink
-              to={homePath()}
-              icon={<HomeIcon />}
-              exact={false}
-              label={t("Home")}
-            />
-            <SidebarLink
-              to={searchPath()}
-              icon={<SearchIcon />}
-              label={t("Search")}
-              exact={false}
-            />
-            {can.createDocument && (
+          <Overflow>
+            <Section>
               <SidebarLink
-                to={draftsPath()}
-                icon={<DraftsIcon />}
-                label={
-                  <Flex align="center" justify="space-between">
-                    {t("Drafts")}
-                    {documents.totalDrafts > 0 ? (
-                      <Drafts size="xsmall" type="tertiary">
-                        {documents.totalDrafts > 25
-                          ? "25+"
-                          : documents.totalDrafts}
-                      </Drafts>
-                    ) : null}
-                  </Flex>
-                }
+                to={homePath()}
+                icon={<HomeIcon />}
+                exact={false}
+                label={t("Home")}
               />
-            )}
-          </Section>
+              <SidebarLink
+                to={searchPath()}
+                icon={<SearchIcon />}
+                label={t("Search")}
+                exact={false}
+              />
+              {can.createDocument && (
+                <SidebarLink
+                  to={draftsPath()}
+                  icon={<DraftsIcon />}
+                  label={
+                    <Flex align="center" justify="space-between">
+                      {t("Drafts")}
+                      {documents.totalDrafts > 0 ? (
+                        <Drafts size="xsmall" type="tertiary">
+                          {documents.totalDrafts > 25
+                            ? "25+"
+                            : documents.totalDrafts}
+                        </Drafts>
+                      ) : null}
+                    </Flex>
+                  }
+                />
+              )}
+            </Section>
+          </Overflow>
           <Scrollable flex shadow>
             <Section>
               <Starred />
@@ -133,16 +135,16 @@ function AppSidebar() {
             <Section>
               <SharedWithMe />
             </Section>
-            <Section auto>
+            <Section>
               <Collections />
             </Section>
+            {can.createDocument && (
+              <Section auto>
+                <ArchiveLink />
+              </Section>
+            )}
             <Section>
-              {can.createDocument && (
-                <>
-                  <ArchiveLink />
-                  <TrashLink />
-                </>
-              )}
+              {can.createDocument && <TrashLink />}
               <SidebarAction action={inviteUser} />
             </Section>
           </Scrollable>
@@ -152,6 +154,11 @@ function AppSidebar() {
   );
 }
 
+const Overflow = styled.div`
+  overflow: hidden;
+  flex-shrink: 0;
+`;
+
 const Drafts = styled(Text)`
   margin: 0 4px;
 `;

app/components/Sidebar/Shared.tsx

@@ -1,13 +1,18 @@
 import { observer } from "mobx-react";
+import { SidebarIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { NavigationNode } from "@shared/types";
+import Flex from "~/components/Flex";
 import Scrollable from "~/components/Scrollable";
 import SearchPopover from "~/components/SearchPopover";
+import Tooltip from "~/components/Tooltip";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";
+import { hover } from "~/styles";
 import history from "~/utils/history";
+import { metaDisplay } from "~/utils/keyboard";
 import { homePath, sharedDocumentPath } from "~/utils/routeHelpers";
 import { useTeamContext } from "../TeamContext";
 import TeamLogo from "../TeamLogo";
@@ -15,6 +20,7 @@ import Sidebar from "./Sidebar";
 import Section from "./components/Section";
 import DocumentLink from "./components/SharedDocumentLink";
 import SidebarButton from "./components/SidebarButton";
+import ToggleButton from "./components/ToggleButton";
 
 type Props = {
   rootNode: NavigationNode;
@@ -27,9 +33,11 @@ function SharedSidebar({ rootNode, shareId }: Props) {
   const { ui, documents } = useStores();
   const { t } = useTranslation();
 
+  const teamAvailable = !!team?.name;
+
   return (
-    <Sidebar>
-      {team?.name && (
+    <StyledSidebar $hoverTransition={!teamAvailable}>
+      {teamAvailable && (
         <SidebarButton
           title={team.name}
           image={<TeamLogo model={team} size={32} alt={t("Logo")} />}
@@ -38,11 +46,20 @@ function SharedSidebar({ rootNode, shareId }: Props) {
               user ? homePath() : sharedDocumentPath(shareId, rootNode.url)
             )
           }
-        />
+        >
+          <ToggleSidebar />
+        </SidebarButton>
       )}
       <ScrollContainer topShadow flex>
         <TopSection>
-          <SearchPopover shareId={shareId} />
+          <SearchWrapper>
+            <StyledSearchPopover shareId={shareId} />
+          </SearchWrapper>
+          {!teamAvailable && (
+            <ToggleWrapper>
+              <ToggleSidebar />
+            </ToggleWrapper>
+          )}
         </TopSection>
         <Section>
           <DocumentLink
@@ -55,23 +72,74 @@ function SharedSidebar({ rootNode, shareId }: Props) {
           />
         </Section>
       </ScrollContainer>
-    </Sidebar>
+    </StyledSidebar>
   );
 }
 
+const ToggleSidebar = () => {
+  const { t } = useTranslation();
+  const { ui } = useStores();
+
+  return (
+    <Tooltip
+      content={t("Toggle sidebar")}
+      shortcut={`${metaDisplay}+.`}
+      delay={500}
+    >
+      <ToggleButton
+        position="bottom"
+        image={<SidebarIcon />}
+        onClick={() => {
+          ui.toggleCollapsedSidebar();
+          (document.activeElement as HTMLElement)?.blur();
+        }}
+      />
+    </Tooltip>
+  );
+};
+
 const ScrollContainer = styled(Scrollable)`
   padding-bottom: 16px;
 `;
 
-const TopSection = styled(Section)`
-  // this weird looking && increases the specificity of the style rule
-  &&:first-child {
-    margin-top: 16px;
-  }
+const TopSection = styled(Flex)`
+  padding: 8px;
+  flex-shrink: 0;
+`;
 
-  && {
-    margin-bottom: 16px;
-  }
+const SearchWrapper = styled.div`
+  width: 100%;
+`;
+
+const StyledSearchPopover = styled(SearchPopover)`
+  width: 100%;
+  transition: width 100ms ease-out;
+  margin: 8px 0;
+`;
+
+const ToggleWrapper = styled.div`
+  position: absolute;
+  right: 0;
+  opacity: 0;
+  transform: translateX(10px);
+  transition: opacity 100ms ease-out, transform 100ms ease-out;
+`;
+
+const StyledSidebar = styled(Sidebar)<{ $hoverTransition: boolean }>`
+  ${({ $hoverTransition }) =>
+    $hoverTransition &&
+    `
+      &: ${hover} {
+        ${StyledSearchPopover} {
+          width: 85%;
+        }
+
+        ${ToggleWrapper} {
+          opacity: 1;
+          transform: translateX(0);
+        }
+      }
+    `}
 `;
 
 export default observer(SharedSidebar);

app/components/Sidebar/Sidebar.tsx

@@ -94,9 +94,17 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
     }
   }, [ui, isSmallerThanMinimum, minWidth, width, setWidth]);
 
+  const handleBlur = React.useCallback(() => {
+    setHovering(false);
+  }, []);
+
   const handleMouseDown = React.useCallback(
     (event) => {
       event.preventDefault();
+      if (!document.hasFocus()) {
+        return;
+      }
+
       setOffset(event.pageX - width);
       setResizing(true);
       setAnimating(false);
@@ -104,9 +112,9 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
     [width]
   );
 
-  const handlePointerMove = React.useCallback(() => {
+  const handlePointerActivity = React.useCallback(() => {
     if (ui.sidebarIsClosed) {
-      setHovering(true);
+      setHovering(document.hasFocus());
       setPointerMoved(true);
     }
   }, [ui.sidebarIsClosed]);
@@ -115,7 +123,10 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
     (ev) => {
       if (hasPointerMoved) {
         setHovering(
-          ev.pageX < width && ev.pageY < window.innerHeight && ev.pageY > 0
+          document.hasFocus() &&
+            ev.pageX < width &&
+            ev.pageY < window.innerHeight &&
+            ev.pageY > 0
         );
       }
     },
@@ -153,11 +164,14 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
       document.body.style.cursor = "initial";
     }
 
+    window.addEventListener("blur", handleBlur);
+
     return () => {
+      window.removeEventListener("blur", handleBlur);
       document.removeEventListener("mousemove", handleDrag);
       document.removeEventListener("mouseup", handleStopDrag);
     };
-  }, [isResizing, handleDrag, handleStopDrag]);
+  }, [isResizing, handleDrag, handleBlur, handleStopDrag]);
 
   const handleReset = React.useCallback(() => {
     ui.setSidebarWidth(theme.sidebarWidth);
@@ -193,7 +207,8 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
         $collapsed={collapsed}
         $isMobile={isMobile}
         className={className}
-        onPointerMove={handlePointerMove}
+        onPointerDown={handlePointerActivity}
+        onPointerMove={handlePointerActivity}
         onPointerLeave={handlePointerLeave}
         column
       >
@@ -217,15 +232,7 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
                   />
                 }
               >
-                <NotificationsPopover>
-                  {(rest: SidebarButtonProps) => (
-                    <SidebarButton
-                      {...rest}
-                      position="bottom"
-                      image={<NotificationIcon />}
-                    />
-                  )}
-                </NotificationsPopover>
+                <Notifications />
               </SidebarButton>
             )}
           </AccountMenu>
@@ -240,6 +247,14 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
   );
 });
 
+const Notifications = () => (
+  <NotificationsPopover>
+    {(rest: SidebarButtonProps) => (
+      <SidebarButton {...rest} position="bottom" image={<NotificationIcon />} />
+    )}
+  </NotificationsPopover>
+);
+
 const Backdrop = styled.a`
   animation: ${fadeIn} 250ms ease-in-out;
   position: fixed;

app/components/Sidebar/components/ArchiveLink.tsx

@@ -1,41 +1,101 @@
+import isUndefined from "lodash/isUndefined";
 import { observer } from "mobx-react";
 import { ArchiveIcon } from "outline-icons";
 import * as React from "react";
-import { useDrop } from "react-dnd";
 import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
+import Flex from "@shared/components/Flex";
+import Collection from "~/models/Collection";
+import PaginatedList from "~/components/PaginatedList";
+import useRequest from "~/hooks/useRequest";
 import useStores from "~/hooks/useStores";
 import { archivePath } from "~/utils/routeHelpers";
-import SidebarLink, { DragObject } from "./SidebarLink";
+import { useDropToArchive } from "../hooks/useDragAndDrop";
+import { ArchivedCollectionLink } from "./ArchivedCollectionLink";
+import { StyledError } from "./Collections";
+import PlaceholderCollections from "./PlaceholderCollections";
+import Relative from "./Relative";
+import SidebarLink from "./SidebarLink";
 
 function ArchiveLink() {
-  const { policies, documents } = useStores();
+  const { collections } = useStores();
   const { t } = useTranslation();
 
-  const [{ isDocumentDropping }, dropToArchiveDocument] = useDrop({
-    accept: "document",
-    drop: async (item: DragObject) => {
-      const document = documents.get(item.id);
-      await document?.archive();
-      toast.success(t("Document archived"));
-    },
-    canDrop: (item) => policies.abilities(item.id).archive,
-    collect: (monitor) => ({
-      isDocumentDropping: monitor.isOver(),
-    }),
-  });
+  const [disclosure, setDisclosure] = React.useState<boolean>(false);
+  const [expanded, setExpanded] = React.useState<boolean | undefined>();
+
+  const { request, data, loading, error } = useRequest(
+    collections.fetchArchived,
+    true
+  );
+
+  React.useEffect(() => {
+    if (!isUndefined(data) && !loading && isUndefined(error)) {
+      setDisclosure(data.length > 0);
+    }
+  }, [data, loading, error]);
+
+  React.useEffect(() => {
+    setDisclosure(collections.archived.length > 0);
+  }, [collections.archived]);
+
+  React.useEffect(() => {
+    if (disclosure && isUndefined(expanded)) {
+      setExpanded(false);
+    }
+  }, [disclosure]);
+
+  React.useEffect(() => {
+    if (expanded) {
+      void request();
+    }
+  }, [expanded, request]);
+
+  const handleDisclosureClick = React.useCallback((ev) => {
+    ev.preventDefault();
+    ev.stopPropagation();
+    setExpanded((e) => !e);
+  }, []);
+
+  const handleClick = React.useCallback(() => {
+    setExpanded(true);
+  }, []);
+
+  const [{ isOverArchiveSection, isDragging }, dropToArchiveRef] =
+    useDropToArchive();
 
   return (
-    <div ref={dropToArchiveDocument}>
-      <SidebarLink
-        to={archivePath()}
-        icon={<ArchiveIcon open={isDocumentDropping} />}
-        exact={false}
-        label={t("Archive")}
-        active={documents.active?.isArchived && !documents.active?.isDeleted}
-        isActiveDrop={isDocumentDropping}
-      />
-    </div>
+    <Flex column>
+      <div ref={dropToArchiveRef}>
+        <SidebarLink
+          to={archivePath()}
+          icon={<ArchiveIcon open={isOverArchiveSection && isDragging} />}
+          exact={false}
+          label={t("Archive")}
+          isActiveDrop={isOverArchiveSection && isDragging}
+          depth={0}
+          expanded={disclosure ? expanded : undefined}
+          onDisclosureClick={handleDisclosureClick}
+          onClick={handleClick}
+        />
+      </div>
+      {expanded === true ? (
+        <Relative>
+          <PaginatedList
+            aria-label={t("Archived collections")}
+            items={collections.archived}
+            loading={<PlaceholderCollections />}
+            renderError={(props) => <StyledError {...props} />}
+            renderItem={(item: Collection) => (
+              <ArchivedCollectionLink
+                key={item.id}
+                depth={1}
+                collection={item}
+              />
+            )}
+          />
+        </Relative>
+      ) : null}
+    </Flex>
   );
 }
 

app/components/Sidebar/components/ArchivedCollectionLink.tsx

@@ -0,0 +1,47 @@
+import * as React from "react";
+import Collection from "~/models/Collection";
+import useStores from "~/hooks/useStores";
+import CollectionLink from "./CollectionLink";
+import CollectionLinkChildren from "./CollectionLinkChildren";
+import Relative from "./Relative";
+
+type Props = {
+  collection: Collection;
+  depth?: number;
+};
+
+export function ArchivedCollectionLink({ collection, depth }: Props) {
+  const { documents } = useStores();
+
+  const [expanded, setExpanded] = React.useState(false);
+
+  const handleDisclosureClick = React.useCallback((ev) => {
+    ev.preventDefault();
+    ev.stopPropagation();
+    setExpanded((e) => !e);
+  }, []);
+
+  const handleClick = React.useCallback(() => {
+    setExpanded(true);
+  }, []);
+
+  return (
+    <>
+      <CollectionLink
+        depth={depth ? depth : 0}
+        collection={collection}
+        expanded={expanded}
+        activeDocument={documents.active}
+        onDisclosureClick={handleDisclosureClick}
+        onClick={handleClick}
+      />
+      <Relative>
+        <CollectionLinkChildren
+          collection={collection}
+          expanded={expanded}
+          prefetchDocument={documents.prefetchDocument}
+        />
+      </Relative>
+    </>
+  );
+}

app/components/Sidebar/components/CollectionLink.tsx

@@ -4,7 +4,6 @@ import { PlusIcon } from "outline-icons";
 import * as React from "react";
 import { useDrop } from "react-dnd";
 import { useTranslation } from "react-i18next";
-import { useHistory } from "react-router-dom";
 import { CollectionValidation } from "@shared/validations";
 import Collection from "~/models/Collection";
 import Document from "~/models/Document";
@@ -30,6 +29,8 @@ type Props = {
   onDisclosureClick: (ev?: React.MouseEvent<HTMLButtonElement>) => void;
   activeDocument: Document | undefined;
   isDraggingAnyCollection?: boolean;
+  depth?: number;
+  onClick?: () => void;
 };
 
 const CollectionLink: React.FC<Props> = ({
@@ -37,13 +38,14 @@ const CollectionLink: React.FC<Props> = ({
   expanded,
   onDisclosureClick,
   isDraggingAnyCollection,
+  depth,
+  onClick,
 }: Props) => {
   const { dialogs, documents, collections } = useStores();
   const [menuOpen, handleMenuOpen, handleMenuClose] = useBoolean();
   const [isEditing, setIsEditing] = React.useState(false);
   const can = usePolicy(collection);
   const { t } = useTranslation();
-  const history = useHistory();
   const sidebarContext = useSidebarContext();
   const editableTitleRef = React.useRef<RefHandle>(null);
 
@@ -52,9 +54,8 @@ const CollectionLink: React.FC<Props> = ({
       await collection.save({
         name,
       });
-      history.replace(collection.path, history.location.state);
     },
-    [collection, history]
+    [collection]
   );
 
   // Drop to re-parent document
@@ -111,10 +112,15 @@ const CollectionLink: React.FC<Props> = ({
     sidebarContext,
   });
 
+  const handleRename = React.useCallback(() => {
+    editableTitleRef.current?.setIsEditing(true);
+  }, [editableTitleRef]);
+
   return (
     <Relative ref={drop}>
       <DropToImport collectionId={collection.id}>
         <SidebarLink
+          onClick={onClick}
           to={{
             pathname: collection.path,
             state: { sidebarContext },
@@ -140,7 +146,7 @@ const CollectionLink: React.FC<Props> = ({
             />
           }
           exact={false}
-          depth={0}
+          depth={depth ? depth : 0}
           menu={
             !isEditing &&
             !isDraggingAnyCollection && (
@@ -155,7 +161,7 @@ const CollectionLink: React.FC<Props> = ({
                 </NudeButton>
                 <CollectionMenu
                   collection={collection}
-                  onRename={() => editableTitleRef.current?.setIsEditing(true)}
+                  onRename={handleRename}
                   onOpen={handleMenuOpen}
                   onClose={handleMenuClose}
                 />

app/components/Sidebar/components/CollectionLinkChildren.tsx

@@ -2,6 +2,7 @@ import { observer } from "mobx-react";
 import * as React from "react";
 import { useDrop } from "react-dnd";
 import { useTranslation } from "react-i18next";
+import { Waypoint } from "react-waypoint";
 import { toast } from "sonner";
 import styled from "styled-components";
 import Collection from "~/models/Collection";
@@ -34,11 +35,13 @@ function CollectionLinkChildren({
   expanded,
   prefetchDocument,
 }: Props) {
+  const pageSize = 250;
   const can = usePolicy(collection);
   const manualSort = collection.sort.field === "index";
   const { documents, dialogs, collections } = useStores();
   const { t } = useTranslation();
   const childDocuments = useCollectionDocuments(collection, documents.active);
+  const [showing, setShowing] = React.useState(pageSize);
 
   // Drop to reorder document
   const [{ isOverReorder, isDraggingAnyDocument }, dropToReorder] = useDrop({
@@ -83,6 +86,18 @@ function CollectionLinkChildren({
     }),
   });
 
+  React.useEffect(() => {
+    if (!expanded) {
+      setShowing(pageSize);
+    }
+  }, [expanded]);
+
+  const showMore = React.useCallback(() => {
+    if (childDocuments && childDocuments.length > showing) {
+      setShowing((value) => value + pageSize);
+    }
+  }, [childDocuments, showing]);
+
   return (
     <Folder expanded={expanded}>
       {isDraggingAnyDocument && can.createDocument && manualSort && (
@@ -98,7 +113,7 @@ function CollectionLinkChildren({
             <Loading />
           </ResizingHeightContainer>
         )}
-        {childDocuments?.map((node, index) => (
+        {childDocuments?.slice(0, showing).map((node, index) => (
           <DocumentLink
             key={node.id}
             node={node}
@@ -121,6 +136,7 @@ function CollectionLinkChildren({
             depth={2}
           />
         )}
+        <Waypoint key={showing} onEnter={showMore} fireOnRapidScroll />
       </DocumentsLoader>
     </Folder>
   );

app/components/Sidebar/components/Collections.tsx

@@ -55,7 +55,7 @@ function Collections() {
           <PaginatedList
             options={params}
             aria-label={t("Collections")}
-            items={collections.orderedData}
+            items={collections.allActive}
             loading={<PlaceholderCollections />}
             heading={
               isDraggingAnyCollection ? (
@@ -84,7 +84,7 @@ function Collections() {
   );
 }
 
-const StyledError = styled(Error)`
+export const StyledError = styled(Error)`
   font-size: 15px;
   padding: 0 8px;
 `;

app/components/Sidebar/components/EditableTitle.tsx

@@ -41,16 +41,6 @@ function EditableTitle(
     setIsEditing(true);
   }, []);
 
-  const handleKeyDown = React.useCallback(
-    (event) => {
-      if (event.key === "Escape") {
-        setIsEditing(false);
-        setValue(originalValue);
-      }
-    },
-    [originalValue]
-  );
-
   const stopPropagation = React.useCallback((event) => {
     event.preventDefault();
     event.stopPropagation();
@@ -63,6 +53,7 @@ function EditableTitle(
   const handleSave = React.useCallback(
     async (ev) => {
       ev.preventDefault();
+      ev.stopPropagation();
       setIsEditing(false);
       const trimmedValue = value.trim();
 
@@ -85,6 +76,22 @@ function EditableTitle(
     [originalValue, value, onSubmit]
   );
 
+  const handleKeyDown = React.useCallback(
+    async (ev) => {
+      if (ev.nativeEvent.isComposing) {
+        return;
+      }
+      if (ev.key === "Escape") {
+        setIsEditing(false);
+        setValue(originalValue);
+      }
+      if (ev.key === "Enter") {
+        await handleSave(ev);
+      }
+    },
+    [handleSave, originalValue]
+  );
+
   React.useEffect(() => {
     onEditing?.(isEditing);
   }, [onEditing, isEditing]);

app/components/Sidebar/components/SidebarButton.tsx

@@ -59,6 +59,7 @@ const StyledMoreIcon = styled(MoreIcon)`
 `;
 
 const Container = styled(Flex)<{ $position: "top" | "bottom" }>`
+  overflow: hidden;
   padding-top: ${(props) =>
     props.$position === "top" && Desktop.hasInsetTitlebar() ? 36 : 0}px;
   ${draggableOnDesktop()}

app/components/Sidebar/components/Version.tsx

@@ -2,41 +2,29 @@ import * as React from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import Badge from "~/components/Badge";
-import { version } from "../../../../package.json";
+import { client } from "~/utils/ApiClient";
+import Logger from "~/utils/Logger";
+import { version as currentVersion } from "../../../../package.json";
 import SidebarLink from "./SidebarLink";
 
 export default function Version() {
-  const [releasesBehind, setReleasesBehind] = React.useState(-1);
+  const [versionsBehind, setVersionsBehind] = React.useState(-1);
   const { t } = useTranslation();
 
   React.useEffect(() => {
-    async function loadReleases() {
-      const res = await fetch(
-        "https://api.github.com/repos/outline/outline/releases"
-      );
-      const releases = await res.json();
-
-      if (Array.isArray(releases)) {
-        const everyNewRelease = releases
-          .map((release) => release.tag_name)
-          .findIndex((tagName) => tagName === `v${version}`);
-
-        const onlyFullNewRelease = releases
-          .filter((release) => !release.prerelease)
-          .map((release) => release.tag_name)
-          .findIndex((tagName) => tagName === `v${version}`);
-
-        const computedReleasesBehind = version.includes("pre")
-          ? everyNewRelease
-          : onlyFullNewRelease;
-
-        if (computedReleasesBehind >= 0) {
-          setReleasesBehind(computedReleasesBehind);
+    async function loadVersionInfo() {
+      try {
+        // Fetch version info from the server-side proxy
+        const res = await client.post("/installation.info");
+        if (res.data && res.data.versionsBehind >= 0) {
+          setVersionsBehind(res.data.versionsBehind);
         }
+      } catch (error) {
+        Logger.error("Failed to load version info", error);
       }
     }
 
-    void loadReleases();
+    void loadVersionInfo();
   }, []);
 
   return (
@@ -45,16 +33,16 @@ export default function Version() {
       href="https://github.com/outline/outline/releases"
       label={
         <>
-          v{version}
-          {releasesBehind >= 0 && (
+          v{currentVersion}
+          {versionsBehind >= 0 && (
             <>
               <br />
               <LilBadge>
-                {releasesBehind === 0
+                {versionsBehind === 0
                   ? t("Up to date")
                   : t(`{{ releasesBehind }} versions behind`, {
-                      releasesBehind,
-                      count: releasesBehind,
+                      releasesBehind: versionsBehind,
+                      count: versionsBehind,
                     })}
               </LilBadge>
             </>

app/components/Sidebar/hooks/useDragAndDrop.tsx

@@ -149,6 +149,7 @@ export function useDragDocument(
         icon: icon ? <Icon value={icon} color={color} /> : undefined,
         collectionId: document?.collectionId || "",
       } as DragObject),
+    canDrag: () => !!document?.isActive,
     collect: (monitor) => ({
       isDragging: monitor.isDragging(),
     }),
@@ -245,6 +246,7 @@ export function useDropToReparentDocument(
       !!pathToNode &&
       !pathToNode.includes(monitor.getItem().id) &&
       item.id !== node.id &&
+      !!document?.isActive &&
       policies.abilities(node.id).update &&
       policies.abilities(item.id).move,
     hover: (_item, monitor) => {
@@ -297,6 +299,8 @@ export function useDropToReorderDocument(
   const { t } = useTranslation();
   const { documents, collections, dialogs, policies } = useStores();
 
+  const document = documents.get(node.id);
+
   return useDrop<
     DragObject,
     Promise<void>,
@@ -304,7 +308,11 @@ export function useDropToReorderDocument(
   >({
     accept: "document",
     canDrop: (item: DragObject) => {
-      if (item.id === node.id || !policies.abilities(item.id)?.move) {
+      if (
+        item.id === node.id ||
+        !policies.abilities(item.id)?.move ||
+        !document?.isActive
+      ) {
         return false;
       }
 
@@ -427,3 +435,44 @@ export function useDropToReorderUserMembership(getIndex?: () => string) {
     }),
   });
 }
+
+/**
+ * Hook for shared logic that allows dropping documents and collections onto archive section
+ */
+export function useDropToArchive() {
+  const accept = ["document", "collection"];
+  const { documents, collections, policies } = useStores();
+  const { t } = useTranslation();
+
+  return useDrop<
+    DragObject,
+    Promise<void>,
+    { isOverArchiveSection: boolean; isDragging: boolean }
+  >({
+    accept,
+    drop: async (item, monitor) => {
+      const type = monitor.getItemType();
+      let model;
+
+      if (type === "collection") {
+        model = collections.get(item.id);
+      } else {
+        model = documents.get(item.id);
+      }
+
+      if (model) {
+        await model.archive();
+        toast.success(
+          type === "collection"
+            ? t("Collection archived")
+            : t("Document archived")
+        );
+      }
+    },
+    canDrop: (item) => policies.abilities(item.id).archive,
+    collect: (monitor) => ({
+      isOverArchiveSection: !!monitor.isOver(),
+      isDragging: monitor.canDrop(),
+    }),
+  });
+}

app/components/Table.tsx

@@ -120,30 +120,33 @@ function Table({
       <Anchor ref={topRef} />
       <InnerTable {...getTableProps()}>
         <thead>
-          {headerGroups.map((headerGroup) => (
-            <tr {...headerGroup.getHeaderGroupProps()} key={headerGroup.id}>
-              {headerGroup.headers.map((column) => (
-                <Head
-                  {...column.getHeaderProps(column.getSortByToggleProps())}
-                  key={column.id}
-                >
-                  <SortWrapper
-                    align="center"
-                    $sortable={!column.disableSortBy}
-                    gap={4}
+          {headerGroups.map((headerGroup) => {
+            const groupProps = headerGroup.getHeaderGroupProps();
+            return (
+              <tr {...groupProps} key={groupProps.key}>
+                {headerGroup.headers.map((column) => (
+                  <Head
+                    {...column.getHeaderProps(column.getSortByToggleProps())}
+                    key={column.id}
                   >
-                    {column.render("Header")}
-                    {column.isSorted &&
-                      (column.isSortedDesc ? (
-                        <DescSortIcon />
-                      ) : (
-                        <AscSortIcon />
-                      ))}
-                  </SortWrapper>
-                </Head>
-              ))}
-            </tr>
-          ))}
+                    <SortWrapper
+                      align="center"
+                      $sortable={!column.disableSortBy}
+                      gap={4}
+                    >
+                      {column.render("Header")}
+                      {column.isSorted &&
+                        (column.isSortedDesc ? (
+                          <DescSortIcon />
+                        ) : (
+                          <AscSortIcon />
+                        ))}
+                    </SortWrapper>
+                  </Head>
+                ))}
+              </tr>
+            );
+          })}
         </thead>
         <tbody {...getTableBodyProps()}>
           {rows.map((row) => {
@@ -253,7 +256,7 @@ const SortWrapper = styled(Flex)<{ $sortable: boolean }>`
 
   &:hover {
     background: ${(props) =>
-      props.$sortable ? props.theme.secondaryBackground : "none"};
+      props.$sortable ? props.theme.backgroundSecondary : "none"};
   }
 `;
 

app/components/WebsocketProvider.tsx

@@ -25,8 +25,9 @@ import User from "~/models/User";
 import UserMembership from "~/models/UserMembership";
 import withStores from "~/components/withStores";
 import {
-  PartialWithId,
+  PartialExcept,
   WebsocketCollectionUpdateIndexEvent,
+  WebsocketCommentReactionEvent,
   WebsocketEntitiesEvent,
   WebsocketEntityDeletedEvent,
 } from "~/types";
@@ -214,23 +215,20 @@ class WebsocketProvider extends React.Component<Props> {
 
     this.socket.on(
       "documents.update",
-      action(
-        (event: PartialWithId<Document> & { title: string; url: string }) => {
-          documents.add(event);
+      action((event: PartialExcept<Document, "id" | "title" | "url">) => {
+        documents.add(event);
 
-          if (event.collectionId) {
-            const collection = collections.get(event.collectionId);
-            collection?.updateDocument(event);
-          }
+        if (event.collectionId) {
+          const collection = collections.get(event.collectionId);
+          collection?.updateDocument(event);
         }
-      )
+      })
     );
 
     this.socket.on(
       "documents.archive",
-      action((event: PartialWithId<Document>) => {
-        documents.add(event);
-        policies.remove(event.id);
+      action((event: PartialExcept<Document, "id">) => {
+        documents.addToArchive(event as Document);
 
         if (event.collectionId) {
           const collection = collections.get(event.collectionId);
@@ -241,7 +239,7 @@ class WebsocketProvider extends React.Component<Props> {
 
     this.socket.on(
       "documents.delete",
-      action((event: PartialWithId<Document>) => {
+      action((event: PartialExcept<Document, "id">) => {
         documents.add(event);
         policies.remove(event.id);
 
@@ -265,7 +263,7 @@ class WebsocketProvider extends React.Component<Props> {
 
     this.socket.on(
       "documents.add_user",
-      async (event: PartialWithId<UserMembership>) => {
+      async (event: PartialExcept<UserMembership, "id">) => {
         userMemberships.add(event);
 
         // Any existing child policies are now invalid
@@ -286,7 +284,7 @@ class WebsocketProvider extends React.Component<Props> {
 
     this.socket.on(
       "documents.remove_user",
-      (event: PartialWithId<UserMembership>) => {
+      (event: PartialExcept<UserMembership, "id">) => {
         userMemberships.remove(event.id);
 
         // Any existing child policies are now invalid
@@ -308,7 +306,7 @@ class WebsocketProvider extends React.Component<Props> {
 
     this.socket.on(
       "documents.add_group",
-      (event: PartialWithId<GroupMembership>) => {
+      (event: PartialExcept<GroupMembership, "id">) => {
         groupMemberships.add(event);
 
         const group = groups.get(event.groupId!);
@@ -330,16 +328,23 @@ class WebsocketProvider extends React.Component<Props> {
 
     this.socket.on(
       "documents.remove_group",
-      (event: PartialWithId<GroupMembership>) => {
+      (event: PartialExcept<GroupMembership, "id">) => {
         groupMemberships.remove(event.id);
       }
     );
 
-    this.socket.on("comments.create", (event: PartialWithId<Comment>) => {
+    this.socket.on("comments.create", (event: PartialExcept<Comment, "id">) => {
       comments.add(event);
     });
 
-    this.socket.on("comments.update", (event: PartialWithId<Comment>) => {
+    this.socket.on("comments.update", (event: PartialExcept<Comment, "id">) => {
+      const comment = comments.get(event.id);
+
+      // Existing policy becomes invalid when the resolution status has changed and we don't have the latest version.
+      if (comment?.resolvedAt !== event.resolvedAt) {
+        policies.remove(event.id);
+      }
+
       comments.add(event);
     });
 
@@ -347,11 +352,35 @@ class WebsocketProvider extends React.Component<Props> {
       comments.remove(event.modelId);
     });
 
-    this.socket.on("groups.create", (event: PartialWithId<Group>) => {
+    this.socket.on(
+      "comments.add_reaction",
+      (event: WebsocketCommentReactionEvent) => {
+        const comment = comments.get(event.commentId);
+        comment?.updateReaction({
+          type: "add",
+          emoji: event.emoji,
+          user: event.user,
+        });
+      }
+    );
+
+    this.socket.on(
+      "comments.remove_reaction",
+      (event: WebsocketCommentReactionEvent) => {
+        const comment = comments.get(event.commentId);
+        comment?.updateReaction({
+          type: "remove",
+          emoji: event.emoji,
+          user: event.user,
+        });
+      }
+    );
+
+    this.socket.on("groups.create", (event: PartialExcept<Group, "id">) => {
       groups.add(event);
     });
 
-    this.socket.on("groups.update", (event: PartialWithId<Group>) => {
+    this.socket.on("groups.update", (event: PartialExcept<Group, "id">) => {
       groups.add(event);
     });
 
@@ -359,24 +388,36 @@ class WebsocketProvider extends React.Component<Props> {
       groups.remove(event.modelId);
     });
 
-    this.socket.on("groups.add_user", (event: PartialWithId<GroupUser>) => {
-      groupUsers.add(event);
-    });
+    this.socket.on(
+      "groups.add_user",
+      (event: PartialExcept<GroupUser, "id">) => {
+        groupUsers.add(event);
+      }
+    );
 
-    this.socket.on("groups.remove_user", (event: PartialWithId<GroupUser>) => {
-      groupUsers.removeAll({
-        groupId: event.groupId,
-        userId: event.userId,
-      });
-    });
+    this.socket.on(
+      "groups.remove_user",
+      (event: PartialExcept<GroupUser, "id">) => {
+        groupUsers.removeAll({
+          groupId: event.groupId,
+          userId: event.userId,
+        });
+      }
+    );
 
-    this.socket.on("collections.create", (event: PartialWithId<Collection>) => {
-      collections.add(event);
-    });
+    this.socket.on(
+      "collections.create",
+      (event: PartialExcept<Collection, "id">) => {
+        collections.add(event);
+      }
+    );
 
-    this.socket.on("collections.update", (event: PartialWithId<Collection>) => {
-      collections.add(event);
-    });
+    this.socket.on(
+      "collections.update",
+      (event: PartialExcept<Collection, "id">) => {
+        collections.add(event);
+      }
+    );
 
     this.socket.on(
       "collections.delete",
@@ -398,7 +439,49 @@ class WebsocketProvider extends React.Component<Props> {
       })
     );
 
-    this.socket.on("teams.update", (event: PartialWithId<Team>) => {
+    this.socket.on(
+      "collections.archive",
+      async (event: PartialExcept<Collection, "id">) => {
+        const collectionId = event.id;
+
+        // Fetch collection to update policies
+        await collections.fetch(collectionId, { force: true });
+
+        documents.unarchivedInCollection(collectionId).forEach(
+          action((doc) => {
+            if (!doc.publishedAt) {
+              // draft is to be detached from collection, not archived
+              doc.collectionId = null;
+            } else {
+              doc.archivedAt = event.archivedAt as string;
+            }
+            policies.remove(doc.id);
+          })
+        );
+      }
+    );
+
+    this.socket.on(
+      "collections.restore",
+      async (event: PartialExcept<Collection, "id">) => {
+        const collectionId = event.id;
+        documents
+          .archivedInCollection(collectionId, {
+            archivedAt: event.archivedAt as string,
+          })
+          .forEach(
+            action((doc) => {
+              doc.archivedAt = null;
+              policies.remove(doc.id);
+            })
+          );
+
+        // Fetch collection to update policies
+        await collections.fetch(collectionId, { force: true });
+      }
+    );
+
+    this.socket.on("teams.update", (event: PartialExcept<Team, "id">) => {
       if ("sharing" in event && event.sharing !== auth.team?.sharing) {
         documents.all.forEach((document) => {
           policies.remove(document.id);
@@ -410,23 +493,23 @@ class WebsocketProvider extends React.Component<Props> {
 
     this.socket.on(
       "notifications.create",
-      (event: PartialWithId<Notification>) => {
+      (event: PartialExcept<Notification, "id">) => {
         notifications.add(event);
       }
     );
 
     this.socket.on(
       "notifications.update",
-      (event: PartialWithId<Notification>) => {
+      (event: PartialExcept<Notification, "id">) => {
         notifications.add(event);
       }
     );
 
-    this.socket.on("pins.create", (event: PartialWithId<Pin>) => {
+    this.socket.on("pins.create", (event: PartialExcept<Pin, "id">) => {
       pins.add(event);
     });
 
-    this.socket.on("pins.update", (event: PartialWithId<Pin>) => {
+    this.socket.on("pins.update", (event: PartialExcept<Pin, "id">) => {
       pins.add(event);
     });
 
@@ -434,11 +517,11 @@ class WebsocketProvider extends React.Component<Props> {
       pins.remove(event.modelId);
     });
 
-    this.socket.on("stars.create", (event: PartialWithId<Star>) => {
+    this.socket.on("stars.create", (event: PartialExcept<Star, "id">) => {
       stars.add(event);
     });
 
-    this.socket.on("stars.update", (event: PartialWithId<Star>) => {
+    this.socket.on("stars.update", (event: PartialExcept<Star, "id">) => {
       stars.add(event);
     });
 
@@ -496,14 +579,14 @@ class WebsocketProvider extends React.Component<Props> {
 
     this.socket.on(
       "fileOperations.create",
-      (event: PartialWithId<FileOperation>) => {
+      (event: PartialExcept<FileOperation, "id">) => {
         fileOperations.add(event);
       }
     );
 
     this.socket.on(
       "fileOperations.update",
-      (event: PartialWithId<FileOperation>) => {
+      (event: PartialExcept<FileOperation, "id">) => {
         fileOperations.add(event);
 
         if (
@@ -520,7 +603,7 @@ class WebsocketProvider extends React.Component<Props> {
 
     this.socket.on(
       "subscriptions.create",
-      (event: PartialWithId<Subscription>) => {
+      (event: PartialExcept<Subscription, "id">) => {
         subscriptions.add(event);
       }
     );
@@ -532,11 +615,11 @@ class WebsocketProvider extends React.Component<Props> {
       }
     );
 
-    this.socket.on("users.update", (event: PartialWithId<User>) => {
+    this.socket.on("users.update", (event: PartialExcept<User, "id">) => {
       users.add(event);
     });
 
-    this.socket.on("users.demote", async (event: PartialWithId<User>) => {
+    this.socket.on("users.demote", async (event: PartialExcept<User, "id">) => {
       if (event.id === auth.user?.id) {
         documents.all.forEach((document) => policies.remove(document.id));
         await collections.fetchAll();
@@ -545,7 +628,7 @@ class WebsocketProvider extends React.Component<Props> {
 
     this.socket.on(
       "userMemberships.update",
-      async (event: PartialWithId<UserMembership>) => {
+      async (event: PartialExcept<UserMembership, "id">) => {
         userMemberships.add(event);
       }
     );

app/editor/components/ComponentView.tsx

@@ -1,29 +1,51 @@
 import { Node as ProsemirrorNode } from "prosemirror-model";
 import { EditorView, Decoration } from "prosemirror-view";
-import * as React from "react";
-import ReactDOM from "react-dom";
-import { ThemeProvider } from "styled-components";
+import { FunctionComponent } from "react";
 import Extension from "@shared/editor/lib/Extension";
 import { ComponentProps } from "@shared/editor/types";
 import { Editor } from "~/editor";
+import { NodeViewRenderer } from "./NodeViewRenderer";
 
-type Component = (props: ComponentProps) => React.ReactElement;
+type ComponentViewConstructor = {
+  /** The editor instance. */
+  editor: Editor;
+  /** The extension the view belongs to. */
+  extension: Extension;
+  /** The node that the view is responsible for. */
+  node: ProsemirrorNode;
+  /** The editor view instance. */
+  view: EditorView;
+  /** A function that returns the current position of the node. */
+  getPos: () => number;
+  /** The decorations applied to the node. */
+  decorations: Decoration[];
+};
 
 export default class ComponentView {
-  component: Component;
+  /** The React component to render. */
+  component: FunctionComponent<ComponentProps>;
+  /** The editor instance. */
   editor: Editor;
+  /** The extension the view belongs to. */
   extension: Extension;
+  /** The node that the view is responsible for. */
   node: ProsemirrorNode;
+  /** The editor view instance. */
   view: EditorView;
+  /** A function that returns the current position of the node. */
   getPos: () => number;
+  /** The decorations applied to the node. */
   decorations: Decoration[];
-
+  /** The renderer instance. */
+  renderer: NodeViewRenderer<ComponentProps>;
+  /** Whether the node is selected. */
   isSelected = false;
+  /** The DOM element that the node is rendered into. */
   dom: HTMLElement | null;
 
   // See https://prosemirror.net/docs/ref/#view.NodeView
   constructor(
-    component: Component,
+    component: FunctionComponent<ComponentProps>,
     {
       editor,
       extension,
@@ -31,14 +53,7 @@ export default class ComponentView {
       view,
       getPos,
       decorations,
-    }: {
-      editor: Editor;
-      extension: Extension;
-      node: ProsemirrorNode;
-      view: EditorView;
-      getPos: () => number;
-      decorations: Decoration[];
-    }
+    }: ComponentViewConstructor
   ) {
     this.component = component;
     this.editor = editor;
@@ -52,51 +67,33 @@ export default class ComponentView {
       : document.createElement("div");
 
     this.dom.classList.add(`component-${node.type.name}`);
+    this.renderer = new NodeViewRenderer(this.dom, this.component, this.props);
 
-    this.renderElement();
-    window.addEventListener("theme-changed", this.renderElement);
-    window.addEventListener("location-changed", this.renderElement);
+    // Add the renderer to the editor's set of renderers so that it is included in the React tree.
+    this.editor.renderers.add(this.renderer);
   }
 
-  renderElement = () => {
-    const { theme } = this.editor.props;
-
-    const children = this.component({
-      theme,
-      node: this.node,
-      view: this.view,
-      isSelected: this.isSelected,
-      isEditable: this.view.editable,
-      getPos: this.getPos,
-    });
-
-    ReactDOM.render(
-      <ThemeProvider theme={theme}>{children}</ThemeProvider>,
-      this.dom
-    );
-  };
-
   update(node: ProsemirrorNode) {
     if (node.type !== this.node.type) {
       return false;
     }
 
     this.node = node;
-    this.renderElement();
+    this.renderer.updateProps(this.props);
     return true;
   }
 
   selectNode() {
     if (this.view.editable) {
       this.isSelected = true;
-      this.renderElement();
+      this.renderer.updateProps(this.props);
     }
   }
 
   deselectNode() {
     if (this.view.editable) {
       this.isSelected = false;
-      this.renderElement();
+      this.renderer.updateProps(this.props);
     }
   }
 
@@ -105,16 +102,21 @@ export default class ComponentView {
   }
 
   destroy() {
-    window.removeEventListener("theme-changed", this.renderElement);
-    window.removeEventListener("location-changed", this.renderElement);
-
-    if (this.dom) {
-      ReactDOM.unmountComponentAtNode(this.dom);
-    }
+    this.editor.renderers.delete(this.renderer);
     this.dom = null;
   }
 
   ignoreMutation() {
     return true;
   }
+
+  get props() {
+    return {
+      node: this.node,
+      view: this.view,
+      isSelected: this.isSelected,
+      isEditable: this.view.editable,
+      getPos: this.getPos,
+    } as ComponentProps;
+  }
 }

app/editor/components/EmojiMenu.tsx

@@ -29,6 +29,7 @@ const EmojiMenu = (props: Props) => {
         .map((item) => {
           // We snake_case the shortcode for backwards compatability with gemoji to
           // avoid multiple formats being written into documents.
+          // @ts-expect-error emojiMartToGemoji key
           const shortcode = snakeCase(emojiMartToGemoji[item.id] || item.id);
           const emoji = item.value;
 

app/editor/components/FloatingToolbar.tsx

@@ -7,6 +7,7 @@ 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 { HEADER_HEIGHT } from "~/components/Header";
 import { Portal } from "~/components/Portal";
 import useComponentSize from "~/hooks/useComponentSize";
 import useEventListener from "~/hooks/useEventListener";
@@ -130,59 +131,64 @@ function usePosition({
 
   // Images need their own positioning to get the toolbar in the center
   if (isImageSelection) {
-    const element = view.nodeDOM(selection.from);
+    const element = view.nodeDOM(selection.from) as HTMLElement;
 
     // Images are wrapped which impacts positioning - need to get the element
     // specifically tagged as the handle
-    const imageElement = (element as HTMLElement).getElementsByClassName(
+    const imageElement = element.getElementsByClassName(
       EditorStyleHelper.imageHandle
     )[0];
-    const { left, top, width } = imageElement.getBoundingClientRect();
+    if (imageElement) {
+      const { left, top, width } = imageElement.getBoundingClientRect();
 
-    return {
-      left: Math.round(left + width / 2 - menuWidth / 2 - offsetParent.left),
-      top: Math.round(top - menuHeight - offsetParent.top),
-      offset: 0,
-      visible: true,
-    };
-  } else {
-    // calculate the horizontal center of the selection
-    const halfSelection =
-      Math.abs(selectionBounds.right - selectionBounds.left) / 2;
-    const centerOfSelection = selectionBounds.left + halfSelection;
+      return {
+        left: Math.round(left + width / 2 - menuWidth / 2 - offsetParent.left),
+        top: Math.round(top - menuHeight - offsetParent.top),
+        offset: 0,
+        visible: true,
+      };
+    }
+  }
 
-    // position the menu so that it is centered over the selection except in
-    // the cases where it would extend off the edge of the screen. In these
-    // instances leave a margin
-    const margin = 12;
-    const left = Math.min(
-      Math.min(
-        offsetParent.x + offsetParent.width - menuWidth - margin,
-        window.innerWidth - margin
-      ),
-      Math.max(
-        Math.max(offsetParent.x, margin),
-        centerOfSelection - menuWidth / 2
-      )
-    );
-    const top = Math.min(
+  // calculate the horizontal center of the selection
+  const halfSelection =
+    Math.abs(selectionBounds.right - selectionBounds.left) / 2;
+  const centerOfSelection = selectionBounds.left + halfSelection;
+
+  // position the menu so that it is centered over the selection except in
+  // the cases where it would extend off the edge of the screen. In these
+  // instances leave a margin
+  const margin = 12;
+  const left = Math.min(
+    Math.min(
+      offsetParent.x + offsetParent.width - menuWidth - margin,
+      window.innerWidth - margin
+    ),
+    Math.max(
+      Math.max(offsetParent.x, margin),
+      centerOfSelection - menuWidth / 2
+    )
+  );
+  const top = Math.max(
+    HEADER_HEIGHT,
+    Math.min(
       window.innerHeight - menuHeight - margin,
       Math.max(margin, selectionBounds.top - menuHeight)
-    );
+    )
+  );
 
-    // if the menu has been offset to not extend offscreen then we should adjust
-    // the position of the triangle underneath to correctly point to the center
-    // of the selection still
-    const offset = left - (centerOfSelection - menuWidth / 2);
-    return {
-      left: Math.round(left - offsetParent.left),
-      top: Math.round(top - offsetParent.top),
-      offset: Math.round(offset),
-      maxWidth: Math.min(window.innerWidth - margin * 2, offsetParent.width),
-      blockSelection: codeBlock || isColSelection || isRowSelection,
-      visible: true,
-    };
-  }
+  // if the menu has been offset to not extend offscreen then we should adjust
+  // the position of the triangle underneath to correctly point to the center
+  // of the selection still
+  const offset = left - (centerOfSelection - menuWidth / 2);
+  return {
+    left: Math.round(left - offsetParent.left),
+    top: Math.round(top - offsetParent.top),
+    offset: Math.round(offset),
+    maxWidth: Math.min(window.innerWidth - margin * 2, offsetParent.width),
+    blockSelection: codeBlock || isColSelection || isRowSelection,
+    visible: true,
+  };
 }
 
 const FloatingToolbar = React.forwardRef(function FloatingToolbar_(

app/editor/components/MentionMenu.tsx

@@ -92,7 +92,7 @@ function MentionMenu({ search, isActive, ...rest }: Props) {
         const user = users.get(item.attrs.modelId);
         toast.message(
           t(
-            "{{ userName }} won't by notified as they do not have access to this document",
+            "{{ userName }} won't be notified, as they do not have access to this document",
             {
               userName: item.attrs.label,
             }

app/editor/components/NodeViewRenderer.tsx

@@ -0,0 +1,28 @@
+import isEqual from "lodash/isEqual";
+import { action, computed, observable } from "mobx";
+import React, { FunctionComponent } from "react";
+import { createPortal } from "react-dom";
+
+export class NodeViewRenderer<T extends object> {
+  @observable public props: T;
+
+  public constructor(
+    public element: HTMLElement,
+    private Component: FunctionComponent,
+    props: T
+  ) {
+    this.props = props;
+  }
+
+  @computed
+  public get content() {
+    return createPortal(<this.Component {...this.props} />, this.element);
+  }
+
+  @action
+  public updateProps(props: T) {
+    if (!isEqual(props, this.props)) {
+      this.props = props;
+    }
+  }
+}

app/editor/components/SelectionToolbar.tsx

@@ -216,8 +216,7 @@ export default function SelectionToolbar(props: Props) {
   const colIndex = getColumnIndex(state);
   const rowIndex = getRowIndex(state);
   const isTableSelection = colIndex !== undefined && rowIndex !== undefined;
-  const link = isMarkActive(state.schema.marks.link)(state);
-  const range = getMarkRange(selection.$from, state.schema.marks.link);
+  const link = getMarkRange(selection.$from, state.schema.marks.link);
   const isImageSelection =
     selection instanceof NodeSelection && selection.node.type.name === "image";
   const isAttachmentSelection =
@@ -266,7 +265,8 @@ export default function SelectionToolbar(props: Props) {
     return null;
   }
 
-  const showLinkToolbar = link && range;
+  const showLinkToolbar =
+    link && link.from === selection.from && link.to === selection.to;
 
   return (
     <FloatingToolbar
@@ -276,12 +276,12 @@ export default function SelectionToolbar(props: Props) {
     >
       {showLinkToolbar ? (
         <LinkEditor
-          key={`${range.from}-${range.to}`}
+          key={`${link.from}-${link.to}`}
           dictionary={dictionary}
           view={view}
-          mark={range.mark}
-          from={range.from}
-          to={range.to}
+          mark={link.mark}
+          from={link.from}
+          to={link.to}
           onClickLink={props.onClickLink}
           onSearchLink={props.onSearchLink}
           onCreateLink={onCreateLink ? handleOnCreateLink : undefined}

app/editor/extensions/FindAndReplace.tsx

@@ -1,3 +1,4 @@
+import deburr from "lodash/deburr";
 import escapeRegExp from "lodash/escapeRegExp";
 import { observable } from "mobx";
 import { Node } from "prosemirror-model";
@@ -243,11 +244,11 @@ export default class FindAndReplaceExtension extends Extension {
     });
 
     mergedTextNodes.forEach(({ text = "", pos }) => {
-      const search = this.findRegExp;
-      let m;
-
       try {
-        while ((m = search.exec(text))) {
+        let m;
+        const search = this.findRegExp;
+
+        while ((m = search.exec(deburr(text)))) {
           if (m[0] === "") {
             break;
           }

app/editor/extensions/MentionMenu.tsx

@@ -8,7 +8,7 @@ export default class MentionMenuExtension extends Suggestion {
   get defaultOptions() {
     return {
       // ported from https://github.com/tc39/proposal-regexp-unicode-property-escapes#unicode-aware-version-of-w
-      openRegex: /(?:^|\s|\()@([\p{L}\p{M}\d]+)?$/u,
+      openRegex: /(?:^|\s|\()@([\p{L}\p{M}\d\s{1}@\.]+)?$/u,
       closeRegex: /(?:^|\s|\()@(([\p{L}\p{M}\d]*\s{2})|(\s+[\p{L}\p{M}\d]+))$/u,
     };
   }

app/editor/extensions/Multiplayer.ts

@@ -1,13 +1,23 @@
+import isEqual from "lodash/isEqual";
+import { keymap } from "prosemirror-keymap";
 import {
   ySyncPlugin,
   yCursorPlugin,
   yUndoPlugin,
   undo,
   redo,
-} from "@getoutline/y-prosemirror";
-import { keymap } from "prosemirror-keymap";
+} from "y-prosemirror";
 import * as Y from "yjs";
 import Extension from "@shared/editor/lib/Extension";
+import { Second } from "@shared/utils/time";
+
+type UserAwareness = {
+  user?: {
+    id: string;
+  };
+  anchor: object;
+  head: object;
+};
 
 export default class Multiplayer extends Extension {
   get name() {
@@ -18,6 +28,7 @@ export default class Multiplayer extends Extension {
     const { user, provider, document: doc } = this.options;
     const type = doc.get("default", Y.XmlFragment);
 
+    // Assign a user to a client ID once they've made a change and then remove the listener
     const assignUser = (tr: Y.Transaction) => {
       const clientIds = Array.from(doc.store.clients.keys());
 
@@ -32,6 +43,54 @@ export default class Multiplayer extends Extension {
       }
     };
 
+    const userAwarenessCache = new Map<
+      string,
+      { aw: UserAwareness; changedAt: Date }
+    >();
+
+    // The opacity of a remote user's selection.
+    const selectionOpacity = 70;
+
+    // The time in milliseconds after which a remote user's selection will be hidden.
+    const selectionTimeout = 10 * Second.ms;
+
+    // We're hijacking this method to store the last time a user's awareness changed as a side
+    // effect, and otherwise behaving as the default.
+    const awarenessStateFilter = (
+      currentClientId: number,
+      userClientId: number,
+      aw: UserAwareness
+    ) => {
+      if (currentClientId === userClientId) {
+        return false;
+      }
+
+      const userId = aw.user?.id;
+      const cached = userId ? userAwarenessCache.get(userId) : undefined;
+      if (!cached || !isEqual(cached?.aw, aw)) {
+        if (userId) {
+          userAwarenessCache.set(userId, { aw, changedAt: new Date() });
+        }
+      }
+
+      return true;
+    };
+
+    // Override the default selection builder to add a background color to the selection
+    // only if the user's awareness has changed recently – this stops selections from lingering.
+    const selectionBuilder = (u: { id: string; color: string }) => {
+      const cached = userAwarenessCache.get(u.id);
+      const opacity =
+        !cached || cached?.changedAt > new Date(Date.now() - selectionTimeout)
+          ? selectionOpacity
+          : 0;
+
+      return {
+        style: `background-color: ${u.color}${opacity}`,
+        class: "ProseMirror-yjs-selection",
+      };
+    };
+
     provider.setAwarenessField("user", user);
 
     // only once an actual change has been made do we add the userId <> clientId
@@ -40,7 +99,10 @@ export default class Multiplayer extends Extension {
 
     return [
       ySyncPlugin(type),
-      yCursorPlugin(provider.awareness),
+      yCursorPlugin(provider.awareness, {
+        awarenessStateFilter,
+        selectionBuilder,
+      }),
       yUndoPlugin(),
       keymap({
         "Mod-z": undo,

app/editor/extensions/PasteHandler.ts

@@ -90,14 +90,8 @@ export default class PasteHandler extends Extension {
             },
           },
           handlePaste: (view, event: ClipboardEvent) => {
-            // Do nothing if the document isn't currently editable
-            if (!view.editable) {
-              return false;
-            }
-
-            // Default behavior if there is nothing on the clipboard or were
-            // special pasting with no formatting (Shift held)
-            if (!event.clipboardData || this.shiftKey) {
+            // Do nothing if the document isn't currently editable or there is no clipboard data
+            if (!view.editable || !event.clipboardData) {
               return false;
             }
 
@@ -137,76 +131,6 @@ export default class PasteHandler extends Extension {
               return true;
             }
 
-            // Check if the clipboard contents can be parsed as a single url
-            if (isUrl(text)) {
-              // If there is selected text then we want to wrap it in a link to the url
-              if (!state.selection.empty) {
-                toggleMark(this.editor.schema.marks.link, { href: text })(
-                  state,
-                  dispatch
-                );
-                return true;
-              }
-
-              // Is this link embeddable? Create an embed!
-              const { embeds } = this.editor.props;
-              if (
-                embeds &&
-                this.editor.commands.embed &&
-                !isInCode(state) &&
-                !isInList(state)
-              ) {
-                for (const embed of embeds) {
-                  if (!embed.matchOnInput) {
-                    continue;
-                  }
-                  const matches = embed.matcher(text);
-                  if (matches) {
-                    this.editor.commands.embed({
-                      href: text,
-                    });
-                    return true;
-                  }
-                }
-              }
-
-              // Is the link a link to a document? If so, we can grab the title and insert it.
-              if (isDocumentUrl(text)) {
-                const slug = parseDocumentSlug(text);
-
-                if (slug) {
-                  void stores.documents
-                    .fetch(slug)
-                    .then((document) => {
-                      if (view.isDestroyed) {
-                        return;
-                      }
-                      if (document) {
-                        const { hash } = new URL(text);
-
-                        const hasEmoji =
-                          determineIconType(document.icon) === IconType.Emoji;
-
-                        const title = `${hasEmoji ? document.icon + " " : ""}${
-                          document.titleWithDefault
-                        }`;
-                        insertLink(`${document.path}${hash}`, title);
-                      }
-                    })
-                    .catch(() => {
-                      if (view.isDestroyed) {
-                        return;
-                      }
-                      insertLink(text);
-                    });
-                }
-              } else {
-                insertLink(text);
-              }
-
-              return true;
-            }
-
             // Because VSCode is an especially popular editor that places metadata
             // on the clipboard, we can parse it to find out what kind of content
             // was pasted.
@@ -215,52 +139,129 @@ export default class PasteHandler extends Extension {
             const supportsCodeBlock = !!state.schema.nodes.code_block;
             const supportsCodeMark = !!state.schema.marks.code_inline;
 
-            if (pasteCodeLanguage && pasteCodeLanguage !== "markdown") {
-              if (text.includes("\n") && supportsCodeBlock) {
-                event.preventDefault();
-                view.dispatch(
-                  state.tr
-                    .replaceSelectionWith(
-                      state.schema.nodes.code_block.create({
-                        language: Object.keys(LANGUAGES).includes(
-                          vscodeMeta.mode
-                        )
-                          ? vscodeMeta.mode
-                          : null,
+            if (!this.shiftKey) {
+              // Check if the clipboard contents can be parsed as a single url
+              if (isUrl(text)) {
+                // If there is selected text then we want to wrap it in a link to the url
+                if (!state.selection.empty) {
+                  toggleMark(this.editor.schema.marks.link, { href: text })(
+                    state,
+                    dispatch
+                  );
+                  return true;
+                }
+
+                // Is this link embeddable? Create an embed!
+                const { embeds } = this.editor.props;
+                if (
+                  embeds &&
+                  this.editor.commands.embed &&
+                  !isInCode(state) &&
+                  !isInList(state)
+                ) {
+                  for (const embed of embeds) {
+                    if (!embed.matchOnInput) {
+                      continue;
+                    }
+                    const matches = embed.matcher(text);
+                    if (matches) {
+                      this.editor.commands.embed({
+                        href: text,
+                      });
+                      return true;
+                    }
+                  }
+                }
+
+                // Is the link a link to a document? If so, we can grab the title and insert it.
+                if (isDocumentUrl(text)) {
+                  const slug = parseDocumentSlug(text);
+
+                  if (slug) {
+                    void stores.documents
+                      .fetch(slug)
+                      .then((document) => {
+                        if (view.isDestroyed) {
+                          return;
+                        }
+                        if (document) {
+                          const { hash } = new URL(text);
+
+                          const hasEmoji =
+                            determineIconType(document.icon) === IconType.Emoji;
+
+                          const title = `${
+                            hasEmoji ? document.icon + " " : ""
+                          }${document.titleWithDefault}`;
+                          insertLink(`${document.path}${hash}`, title);
+                        }
                       })
-                    )
-                    .insertText(text)
-                );
+                      .catch(() => {
+                        if (view.isDestroyed) {
+                          return;
+                        }
+                        insertLink(text);
+                      });
+                  }
+                } else {
+                  insertLink(text);
+                }
+
                 return true;
               }
 
-              if (supportsCodeMark) {
-                event.preventDefault();
-                view.dispatch(
-                  state.tr
-                    .insertText(text, state.selection.from, state.selection.to)
-                    .addMark(
-                      state.selection.from,
-                      state.selection.to + text.length,
-                      state.schema.marks.code_inline.create()
-                    )
-                );
-                return true;
-              }
-            }
+              if (pasteCodeLanguage && pasteCodeLanguage !== "markdown") {
+                if (text.includes("\n") && supportsCodeBlock) {
+                  event.preventDefault();
+                  view.dispatch(
+                    state.tr
+                      .replaceSelectionWith(
+                        state.schema.nodes.code_block.create({
+                          language: Object.keys(LANGUAGES).includes(
+                            vscodeMeta.mode
+                          )
+                            ? vscodeMeta.mode
+                            : null,
+                        })
+                      )
+                      .insertText(text)
+                  );
+                  return true;
+                }
 
-            // If the HTML on the clipboard is from Prosemirror then the best
-            // compatability is to just use the HTML parser, regardless of
-            // whether it "looks" like Markdown, see: outline/outline#2416
-            if (html?.includes("data-pm-slice")) {
-              return false;
+                if (supportsCodeMark) {
+                  event.preventDefault();
+                  view.dispatch(
+                    state.tr
+                      .insertText(
+                        text,
+                        state.selection.from,
+                        state.selection.to
+                      )
+                      .addMark(
+                        state.selection.from,
+                        state.selection.to + text.length,
+                        state.schema.marks.code_inline.create()
+                      )
+                  );
+                  return true;
+                }
+              }
+
+              // If the HTML on the clipboard is from Prosemirror then the best
+              // compatability is to just use the HTML parser, regardless of
+              // whether it "looks" like Markdown, see: outline/outline#2416
+              if (html?.includes("data-pm-slice")) {
+                return false;
+              }
             }
 
             // If the text on the clipboard looks like Markdown OR there is no
             // html on the clipboard then try to parse content as Markdown
             if (
               (isMarkdown(text) && !isDropboxPaper(html)) ||
-              pasteCodeLanguage === "markdown"
+              pasteCodeLanguage === "markdown" ||
+              this.shiftKey
             ) {
               event.preventDefault();
 

app/editor/extensions/SmartText.ts

@@ -30,19 +30,23 @@ export default class SmartText extends Extension {
   }
 
   inputRules() {
-    return [
-      rightArrow,
-      emdash,
-      oneHalf,
-      threeQuarters,
-      copyright,
-      registered,
-      trademarked,
-      ellipsis,
-      openDoubleQuote,
-      closeDoubleQuote,
-      openSingleQuote,
-      closeSingleQuote,
-    ];
+    if (this.options.userPreferences?.enableSmartText ?? true) {
+      return [
+        rightArrow,
+        emdash,
+        oneHalf,
+        threeQuarters,
+        copyright,
+        registered,
+        trademarked,
+        ellipsis,
+        openDoubleQuote,
+        closeDoubleQuote,
+        openSingleQuote,
+        closeSingleQuote,
+      ];
+    }
+
+    return [];
   }
 }

app/editor/index.tsx

@@ -38,7 +38,7 @@ import Mark from "@shared/editor/marks/Mark";
 import { basicExtensions as extensions } from "@shared/editor/nodes";
 import Node from "@shared/editor/nodes/Node";
 import ReactNode from "@shared/editor/nodes/ReactNode";
-import { EventType } from "@shared/editor/types";
+import { ComponentProps, EventType } from "@shared/editor/types";
 import { ProsemirrorData, UserPreferences } from "@shared/types";
 import { ProsemirrorHelper } from "@shared/utils/ProsemirrorHelper";
 import EventEmitter from "@shared/utils/events";
@@ -50,6 +50,7 @@ import ComponentView from "./components/ComponentView";
 import EditorContext from "./components/EditorContext";
 import { SearchResult } from "./components/LinkEditor";
 import LinkToolbar from "./components/LinkToolbar";
+import { NodeViewRenderer } from "./components/NodeViewRenderer";
 import SelectionToolbar from "./components/SelectionToolbar";
 import WithTheme from "./components/WithTheme";
 
@@ -90,6 +91,10 @@ export type Props = {
   scrollTo?: string;
   /** Callback for handling uploaded images, should return the url of uploaded file */
   uploadFile?: (file: File) => Promise<string>;
+  /** Callback when prosemirror nodes are initialized on document mount. */
+  onInit?: () => void;
+  /** Callback when prosemirror nodes are destroyed on document unmount. */
+  onDestroy?: () => void;
   /** Callback when editor is blurred, as native input */
   onBlur?: () => void;
   /** Callback when editor is focused, as native input */
@@ -175,6 +180,7 @@ export class Editor extends React.PureComponent<
     linkToolbarOpen: false,
   };
 
+  isInitialized = false;
   isBlurred = true;
   extensions: ExtensionManager;
   elementRef = React.createRef<HTMLDivElement>();
@@ -192,6 +198,7 @@ export class Editor extends React.PureComponent<
   };
 
   widgets: { [name: string]: (props: WidgetProps) => React.ReactElement };
+  renderers: Set<NodeViewRenderer<ComponentProps>> = new Set();
   nodes: { [name: string]: NodeSpec };
   marks: { [name: string]: MarkSpec };
   commands: Record<string, CommandFactory>;
@@ -281,6 +288,7 @@ export class Editor extends React.PureComponent<
     window.removeEventListener("theme-changed", this.dispatchThemeChanged);
     this.view?.destroy();
     this.mutationObserver?.disconnect();
+    this.handleEditorDestroy();
   }
 
   private init() {
@@ -480,6 +488,8 @@ export class Editor extends React.PureComponent<
           self.handleChange();
         }
 
+        self.handleEditorInit();
+
         self.calculateDir();
 
         // Because Prosemirror and React are not linked we must tell React that
@@ -738,6 +748,22 @@ export class Editor extends React.PureComponent<
     );
   };
 
+  private handleEditorInit = () => {
+    if (!this.props.onInit || this.isInitialized) {
+      return;
+    }
+
+    this.props.onInit();
+    this.isInitialized = true;
+  };
+
+  private handleEditorDestroy = () => {
+    if (!this.props.onDestroy) {
+      return;
+    }
+    this.props.onDestroy();
+  };
+
   private handleEditorBlur = () => {
     this.setState({ isEditorFocused: false });
     return false;
@@ -838,6 +864,7 @@ export class Editor extends React.PureComponent<
               Object.values(this.widgets).map((Widget, index) => (
                 <Widget key={String(index)} rtl={isRTL} readOnly={readOnly} />
               ))}
+            {Array.from(this.renderers).map((view) => view.content)}
           </Flex>
         </EditorContext.Provider>
       </PortalContext.Provider>

app/editor/menus/code.tsx

@@ -14,7 +14,10 @@ export default function codeMenuItems(
 ): MenuItem[] {
   const node = state.selection.$from.node();
 
-  const allLanguages = Object.entries(LANGUAGES);
+  const allLanguages = Object.entries(LANGUAGES) as [
+    keyof typeof LANGUAGES,
+    string
+  ][];
   const frequentLanguages = getFrequentCodeLanguages();
 
   const frequentLangMenuItems = frequentLanguages.map((value) => {
@@ -49,6 +52,7 @@ export default function codeMenuItems(
       visible: !readOnly,
       name: "code_block",
       icon: <ExpandedIcon />,
+      // @ts-expect-error We have a fallback for incorrect mapping
       label: LANGUAGES[node.attrs.language ?? "none"],
       children: languageMenuItems,
     },

app/editor/menus/formatting.tsx

@@ -214,7 +214,6 @@ export default function formattingMenuItems(
       name: "link",
       tooltip: dictionary.createLink,
       icon: <LinkIcon />,
-      active: isMarkActive(schema.marks.link),
       attrs: { href: "" },
       visible: !isCodeBlock && (!isMobile || !isEmpty),
     },

app/editor/menus/readOnly.tsx

@@ -11,10 +11,11 @@ export default function readOnlyMenuItems(
   dictionary: Dictionary
 ): MenuItem[] {
   const { schema } = state;
+  const isEmpty = state.selection.empty;
 
   return [
     {
-      visible: canUpdate,
+      visible: canUpdate && !isEmpty,
       name: "comment",
       tooltip: dictionary.comment,
       label: dictionary.comment,

app/editor/menus/table.tsx

@@ -1,4 +1,4 @@
-import { AlignFullWidthIcon, TrashIcon } from "outline-icons";
+import { AlignFullWidthIcon, DownloadIcon, TrashIcon } from "outline-icons";
 import { EditorState } from "prosemirror-state";
 import * as React from "react";
 import { isNodeActive } from "@shared/editor/queries/isNodeActive";
@@ -32,5 +32,15 @@ export default function tableMenuItems(
       tooltip: dictionary.deleteTable,
       icon: <TrashIcon />,
     },
+    {
+      name: "separator",
+    },
+    {
+      name: "exportTable",
+      tooltip: dictionary.exportAsCSV,
+      label: "CSV",
+      attrs: { format: "csv", fileName: `${window.document.title}.csv` },
+      icon: <DownloadIcon />,
+    },
   ];
 }

app/hooks/useDictionary.ts

@@ -77,6 +77,7 @@ export default function useDictionary() {
       sortAsc: t("Sort ascending"),
       sortDesc: t("Sort descending"),
       table: t("Table"),
+      exportAsCSV: t("Export as CSV"),
       toggleHeader: t("Toggle header"),
       mathInline: t("Math inline (LaTeX)"),
       mathBlock: t("Math block (LaTeX)"),

app/hooks/useHover.ts

@@ -0,0 +1,50 @@
+import React from "react";
+import useUnmount from "./useUnmount";
+
+type Props = {
+  /** Ref to the element that needs to be observed. */
+  ref: React.RefObject<HTMLElement>;
+  /** Duration to wait until it's considered as a hover event. */
+  duration: number;
+};
+
+/**
+ * Hook that will trigger the first time an element is hovered.
+ *
+ * @returns {boolean} hovered - Signals when an element is hovered by the user.
+ */
+const useHover = ({ ref, duration }: Props): boolean => {
+  const [hovered, setHovered] = React.useState(false);
+  const timer = React.useRef<number>();
+
+  const onMouseEnter = React.useCallback(() => {
+    if (timer.current) {
+      clearTimeout(timer.current);
+    }
+
+    timer.current = window.setTimeout(() => setHovered(true), duration);
+  }, [duration]);
+
+  const onMouseLeave = React.useCallback(() => {
+    if (timer.current) {
+      clearTimeout(timer.current);
+    }
+  }, []);
+
+  useUnmount(() => {
+    if (timer.current) {
+      clearTimeout(timer.current);
+    }
+  });
+
+  React.useEffect(() => {
+    if (ref.current) {
+      ref.current.onmouseenter = onMouseEnter;
+      ref.current.onmouseleave = onMouseLeave;
+    }
+  }, [ref, onMouseEnter, onMouseLeave]);
+
+  return hovered;
+};
+
+export default useHover;

app/hooks/useOnClickOutside.ts

@@ -23,6 +23,6 @@ export default function useOnClickOutside(
     [ref, callback]
   );
 
-  useEventListener("mousedown", listener, window, options);
+  useEventListener("pointerdown", listener, window, options);
   useEventListener("touchstart", listener, window, options);
 }

app/hooks/useUserLocale.ts

@@ -3,16 +3,9 @@ import useCurrentUser from "./useCurrentUser";
 /**
  * Returns the user's locale, or undefined if the user is not logged in.
  *
- * @param languageCode Whether to only return the language code
  * @returns The user's locale, or undefined if the user is not logged in
  */
-export default function useUserLocale(languageCode?: boolean) {
+export default function useUserLocale() {
   const user = useCurrentUser({ rejectOnEmpty: false });
-
-  if (!user?.language) {
-    return undefined;
-  }
-
-  const { language } = user;
-  return languageCode ? language.split("_")[0] : language;
+  return user?.language;
 }

app/index.tsx

@@ -32,12 +32,6 @@ void PluginManager.loadPlugins();
 initI18n(env.DEFAULT_LANGUAGE);
 const element = window.document.getElementById("root");
 
-history.listen(() => {
-  requestAnimationFrame(() =>
-    window.dispatchEvent(new Event("location-changed"))
-  );
-});
-
 if (env.SENTRY_DSN) {
   initSentry(history);
 }

app/menus/CollectionMenu.tsx

@@ -29,6 +29,8 @@ import {
   unstarCollection,
   searchInCollection,
   createTemplate,
+  archiveCollection,
+  restoreCollection,
 } from "~/actions/definitions/collections";
 import useActionContext from "~/hooks/useActionContext";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
@@ -122,6 +124,8 @@ function CollectionMenu({
       } catch (err) {
         toast.error(err.message);
         throw err;
+      } finally {
+        ev.target.value = "";
       }
     },
     [history, collection.id, documents]
@@ -151,6 +155,7 @@ function CollectionMenu({
   const canUserInTeam = usePolicy(team);
   const items: MenuItem[] = React.useMemo(
     () => [
+      actionToMenuItem(restoreCollection, context),
       actionToMenuItem(starCollection, context),
       actionToMenuItem(unstarCollection, context),
       {
@@ -224,6 +229,7 @@ function CollectionMenu({
         onClick: handleExport,
         icon: <ExportIcon />,
       },
+      actionToMenuItem(archiveCollection, context),
       actionToMenuItem(searchInCollection, context),
       {
         type: "separator",

app/menus/CommentMenu.tsx

@@ -15,6 +15,7 @@ import {
   deleteCommentFactory,
   resolveCommentFactory,
   unresolveCommentFactory,
+  viewCommentReactionsFactory,
 } from "~/actions/definitions/comments";
 import useActionContext from "~/hooks/useActionContext";
 import usePolicy from "~/hooks/usePolicy";
@@ -66,47 +67,55 @@ function CommentMenu({
           {...menu}
         />
       </EventBoundary>
-      <ContextMenu {...menu} aria-label={t("Comment options")}>
-        <Template
-          {...menu}
-          items={[
-            {
-              type: "button",
-              title: `${t("Edit")}…`,
-              icon: <EditIcon />,
-              onClick: onEdit,
-              visible: can.update,
-            },
-            actionToMenuItem(
-              resolveCommentFactory({
-                comment,
-                onResolve: () => onUpdate({ resolved: true }),
-              }),
-              context
-            ),
-            actionToMenuItem(
-              unresolveCommentFactory({
-                comment,
-                onUnresolve: () => onUpdate({ resolved: false }),
-              }),
-              context
-            ),
-            {
-              type: "button",
-              icon: <CopyIcon />,
-              title: t("Copy link"),
-              onClick: handleCopyLink,
-            },
-            {
-              type: "separator",
-            },
-            actionToMenuItem(
-              deleteCommentFactory({ comment, onDelete }),
-              context
-            ),
-          ]}
-        />
-      </ContextMenu>
+      {menu.visible && (
+        <ContextMenu {...menu} aria-label={t("Comment options")}>
+          <Template
+            {...menu}
+            items={[
+              {
+                type: "button",
+                title: `${t("Edit")}…`,
+                icon: <EditIcon />,
+                onClick: onEdit,
+                visible: can.update && !comment.isResolved,
+              },
+              actionToMenuItem(
+                resolveCommentFactory({
+                  comment,
+                  onResolve: () => onUpdate({ resolved: true }),
+                }),
+                context
+              ),
+              actionToMenuItem(
+                unresolveCommentFactory({
+                  comment,
+                  onUnresolve: () => onUpdate({ resolved: false }),
+                }),
+                context
+              ),
+              actionToMenuItem(
+                viewCommentReactionsFactory({
+                  comment,
+                }),
+                context
+              ),
+              {
+                type: "button",
+                icon: <CopyIcon />,
+                title: t("Copy link"),
+                onClick: handleCopyLink,
+              },
+              {
+                type: "separator",
+              },
+              actionToMenuItem(
+                deleteCommentFactory({ comment, onDelete }),
+                context
+              ),
+            ]}
+          />
+        </ContextMenu>
+      )}
     </>
   );
 }

app/menus/DocumentMenu.tsx

@@ -47,6 +47,7 @@ import {
   shareDocument,
   copyDocument,
   searchInDocument,
+  leaveDocument,
   moveTemplate,
 } from "~/actions/definitions/documents";
 import useActionContext from "~/hooks/useActionContext";
@@ -215,8 +216,8 @@ const MenuContent: React.FC<MenuContentProps> = ({
             type: "button",
             title: t("Restore"),
             visible:
-              ((document.isWorkspaceTemplate || !!collection) && can.restore) ||
-              !!can.unarchive,
+              !!(document.isWorkspaceTemplate || collection?.isActive) &&
+              !!(can.restore || can.unarchive),
             onClick: (ev) => handleRestore(ev),
             icon: <RestoreIcon />,
           },
@@ -224,9 +225,8 @@ const MenuContent: React.FC<MenuContentProps> = ({
             type: "submenu",
             title: t("Restore"),
             visible:
-              !document.isWorkspaceTemplate &&
-              !collection &&
-              !!can.restore &&
+              !(document.isWorkspaceTemplate || collection?.isActive) &&
+              !!(can.restore || can.unarchive) &&
               restoreItems.length !== 0,
             style: {
               left: -170,
@@ -299,6 +299,7 @@ const MenuContent: React.FC<MenuContentProps> = ({
           },
           actionToMenuItem(deleteDocument, context),
           actionToMenuItem(permanentlyDeleteDocument, context),
+          actionToMenuItem(leaveDocument, context),
         ]}
       />
       {(showDisplayOptions || showToggleEmbeds) && can.update && (
@@ -408,6 +409,8 @@ function DocumentMenu({
       } catch (err) {
         toast.error(err.message);
         throw err;
+      } finally {
+        ev.target.value = "";
       }
     },
     [history, collection, documents, document.id]

app/menus/OrganizationMenu.tsx

@@ -4,7 +4,10 @@ import { useTranslation } from "react-i18next";
 import { MenuButton, useMenuState } from "reakit/Menu";
 import ContextMenu from "~/components/ContextMenu";
 import Template from "~/components/ContextMenu/Template";
-import { navigateToSettings, logout } from "~/actions/definitions/navigation";
+import {
+  navigateToWorkspaceSettings,
+  logout,
+} from "~/actions/definitions/navigation";
 import {
   createTeam,
   createTeamsList,
@@ -45,7 +48,7 @@ const OrganizationMenu: React.FC = ({ children }: Props) => {
       createTeam,
       desktopLoginTeam,
       separator(),
-      navigateToSettings,
+      navigateToWorkspaceSettings,
       logout,
     ],
     [context]

app/models/ApiKey.ts

@@ -16,10 +16,13 @@ class ApiKey extends ParanoidModel {
   @observable
   expiresAt?: string;
 
-  /** An optional datetime that the API key was last used at. */
+  /** Timestamp that the API key was last used. */
   @observable
   lastActiveAt?: string;
 
+  /** The user ID that the API key belongs to. */
+  userId: string;
+
   /** The plain text value of the API key, only available on creation. */
   value: string;
 

app/models/Collection.ts

@@ -80,6 +80,18 @@ export default class Collection extends ParanoidModel {
   @observable
   urlId: string;
 
+  /**
+   * The date and time the collection was archived.
+   */
+  @observable
+  archivedAt: string;
+
+  /**
+   * User who archived the collection.
+   */
+  @observable
+  archivedBy?: User;
+
   /** Returns whether the collection is empty, or undefined if not loaded. */
   @computed
   get isEmpty(): boolean | undefined {
@@ -154,6 +166,21 @@ export default class Collection extends ParanoidModel {
       .filter(Boolean);
   }
 
+  @computed
+  get isArchived() {
+    return !!this.archivedAt;
+  }
+
+  @computed
+  get isDeleted() {
+    return !!this.deletedAt;
+  }
+
+  @computed
+  get isActive() {
+    return !this.isArchived && !this.isDeleted;
+  }
+
   fetchDocuments = async (options?: { force: boolean }) => {
     if (this.isFetching) {
       return;
@@ -314,6 +341,10 @@ export default class Collection extends ParanoidModel {
   @action
   unstar = async () => this.store.unstar(this);
 
+  archive = () => this.store.archive(this);
+
+  restore = () => this.store.restore(this);
+
   export = (format: FileOperationFormat, includeAttachments: boolean) =>
     client.post("/collections.export", {
       id: this.id,

app/models/Comment.ts

@@ -1,8 +1,12 @@
 import { subSeconds } from "date-fns";
-import { computed, observable } from "mobx";
+import invariant from "invariant";
+import uniq from "lodash/uniq";
+import { action, computed, observable } from "mobx";
 import { now } from "mobx-utils";
-import type { ProsemirrorData } from "@shared/types";
+import { Pagination } from "@shared/constants";
+import type { ProsemirrorData, ReactionSummary } from "@shared/types";
 import User from "~/models/User";
+import { client } from "~/utils/ApiClient";
 import Document from "./Document";
 import Model from "./base/Model";
 import Field from "./decorators/Field";
@@ -26,7 +30,7 @@ class Comment extends Model {
    * The Prosemirror data representing the comment content
    */
   @Field
-  @observable
+  @observable.shallow
   data: ProsemirrorData;
 
   /**
@@ -84,6 +88,25 @@ class Comment extends Model {
    */
   resolvedById: string | null;
 
+  /**
+   * Active reactions for this comment.
+   *
+   * Note: This contains just the emoji with the associated user-ids.
+   */
+  @observable
+  reactions: ReactionSummary[];
+
+  /**
+   * Denotes whether the user data for the active reactions are loaded.
+   */
+  @observable
+  reactedUsersLoaded: boolean = false;
+
+  /**
+   * Denotes whether there is an in-flight request for loading reacted users.
+   */
+  private reactedUsersLoading = false;
+
   /**
    * An array of users that are currently typing a reply in this comments thread.
    */
@@ -99,8 +122,8 @@ class Comment extends Model {
    * Whether the comment is resolved
    */
   @computed
-  public get isResolved() {
-    return !!this.resolvedAt;
+  public get isResolved(): boolean {
+    return !!this.resolvedAt || !!this.parentComment?.isResolved;
   }
 
   /**
@@ -124,6 +147,156 @@ class Comment extends Model {
   public unresolve() {
     return this.store.rootStore.comments.unresolve(this.id);
   }
+
+  /**
+   * Add an emoji as a reaction to this comment.
+   *
+   * Optimistically updates the `reactions` cache and invokes the backend API.
+   *
+   * @param {Object} reaction - The reaction data.
+   * @param {string} reaction.emoji - The emoji to add as a reaction.
+   * @param {string} reaction.user - The user who added this reaction.
+   */
+  @action
+  public addReaction = async ({
+    emoji,
+    user,
+  }: {
+    emoji: string;
+    user: User;
+  }) => {
+    this.updateReaction({ type: "add", emoji, user });
+    try {
+      await client.post("/comments.add_reaction", {
+        id: this.id,
+        emoji,
+      });
+    } catch {
+      this.updateReaction({ type: "remove", emoji, user });
+    }
+  };
+
+  /**
+   * Remove an emoji as a reaction from this comment.
+   *
+   * Optimistically updates the `reactions` cache and invokes the backend API.
+   *
+   * @param {Object} reaction - The reaction data.
+   * @param {string} reaction.emoji - The emoji to remove as a reaction.
+   * @param {string} reaction.user - The user who removed this reaction.
+   */
+  @action
+  public removeReaction = async ({
+    emoji,
+    user,
+  }: {
+    emoji: string;
+    user: User;
+  }) => {
+    this.updateReaction({ type: "remove", emoji, user });
+    try {
+      await client.post("/comments.remove_reaction", {
+        id: this.id,
+        emoji,
+      });
+    } catch {
+      this.updateReaction({ type: "add", emoji, user });
+    }
+  };
+
+  /**
+   * Update the `reactions` cache.
+   *
+   * @param {Object} reaction - The reaction data.
+   * @param {string} reaction.type - The type of the action.
+   * @param {string} reaction.emoji - The emoji to update as a reaction.
+   * @param {string} reaction.user - The user who performed this action.
+   */
+  @action
+  public updateReaction = ({
+    type,
+    emoji,
+    user,
+  }: {
+    type: "add" | "remove";
+    emoji: string;
+    user: User;
+  }) => {
+    const reaction = this.reactions.find((r) => r.emoji === emoji);
+
+    // Step 1: Update the reactions cache.
+
+    if (type === "add") {
+      if (!reaction) {
+        this.reactions.push({ emoji, userIds: [user.id] });
+      } else {
+        reaction.userIds = uniq([...reaction.userIds, user.id]);
+      }
+    } else {
+      if (reaction) {
+        reaction.userIds = reaction.userIds.filter((id) => id !== user.id);
+      }
+
+      if (reaction?.userIds.length === 0) {
+        this.reactions = this.reactions.filter(
+          (r) => r.emoji !== reaction.emoji
+        );
+      }
+    }
+
+    // Step 2: Add the user to the store.
+    this.store.rootStore.users.add(user);
+  };
+
+  /**
+   * Load the users for the active reactions.
+   *
+   *
+   * @param {Object} options - Options for loading the data.
+   * @param {string} options.limit - Per request limit for pagination.
+   */
+  @action
+  loadReactedUsersData = async (
+    { limit }: { limit: number } = { limit: Pagination.defaultLimit }
+  ) => {
+    if (this.reactedUsersLoading || this.reactedUsersLoaded) {
+      return;
+    }
+
+    this.reactedUsersLoading = true;
+
+    try {
+      const fetchPage = async (offset: number = 0) => {
+        const res = await client.post("/reactions.list", {
+          commentId: this.id,
+          offset,
+          limit,
+        });
+
+        invariant(res?.data, "Data not available");
+        // @ts-expect-error reaction from server response
+        res.data.map((reaction) =>
+          this.store.rootStore.users.add(reaction.user)
+        );
+
+        return res.pagination;
+      };
+
+      const { total } = await fetchPage();
+
+      const pages = Math.ceil(total / limit);
+      const fetchPages = [];
+      for (let page = 1; page < pages; page++) {
+        fetchPages.push(fetchPage(page * limit));
+      }
+
+      await Promise.all(fetchPages);
+
+      this.reactedUsersLoaded = true;
+    } finally {
+      this.reactedUsersLoading = false;
+    }
+  };
 }
 
 export default Comment;

app/models/Document.ts

@@ -28,7 +28,7 @@ import { settingsPath } from "~/utils/routeHelpers";
 import Collection from "./Collection";
 import Notification from "./Notification";
 import View from "./View";
-import ParanoidModel from "./base/ParanoidModel";
+import ArchivableModel from "./base/ArchivableModel";
 import Field from "./decorators/Field";
 import Relation from "./decorators/Relation";
 
@@ -38,7 +38,7 @@ type SaveOptions = JSONObject & {
   autosave?: boolean;
 };
 
-export default class Document extends ParanoidModel {
+export default class Document extends ArchivableModel {
   static modelName = "Document";
 
   constructor(fields: Record<string, any>, store: DocumentsStore) {
@@ -176,7 +176,10 @@ export default class Document extends ParanoidModel {
   @observable
   parentDocumentId: string | undefined;
 
-  @Relation(() => Document)
+  /**
+   * Parent document that this is a child of, if any.
+   */
+  @Relation(() => Document, { onArchive: "cascade" })
   parentDocument?: Document;
 
   @observable
@@ -191,9 +194,6 @@ export default class Document extends ParanoidModel {
   @observable
   publishedAt: string | undefined;
 
-  @observable
-  archivedAt: string;
-
   /**
    * @deprecated Use path instead
    */
@@ -643,7 +643,9 @@ export default class Document extends ParanoidModel {
       nodes: extensionManager.nodes,
       marks: extensionManager.marks,
     });
-    const markdown = serializer.serialize(Node.fromJSON(schema, this.data));
+    const markdown = serializer.serialize(Node.fromJSON(schema, this.data), {
+      softBreak: true,
+    });
     return markdown;
   };
 

app/models/FileOperation.ts

@@ -1,5 +1,9 @@
 import { computed, observable } from "mobx";
-import { FileOperationFormat, FileOperationType } from "@shared/types";
+import {
+  FileOperationFormat,
+  FileOperationState,
+  FileOperationType,
+} from "@shared/types";
 import { bytesToHumanReadable } from "@shared/utils/files";
 import User from "./User";
 import Model from "./base/Model";
@@ -10,7 +14,7 @@ class FileOperation extends Model {
   id: string;
 
   @observable
-  state: string;
+  state: FileOperationState;
 
   name: string;
 

app/models/Share.ts

@@ -55,6 +55,10 @@ class Share extends Model {
   @observable
   url: string;
 
+  @Field
+  @observable
+  allowIndexing: boolean;
+
   /** The user that shared the document. */
   @Relation(() => User, { onDelete: "null" })
   createdBy: User;

app/models/User.ts

@@ -11,6 +11,7 @@ import {
   UserRole,
 } from "@shared/types";
 import type { NotificationSettings } from "@shared/types";
+import { locales } from "@shared/utils/date";
 import { client } from "~/utils/ApiClient";
 import Document from "./Document";
 import Group from "./Group";
@@ -39,7 +40,7 @@ class User extends ParanoidModel {
 
   @Field
   @observable
-  language: string;
+  language: keyof typeof locales;
 
   @Field
   @observable
@@ -49,6 +50,10 @@ class User extends ParanoidModel {
   @observable
   notificationSettings: NotificationSettings;
 
+  @Field
+  @observable
+  timezone?: string;
+
   @observable
   email: string;
 

app/models/base/ArchivableModel.ts

@@ -0,0 +1,7 @@
+import { observable } from "mobx";
+import ParanoidModel from "./ParanoidModel";
+
+export default abstract class ArchivableModel extends ParanoidModel {
+  @observable
+  archivedAt: string | null;
+}

app/models/base/Model.ts

@@ -40,6 +40,7 @@ export default abstract class Model {
    * @returns A promise that resolves when loading is complete.
    */
   async loadRelations(
+    this: Model,
     options: { withoutPolicies?: boolean } = {}
   ): Promise<any> {
     const relations = getRelationsForModelClass(
@@ -62,7 +63,7 @@ export default abstract class Model {
       if ("fetch" in store) {
         const id = this[properties.idKey];
         if (id) {
-          promises.push(store.fetch(id));
+          promises.push(store.fetch(id as string));
         }
       }
     }
@@ -145,6 +146,7 @@ export default abstract class Model {
         if (key === "initialized") {
           continue;
         }
+        // @ts-expect-error TODO
         this[key] = data[key];
       } catch (error) {
         Logger.warn(`Error setting ${key} on model`, error);

app/models/decorators/Relation.ts

@@ -3,17 +3,21 @@ import type Model from "../base/Model";
 
 /** The behavior of a relationship on deletion */
 type DeleteBehavior = "cascade" | "null" | "ignore";
+/** The behavior of a relationship on archival */
+type ArchiveBehavior = "cascade" | "null" | "ignore";
 
 type RelationOptions<T = Model> = {
   /** Whether this relation is required. */
   required?: boolean;
   /** Behavior of this model when relationship is deleted. */
-  onDelete: DeleteBehavior | ((item: T) => DeleteBehavior);
+  onDelete?: DeleteBehavior | ((item: T) => DeleteBehavior);
+  /** Behavior of this model when relationship is archived. */
+  onArchive?: ArchiveBehavior | ((item: T) => ArchiveBehavior);
 };
 
 type RelationProperties<T = Model> = {
   /** The name of the property on the model that stores the ID of the relation. */
-  idKey: string;
+  idKey: keyof T;
   /** A function that returns the class of the relation. */
   relationClassResolver: () => typeof Model;
   /** Options for the relation. */

app/scenes/ApiKeyNew/index.tsx

@@ -112,7 +112,7 @@ function ApiKeyNew({ onSubmit }: Props) {
             value={expiryType}
             options={expiryOptions}
             onChange={handleExpiryTypeChange}
-            skipBodyScroll={true}
+            skipBodyScroll
           />
           {expiryType === ExpiryType.Custom ? (
             <ExpiryDatePicker

app/scenes/Collection/components/MembershipPreview.tsx

@@ -43,8 +43,12 @@ const MembershipPreview = ({ collection, limit = 8 }: Props) => {
           memberships.fetchPage(options),
           groupMemberships.fetchPage(options),
         ]);
-        setUsersCount(users[PAGINATION_SYMBOL].total);
-        setGroupsCount(groups[PAGINATION_SYMBOL].total);
+        if (users[PAGINATION_SYMBOL]) {
+          setUsersCount(users[PAGINATION_SYMBOL].total);
+        }
+        if (groups[PAGINATION_SYMBOL]) {
+          setGroupsCount(groups[PAGINATION_SYMBOL].total);
+        }
       } finally {
         setIsLoading(false);
       }

app/scenes/Collection/components/Notices.tsx

@@ -0,0 +1,29 @@
+import { ArchiveIcon } from "outline-icons";
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import Collection from "~/models/Collection";
+import ErrorBoundary from "~/components/ErrorBoundary";
+import Notice from "~/components/Notice";
+import Time from "~/components/Time";
+
+type Props = {
+  collection: Collection;
+};
+
+export default function Notices({ collection }: Props) {
+  const { t } = useTranslation();
+
+  return (
+    <ErrorBoundary>
+      {collection.isArchived && !collection.isDeleted && (
+        <Notice icon={<ArchiveIcon />}>
+          {t("Archived by {{userName}}", {
+            userName: collection.archivedBy?.name ?? t("Unknown"),
+          })}
+          &nbsp;
+          <Time dateTime={collection.archivedAt} addSuffix />
+        </Notice>
+      )}
+    </ErrorBoundary>
+  );
+}

app/scenes/Collection/index.tsx

@@ -13,11 +13,13 @@ import {
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import { s } from "@shared/styles";
+import { StatusFilter } from "@shared/types";
 import { colorPalette } from "@shared/utils/collections";
 import Collection from "~/models/Collection";
 import Search from "~/scenes/Search";
 import { Action } from "~/components/Actions";
 import CenteredContent from "~/components/CenteredContent";
+import { CollectionBreadcrumb } from "~/components/CollectionBreadcrumb";
 import CollectionDescription from "~/components/CollectionDescription";
 import Heading from "~/components/Heading";
 import Icon, { IconTitleWrapper } from "~/components/Icon";
@@ -28,6 +30,7 @@ import PaginatedDocumentList from "~/components/PaginatedDocumentList";
 import PinnedDocuments from "~/components/PinnedDocuments";
 import PlaceholderText from "~/components/PlaceholderText";
 import Scene from "~/components/Scene";
+import Subheading from "~/components/Subheading";
 import Tab from "~/components/Tab";
 import Tabs from "~/components/Tabs";
 import { editCollection } from "~/actions/definitions/collections";
@@ -41,6 +44,7 @@ import Actions from "./components/Actions";
 import DropToImport from "./components/DropToImport";
 import Empty from "./components/Empty";
 import MembershipPreview from "./components/MembershipPreview";
+import Notices from "./components/Notices";
 import ShareButton from "./components/ShareButton";
 
 const IconPicker = React.lazy(() => import("~/components/IconPicker"));
@@ -132,7 +136,9 @@ function CollectionScene() {
       centered={false}
       textTitle={collection.name}
       left={
-        collection.isEmpty ? undefined : (
+        collection.isArchived ? (
+          <CollectionBreadcrumb collection={collection} />
+        ) : collection.isEmpty ? undefined : (
           <InputSearchPage
             source="collection"
             placeholder={`${t("Search in collection")}…`}
@@ -163,6 +169,7 @@ function CollectionScene() {
         collectionId={collection.id}
       >
         <CenteredContent withStickyHeader>
+          <Notices collection={collection} />
           <CollectionHeading>
             <IconTitleWrapper>
               {can.update ? (
@@ -192,26 +199,28 @@ function CollectionScene() {
           <CollectionDescription collection={collection} />
 
           <Documents>
-            <Tabs>
-              <Tab to={collectionPath(collection.path)} exact>
-                {t("Documents")}
-              </Tab>
-              <Tab to={collectionPath(collection.path, "updated")} exact>
-                {t("Recently updated")}
-              </Tab>
-              <Tab to={collectionPath(collection.path, "published")} exact>
-                {t("Recently published")}
-              </Tab>
-              <Tab to={collectionPath(collection.path, "old")} exact>
-                {t("Least recently updated")}
-              </Tab>
-              <Tab to={collectionPath(collection.path, "alphabetical")} exact>
-                {t("A–Z")}
-              </Tab>
-            </Tabs>
+            {!collection.isArchived && (
+              <Tabs>
+                <Tab to={collectionPath(collection.path)} exact>
+                  {t("Documents")}
+                </Tab>
+                <Tab to={collectionPath(collection.path, "updated")} exact>
+                  {t("Recently updated")}
+                </Tab>
+                <Tab to={collectionPath(collection.path, "published")} exact>
+                  {t("Recently published")}
+                </Tab>
+                <Tab to={collectionPath(collection.path, "old")} exact>
+                  {t("Least recently updated")}
+                </Tab>
+                <Tab to={collectionPath(collection.path, "alphabetical")} exact>
+                  {t("A–Z")}
+                </Tab>
+              </Tabs>
+            )}
             {collection.isEmpty ? (
               <Empty collection={collection} />
-            ) : (
+            ) : !collection.isArchived ? (
               <Switch>
                 <Route path={collectionPath(collection.path, "alphabetical")}>
                   <PaginatedDocumentList
@@ -279,6 +288,24 @@ function CollectionScene() {
                   />
                 </Route>
               </Switch>
+            ) : (
+              <Switch>
+                <Route path={collectionPath(collection.path)} exact>
+                  <PaginatedDocumentList
+                    documents={documents.archivedInCollection(collection.id)}
+                    fetch={documents.fetchPage}
+                    heading={<Subheading sticky>{t("Documents")}</Subheading>}
+                    options={{
+                      collectionId: collection.id,
+                      parentDocumentId: null,
+                      sort: collection.sort.field,
+                      direction: collection.sort.direction,
+                      statusFilter: [StatusFilter.Archived],
+                    }}
+                    showParentDocuments
+                  />
+                </Route>
+              </Switch>
             )}
           </Documents>
         </CenteredContent>

app/scenes/Document/Shared.tsx

@@ -172,7 +172,8 @@ function SharedDocumentScene(props: Props) {
     }
   }
 
-  if (!response) {
+  // Note: `sharedTree` will be null when `includeChildDocuments` = false
+  if (response?.sharedTree === undefined) {
     return <Loading location={props.location} />;
   }
 

app/scenes/Document/components/CommentEditor.tsx

@@ -1,3 +1,4 @@
+import { observer } from "mobx-react";
 import * as React from "react";
 import { basicExtensions, withComments } from "@shared/editor/nodes";
 import HardBreak from "@shared/editor/nodes/HardBreak";
@@ -36,4 +37,4 @@ const CommentEditor = (
   );
 };
 
-export default React.forwardRef(CommentEditor);
+export default observer(React.forwardRef(CommentEditor));

app/scenes/Document/components/CommentForm.tsx

@@ -109,6 +109,7 @@ function CommentForm({
           createdAt: new Date().toISOString(),
           documentId,
           data: draft,
+          reactions: [],
         },
         comments
       );
@@ -144,6 +145,7 @@ function CommentForm({
         parentCommentId: thread?.id,
         documentId,
         data: draft,
+        reactions: [],
       },
       comments
     );

app/scenes/Document/components/CommentSortMenu.tsx

@@ -0,0 +1,86 @@
+import queryString from "query-string";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { useHistory, useLocation } from "react-router-dom";
+import styled from "styled-components";
+import { s } from "@shared/styles";
+import { UserPreference } from "@shared/types";
+import InputSelect from "~/components/InputSelect";
+import useCurrentUser from "~/hooks/useCurrentUser";
+import useQuery from "~/hooks/useQuery";
+import { CommentSortType } from "~/types";
+
+const CommentSortMenu = () => {
+  const { t } = useTranslation();
+  const location = useLocation();
+  const history = useHistory();
+  const user = useCurrentUser();
+  const params = useQuery();
+
+  const viewingResolved = params.get("resolved") === "";
+  const value = viewingResolved
+    ? "resolved"
+    : user.getPreference(UserPreference.SortCommentsByOrderInDocument)
+    ? CommentSortType.OrderInDocument
+    : CommentSortType.MostRecent;
+
+  const handleSortTypeChange = (type: CommentSortType) => {
+    user.setPreference(
+      UserPreference.SortCommentsByOrderInDocument,
+      type === CommentSortType.OrderInDocument
+    );
+    void user.save();
+  };
+
+  const showResolved = () => {
+    history.push({
+      search: queryString.stringify({
+        ...queryString.parse(location.search),
+        resolved: "",
+      }),
+      pathname: location.pathname,
+    });
+  };
+
+  const showUnresolved = () => {
+    history.push({
+      search: queryString.stringify({
+        ...queryString.parse(location.search),
+        resolved: undefined,
+      }),
+      pathname: location.pathname,
+    });
+  };
+
+  return (
+    <Select
+      style={{ margin: 0 }}
+      ariaLabel={t("Sort comments")}
+      value={value}
+      onChange={(ev) => {
+        if (ev === "resolved") {
+          showResolved();
+        } else {
+          handleSortTypeChange(ev as CommentSortType);
+          showUnresolved();
+        }
+      }}
+      borderOnHover
+      options={[
+        { value: CommentSortType.MostRecent, label: t("Most recent") },
+        { value: CommentSortType.OrderInDocument, label: t("Order in doc") },
+        {
+          divider: true,
+          value: "resolved",
+          label: t("Resolved"),
+        },
+      ]}
+    />
+  );
+};
+
+const Select = styled(InputSelect)`
+  color: ${s("textSecondary")};
+`;
+
+export default CommentSortMenu;

app/scenes/Document/components/CommentThread.tsx

@@ -36,12 +36,16 @@ type Props = {
   focused: boolean;
   /** Whether the thread is displayed in a recessed/backgrounded state */
   recessed: boolean;
+  /** Enable scroll for the comments container */
+  enableScroll: () => void;
+  /** Disable scroll for the comments container */
+  disableScroll: () => void;
 };
 
 function useTypingIndicator({
   document,
   comment,
-}: Omit<Props, "focused" | "recessed">): [undefined, () => void] {
+}: Pick<Props, "document" | "comment">): [undefined, () => void] {
   const socket = React.useContext(WebsocketContext);
 
   const setIsTyping = React.useMemo(
@@ -63,6 +67,8 @@ function CommentThread({
   document,
   recessed,
   focused,
+  enableScroll,
+  disableScroll,
 }: Props) {
   const [focusedOnMount] = React.useState(focused);
   const { editor } = useDocumentContext();
@@ -80,6 +86,8 @@ function CommentThread({
   });
   const can = usePolicy(document);
 
+  const canReply = can.comment && !thread.isResolved;
+
   const highlightedCommentMarks = editor
     ?.getComments()
     .filter((comment) => comment.id === thread.id);
@@ -92,7 +100,8 @@ function CommentThread({
   useOnClickOutside(topRef, (event) => {
     if (
       focused &&
-      !(event.target as HTMLElement).classList.contains("comment")
+      !(event.target as HTMLElement).classList.contains("comment") &&
+      event.defaultPrevented === false
     ) {
       history.replace({
         search: location.search,
@@ -105,7 +114,7 @@ function CommentThread({
   const handleClickThread = () => {
     history.replace({
       // Clear any commentId from the URL when explicitly focusing a thread
-      search: "",
+      search: thread.isResolved ? "resolved=" : "",
       pathname: location.pathname.replace(/\/history$/, ""),
       state: { commentId: thread.id },
     });
@@ -190,8 +199,8 @@ function CommentThread({
           <CommentThreadItem
             highlightedText={index === 0 ? highlightedText : undefined}
             comment={comment}
-            onDelete={() => editor?.removeComment(comment.id)}
-            onUpdate={(attrs) => editor?.updateComment(comment.id, attrs)}
+            onDelete={editor?.removeComment}
+            onUpdate={editor?.updateComment}
             key={comment.id}
             firstOfThread={index === 0}
             lastOfThread={index === commentsInThread.length - 1 && !draft}
@@ -200,6 +209,8 @@ function CommentThread({
             lastOfAuthor={lastOfAuthor}
             previousCommentCreatedAt={commentsInThread[index - 1]?.createdAt}
             dir={document.dir}
+            enableScroll={enableScroll}
+            disableScroll={disableScroll}
           />
         );
       })}
@@ -214,7 +225,7 @@ function CommentThread({
         ))}
 
       <ResizingHeightContainer hideOverflow={false} ref={replyRef}>
-        {(focused || draft || commentsInThread.length === 0) && can.comment && (
+        {(focused || draft || commentsInThread.length === 0) && canReply && (
           <Fade timing={100}>
             <CommentForm
               onSaveDraft={onSaveDraft}
@@ -232,7 +243,7 @@ function CommentThread({
           </Fade>
         )}
       </ResizingHeightContainer>
-      {!focused && !recessed && !draft && can.comment && (
+      {!focused && !recessed && !draft && canReply && (
         <Reply onClick={() => setAutoFocus(true)}>{t("Reply")}…</Reply>
       )}
     </Thread>

app/scenes/Document/components/CommentThreadItem.tsx

@@ -1,5 +1,5 @@
 import { differenceInMilliseconds } from "date-fns";
-import { toJS } from "mobx";
+import { action } from "mobx";
 import { observer } from "mobx-react";
 import { darken } from "polished";
 import * as React from "react";
@@ -16,9 +16,12 @@ import Comment from "~/models/Comment";
 import { Avatar } from "~/components/Avatar";
 import ButtonSmall from "~/components/ButtonSmall";
 import Flex from "~/components/Flex";
+import ReactionList from "~/components/Reactions/ReactionList";
+import ReactionPicker from "~/components/Reactions/ReactionPicker";
 import Text from "~/components/Text";
 import Time from "~/components/Time";
 import useBoolean from "~/hooks/useBoolean";
+import useCurrentUser from "~/hooks/useCurrentUser";
 import CommentMenu from "~/menus/CommentMenu";
 import { hover } from "~/styles";
 import CommentEditor from "./CommentEditor";
@@ -76,11 +79,15 @@ type Props = {
   /** Whether the user can reply in the thread */
   canReply: boolean;
   /** Callback when the comment has been deleted */
-  onDelete: () => void;
+  onDelete?: (id: string) => void;
   /** Callback when the comment has been updated */
-  onUpdate: (attrs: { resolved: boolean }) => void;
+  onUpdate?: (id: string, attrs: { resolved: boolean }) => void;
   /** Text to highlight at the top of the comment */
   highlightedText?: string;
+  /** Enable scroll for the comments container */
+  enableScroll: () => void;
+  /** Disable scroll for the comments container */
+  disableScroll: () => void;
 };
 
 function CommentThreadItem({
@@ -94,10 +101,12 @@ function CommentThreadItem({
   onDelete,
   onUpdate,
   highlightedText,
+  enableScroll,
+  disableScroll,
 }: Props) {
   const { t } = useTranslation();
-  const [forceRender, setForceRender] = React.useState(0);
-  const [data, setData] = React.useState(toJS(comment.data));
+  const user = useCurrentUser();
+  const [data, setData] = React.useState(comment.data);
   const showAuthor = firstOfAuthor;
   const showTime = useShowTime(comment.createdAt, previousCommentCreatedAt);
   const showEdited =
@@ -107,41 +116,62 @@ function CommentThreadItem({
   const [isEditing, setEditing, setReadOnly] = useBoolean();
   const formRef = React.useRef<HTMLFormElement>(null);
 
-  const handleChange = (value: (asString: boolean) => ProsemirrorData) => {
-    setData(value(false));
-  };
+  const handleAddReaction = React.useCallback(
+    async (emoji: string) => {
+      await comment.addReaction({ emoji, user });
+    },
+    [comment, user]
+  );
 
-  const handleSave = () => {
+  const handleRemoveReaction = React.useCallback(
+    async (emoji: string) => {
+      await comment.removeReaction({ emoji, user });
+    },
+    [comment, user]
+  );
+
+  const handleUpdate = React.useCallback(
+    (attrs: { resolved: boolean }) => {
+      onUpdate?.(comment.id, attrs);
+    },
+    [comment.id, onUpdate]
+  );
+
+  const handleDelete = React.useCallback(() => {
+    onDelete?.(comment.id);
+  }, [comment.id, onDelete]);
+
+  const handleChange = React.useCallback(
+    (value: (asString: boolean) => ProsemirrorData) => {
+      setData(value(false));
+    },
+    []
+  );
+
+  const handleSave = React.useCallback(() => {
     formRef.current?.dispatchEvent(
       new Event("submit", { cancelable: true, bubbles: true })
     );
-  };
+  }, []);
 
-  const handleSubmit = async (event: React.FormEvent) => {
+  const handleSubmit = action(async (event: React.FormEvent) => {
     event.preventDefault();
 
     try {
       setReadOnly();
-      await comment.save({
-        data,
-      });
+      comment.data = data;
+      await comment.save();
     } catch (error) {
       setEditing();
       toast.error(t("Error updating comment"));
     }
-  };
+  });
 
   const handleCancel = () => {
-    setData(toJS(comment.data));
+    setData(comment.data);
     setReadOnly();
-    setForceRender((i) => ++i);
   };
 
-  React.useEffect(() => {
-    setData(toJS(comment.data));
-    setForceRender((i) => ++i);
-  }, [comment.data]);
-
   return (
     <Flex gap={8} align="flex-start" reverse={dir === "rtl"}>
       {firstOfAuthor && (
@@ -186,8 +216,9 @@ function CommentThreadItem({
         )}
         <Body ref={formRef} onSubmit={handleSubmit}>
           <StyledCommentEditor
-            key={`${forceRender}`}
+            key={String(isEditing)}
             readOnly={!isEditing}
+            value={comment.data}
             defaultValue={data}
             onChange={handleChange}
             onSave={handleSave}
@@ -203,16 +234,43 @@ function CommentThreadItem({
               </ButtonSmall>
             </Flex>
           )}
+          {!!comment.reactions.length && (
+            <ReactionListContainer gap={6} align="center">
+              <ReactionList
+                model={comment}
+                onAddReaction={handleAddReaction}
+                onRemoveReaction={handleRemoveReaction}
+                picker={
+                  !comment.isResolved ? (
+                    <StyledReactionPicker
+                      onSelect={handleAddReaction}
+                      onOpen={disableScroll}
+                      onClose={enableScroll}
+                      size={28}
+                    />
+                  ) : undefined
+                }
+              />
+            </ReactionListContainer>
+          )}
         </Body>
         <EventBoundary>
           {!isEditing && (
-            <Menu
-              comment={comment}
-              onEdit={setEditing}
-              onDelete={onDelete}
-              onUpdate={onUpdate}
-              dir={dir}
-            />
+            <Actions gap={4} dir={dir}>
+              {!comment.isResolved && (
+                <StyledReactionPicker
+                  onSelect={handleAddReaction}
+                  onOpen={disableScroll}
+                  onClose={enableScroll}
+                />
+              )}
+              <StyledMenu
+                comment={comment}
+                onEdit={setEditing}
+                onDelete={handleDelete}
+                onUpdate={handleUpdate}
+              />
+            </Actions>
           )}
         </EventBoundary>
       </Bubble>
@@ -250,21 +308,59 @@ const Body = styled.form`
   border-radius: 2px;
 `;
 
-const Menu = styled(CommentMenu)<{ dir?: "rtl" | "ltr" }>`
+const StyledMenu = styled(CommentMenu)`
+  color: ${s("textSecondary")};
+
+  svg {
+    fill: currentColor;
+    opacity: 0.5;
+  }
+
+  &: ${hover}, &[aria-expanded= "true"] {
+    background: ${s("backgroundQuaternary")};
+
+    svg {
+      opacity: 0.75;
+    }
+  }
+`;
+
+const StyledReactionPicker = styled(ReactionPicker)`
+  color: ${s("textSecondary")};
+
+  svg {
+    fill: currentColor;
+    opacity: 0.5;
+  }
+
+  &: ${hover}, &[aria-expanded= "true"] {
+    background: ${s("backgroundQuaternary")};
+
+    svg {
+      opacity: 0.75;
+    }
+  }
+`;
+
+const Actions = styled(Flex)<{ dir?: "rtl" | "ltr" }>`
   position: absolute;
   left: ${(props) => (props.dir !== "rtl" ? "auto" : "4px")};
   right: ${(props) => (props.dir === "rtl" ? "auto" : "4px")};
   top: 4px;
   opacity: 0;
   transition: opacity 100ms ease-in-out;
-  color: ${s("textSecondary")};
+  background: ${s("backgroundSecondary")};
+  padding-left: 4px;
 
-  &: ${hover}, &[aria-expanded= "true"] {
+  &:has(${StyledReactionPicker}[aria-expanded="true"], ${StyledMenu}[aria-expanded="true"]) {
     opacity: 1;
-    background: ${s("sidebarActiveBackground")};
   }
 `;
 
+const ReactionListContainer = styled(Flex)`
+  margin-top: 6px;
+`;
+
 const Meta = styled(Text)`
   margin-bottom: 2px;
 
@@ -286,7 +382,7 @@ export const Bubble = styled(Flex)<{
   flex-grow: 1;
   font-size: 16px;
   color: ${s("text")};
-  background: ${s("commentBackground")};
+  background: ${s("backgroundSecondary")};
   min-width: 2em;
   margin-bottom: 1px;
   padding: 8px 12px;
@@ -310,7 +406,7 @@ export const Bubble = styled(Flex)<{
     margin-bottom: 0;
   }
 
-  &: ${hover} ${Menu} {
+  &: ${hover} ${Actions} {
     opacity: 1;
   }