chore: Add application name to pg connection

fix: unable to delete the last character before a inline image (#10759 )
Rename ActionV2 to Action (#10770 )
2026-06-13 19:35:02 +03:00 · 2025-12-03 18:48:13 -05:00 · 2025-12-03 23:20:10 +00:00 · 2025-12-03 18:16:36 -05:00 · 2025-12-03 18:09:43 -05:00 · 2025-12-02 21:13:16 -05:00
435 changed files with 12665 additions and 6252 deletions
@@ -1,6 +1,7 @@
 {
  "workerIdleMemoryLimit": "0.75",
  "maxWorkers": "50%",
+  "transformIgnorePatterns": ["node_modules/(?!(franc|trigram-utils)/)"],
  "projects": [
    {
      "displayName": "server",
@@ -0,0 +1,192 @@
+Outline is a fast, collaborative knowledge base built for teams. It's built with React and TypeScript in both frontend and backend, uses a real-time collaboration engine, and is designed for excellent performance and user experience. The backend is a Koa server with an RPC API and uses PostgreSQL and Redis. The application can be self-hosted or used as a cloud service.
+
+There is a web client which is fully responsive and works on mobile devices.
+
+**Monorepo Structure:**
+
+- **`app/`** - React web application with MobX state management
+- **`server/`** - Koa API server with Sequelize ORM and background workers
+- **`shared/`** - Shared TypeScript types, utilities, and editor components
+- **`plugins/`** - Plugin system for extending functionality
+- **`public/`** - Static assets served directly
+- **Various config files** - TypeScript, Vite, Jest, Prettier, Oxlint configurations
+
+Refer to /docs/ARCHITECTURE.md for detailed architecture documentation.
+
+## Instructions
+
+You're an expert in the following areas:
+
+- TypeScript
+- React and React Router
+- MobX and MobX-React
+- Node.js and Koa
+- Sequelize ORM
+- PostgreSQL
+- Redis
+- HTML, CSS and Styled Components
+- Prosemirror (rich text editor)
+- WebSockets and real-time collaboration
+
+## General Guidelines
+
+- Use early returns for readability.
+- Emphasize type safety and static analysis.
+- Follow consistent Prettier formatting.
+- Do not replace smart quotes ("") or ('') with simple quotes ("").
+
+## Dependencies and Upgrading
+
+- Use yarn for all dependency management.
+- After updating dependency versions, install to update lockfiles:
+
+```bash
+yarn install
+```
+
+## TypeScript Usage
+
+- Use strict mode.
+- Avoid "unknown" unless absolutely necessary.
+- Never use "any".
+- Prefer type definitions; avoid type assertions (as, !).
+- Always use curly braces for if statements.
+- Avoid # for private properties.
+- Prefer interface over type for object shapes.
+
+## Classes & Code Organization
+
+### Class Member Order
+
+1. Public static variables
+2. Public static methods
+3. Public variables
+4. Public methods
+6. Protected variables & methods
+8. Private variables & methods
+
+### Exports
+
+- Exported members must appear at the top of the file.
+- Prefer named exports for components & classes.
+- Document ALL public/exported functions with JSDoc.
+
+## React Usage
+
+- Use functional components with hooks.
+- Event handlers should be prefixed with "handle", like "handleClick" for onClick.
+- Avoid unnecessary re-renders by using React.memo, useMemo, and useCallback appropriately.
+- Use descriptive prop types with TypeScript interfaces.
+- You do not need to import React unless it is used directly.
+- Use styled-components for component styling.
+- Ensure high accessibility (a11y) standards using ARIA roles and semantic HTML.
+
+## MobX State Management
+
+- Use MobX stores for global state management.
+- Keep stores in `app/stores/`.
+- Use `observable`, `action`, and `computed` decorators appropriately.
+- Prefer computed values over manual calculations in render.
+- Keep business logic in stores, not components.
+
+## Database & ORM
+
+- Use Sequelize models in `server/models/`.
+- Generate migrations with Sequelize CLI:
+
+```bash
+yarn sequelize migration:create --name=add-field-to-table
+```
+
+- Run migrations with `yarn db:migrate`.
+- Use transactions for multi-table operations.
+- Add appropriate indexes for query performance.
+- Always handle database errors gracefully.
+
+## API Design
+
+- RESTful endpoints under `/api/`.
+- Authentication endpoints under `/auth/`.
+- Use consistent error responses.
+- Validate request data using the validation middleware and schemas
+- Use presenters to format API responses.
+- Keep API routes thin, use model methods for business logic, or commands if logic spans multiple models.
+
+## Authentication & Authorization
+
+- JWT tokens for authentication.
+- Policies in `server/policies/` for authorization.
+- Use cancan-style ability checks.
+- Use authenticated middleware for protected routes.
+- Always verify user permissions before data access.
+
+## Real-time Collaboration
+
+- WebSocket connections for real-time updates.
+- Use Y.js for collaborative editing.
+- Handle connection state changes gracefully.
+
+## Documentation
+
+- All public/exported functions & classes must have JSDoc.
+- Include:
+  - Description
+  - @param and @return (start lowercase, end with period)
+  - @throws if applicable
+- Add a newline between the description and the @ block.
+- Use correct punctuation.
+
+## Testing
+
+- Run tests with Jest:
+
+```bash
+# Run all tests
+yarn test
+
+# Run specific test suites
+yarn test:app      # Frontend tests
+yarn test:server   # Backend tests
+yarn test:shared   # Shared code tests
+
+# Run specific test file
+yarn test path/to/test.spec.ts
+```
+
+- Write unit tests for utilities and business logic in a collocated .test.ts file.
+- Mock external dependencies appropriately in __mocks__ folder.
+- Aim for high code coverage but focus on critical paths.
+
+## Code Quality
+
+- Use Oxlint for linting: `yarn lint`
+- Format code with Prettier: `yarn format`
+- Check types with TypeScript: `yarn tsc`
+- Pre-commit hooks run automatically via Husky.
+- Fix linting issues before committing.
+
+## Error Handling
+
+- Use custom error classes in `server/errors.ts`.
+- Always catch and handle errors appropriately.
+- Log errors with appropriate context.
+- Return user-friendly error messages.
+- Never expose sensitive information in errors.
+
+## Performance
+
+- Use React.memo for expensive components.
+- Implement pagination for large lists.
+- Use database indexes effectively.
+- Cache expensive computations.
+- Monitor performance with appropriate tools.
+- Lazy load routes and components where appropriate.
+
+## Security
+
+- Sanitize all user input.
+- Use CSRF protection.
+- Use rateLimiter middleware for sensitive endpoints.
+- Follow OWASP guidelines.
+- Never store sensitive data in plain text.
+- Use environment variables for secrets.
@@ -3,7 +3,7 @@ Business Source License 1.1
 Parameters

 Licensor:             General Outline, Inc.
-Licensed Work:        Outline 1.0.1
+Licensed Work:        Outline 1.1.0
                      The Licensed Work is (c) 2025 General Outline, Inc.
 Additional Use Grant: You may make use of the Licensed Work, provided that
                      you may not use the Licensed Work for a Document
@@ -15,7 +15,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided that
                      Licensed Work by creating teams and documents
                      controlled by such third parties.

-Change Date:          2029-10-29
+Change Date:          2029-11-16

 Change License:       Apache License, Version 2.0

@@ -194,6 +194,11 @@
      "description": "Use a secure SMTP connection (optional)",
      "required": false
    },
+    "SMTP_DISABLE_STARTTLS": {
+      "value": "false",
+      "description": "Disable STARTTLS even if the server supports it (optional)",
+      "required": false
+    },
    "SMTP_TLS_CIPHERS": {
      "description": "Override SMTP cipher configuration (optional)",
      "required": false
@@ -3,7 +3,7 @@ import stores from "~/stores";
 import ApiKey from "~/models/ApiKey";
 import ApiKeyNew from "~/scenes/ApiKeyNew";
 import ApiKeyRevokeDialog from "~/scenes/Settings/components/ApiKeyRevokeDialog";
-import { createAction, createActionV2 } from "..";
+import { createAction } from "..";
 import { SettingsSection } from "../sections";

 export const createApiKey = createAction({
@@ -26,7 +26,7 @@ export const createApiKey = createAction({
 });

 export const revokeApiKeyFactory = ({ apiKey }: { apiKey: ApiKey }) =>
-  createActionV2({
+  createAction({
    name: ({ t, isMenu }) =>
      isMenu
        ? apiKey.isExpired
@@ -29,9 +29,8 @@ import DynamicCollectionIcon from "~/components/Icons/CollectionIcon";
 import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
 import {
  createAction,
-  createActionV2,
-  createActionV2WithChildren,
-  createInternalLinkActionV2,
+  createActionWithChildren,
+  createInternalLinkAction,
 } from "~/actions";
 import { ActiveCollectionSection, CollectionSection } from "~/actions/sections";
 import { setPersistedState } from "~/hooks/usePersistedState";
@@ -52,7 +51,7 @@ const SharePopover = lazyWithRetry(
  () => import("~/components/Sharing/Collection/SharePopover")
 );

-export const openCollection = createAction({
+export const openCollection = createActionWithChildren({
  name: ({ t }) => t("Open collection"),
  analyticsName: "Open collection",
  section: CollectionSection,
@@ -60,15 +59,17 @@ export const openCollection = createAction({
  icon: <CollectionIcon />,
  children: ({ stores }) => {
    const collections = stores.collections.orderedData;
-    return collections.map((collection) => ({
-      // Note: using url which includes the slug rather than id here to bust
-      // cache if the collection is renamed
-      id: collection.path,
-      name: collection.name,
-      icon: <ColorCollectionIcon collection={collection} />,
-      section: CollectionSection,
-      to: collection.path,
-    }));
+    return collections.map((collection) =>
+      createInternalLinkAction({
+        // Note: using url which includes the slug rather than id here to bust
+        // cache if the collection is renamed
+        id: collection.path,
+        name: collection.name,
+        icon: <ColorCollectionIcon collection={collection} />,
+        section: CollectionSection,
+        to: collection.path,
+      })
+    );
  },
 });

@@ -90,7 +91,7 @@ export const createCollection = createAction({
  },
 });

-export const editCollection = createActionV2({
+export const editCollection = createAction({
  name: ({ t, isMenu }) => (isMenu ? `${t("Edit")}…` : t("Edit collection")),
  analyticsName: "Edit collection",
  section: ActiveCollectionSection,
@@ -115,7 +116,7 @@ export const editCollection = createActionV2({
  },
 });

-export const editCollectionPermissions = createActionV2({
+export const editCollectionPermissions = createAction({
  name: ({ t, isMenu }) =>
    isMenu ? `${t("Permissions")}…` : t("Collection permissions"),
  analyticsName: "Collection permissions",
@@ -147,7 +148,7 @@ export const editCollectionPermissions = createActionV2({
  },
 });

-export const importDocument = createActionV2({
+export const importDocument = createAction({
  name: ({ t }) => t("Import document"),
  analyticsName: "Import document",
  section: ActiveCollectionSection,
@@ -163,7 +164,7 @@ export const importDocument = createActionV2({
    const { documents } = stores;
    const input = document.createElement("input");
    input.type = "file";
-    input.accept = documents.importFileTypes.join(", ");
+    input.accept = documents.importFileTypesString;

    input.onchange = async (ev) => {
      const files = getEventFiles(ev);
@@ -188,7 +189,7 @@ export const importDocument = createActionV2({
  },
 });

-export const sortCollection = createActionV2WithChildren({
+export const sortCollection = createActionWithChildren({
  name: ({ t }) => t("Sort in sidebar"),
  section: ActiveCollectionSection,
  visible: ({ activeCollectionId, stores }) =>
@@ -210,7 +211,7 @@ export const sortCollection = createActionV2WithChildren({
    );
  },
  children: [
-    createActionV2({
+    createAction({
      name: ({ t }) => t("A-Z sort"),
      section: ActiveCollectionSection,
      selected: ({ activeCollectionId, stores }) => {
@@ -230,7 +231,7 @@ export const sortCollection = createActionV2WithChildren({
        });
      },
    }),
-    createActionV2({
+    createAction({
      name: ({ t }) => t("Z-A sort"),
      section: ActiveCollectionSection,
      selected: ({ activeCollectionId, stores }) => {
@@ -250,7 +251,7 @@ export const sortCollection = createActionV2WithChildren({
        });
      },
    }),
-    createActionV2({
+    createAction({
      name: ({ t }) => t("Manual sort"),
      section: ActiveCollectionSection,
      selected: ({ activeCollectionId, stores }) => {
@@ -270,7 +271,7 @@ export const sortCollection = createActionV2WithChildren({
  ],
 });

-export const searchInCollection = createInternalLinkActionV2({
+export const searchInCollection = createInternalLinkAction({
  name: ({ t }) => t("Search in collection"),
  analyticsName: "Search collection",
  section: ActiveCollectionSection,
@@ -301,7 +302,7 @@ export const searchInCollection = createInternalLinkActionV2({
  },
 });

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

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

-export const subscribeCollection = createActionV2({
+export const subscribeCollection = createAction({
  name: ({ t }) => t("Subscribe"),
  analyticsName: "Subscribe to collection",
  section: ActiveCollectionSection,
@@ -385,7 +386,7 @@ export const subscribeCollection = createActionV2({
  },
 });

-export const unsubscribeCollection = createActionV2({
+export const unsubscribeCollection = createAction({
  name: ({ t }) => t("Unsubscribe"),
  analyticsName: "Unsubscribe from collection",
  section: ActiveCollectionSection,
@@ -416,7 +417,7 @@ export const unsubscribeCollection = createActionV2({
  },
 });

-export const archiveCollection = createActionV2({
+export const archiveCollection = createAction({
  name: ({ t }) => `${t("Archive")}…`,
  analyticsName: "Archive collection",
  section: ActiveCollectionSection,
@@ -457,7 +458,7 @@ export const archiveCollection = createActionV2({
  },
 });

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

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

-export const exportCollection = createActionV2({
+export const exportCollection = createAction({
  name: ({ t }) => `${t("Export")}…`,
  analyticsName: "Export collection",
  section: ActiveCollectionSection,
@@ -526,10 +527,7 @@ export const exportCollection = createActionV2({
      return false;
    }

-    return (
-      !!stores.policies.abilities(currentTeamId).createExport &&
-      !!stores.policies.abilities(activeCollectionId).export
-    );
+    return !!stores.policies.abilities(activeCollectionId).export;
  },
  perform: async ({ activeCollectionId, stores, t }) => {
    if (!activeCollectionId) {
@@ -552,7 +550,7 @@ export const exportCollection = createActionV2({
  },
 });

-export const createDocument = createInternalLinkActionV2({
+export const createDocument = createInternalLinkAction({
  name: ({ t }) => t("New document"),
  analyticsName: "New document",
  section: ActiveCollectionSection,
@@ -574,7 +572,7 @@ export const createDocument = createInternalLinkActionV2({
  },
 });

-export const createTemplate = createInternalLinkActionV2({
+export const createTemplate = createInternalLinkAction({
  name: ({ t }) => t("New template"),
  analyticsName: "New template",
  section: ActiveCollectionSection,
@@ -3,7 +3,7 @@ import { toast } from "sonner";
 import Comment from "~/models/Comment";
 import CommentDeleteDialog from "~/components/CommentDeleteDialog";
 import ViewReactionsDialog from "~/components/Reactions/ViewReactionsDialog";
-import { createActionV2 } from "..";
+import { createAction } from "..";
 import { ActiveDocumentSection } from "../sections";

 export const deleteCommentFactory = ({
@@ -13,7 +13,7 @@ export const deleteCommentFactory = ({
  comment: Comment;
  onDelete: () => void;
 }) =>
-  createActionV2({
+  createAction({
    name: ({ t }) => `${t("Delete")}…`,
    analyticsName: "Delete comment",
    section: ActiveDocumentSection,
@@ -39,7 +39,7 @@ export const resolveCommentFactory = ({
  comment: Comment;
  onResolve: () => void;
 }) =>
-  createActionV2({
+  createAction({
    name: ({ t }) => t("Mark as resolved"),
    analyticsName: "Resolve thread",
    section: ActiveDocumentSection,
@@ -61,7 +61,7 @@ export const unresolveCommentFactory = ({
  comment: Comment;
  onUnresolve: () => void;
 }) =>
-  createActionV2({
+  createAction({
    name: ({ t }) => t("Mark as unresolved"),
    analyticsName: "Unresolve thread",
    section: ActiveDocumentSection,
@@ -80,7 +80,7 @@ export const viewCommentReactionsFactory = ({
 }: {
  comment: Comment;
 }) =>
-  createActionV2({
+  createAction({
    name: ({ t }) => `${t("View reactions")}`,
    analyticsName: "View comment reactions",
    section: ActiveDocumentSection,
@@ -9,7 +9,7 @@ import {
  UserIcon,
 } from "outline-icons";
 import { toast } from "sonner";
-import { createAction } from "~/actions";
+import { createAction, createActionWithChildren } from "~/actions";
 import { DeveloperSection } from "~/actions/sections";
 import env from "~/env";
 import { client } from "~/utils/ApiClient";
@@ -19,7 +19,7 @@ import { deleteAllDatabases } from "~/utils/developer";
 import history from "~/utils/history";
 import { homePath } from "~/utils/routeHelpers";

-export const copyId = createAction({
+export const copyId = createActionWithChildren({
  name: ({ t }) => t("Copy ID"),
  icon: <CopyIcon />,
  keywords: "uuid",
@@ -191,7 +191,7 @@ export const toggleDebugSafeArea = createAction({
  },
 });

-export const toggleFeatureFlag = createAction({
+export const toggleFeatureFlag = createActionWithChildren({
  name: "Toggle feature flag",
  icon: <BeakerIcon />,
  section: DeveloperSection,
@@ -215,7 +215,7 @@ export const toggleFeatureFlag = createAction({
  ),
 });

-export const developer = createAction({
+export const developer = createActionWithChildren({
  name: ({ t }) => t("Development"),
  keywords: "debug",
  icon: <ToolsIcon />,
@@ -54,10 +54,9 @@ import { getHeaderExpandedKey } from "~/components/Sidebar/components/Header";
 import DocumentTemplatizeDialog from "~/components/TemplatizeDialog";
 import {
  createAction,
-  createActionV2,
-  createActionV2Group,
-  createActionV2WithChildren,
-  createInternalLinkActionV2,
+  createActionGroup,
+  createActionWithChildren,
+  createInternalLinkAction,
 } from "~/actions";
 import {
  ActiveDocumentSection,
@@ -80,7 +79,7 @@ import {
 } from "~/utils/routeHelpers";
 import capitalize from "lodash/capitalize";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
-import { ActionV2, ActionV2Group, ActionV2Separator } from "~/types";
+import { Action, ActionGroup, ActionSeparator } from "~/types";
 import lazyWithRetry from "~/utils/lazyWithRetry";

 const Insights = lazyWithRetry(
@@ -90,7 +89,7 @@ const SharePopover = lazyWithRetry(
  () => import("~/components/Sharing/Document/SharePopover")
 );

-export const openDocument = createAction({
+export const openDocument = createActionWithChildren({
  name: ({ t }) => t("Open document"),
  analyticsName: "Open document",
  section: DocumentSection,
@@ -104,23 +103,25 @@ export const openDocument = createAction({
    );
    const documents = stores.documents.orderedData;

-    return uniqBy([...documents, ...nodes], "id").map((item) => ({
-      // Note: using url which includes the slug rather than id here to bust
-      // cache if the document is renamed
-      id: item.url,
-      name: item.title,
-      icon: item.icon ? (
-        <Icon value={item.icon} color={item.color ?? undefined} />
-      ) : (
-        <DocumentIcon />
-      ),
-      section: DocumentSection,
-      to: item.url,
-    }));
+    return uniqBy([...documents, ...nodes], "id").map((item) =>
+      createInternalLinkAction({
+        // Note: using url which includes the slug rather than id here to bust
+        // cache if the document is renamed
+        id: item.url,
+        name: item.title,
+        icon: item.icon ? (
+          <Icon value={item.icon} color={item.color ?? undefined} />
+        ) : (
+          <DocumentIcon />
+        ),
+        section: DocumentSection,
+        to: item.url,
+      })
+    );
  },
 });

-export const editDocument = createInternalLinkActionV2({
+export const editDocument = createInternalLinkAction({
  name: ({ t }) => t("Edit"),
  analyticsName: "Edit document",
  section: ActiveDocumentSection,
@@ -152,7 +153,7 @@ export const editDocument = createInternalLinkActionV2({
  },
 });

-export const createDocument = createAction({
+export const createDocument = createInternalLinkAction({
  name: ({ t }) => t("New document"),
  analyticsName: "New document",
  section: DocumentSection,
@@ -170,13 +171,18 @@ export const createDocument = createAction({
      !!currentTeamId && stores.policies.abilities(currentTeamId).createDocument
    );
  },
-  perform: ({ activeCollectionId, sidebarContext }) =>
-    history.push(newDocumentPath(activeCollectionId), {
-      sidebarContext,
-    }),
+  to: ({ activeCollectionId, sidebarContext }) => {
+    const [pathname, search] = newDocumentPath(activeCollectionId).split("?");
+
+    return {
+      pathname,
+      search,
+      state: { sidebarContext },
+    };
+  },
 });

-export const createDraftDocument = createAction({
+export const createDraftDocument = createInternalLinkAction({
  name: ({ t }) => t("New draft"),
  analyticsName: "New document",
  section: DocumentSection,
@@ -184,13 +190,13 @@ export const createDraftDocument = createAction({
  keywords: "create document",
  visible: ({ currentTeamId, stores }) =>
    !!currentTeamId && stores.policies.abilities(currentTeamId).createDocument,
-  perform: ({ sidebarContext }) =>
-    history.push(newDocumentPath(), {
-      sidebarContext,
-    }),
+  to: ({ sidebarContext }) => ({
+    pathname: newDocumentPath(),
+    state: { sidebarContext },
+  }),
 });

-export const createDocumentFromTemplate = createInternalLinkActionV2({
+export const createDocumentFromTemplate = createInternalLinkAction({
  name: ({ t }) => t("New from template"),
  analyticsName: "New document",
  section: DocumentSection,
@@ -237,7 +243,7 @@ export const createDocumentFromTemplate = createInternalLinkActionV2({
  },
 });

-export const createNestedDocument = createInternalLinkActionV2({
+export const createNestedDocument = createInternalLinkAction({
  name: ({ t }) => t("New nested document"),
  analyticsName: "New document",
  section: ActiveDocumentSection,
@@ -260,7 +266,7 @@ export const createNestedDocument = createInternalLinkActionV2({
  },
 });

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

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

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

-export const unpublishDocument = createActionV2({
+export const unpublishDocument = createAction({
  name: ({ t }) => t("Unpublish"),
  analyticsName: "Unpublish document",
  section: ActiveDocumentSection,
@@ -385,7 +391,7 @@ export const unpublishDocument = createActionV2({
  },
 });

-export const subscribeDocument = createActionV2({
+export const subscribeDocument = createAction({
  name: ({ t }) => t("Subscribe"),
  analyticsName: "Subscribe to document",
  section: ActiveDocumentSection,
@@ -431,7 +437,7 @@ export const subscribeDocument = createActionV2({
  },
 });

-export const unsubscribeDocument = createActionV2({
+export const unsubscribeDocument = createAction({
  name: ({ t }) => t("Unsubscribe"),
  analyticsName: "Unsubscribe from document",
  section: ActiveDocumentSection,
@@ -479,7 +485,7 @@ export const unsubscribeDocument = createActionV2({
  },
 });

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

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

-export const downloadDocumentAsPDF = createActionV2({
+export const downloadDocumentAsPDF = createAction({
  name: ({ t }) => t("PDF"),
  analyticsName: "Download document as PDF",
  section: ActiveDocumentSection,
@@ -557,7 +563,7 @@ export const downloadDocumentAsPDF = createActionV2({
  },
 });

-export const downloadDocumentAsMarkdown = createActionV2({
+export const downloadDocumentAsMarkdown = createAction({
  name: ({ t }) => t("Markdown"),
  analyticsName: "Download document as Markdown",
  section: ActiveDocumentSection,
@@ -576,7 +582,7 @@ export const downloadDocumentAsMarkdown = createActionV2({
  },
 });

-export const downloadDocument = createActionV2WithChildren({
+export const downloadDocument = createActionWithChildren({
  name: ({ t, isMenu }) => (isMenu ? t("Download") : t("Download document")),
  analyticsName: "Download document",
  section: ActiveDocumentSection,
@@ -591,7 +597,7 @@ export const downloadDocument = createActionV2WithChildren({
  ],
 });

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

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

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

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

-export const copyDocument = createActionV2WithChildren({
+export const copyDocument = createActionWithChildren({
  name: ({ t }) => t("Copy"),
  analyticsName: "Copy document",
  section: ActiveDocumentSection,
@@ -688,7 +694,7 @@ export const copyDocument = createActionV2WithChildren({
  ],
 });

-export const duplicateDocument = createActionV2({
+export const duplicateDocument = createAction({
  name: ({ t, isMenu }) => (isMenu ? t("Duplicate") : t("Duplicate document")),
  analyticsName: "Duplicate document",
  section: ActiveDocumentSection,
@@ -723,7 +729,7 @@ export const duplicateDocument = createActionV2({
 * Pin a document to a collection. Pinned documents will be displayed at the top
 * of the collection for all collection members to see.
 */
-export const pinDocumentToCollection = createActionV2({
+export const pinDocumentToCollection = createAction({
  name: ({ activeDocumentId = "", t, stores }) => {
    const selectedDocument = stores.documents.get(activeDocumentId);
    const collectionName = selectedDocument
@@ -768,7 +774,7 @@ export const pinDocumentToCollection = createActionV2({
 * Pin a document to team home. Pinned documents will be displayed at the top
 * of the home screen for all team members to see.
 */
-export const pinDocumentToHome = createActionV2({
+export const pinDocumentToHome = createAction({
  name: ({ t }) => t("Pin to home"),
  analyticsName: "Pin document to home",
  section: ActiveDocumentSection,
@@ -800,7 +806,7 @@ export const pinDocumentToHome = createActionV2({
  },
 });

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

-export const searchInDocument = createInternalLinkActionV2({
+export const searchInDocument = createInternalLinkAction({
  name: ({ t }) => t("Search in document"),
  analyticsName: "Search document",
  section: ActiveDocumentSection,
@@ -838,7 +844,7 @@ export const searchInDocument = createInternalLinkActionV2({
  },
 });

-export const printDocument = createActionV2({
+export const printDocument = createAction({
  name: ({ t, isMenu }) => (isMenu ? t("Print") : t("Print document")),
  analyticsName: "Print document",
  section: ActiveDocumentSection,
@@ -849,7 +855,7 @@ export const printDocument = createActionV2({
  },
 });

-export const importDocument = createActionV2({
+export const importDocument = createAction({
  name: ({ t }) => t("Import document"),
  analyticsName: "Import document",
  section: DocumentSection,
@@ -870,7 +876,7 @@ export const importDocument = createActionV2({
    const { documents } = stores;
    const input = document.createElement("input");
    input.type = "file";
-    input.accept = documents.importFileTypes.join(", ");
+    input.accept = documents.importFileTypesString;

    input.onchange = async (ev) => {
      const files = getEventFiles(ev);
@@ -895,7 +901,7 @@ export const importDocument = createActionV2({
  },
 });

-export const createTemplateFromDocument = createActionV2({
+export const createTemplateFromDocument = createAction({
  name: ({ t }) => t("Templatize"),
  analyticsName: "Templatize document",
  section: ActiveDocumentSection,
@@ -946,7 +952,7 @@ export const openRandomDocument = createAction({
 });

 export const searchDocumentsForQuery = (query: string) =>
-  createAction({
+  createInternalLinkAction({
    id: "search",
    name: ({ t }) =>
      t(`Search documents for "{{searchQuery}}"`, { searchQuery: query }),
@@ -957,7 +963,7 @@ export const searchDocumentsForQuery = (query: string) =>
    visible: ({ location }) => location.pathname !== searchPath(),
  });

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

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

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

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

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

-export const restoreDocument = createActionV2({
+export const restoreDocument = createAction({
  name: ({ t }) => `${t("Restore")}`,
  analyticsName: "Restore document",
  section: ActiveDocumentSection,
@@ -1142,7 +1148,7 @@ export const restoreDocument = createActionV2({
  },
 });

-export const restoreDocumentToCollection = createActionV2WithChildren({
+export const restoreDocumentToCollection = createActionWithChildren({
  name: ({ t }) => `${t("Restore")}…`,
  analyticsName: "Restore document",
  section: ActiveDocumentSection,
@@ -1177,7 +1183,7 @@ export const restoreDocumentToCollection = createActionV2WithChildren({

    const actions = collections.orderedData.map((collection) => {
      const can = policies.abilities(collection.id);
-      return createActionV2({
+      return createAction({
        name: collection.name,
        section: ActiveDocumentSection,
        icon: <CollectionIcon collection={collection} />,
@@ -1193,11 +1199,11 @@ export const restoreDocumentToCollection = createActionV2WithChildren({
      });
    });

-    return [createActionV2Group({ name: t("Choose a collection"), actions })];
+    return [createActionGroup({ name: t("Choose a collection"), actions })];
  },
 });

-export const deleteDocument = createActionV2({
+export const deleteDocument = createAction({
  name: ({ t }) => `${t("Delete")}…`,
  analyticsName: "Delete document",
  section: ActiveDocumentSection,
@@ -1231,7 +1237,7 @@ export const deleteDocument = createActionV2({
  },
 });

-export const permanentlyDeleteDocument = createActionV2({
+export const permanentlyDeleteDocument = createAction({
  name: ({ t }) => t("Permanently delete"),
  analyticsName: "Permanently delete document",
  section: ActiveDocumentSection,
@@ -1286,7 +1292,7 @@ export const permanentlyDeleteDocumentsInTrash = createAction({
  },
 });

-export const openDocumentComments = createActionV2({
+export const openDocumentComments = createAction({
  name: ({ t }) => t("Comments"),
  analyticsName: "Open comments",
  section: ActiveDocumentSection,
@@ -1309,7 +1315,7 @@ export const openDocumentComments = createActionV2({
  },
 });

-export const openDocumentHistory = createInternalLinkActionV2({
+export const openDocumentHistory = createInternalLinkAction({
  name: ({ t }) => t("History"),
  analyticsName: "Open document history",
  section: ActiveDocumentSection,
@@ -1336,7 +1342,7 @@ export const openDocumentHistory = createInternalLinkActionV2({
  },
 });

-export const openDocumentInsights = createActionV2({
+export const openDocumentInsights = createAction({
  name: ({ t }) => t("Insights"),
  analyticsName: "Open document insights",
  section: ActiveDocumentSection,
@@ -1369,7 +1375,7 @@ export const openDocumentInsights = createActionV2({
  },
 });

-export const leaveDocument = createActionV2({
+export const leaveDocument = createAction({
  name: ({ t }) => t("Leave document"),
  analyticsName: "Leave document",
  section: ActiveDocumentSection,
@@ -1408,9 +1414,9 @@ export const leaveDocument = createActionV2({
 export const applyTemplateFactory = ({
  actions,
 }: {
-  actions: (ActionV2 | ActionV2Group | ActionV2Separator)[];
+  actions: (Action | ActionGroup | ActionSeparator)[];
 }) =>
-  createActionV2WithChildren({
+  createActionWithChildren({
    name: ({ t }) => t("Apply template"),
    analyticsName: "Apply template",
    section: ActiveDocumentSection,
@@ -0,0 +1,21 @@
+import { PlusIcon } from "outline-icons";
+import { createAction } from "~/actions";
+import { TeamSection } from "../sections";
+import stores from "~/stores";
+import { EmojiCreateDialog } from "~/components/EmojiCreateDialog";
+
+export const createEmoji = createAction({
+  name: ({ t }) => `${t("New emoji")}…`,
+  analyticsName: "Create emoji",
+  icon: <PlusIcon />,
+  keywords: "emoji custom upload image",
+  section: TeamSection,
+  visible: () =>
+    stores.policies.abilities(stores.auth.team?.id || "").createEmoji,
+  perform: ({ t }) => {
+    stores.dialogs.openModal({
+      title: t("Upload emoji"),
+      content: <EmojiCreateDialog onSubmit={stores.dialogs.closeAllModals} />,
+    });
+  },
+});
@@ -3,8 +3,27 @@ import stores from "~/stores";
 import { createAction } from "..";
 import { SettingsSection } from "../sections";
 import Integration from "~/models/Integration";
+import { DisconnectAnalyticsDialog } from "~/scenes/Settings/components/DisconnectAnalyticsDialog";
 import { IntegrationType } from "@shared/types";
-import { DisconnectAnalyticsDialog } from "~/components/DisconnectAnalyticsDialog";
+import { settingsPath } from "@shared/utils/routeHelpers";
+import history from "~/utils/history";
+
+export const disconnectIntegrationFactory = (integration?: Integration) =>
+  createAction({
+    name: ({ t }) => t("Disconnect"),
+    analyticsName: "Disconnect integration",
+    section: SettingsSection,
+    icon: <TrashIcon />,
+    keywords: "disconnect",
+    visible: () => !!integration,
+    perform: async ({ event }) => {
+      event?.preventDefault();
+      event?.stopPropagation();
+
+      await integration?.delete();
+      history.push(settingsPath("integrations"));
+    },
+  });

 export const disconnectAnalyticsIntegrationFactory = (
  integration?: Integration<IntegrationType.Analytics>
@@ -21,9 +21,8 @@ import SearchQuery from "~/models/SearchQuery";
 import KeyboardShortcuts from "~/scenes/KeyboardShortcuts";
 import {
  createAction,
-  createActionV2,
-  createExternalLinkActionV2,
-  createInternalLinkActionV2,
+  createExternalLinkAction,
+  createInternalLinkAction,
 } from "~/actions";
 import { NavigationSection, RecentSearchesSection } from "~/actions/sections";
 import Desktop from "~/utils/Desktop";
@@ -37,7 +36,7 @@ import {
  settingsPath,
 } from "~/utils/routeHelpers";

-export const navigateToHome = createAction({
+export const navigateToHome = createInternalLinkAction({
  name: ({ t }) => t("Home"),
  analyticsName: "Navigate to home",
  section: NavigationSection,
@@ -48,7 +47,7 @@ export const navigateToHome = createAction({
 });

 export const navigateToRecentSearchQuery = (searchQuery: SearchQuery) =>
-  createAction({
+  createInternalLinkAction({
    section: RecentSearchesSection,
    name: searchQuery.query,
    analyticsName: "Navigate to recent search query",
@@ -56,7 +55,7 @@ export const navigateToRecentSearchQuery = (searchQuery: SearchQuery) =>
    to: searchPath({ query: searchQuery.query }),
  });

-export const navigateToDrafts = createAction({
+export const navigateToDrafts = createInternalLinkAction({
  name: ({ t }) => t("Drafts"),
  analyticsName: "Navigate to drafts",
  section: NavigationSection,
@@ -65,7 +64,7 @@ export const navigateToDrafts = createAction({
  visible: ({ location }) => location.pathname !== draftsPath(),
 });

-export const navigateToSearch = createAction({
+export const navigateToSearch = createInternalLinkAction({
  name: ({ t }) => t("Search"),
  analyticsName: "Navigate to search",
  section: NavigationSection,
@@ -74,7 +73,7 @@ export const navigateToSearch = createAction({
  visible: ({ location }) => location.pathname !== searchPath(),
 });

-export const navigateToArchive = createAction({
+export const navigateToArchive = createInternalLinkAction({
  name: ({ t }) => t("Archive"),
  analyticsName: "Navigate to archive",
  section: NavigationSection,
@@ -84,7 +83,7 @@ export const navigateToArchive = createAction({
  visible: ({ location }) => location.pathname !== archivePath(),
 });

-export const navigateToTrash = createAction({
+export const navigateToTrash = createInternalLinkAction({
  name: ({ t }) => t("Trash"),
  analyticsName: "Navigate to trash",
  section: NavigationSection,
@@ -93,7 +92,7 @@ export const navigateToTrash = createAction({
  visible: ({ location }) => location.pathname !== trashPath(),
 });

-export const navigateToSettings = createAction({
+export const navigateToSettings = createInternalLinkAction({
  name: ({ t }) => t("Settings"),
  analyticsName: "Navigate to settings",
  section: NavigationSection,
@@ -103,7 +102,7 @@ export const navigateToSettings = createAction({
  to: settingsPath(),
 });

-export const navigateToWorkspaceSettings = createInternalLinkActionV2({
+export const navigateToWorkspaceSettings = createInternalLinkAction({
  name: ({ t }) => t("Settings"),
  analyticsName: "Navigate to workspace settings",
  section: NavigationSection,
@@ -112,7 +111,7 @@ export const navigateToWorkspaceSettings = createInternalLinkActionV2({
  to: settingsPath("details"),
 });

-export const navigateToProfileSettings = createInternalLinkActionV2({
+export const navigateToProfileSettings = createInternalLinkAction({
  name: ({ t }) => t("Profile"),
  analyticsName: "Navigate to profile settings",
  section: NavigationSection,
@@ -121,7 +120,7 @@ export const navigateToProfileSettings = createInternalLinkActionV2({
  to: settingsPath(),
 });

-export const navigateToTemplateSettings = createAction({
+export const navigateToTemplateSettings = createInternalLinkAction({
  name: ({ t }) => t("Templates"),
  analyticsName: "Navigate to template settings",
  section: NavigationSection,
@@ -130,7 +129,7 @@ export const navigateToTemplateSettings = createAction({
  to: settingsPath("templates"),
 });

-export const navigateToNotificationSettings = createInternalLinkActionV2({
+export const navigateToNotificationSettings = createInternalLinkAction({
  name: ({ t, isMenu }) =>
    isMenu ? t("Notification settings") : t("Notifications"),
  analyticsName: "Navigate to notification settings",
@@ -140,7 +139,7 @@ export const navigateToNotificationSettings = createInternalLinkActionV2({
  to: settingsPath("notifications"),
 });

-export const navigateToAccountPreferences = createInternalLinkActionV2({
+export const navigateToAccountPreferences = createInternalLinkAction({
  name: ({ t }) => t("Preferences"),
  analyticsName: "Navigate to account preferences",
  section: NavigationSection,
@@ -149,7 +148,7 @@ export const navigateToAccountPreferences = createInternalLinkActionV2({
  to: settingsPath("preferences"),
 });

-export const openDocumentation = createExternalLinkActionV2({
+export const openDocumentation = createExternalLinkAction({
  name: ({ t }) => t("Documentation"),
  analyticsName: "Open documentation",
  section: NavigationSection,
@@ -159,7 +158,7 @@ export const openDocumentation = createExternalLinkActionV2({
  target: "_blank",
 });

-export const openAPIDocumentation = createExternalLinkActionV2({
+export const openAPIDocumentation = createExternalLinkAction({
  name: ({ t }) => t("API documentation"),
  analyticsName: "Open API documentation",
  section: NavigationSection,
@@ -177,7 +176,7 @@ export const toggleSidebar = createAction({
  perform: () => stores.ui.toggleCollapsedSidebar(),
 });

-export const openFeedbackUrl = createExternalLinkActionV2({
+export const openFeedbackUrl = createExternalLinkAction({
  name: ({ t }) => t("Send us feedback"),
  analyticsName: "Open feedback",
  section: NavigationSection,
@@ -187,7 +186,7 @@ export const openFeedbackUrl = createExternalLinkActionV2({
  target: "_blank",
 });

-export const openBugReportUrl = createExternalLinkActionV2({
+export const openBugReportUrl = createExternalLinkAction({
  name: ({ t }) => t("Report a bug"),
  analyticsName: "Open bug report",
  section: NavigationSection,
@@ -197,7 +196,7 @@ export const openBugReportUrl = createExternalLinkActionV2({
  target: "_blank",
 });

-export const openChangelog = createExternalLinkActionV2({
+export const openChangelog = createExternalLinkAction({
  name: ({ t }) => t("Changelog"),
  analyticsName: "Open changelog",
  section: NavigationSection,
@@ -207,7 +206,7 @@ export const openChangelog = createExternalLinkActionV2({
  target: "_blank",
 });

-export const openKeyboardShortcuts = createActionV2({
+export const openKeyboardShortcuts = createAction({
  name: ({ t }) => t("Keyboard shortcuts"),
  analyticsName: "Open keyboard shortcuts",
  section: NavigationSection,
@@ -222,7 +221,7 @@ export const openKeyboardShortcuts = createActionV2({
  },
 });

-export const downloadApp = createAction({
+export const downloadApp = createExternalLinkAction({
  name: ({ t }) =>
    t("Download {{ platform }} app", {
      platform: isMac() ? "macOS" : "Windows",
@@ -232,13 +231,11 @@ export const downloadApp = createAction({
  iconInContextMenu: false,
  icon: <BrowserIcon />,
  visible: () => !Desktop.isElectron() && isMac() && isCloudHosted,
-  to: {
-    url: "https://desktop.getoutline.com",
-    target: "_blank",
-  },
+  url: "https://desktop.getoutline.com",
+  target: "_blank",
 });

-export const logout = createActionV2({
+export const logout = createAction({
  name: ({ t }) => t("Log out"),
  analyticsName: "Log out",
  section: NavigationSection,
@@ -1,5 +1,5 @@
 import { ArchiveIcon, MarkAsReadIcon } from "outline-icons";
-import { createAction, createActionV2 } from "..";
+import { createAction } from "..";
 import { NotificationSection } from "../sections";

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

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

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

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

-export const changeToDarkTheme = createActionV2({
+export const changeToDarkTheme = createAction({
  name: ({ t }) => t("Dark"),
  analyticsName: "Change to dark theme",
  icon: <MoonIcon />,
@@ -14,7 +14,7 @@ export const changeToDarkTheme = createActionV2({
  perform: ({ stores }) => stores.ui.setTheme(Theme.Dark),
 });

-export const changeToLightTheme = createActionV2({
+export const changeToLightTheme = createAction({
  name: ({ t }) => t("Light"),
  analyticsName: "Change to light theme",
  icon: <SunIcon />,
@@ -25,7 +25,7 @@ export const changeToLightTheme = createActionV2({
  perform: ({ stores }) => stores.ui.setTheme(Theme.Light),
 });

-export const changeToSystemTheme = createActionV2({
+export const changeToSystemTheme = createAction({
  name: ({ t }) => t("System"),
  analyticsName: "Change to system theme",
  icon: <BrowserIcon />,
@@ -36,7 +36,7 @@ export const changeToSystemTheme = createActionV2({
  perform: ({ stores }) => stores.ui.setTheme(Theme.System),
 });

-export const changeTheme = createActionV2WithChildren({
+export const changeTheme = createActionWithChildren({
  name: ({ t, isMenu }) => (isMenu ? t("Appearance") : t("Change theme")),
  analyticsName: "Change theme",
  placeholder: ({ t }) => t("Change theme to"),
@@ -1,13 +1,13 @@
 import copy from "copy-to-clipboard";
 import Share from "~/models/Share";
-import { createActionV2, createInternalLinkActionV2 } from "..";
+import { createAction, createInternalLinkAction } from "..";
 import { ArrowIcon, CopyIcon, TrashIcon } from "outline-icons";
 import { ShareSection } from "../sections";
 import env from "~/env";
 import { toast } from "sonner";

 export const copyShareUrlFactory = ({ share }: { share: Share }) =>
-  createActionV2({
+  createAction({
    name: ({ t }) => t("Copy link"),
    analyticsName: "Copy share link",
    section: ShareSection,
@@ -22,7 +22,7 @@ export const copyShareUrlFactory = ({ share }: { share: Share }) =>
  });

 export const goToShareSourceFactory = ({ share }: { share: Share }) =>
-  createInternalLinkActionV2({
+  createInternalLinkAction({
    name: ({ t }) =>
      share.collectionId ? t("Go to collection") : t("Go to document"),
    analyticsName: "Go to share source",
@@ -41,7 +41,7 @@ export const revokeShareFactory = ({
  share: Share;
  can: Record<string, boolean>;
 }) =>
-  createActionV2({
+  createAction({
    name: ({ t }) => t("Revoke link"),
    analyticsName: "Revoke share",
    section: ShareSection,
@@ -6,17 +6,17 @@ import { LoginDialog } from "~/scenes/Login/components/LoginDialog";
 import TeamNew from "~/scenes/TeamNew";
 import TeamLogo from "~/components/TeamLogo";
 import {
-  createActionV2,
-  createActionV2WithChildren,
-  createExternalLinkActionV2,
+  createAction,
+  createActionWithChildren,
+  createExternalLinkAction,
 } from "~/actions";
-import { ActionContext, ExternalLinkActionV2 } from "~/types";
+import { ActionContext, ExternalLinkAction } from "~/types";
 import Desktop from "~/utils/Desktop";
 import { TeamSection } from "../sections";

 export const switchTeamsList = ({ stores }: { stores: RootStore }) =>
-  stores.auth.availableTeams?.map<ExternalLinkActionV2>((session) =>
-    createExternalLinkActionV2({
+  stores.auth.availableTeams?.map<ExternalLinkAction>((session) =>
+    createExternalLinkAction({
      id: `switch-${session.id}`,
      name: session.name,
      analyticsName: "Switch workspace",
@@ -41,7 +41,7 @@ export const switchTeamsList = ({ stores }: { stores: RootStore }) =>
    })
  ) ?? [];

-export const switchTeam = createActionV2WithChildren({
+export const switchTeam = createActionWithChildren({
  name: ({ t }) => t("Switch workspace"),
  placeholder: ({ t }) => t("Select a workspace"),
  analyticsName: "Switch workspace",
@@ -52,7 +52,7 @@ export const switchTeam = createActionV2WithChildren({
  children: switchTeamsList,
 });

-export const createTeam = createActionV2({
+export const createTeam = createAction({
  name: ({ t }) => `${t("New workspace")}…`,
  analyticsName: "New workspace",
  keywords: "create change switch workspace organization team",
@@ -74,7 +74,7 @@ export const createTeam = createActionV2({
  },
 });

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

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

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

 export const deleteUserActionFactory = (userId: string) =>
-  createActionV2({
+  createAction({
    name: ({ t }) => `${t("Delete user")}…`,
    analyticsName: "Delete user",
    keywords: "leave",
@@ -1,23 +1,17 @@
 import { LocationDescriptor } from "history";
-import { v4 as uuidv4 } from "uuid";
-import flattenDeep from "lodash/flattenDeep";
 import { toast } from "sonner";
 import { Optional } from "utility-types";
+import { v4 as uuidv4 } from "uuid";
 import {
-  Action,
  ActionContext,
-  ActionV2,
-  ActionV2Group,
-  ActionV2Separator as TActionV2Separator,
-  ActionV2Variant,
-  ActionV2WithChildren,
-  ExternalLinkActionV2,
-  InternalLinkActionV2,
-  MenuExternalLink,
-  MenuInternalLink,
+  Action,
+  ActionGroup,
+  ActionSeparator as TActionSeparator,
+  ActionVariant,
+  ActionWithChildren,
+  ExternalLinkAction,
+  InternalLinkAction,
  MenuItem,
-  MenuItemButton,
-  MenuItemWithChildren,
 } from "~/types";
 import Analytics from "~/utils/Analytics";
 import history from "~/utils/history";
@@ -27,161 +21,13 @@ export function resolve<T>(value: any, context: ActionContext): T {
  return typeof value === "function" ? value(context) : value;
 }

-export function createAction(definition: Optional<Action, "id">): Action {
-  return {
-    ...definition,
-    perform: definition.perform
-      ? (context) => {
-          // We must use the specific analytics name here as the action name is
-          // translated and potentially contains user strings.
-          if (definition.analyticsName) {
-            Analytics.track("perform_action", definition.analyticsName, {
-              context: context.isButton
-                ? "button"
-                : context.isCommandBar
-                  ? "commandbar"
-                  : "contextmenu",
-            });
-          }
-          return definition.perform?.(context);
-        }
-      : undefined,
-    id: definition.id ?? uuidv4(),
-  };
-}
-
-export function actionToMenuItem(
-  action: Action,
-  context: ActionContext
-): MenuItemButton | MenuExternalLink | MenuInternalLink | MenuItemWithChildren {
-  const resolvedIcon = resolve<React.ReactElement<any>>(action.icon, context);
-  const resolvedChildren = resolve<Action[]>(action.children, context);
-  const visible = action.visible ? action.visible(context) : true;
-  const title = resolve<string>(action.name, context);
-  const icon =
-    resolvedIcon && action.iconInContextMenu !== false
-      ? resolvedIcon
-      : undefined;
-
-  if (resolvedChildren) {
-    const items = resolvedChildren
-      .map((a) => actionToMenuItem(a, context))
-      .filter(Boolean)
-      .filter((a) => a.visible);
-
-    return {
-      type: "submenu",
-      title,
-      icon,
-      items,
-      visible: visible && items.length > 0,
-    };
-  }
-
-  if (action.to) {
-    return typeof action.to === "string"
-      ? {
-          type: "route",
-          title,
-          icon,
-          visible,
-          to: action.to,
-          selected: action.selected?.(context),
-        }
-      : {
-          type: "link",
-          title,
-          icon,
-          visible,
-          href: action.to,
-          selected: action.selected?.(context),
-        };
-  }
-
-  return {
-    type: "button",
-    title,
-    icon,
-    visible,
-    dangerous: action.dangerous,
-    onClick: () => performAction(action, context),
-    selected: action.selected?.(context),
-  };
-}
-
-export function actionToKBar(
-  action: Action,
-  context: ActionContext
-): KbarAction[] {
-  if (typeof action.visible === "function" && !action.visible(context)) {
-    return [];
-  }
-
-  const resolvedIcon = resolve<React.ReactElement>(action.icon, context);
-  const resolvedChildren = resolve<Action[]>(action.children, context);
-  const resolvedSection = resolve<string>(action.section, context);
-  const resolvedName = resolve<string>(action.name, context);
-  const resolvedPlaceholder = resolve<string>(action.placeholder, context);
-  const children = resolvedChildren
-    ? flattenDeep(resolvedChildren.map((a) => actionToKBar(a, context))).filter(
-        (a) => !!a
-      )
-    : [];
-
-  const sectionPriority =
-    typeof action.section !== "string" && "priority" in action.section
-      ? ((action.section.priority as number) ?? 0)
-      : 0;
-
-  return [
-    {
-      id: action.id,
-      name: resolvedName,
-      analyticsName: action.analyticsName,
-      section: resolvedSection,
-      placeholder: resolvedPlaceholder,
-      keywords: action.keywords ?? "",
-      shortcut: action.shortcut || [],
-      icon: resolvedIcon,
-      priority: (1 + (action.priority ?? 0)) * (1 + (sectionPriority ?? 0)),
-      perform:
-        action.perform || action.to
-          ? () => performAction(action, context)
-          : undefined,
-    },
-  ].concat(
-    // @ts-expect-error ts-migrate(2769) FIXME: No overload matches this call.
-    children.map((child) => ({ ...child, parent: child.parent ?? action.id }))
-  );
-}
-
-export async function performAction(action: Action, context: ActionContext) {
-  const result = action.perform
-    ? action.perform(context)
-    : action.to
-      ? typeof action.to === "string"
-        ? history.push(action.to)
-        : window.open(action.to.url, action.to.target)
-      : undefined;
-
-  if (result instanceof Promise) {
-    return result.catch((err: Error) => {
-      toast.error(err.message);
-    });
-  }
-
-  return result;
-}
-
-/** Actions V2 */
-
-export const ActionV2Separator: TActionV2Separator = {
+export const ActionSeparator: TActionSeparator = {
  type: "action_separator",
 };

-export function createActionV2(
-  definition: Optional<Omit<ActionV2, "type" | "variant">, "id">
-): ActionV2 {
+export function createAction(
+  definition: Optional<Omit<Action, "type" | "variant">, "id">
+): Action {
  return {
    ...definition,
    type: "action",
@@ -206,9 +52,9 @@ export function createActionV2(
  };
 }

-export function createInternalLinkActionV2(
-  definition: Optional<Omit<InternalLinkActionV2, "type" | "variant">, "id">
-): InternalLinkActionV2 {
+export function createInternalLinkAction(
+  definition: Optional<Omit<InternalLinkAction, "type" | "variant">, "id">
+): InternalLinkAction {
  return {
    ...definition,
    type: "action",
@@ -217,9 +63,9 @@ export function createInternalLinkActionV2(
  };
 }

-export function createExternalLinkActionV2(
-  definition: Optional<Omit<ExternalLinkActionV2, "type" | "variant">, "id">
-): ExternalLinkActionV2 {
+export function createExternalLinkAction(
+  definition: Optional<Omit<ExternalLinkAction, "type" | "variant">, "id">
+): ExternalLinkAction {
  return {
    ...definition,
    type: "action",
@@ -228,9 +74,9 @@ export function createExternalLinkActionV2(
  };
 }

-export function createActionV2WithChildren(
-  definition: Optional<Omit<ActionV2WithChildren, "type" | "variant">, "id">
-): ActionV2WithChildren {
+export function createActionWithChildren(
+  definition: Optional<Omit<ActionWithChildren, "type" | "variant">, "id">
+): ActionWithChildren {
  return {
    ...definition,
    type: "action",
@@ -239,9 +85,9 @@ export function createActionV2WithChildren(
  };
 }

-export function createActionV2Group(
-  definition: Omit<ActionV2Group, "type">
-): ActionV2Group {
+export function createActionGroup(
+  definition: Omit<ActionGroup, "type">
+): ActionGroup {
  return {
    ...definition,
    type: "action_group",
@@ -249,8 +95,8 @@ export function createActionV2Group(
 }

 export function createRootMenuAction(
-  actions: (ActionV2Variant | ActionV2Group | TActionV2Separator)[]
-): ActionV2WithChildren {
+  actions: (ActionVariant | ActionGroup | TActionSeparator)[]
+): ActionWithChildren {
  return {
    id: uuidv4(),
    type: "action",
@@ -261,8 +107,8 @@ export function createRootMenuAction(
  };
 }

-export function actionV2ToMenuItem(
-  action: ActionV2Variant | ActionV2Group | TActionV2Separator,
+export function actionToMenuItem(
+  action: ActionVariant | ActionGroup | TActionSeparator,
  context: ActionContext
 ): MenuItem {
  switch (action.type) {
@@ -286,7 +132,7 @@ export function actionV2ToMenuItem(
            tooltip: resolve<React.ReactChild>(action.tooltip, context),
            selected: resolve<boolean>(action.selected, context),
            dangerous: action.dangerous,
-            onClick: () => performActionV2(action, context),
+            onClick: () => performAction(action, context),
          };

        case "internal_link": {
@@ -315,10 +161,10 @@ export function actionV2ToMenuItem(

        case "action_with_children": {
          const children = resolve<
-            (ActionV2Variant | ActionV2Group | TActionV2Separator)[]
+            (ActionVariant | ActionGroup | TActionSeparator)[]
          >(action.children, context);
          const subMenuItems = children.map((a) =>
-            actionV2ToMenuItem(a, context)
+            actionToMenuItem(a, context)
          );
          return {
            type: "submenu",
@@ -337,7 +183,7 @@ export function actionV2ToMenuItem(

    case "action_group": {
      const groupItems = action.actions.map((a) =>
-        actionV2ToMenuItem(a, context)
+        actionToMenuItem(a, context)
      );
      return {
        type: "group",
@@ -352,8 +198,8 @@ export function actionV2ToMenuItem(
  }
 }

-export function actionV2ToKBar(
-  action: ActionV2Variant,
+export function actionToKBar(
+  action: ActionVariant,
  context: ActionContext
 ): KbarAction[] {
  const visible = resolve<boolean>(action.visible, context);
@@ -385,18 +231,18 @@ export function actionV2ToKBar(
          shortcut: action.shortcut,
          icon,
          priority,
-          perform: () => performActionV2(action, context),
+          perform: () => performAction(action, context),
        },
      ];
    }

    case "action_with_children": {
-      const resolvedChildren = resolve<ActionV2Variant[]>(
+      const resolvedChildren = resolve<ActionVariant[]>(
        action.children,
        context
      );
      const children = resolvedChildren
-        .map((a) => actionV2ToKBar(a, context))
+        .map((a) => actionToKBar(a, context))
        .flat()
        .filter(Boolean);

@@ -422,8 +268,8 @@ export function actionV2ToKBar(
  }
 }

-export async function performActionV2(
-  action: Exclude<ActionV2Variant, ActionV2WithChildren>,
+export async function performAction(
+  action: Exclude<ActionVariant, ActionWithChildren>,
  context: ActionContext
 ) {
  const perform =
@@ -38,6 +38,8 @@ export const NotificationSection = ({ t }: ActionContext) => t("Notification");

 export const GroupSection = ({ t }: ActionContext) => t("Groups");

+export const EmojiSecion = ({ t }: ActionContext) => t("Emoji");
+
 export const UserSection = ({ t }: ActionContext) => t("People");

 UserSection.priority = 0.5;
@@ -1,10 +1,10 @@
 /* oxlint-disable react/prop-types */
 import * as React from "react";
 import Tooltip, { Props as TooltipProps } from "~/components/Tooltip";
-import { performAction, performActionV2, resolve } from "~/actions";
+import { performAction, resolve } from "~/actions";
 import useIsMounted from "~/hooks/useIsMounted";
-import { Action, ActionV2Variant, ActionV2WithChildren } from "~/types";
 import useActionContext from "~/hooks/useActionContext";
+import { ActionVariant, ActionWithChildren } from "~/types";

 export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  /** Show the button in a disabled state */
@@ -12,7 +12,7 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  /** Hide the button entirely if action is not applicable */
  hideOnActionDisabled?: boolean;
  /** Action to use on button */
-  action?: Action | Exclude<ActionV2Variant, ActionV2WithChildren>;
+  action?: Exclude<ActionVariant, ActionWithChildren>;
  /** If tooltip props are provided the button will be wrapped in a tooltip */
  tooltip?: Omit<TooltipProps, "children">;
 };
@@ -30,20 +30,20 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
    });
    const isMounted = useIsMounted();
    const [executing, setExecuting] = React.useState(false);
-    const disabled = rest.disabled;

    if (!actionContext || !action) {
      return <button {...rest} ref={ref} />;
    }

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

+    const disabled = rest.disabled || actionIsDisabled;
+
    const label =
      rest["aria-label"] ??
      (typeof action.name === "function"
@@ -61,10 +61,7 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
            ? (ev) => {
                ev.preventDefault();
                ev.stopPropagation();
-                const response =
-                  "variant" in action
-                    ? performActionV2(action, actionContext)
-                    : performAction(action, actionContext);
+                const response = performAction(action, actionContext);
                if (response?.finally) {
                  setExecuting(true);
                  void response.finally(
@@ -71,7 +71,7 @@ function Avatar(props: Props) {
        <Image onError={handleError} src={src} {...rest} />
      ) : model ? (
        <Initials color={model.color} {...rest}>
-          {model.initial}
+          {model.initial?.toUpperCase()}
        </Initials>
      ) : (
        <Initials {...rest} />
@@ -6,17 +6,17 @@ import { s, ellipsis } from "@shared/styles";
 import Flex from "~/components/Flex";
 import BreadcrumbMenu from "~/menus/BreadcrumbMenu";
 import { undraggableOnDesktop } from "~/styles";
-import { InternalLinkActionV2, MenuInternalLink } from "~/types";
-import { actionV2ToMenuItem } from "~/actions";
+import { InternalLinkAction, MenuInternalLink } from "~/types";
+import { actionToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import { useComputed } from "~/hooks/useComputed";

 type TopLevelAction =
-  | InternalLinkActionV2
-  | { type: "menu"; actions: InternalLinkActionV2[] };
+  | InternalLinkAction
+  | { type: "menu"; actions: InternalLinkAction[] };

 type Props = React.PropsWithChildren<{
-  actions: InternalLinkActionV2[];
+  actions: InternalLinkAction[];
  max?: number;
  highlightFirstItem?: boolean;
 }>;
@@ -46,7 +46,7 @@ function Breadcrumb(
    const menuActions = topLevelActions.splice(
      halfMax,
      totalVisibleActions - max
-    ) as InternalLinkActionV2[];
+    ) as InternalLinkAction[];

    topLevelActions.splice(halfMax, 0, {
      type: "menu",
@@ -60,10 +60,7 @@ function Breadcrumb(
        return <BreadcrumbMenu key="menu" actions={action.actions} />;
      }

-      const item = actionV2ToMenuItem(
-        action,
-        actionContext
-      ) as MenuInternalLink;
+      const item = actionToMenuItem(action, actionContext) as MenuInternalLink;

      return (
        <>
@@ -34,6 +34,7 @@ const RealButton = styled(ActionButton)<RealProps>`
  cursor: var(--pointer);
  user-select: none;
  appearance: none !important;
+  transition: background 200ms ease-out;
  ${undraggableOnDesktop()}

  &::-moz-focus-inner {
@@ -44,6 +45,7 @@ const RealButton = styled(ActionButton)<RealProps>`
  &:hover:not(:disabled),
  &[aria-expanded="true"] {
    background: ${(props) => darken(0.05, props.theme.accent)};
+    transition: background 0s;
  }

  &:disabled {
@@ -78,6 +80,7 @@ const RealButton = styled(ActionButton)<RealProps>`
      box-shadow: rgba(0, 0, 0, 0.07) 0px 1px 2px, ${
        props.theme.buttonNeutralBorder
      } 0 0 0 1px inset;
+      transition: background 0s;
    }

    &:focus-visible {
@@ -103,6 +106,7 @@ const RealButton = styled(ActionButton)<RealProps>`
      &:hover:not(:disabled),
      &[aria-expanded="true"] {
        background: ${darken(0.05, props.theme.danger)};
+        transition: background 0s;
      }

      &:disabled {
@@ -5,7 +5,7 @@ import Collection from "~/models/Collection";
 import CollectionIcon from "~/components/Icons/CollectionIcon";
 import { archivePath, collectionPath } from "~/utils/routeHelpers";
 import Breadcrumb from "./Breadcrumb";
-import { createInternalLinkActionV2 } from "~/actions";
+import { createInternalLinkAction } from "~/actions";
 import { ActiveCollectionSection } from "~/actions/sections";

 type Props = {
@@ -17,14 +17,14 @@ export const CollectionBreadcrumb: React.FC<Props> = ({ collection }) => {

  const actions = React.useMemo(
    () => [
-      createInternalLinkActionV2({
+      createInternalLinkAction({
        name: t("Archive"),
        section: ActiveCollectionSection,
        icon: <ArchiveIcon />,
        visible: collection.isArchived,
        to: archivePath(),
      }),
-      createInternalLinkActionV2({
+      createInternalLinkAction({
        name: collection.name,
        section: ActiveCollectionSection,
        icon: <CollectionIcon collection={collection} expanded />,
@@ -0,0 +1,63 @@
+import * as React from "react";
+import styled from "styled-components";
+import NudeButton from "./NudeButton";
+import { hover, s } from "@shared/styles";
+
+type Props = React.HTMLAttributes<HTMLButtonElement> & {
+  /** The current color value in hex format. If no color is passed a radial gradient will be shown */
+  color?: string;
+  /** Whether the button is currently active/selected */
+  active?: boolean;
+  /** The size of the button in pixels */
+  size?: number;
+};
+
+export const ColorButton = React.forwardRef(
+  (
+    { color, active = false, size = 24, ...rest }: Props,
+    ref: React.Ref<HTMLButtonElement>
+  ) => (
+    <ColorButtonInternal
+      $active={active}
+      $size={size}
+      {...rest}
+      style={{ "--color": color, ...rest.style } as React.CSSProperties}
+      ref={ref}
+    >
+      <Selected />
+    </ColorButtonInternal>
+  )
+);
+
+const Selected = styled.span`
+  width: 10px;
+  height: 5px;
+  border-left: 2px solid white;
+  border-bottom: 2px solid white;
+  transform: translateY(-25%) rotate(-45deg);
+`;
+
+const ColorButtonInternal = styled(NudeButton)<{
+  $active: boolean;
+  $size: number;
+}>`
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  width: ${({ $size }) => $size}px;
+  height: ${({ $size }) => $size}px;
+  border-radius: 50%;
+  background: var(
+    --color,
+    linear-gradient(135deg, #ff5858 0%, #fbcc34 50%, #00c6ff 100%)
+  );
+
+  &: ${hover} {
+    outline: 2px solid ${s("menuBackground")} !important;
+    box-shadow: 0px 0px 3px 3px var(--color);
+  }
+
+  & ${Selected} {
+    display: ${({ $active }) => ($active ? "block" : "none")};
+  }
+`;
@@ -1,7 +1,7 @@
 import { DocumentIcon } from "outline-icons";
 import { useMemo } from "react";
 import Icon from "@shared/components/Icon";
-import { createAction } from "~/actions";
+import { createInternalLinkAction } from "~/actions";
 import { RecentSection } from "~/actions/sections";
 import useStores from "~/hooks/useStores";
 import { documentPath } from "~/utils/routeHelpers";
@@ -15,7 +15,7 @@ const useRecentDocumentActions = (count = 6) => {
        .filter((document) => document.id !== ui.activeDocumentId)
        .slice(0, count)
        .map((item) =>
-          createAction({
+          createInternalLinkAction({
            name: item.titleWithDefault,
            analyticsName: "Recently viewed document",
            section: RecentSection,
@@ -1,6 +1,6 @@
 import { SettingsIcon } from "outline-icons";
 import { useMemo } from "react";
-import { createAction } from "~/actions";
+import { createActionWithChildren, createInternalLinkAction } from "~/actions";
 import { NavigationSection } from "~/actions/sections";
 import useSettingsConfig from "~/hooks/useSettingsConfig";

@@ -10,20 +10,20 @@ const useSettingsAction = () => {
    () =>
      config.map((item) => {
        const Icon = item.icon;
-        return {
+        return createInternalLinkAction({
          id: item.path,
          name: item.name,
          icon: <Icon />,
          section: NavigationSection,
          to: item.path,
-        };
+        });
      }),
    [config]
  );

  const navigateToSettings = useMemo(
    () =>
-      createAction({
+      createActionWithChildren({
        id: "settings",
        name: ({ t }) => t("Settings"),
        section: NavigationSection,
@@ -1,14 +1,13 @@
 import { NewDocumentIcon, ShapesIcon } from "outline-icons";
 import { useEffect, useMemo } from "react";
 import Icon from "@shared/components/Icon";
-import { createAction } from "~/actions";
+import { createActionWithChildren, createInternalLinkAction } from "~/actions";
 import {
  ActiveCollectionSection,
  DocumentSection,
  TeamSection,
 } from "~/actions/sections";
 import useStores from "~/hooks/useStores";
-import history from "~/utils/history";
 import { newDocumentPath } from "~/utils/routeHelpers";

 const useTemplatesAction = () => {
@@ -21,7 +20,7 @@ const useTemplatesAction = () => {
  const actions = useMemo(
    () =>
      documents.templatesAlphabetical.map((template) =>
-        createAction({
+        createInternalLinkAction({
          name: template.titleWithDefault,
          analyticsName: "New document",
          section: template.isWorkspaceTemplate
@@ -47,15 +46,20 @@ const useTemplatesAction = () => {
              template.isWorkspaceTemplate
            );
          },
-          perform: ({ activeCollectionId, sidebarContext }) =>
-            history.push(
-              newDocumentPath(template.collectionId ?? activeCollectionId, {
-                templateId: template.id,
-              }),
+          to: ({ activeCollectionId, sidebarContext }) => {
+            const [pathname, search] = newDocumentPath(
+              template.collectionId ?? activeCollectionId,
              {
-                sidebarContext,
+                templateId: template.id,
              }
-            ),
+            ).split("?");
+
+            return {
+              pathname,
+              search,
+              state: { sidebarContext },
+            };
+          },
        })
      ),
    [documents.templatesAlphabetical]
@@ -63,7 +67,7 @@ const useTemplatesAction = () => {

  const newFromTemplate = useMemo(
    () =>
-      createAction({
+      createActionWithChildren({
        id: "templates",
        name: ({ t }) => t("New from template"),
        placeholder: ({ t }) => t("Choose a template"),
@@ -78,7 +82,7 @@ const useTemplatesAction = () => {
            stores.policies.abilities(currentTeamId).createDocument
          );
        },
-        children: () => actions,
+        children: actions,
      }),
    [actions]
  );
@@ -12,7 +12,7 @@ import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
 import { archivePath, settingsPath, trashPath } from "~/utils/routeHelpers";
-import { createInternalLinkActionV2 } from "~/actions";
+import { createInternalLinkAction } from "~/actions";
 import { ActiveDocumentSection } from "~/actions/sections";

 type Props = {
@@ -53,28 +53,28 @@ function DocumentBreadcrumb(
    }

    const outputActions = [
-      createInternalLinkActionV2({
+      createInternalLinkAction({
        name: t("Trash"),
        section: ActiveDocumentSection,
        icon: <TrashIcon />,
        visible: document.isDeleted,
        to: trashPath(),
      }),
-      createInternalLinkActionV2({
+      createInternalLinkAction({
        name: t("Archive"),
        section: ActiveDocumentSection,
        icon: <ArchiveIcon />,
        visible: document.isArchived,
        to: archivePath(),
      }),
-      createInternalLinkActionV2({
+      createInternalLinkAction({
        name: t("Templates"),
        section: ActiveDocumentSection,
        icon: <ShapesIcon />,
        visible: document.template,
        to: settingsPath("templates"),
      }),
-      createInternalLinkActionV2({
+      createInternalLinkAction({
        name: collection?.name,
        section: ActiveDocumentSection,
        icon: collection ? (
@@ -88,7 +88,7 @@ function DocumentBreadcrumb(
            }
          : "",
      }),
-      createInternalLinkActionV2({
+      createInternalLinkAction({
        name: t("Deleted Collection"),
        section: ActiveDocumentSection,
        visible: document.isCollectionDeleted,
@@ -96,10 +96,15 @@ function DocumentBreadcrumb(
      }),
      ...path.map((node) => {
        const title = node.title || t("Untitled");
-        return createInternalLinkActionV2({
+        return createInternalLinkAction({
          name: node.icon ? (
            <>
-              <StyledIcon value={node.icon} color={node.color} /> {title}
+              <StyledIcon
+                value={node.icon}
+                color={node.color}
+                initial={node.title.charAt(0).toUpperCase()}
+              />{" "}
+              {title}
            </>
          ) : (
            title
@@ -18,6 +18,7 @@ import breakpoint from "styled-components-breakpoint";
 import Icon from "@shared/components/Icon";
 import { NavigationNode } from "@shared/types";
 import { isModKey } from "@shared/utils/keyboard";
+import { ancestors, descendants, flattenTree } from "@shared/utils/tree";
 import DocumentExplorerNode from "~/components/DocumentExplorerNode";
 import DocumentExplorerSearchResult from "~/components/DocumentExplorerSearchResult";
 import Flex from "~/components/Flex";
@@ -27,7 +28,6 @@ import InputSearch from "~/components/InputSearch";
 import Text from "~/components/Text";
 import useMobile from "~/hooks/useMobile";
 import useStores from "~/hooks/useStores";
-import { ancestors, descendants, flattenTree } from "~/utils/tree";

 type Props = {
  /** Action taken upon submission of selected item, could be publish, move etc. */
@@ -7,6 +7,7 @@ import Document from "~/models/Document";
 import CircularProgressBar from "~/components/CircularProgressBar";
 import usePrevious from "~/hooks/usePrevious";
 import { bounceIn } from "~/styles/animations";
+import Flex from "./Flex";

 type Props = {
  document: Document;
@@ -41,7 +42,7 @@ function DocumentTasks({ document }: Props) {
  const message = getMessage(t, total, completed);

  return (
-    <>
+    <Flex align="center" style={{ padding: "0 1px" }} gap={2}>
      {completed === total ? (
        <Done
          color={theme.accent}
@@ -51,8 +52,8 @@ function DocumentTasks({ document }: Props) {
      ) : (
        <CircularProgressBar percentage={tasksPercentage} />
      )}
-      &nbsp;{message}
-    </>
+      {message}
+    </Flex>
  );
 }

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { toast } from "sonner";
 import styled from "styled-components";
-import { s, truncateMultiline } from "@shared/styles";
+import { s, ellipsis } from "@shared/styles";

 type Props = Omit<React.HTMLAttributes<HTMLInputElement>, "onSubmit"> & {
  /** A callback when the title is submitted. */
@@ -42,27 +42,47 @@ function EditableTitle(
    setValue(title);
  }, [title]);

-  const handleChange = React.useCallback((event) => {
-    setValue(event.target.value);
-  }, []);
+  const handleChange = React.useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      setValue(event.target.value);
+    },
+    []
+  );

-  const handleDoubleClick = React.useCallback((event) => {
-    event.preventDefault();
-    event.stopPropagation();
-    setIsEditing(true);
-  }, []);
+  const handleDoubleClick = React.useCallback(
+    (event: React.MouseEvent<HTMLSpanElement>) => {
+      if (event.altKey) {
+        return;
+      }
+      event.preventDefault();
+      event.stopPropagation();
+      setIsEditing(true);
+    },
+    []
+  );

-  const stopPropagation = React.useCallback((event) => {
-    event.preventDefault();
-    event.stopPropagation();
-  }, []);
+  const stopPropagation = React.useCallback(
+    (event: React.MouseEvent<HTMLSpanElement>) => {
+      event.preventDefault();
+      event.stopPropagation();
+    },
+    []
+  );

-  const handleFocus = React.useCallback((event) => {
-    event.target.select();
-  }, []);
+  const handleFocus = React.useCallback(
+    (event: React.FocusEvent<HTMLInputElement>) => {
+      event.target.select();
+    },
+    []
+  );

  const handleSave = React.useCallback(
-    async (ev) => {
+    async (
+      ev:
+        | React.FocusEvent<HTMLInputElement>
+        | React.KeyboardEvent<HTMLInputElement>
+        | React.FormEvent<HTMLFormElement>
+    ) => {
      ev.preventDefault();
      ev.stopPropagation();

@@ -98,7 +118,7 @@ function EditableTitle(
  );

  const handleKeyDown = React.useCallback(
-    async (ev) => {
+    async (ev: React.KeyboardEvent<HTMLInputElement>) => {
      if (ev.nativeEvent.isComposing) {
        return;
      }
@@ -148,8 +168,8 @@ function EditableTitle(
  );
 }

-const Text = styled.span`
-  ${truncateMultiline(3)}
+const Text = styled.div`
+  ${ellipsis()}
 `;

 const Input = styled.input`
@@ -21,6 +21,7 @@ import useEmbeds from "~/hooks/useEmbeds";
 import useStores from "~/hooks/useStores";
 import { uploadFile, uploadFileFromUrl } from "~/utils/files";
 import lazyWithRetry from "~/utils/lazyWithRetry";
+import useShare from "@shared/hooks/useShare";

 const LazyLoadedEditor = lazyWithRetry(() => import("~/editor"));

@@ -33,7 +34,6 @@ export type Props = Optional<
  | "dictionary"
  | "extensions"
 > & {
-  shareId?: string | undefined;
  embedsDisabled?: boolean;
  onSynced?: () => Promise<void>;
  onPublish?: (event: React.MouseEvent) => void;
@@ -41,9 +41,9 @@ export type Props = Optional<
 };

 function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
-  const { id, shareId, onChange, onCreateCommentMark, onDeleteCommentMark } =
-    props;
+  const { id, onChange, onCreateCommentMark, onDeleteCommentMark } = props;
  const { comments } = useStores();
+  const { shareId } = useShare();
  const dictionary = useDictionary();
  const embeds = useEmbeds(!shareId);
  const localRef = React.useRef<SharedEditor>();
@@ -202,6 +202,7 @@ function Editor(props: Props, ref: React.RefObject<SharedEditor> | null) {
            style={props.style}
            editorStyle={props.editorStyle}
            commenting={!!props.onClickCommentMark}
+            lang={props.lang}
          >
            <div className="ProseMirror">
              {paragraphs.map((paragraph, index) => (
@@ -0,0 +1,217 @@
+import * as React from "react";
+import { useDropzone } from "react-dropzone";
+import { useTranslation } from "react-i18next";
+import { toast } from "sonner";
+import styled from "styled-components";
+import { s } from "@shared/styles";
+import { AttachmentPreset } from "@shared/types";
+import { getDataTransferFiles } from "@shared/utils/files";
+import ConfirmationDialog from "~/components/ConfirmationDialog";
+import Flex from "~/components/Flex";
+import Input from "~/components/Input";
+import Text from "~/components/Text";
+import useStores from "~/hooks/useStores";
+import { uploadFile } from "~/utils/files";
+import { compressImage } from "~/utils/compressImage";
+import { AttachmentValidation, EmojiValidation } from "@shared/validations";
+import { bytesToHumanReadable } from "@shared/utils/files";
+
+type Props = {
+  onSubmit: () => void;
+};
+
+export function EmojiCreateDialog({ onSubmit }: Props) {
+  const { t } = useTranslation();
+  const { emojis } = useStores();
+  const [name, setName] = React.useState("");
+  const [file, setFile] = React.useState<File | null>(null);
+  const [isUploading, setIsUploading] = React.useState(false);
+
+  const handleFileSelection = React.useCallback(
+    (file: File) => {
+      const isValidType = AttachmentValidation.emojiContentTypes.includes(
+        file.type
+      );
+
+      if (!isValidType) {
+        toast.error(
+          t("File type not supported. Please use PNG, JPG, GIF, or WebP.")
+        );
+        return;
+      }
+
+      // Validate file size
+      if (file.size > AttachmentValidation.emojiMaxFileSize) {
+        toast.error(
+          t("File size too large. Maximum size is {{ size }}.", {
+            size: bytesToHumanReadable(AttachmentValidation.emojiMaxFileSize),
+          })
+        );
+        return;
+      }
+
+      setFile(file);
+    },
+    [t]
+  );
+
+  const onDrop = React.useCallback(
+    (acceptedFiles: File[]) => {
+      if (acceptedFiles.length > 0) {
+        handleFileSelection(acceptedFiles[0]);
+      }
+    },
+    [handleFileSelection]
+  );
+
+  // Handle paste events
+  React.useEffect(() => {
+    const handlePaste = (event: ClipboardEvent) => {
+      const files = getDataTransferFiles(event);
+      if (files.length > 0) {
+        event.preventDefault();
+        handleFileSelection(files[0]);
+      }
+    };
+
+    document.addEventListener("paste", handlePaste);
+    return () => document.removeEventListener("paste", handlePaste);
+  }, [handleFileSelection]);
+
+  const { getRootProps, getInputProps, isDragActive } = useDropzone({
+    onDropAccepted: onDrop,
+    accept: AttachmentValidation.emojiContentTypes,
+    maxSize: AttachmentValidation.emojiMaxFileSize,
+    maxFiles: 1,
+  });
+
+  const handleSubmit = async () => {
+    if (!name.trim()) {
+      toast.error(t("Please enter a name for the emoji"));
+      return;
+    }
+
+    if (!file) {
+      toast.error(t("Please select an image file"));
+      return;
+    }
+
+    setIsUploading(true);
+    try {
+      const compressed = await compressImage(file, {
+        maxHeight: 64,
+        maxWidth: 64,
+      });
+
+      const attachment = await uploadFile(compressed, {
+        name: file.name,
+        preset: AttachmentPreset.Emoji,
+      });
+
+      await emojis.create({
+        name: name.trim(),
+        attachmentId: attachment.id,
+      });
+
+      toast.success(t("Emoji created successfully"));
+      onSubmit();
+    } finally {
+      setIsUploading(false);
+    }
+  };
+
+  const handleNameChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const { value } = event.target;
+    setName(value);
+  };
+
+  const isValidName = EmojiValidation.allowedNameCharacters.test(name);
+  const isValid = name.trim().length > 0 && file && isValidName;
+
+  return (
+    <ConfirmationDialog
+      onSubmit={handleSubmit}
+      disabled={!isValid || isUploading}
+      savingText={isUploading ? `${t("Uploading")}…` : undefined}
+      submitText={t("Add emoji")}
+    >
+      <Text as="p" type="secondary">
+        {t(
+          "The emoji name should be unique and contain only lowercase letters, numbers, and underscores."
+        )}
+      </Text>
+
+      <Input
+        label={t("Name")}
+        value={name}
+        onChange={handleNameChange}
+        placeholder="my_custom_emoji"
+        autoFocus
+        required
+        error={
+          !isValidName
+            ? t(
+                "name can only contain lowercase letters, numbers, and underscores."
+              )
+            : undefined
+        }
+      />
+
+      <DropZone {...getRootProps()}>
+        <input {...getInputProps()} />
+        <Flex column align="center" gap={8}>
+          {file ? (
+            <>
+              <PreviewImage src={URL.createObjectURL(file)} alt="Preview" />
+              <Text size="medium">{file.name}</Text>
+              <Text size="medium" type="secondary">
+                {t("Click or drag to replace")}
+              </Text>
+            </>
+          ) : (
+            <>
+              <Text size="medium">
+                {isDragActive
+                  ? t("Drop the image here")
+                  : t("Click, drop, or paste an image here")}
+              </Text>
+              <Text size="medium" type="secondary">
+                {t("PNG, JPG, GIF, or WebP up to {{ size }}", {
+                  size: bytesToHumanReadable(
+                    AttachmentValidation.emojiMaxFileSize
+                  ),
+                })}
+              </Text>
+            </>
+          )}
+        </Flex>
+      </DropZone>
+
+      {name.trim() && isValidName && (
+        <Text type="secondary" style={{ marginTop: "8px" }}>
+          {t("This emoji will be available as")} <code>:{name}:</code>
+        </Text>
+      )}
+    </ConfirmationDialog>
+  );
+}
+
+const DropZone = styled.div`
+  border: 2px dashed ${s("inputBorder")};
+  border-radius: 8px;
+  padding: 24px;
+  text-align: center;
+  cursor: var(--pointer);
+  transition: border-color 0.2s;
+
+  &:hover {
+    border-color: ${s("inputBorderFocused")};
+  }
+`;
+
+const PreviewImage = styled.img`
+  width: 64px;
+  height: 64px;
+  object-fit: contain;
+  border-radius: 4px;
+`;
@@ -46,20 +46,22 @@ class ErrorBoundary extends React.Component<Props> {

  componentDidCatch(error: Error) {
    this.error = error;
+    this.trackError();

    if (
      this.props.reloadOnChunkMissing &&
      error.message &&
-      error.message.match(/dynamically imported module/)
+      error.message.match(/dynamically imported module/) &&
+      !this.isRepeatedError
    ) {
      // If the editor bundle fails to load then reload the entire window. This
      // can happen if a deploy happens between the user loading the initial JS
      // bundle and the async-loaded editor JS bundle as the hash will change.
+      // Don't reload if this is a repeated error to avoid infinite reload loops.
      window.location.reload();
      return;
    }

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

@@ -156,19 +156,21 @@ function ExportDialog({ collection, onSubmit }: Props) {
            </Text>{" "}
          </div>
        </Option>
-        <Option>
-          <input
-            type="checkbox"
-            name="includePrivate"
-            checked={includePrivate}
-            onChange={handleIncludePrivateChange}
-          />
-          <div>
-            <Text as="p" size="small" weight="bold">
-              {t("Include private collections")}
-            </Text>
-          </div>
-        </Option>
+        {!collection && (
+          <Option>
+            <input
+              type="checkbox"
+              name="includePrivate"
+              checked={includePrivate}
+              onChange={handleIncludePrivateChange}
+            />
+            <div>
+              <Text as="p" size="small" weight="bold">
+                {t("Include private collections")}
+              </Text>
+            </div>
+          </Option>
+        )}
      </Flex>
    </ConfirmationDialog>
  );
@@ -6,6 +6,7 @@ import User from "~/models/User";
 import { Avatar, AvatarSize } from "~/components/Avatar";
 import Flex from "~/components/Flex";
 import { s } from "@shared/styles";
+import { VisuallyHidden } from "@radix-ui/react-visually-hidden";

 type Props = {
  /** The users to display */
@@ -68,7 +69,9 @@ function Facepile({
          />
        );
      })}
-      <FacepileClip size={size} />
+      <VisuallyHidden>
+        <FacepileClip size={size} />
+      </VisuallyHidden>
    </Avatars>
  );
 }
@@ -10,6 +10,7 @@ import Input, { NativeInput, Outline } from "./Input";
 import PaginatedList, { PaginatedItem } from "./PaginatedList";
 import { MenuProvider } from "./primitives/Menu/MenuContext";
 import { Menu, MenuContent, MenuTrigger, MenuButton } from "./primitives/Menu";
+import { MenuIconWrapper } from "./primitives/components/Menu";

 interface TFilterOption extends PaginatedItem {
  key: string;
@@ -55,7 +56,11 @@ const FilterOptions = ({
    (option) => (
      <MenuButton
        key={option.key}
-        icon={option.icon}
+        icon={
+          option.icon ? (
+            <MenuIconWrapper aria-hidden>{option.icon}</MenuIconWrapper>
+          ) : undefined
+        }
        label={option.label}
        onClick={() => {
          onSelect(option.key);
@@ -77,30 +82,45 @@ const FilterOptions = ({
  const filteredOptions = React.useMemo(() => {
    const normalizedQuery = deburr(query.toLowerCase());

-    return query
-      ? options
-          .filter((option) =>
-            deburr(option.label).toLowerCase().includes(normalizedQuery)
-          )
-          // sort options starting with query first
-          .sort((a, b) => {
-            const aStartsWith = deburr(a.label)
-              .toLowerCase()
-              .startsWith(normalizedQuery);
-            const bStartsWith = deburr(b.label)
-              .toLowerCase()
-              .startsWith(normalizedQuery);
-
-            if (aStartsWith && !bStartsWith) {
-              return -1;
-            }
-            if (!aStartsWith && bStartsWith) {
-              return 1;
-            }
-            return 0;
-          })
+    const filtered = query
+      ? options.filter((option) =>
+          deburr(option.label).toLowerCase().includes(normalizedQuery)
+        )
      : options;
-  }, [options, query]);
+
+    return filtered.sort((a, b) => {
+      const aSelected = selectedKeys.includes(a.key);
+      const bSelected = selectedKeys.includes(b.key);
+
+      // Selected items come first
+      if (aSelected && !bSelected) {
+        return -1;
+      }
+      if (!aSelected && bSelected) {
+        return 1;
+      }
+
+      // If both have the same selection state and there's a query,
+      // sort options starting with query first
+      if (query) {
+        const aStartsWith = deburr(a.label)
+          .toLowerCase()
+          .startsWith(normalizedQuery);
+        const bStartsWith = deburr(b.label)
+          .toLowerCase()
+          .startsWith(normalizedQuery);
+
+        if (aStartsWith && !bStartsWith) {
+          return -1;
+        }
+        if (!aStartsWith && bStartsWith) {
+          return 1;
+        }
+      }
+
+      return 0;
+    });
+  }, [options, query, selectedKeys]);

  const handleKeyDown = React.useCallback(
    (ev: React.KeyboardEvent) => {
@@ -108,6 +128,10 @@ const FilterOptions = ({
        return;
      }

+      // Stop all keyboard events from propagating to prevent Radix UI menu
+      // from handling them and potentially moving focus
+      ev.stopPropagation();
+
      switch (ev.key) {
        case "Escape":
          setOpen(false);
@@ -117,12 +117,31 @@ const HoverPreviewDesktop = observer(
        <Position top={cardTop} left={cardLeft} aria-hidden>
          {isVisible ? (
            <Animate
-              initial={{ opacity: 0, y: -20, pointerEvents: "none" }}
+              initial={{
+                opacity: 0,
+                y: -20,
+                filter: "blur(5px)",
+                pointerEvents: "none",
+              }}
              animate={{
                opacity: 1,
                y: 0,
+                filter: "blur(0px)",
                transitionEnd: { pointerEvents: "auto" },
              }}
+              transition={{
+                y: {
+                  type: "spring",
+                  stiffness: 400,
+                  damping: 25,
+                },
+                opacity: {
+                  duration: 0.2,
+                },
+                filter: {
+                  duration: 0.2,
+                },
+              }}
            >
              {data.type === UnfurlResourceType.Mention ? (
                <HoverPreviewMention
@@ -137,6 +156,7 @@ const HoverPreviewDesktop = observer(
                <HoverPreviewGroup
                  ref={cardRef}
                  name={data.name}
+                  description={data.description}
                  memberCount={data.memberCount}
                  users={data.users}
                />
@@ -1,4 +1,5 @@
 import * as React from "react";
+import { useTranslation } from "react-i18next";
 import { UnfurlResourceType, UnfurlResponse } from "@shared/types";
 import { MAX_AVATAR_DISPLAY } from "@shared/constants";
 import User from "~/models/User";
@@ -17,21 +18,30 @@ import ErrorBoundary from "../ErrorBoundary";
 type Props = Omit<UnfurlResponse[UnfurlResourceType.Group], "type">;

 const HoverPreviewGroup = React.forwardRef(function _HoverPreviewGroup(
-  { name, memberCount, users }: Props,
+  { name, description, memberCount, users }: Props,
  ref: React.Ref<HTMLDivElement>
 ) {
+  const { t } = useTranslation();
+
  return (
    <Preview as="div">
      <Card fadeOut={false} ref={ref}>
        <CardContent>
          <ErrorBoundary showTitle={false} reloadOnChunkMissing={false}>
            <Flex column gap={2} align="start">
-              <Title>{name}</Title>
-              <Info>
-                {memberCount === 1 ? "1 member" : `${memberCount} members`}
-              </Info>
-              {users.length > 0 && (
-                <Description>
+              <Flex
+                justify="space-between"
+                gap={4}
+                style={{ width: "100%" }}
+                auto
+              >
+                <Flex column align="start">
+                  <Title>{name}</Title>
+                  <Info>
+                    {t("{{ count }} members", { count: memberCount })}
+                  </Info>
+                </Flex>
+                {users.length > 0 && (
                  <Facepile
                    users={users.map(
                      (member) =>
@@ -46,8 +56,9 @@ const HoverPreviewGroup = React.forwardRef(function _HoverPreviewGroup(
                    overflow={Math.max(0, memberCount - users.length)}
                    limit={MAX_AVATAR_DISPLAY}
                  />
-                </Description>
-              )}
+                )}
+              </Flex>
+              {description && <Description>{description}</Description>}
            </Flex>
          </ErrorBoundary>
        </CardContent>
@@ -1,17 +1,11 @@
-import { BackIcon } from "outline-icons";
 import * as React from "react";
+import debounce from "lodash/debounce";
 import styled from "styled-components";
-import { breakpoints, s, hover } from "@shared/styles";
+import { s } from "@shared/styles";
 import { colorPalette } from "@shared/utils/collections";
-import { validateColorHex } from "@shared/utils/color";
 import Flex from "~/components/Flex";
-import NudeButton from "~/components/NudeButton";
-import Text from "~/components/Text";
-
-enum Panel {
-  Builtin,
-  Hex,
-}
+import { SwatchButton } from "~/components/SwatchButton";
+import { ColorButton } from "~/components/ColorButton";

 type Props = {
  width: number;
@@ -19,128 +13,77 @@ type Props = {
  onSelect: (color: string) => void;
 };

-const ColorPicker = ({ width, activeColor, onSelect }: Props) => {
-  const [localValue, setLocalValue] = React.useState(activeColor);
+const ColorPicker = ({ activeColor, onSelect }: Props) => {
+  const [selectedColor, setSelectedColor] = React.useState(activeColor);
+  const isBuiltInColor = colorPalette.includes(selectedColor);
+  const color = isBuiltInColor ? undefined : selectedColor;

-  const [panel, setPanel] = React.useState(
-    colorPalette.includes(activeColor) ? Panel.Builtin : Panel.Hex
+  const debouncedOnSelect = React.useMemo(
+    () =>
+      debounce((color: string) => {
+        onSelect(color);
+      }, 250),
+    [onSelect]
  );

-  const handleSwitcherClick = React.useCallback(() => {
-    setPanel(panel === Panel.Builtin ? Panel.Hex : Panel.Builtin);
-  }, [panel, setPanel]);
-
-  const isLargeMobile = width > breakpoints.mobileLarge + 12; // 12px for the Container padding
+  React.useEffect(
+    () => () => {
+      debouncedOnSelect.cancel();
+    },
+    [debouncedOnSelect]
+  );

  React.useEffect(() => {
-    setLocalValue(activeColor);
-    setPanel(colorPalette.includes(activeColor) ? Panel.Builtin : Panel.Hex);
+    setSelectedColor(activeColor);
  }, [activeColor]);

-  return isLargeMobile ? (
-    <Container justify="space-between">
-      <LargeMobileBuiltinColors activeColor={activeColor} onClick={onSelect} />
-      <LargeMobileCustomColor
-        value={localValue}
-        setLocalValue={setLocalValue}
-        onValidHex={onSelect}
+  const handleSelect = (color: string) => {
+    setSelectedColor(color);
+    debouncedOnSelect(color);
+  };
+
+  return (
+    <BuiltinColors activeColor={selectedColor} onClick={handleSelect}>
+      <Divider />
+      <SwatchButton
+        color={color}
+        active={!isBuiltInColor}
+        onChange={handleSelect}
+        pickerInModal
      />
-    </Container>
-  ) : (
-    <Container gap={12}>
-      <PanelSwitcher align="center">
-        <SwitcherButton panel={panel} onClick={handleSwitcherClick}>
-          {panel === Panel.Builtin ? "#" : <BackIcon />}
-        </SwitcherButton>
-      </PanelSwitcher>
-      {panel === Panel.Builtin ? (
-        <BuiltinColors activeColor={activeColor} onClick={onSelect} />
-      ) : (
-        <CustomColor
-          value={localValue}
-          setLocalValue={setLocalValue}
-          onValidHex={onSelect}
-        />
-      )}
-    </Container>
+    </BuiltinColors>
  );
 };

+const Divider = styled.div`
+  width: 1px;
+  height: 24px;
+  background-color: ${s("inputBorder")};
+`;
+
 const BuiltinColors = ({
  activeColor,
  onClick,
  className,
+  children,
 }: {
  activeColor: string;
  onClick: (color: string) => void;
  className?: string;
+  children?: React.ReactNode;
 }) => (
-  <Flex className={className} justify="space-between" align="center" auto>
+  <Container className={className} justify="space-between" align="center" auto>
    {colorPalette.map((color) => (
      <ColorButton
        key={color}
-        $color={color}
-        $active={color === activeColor}
+        color={color}
+        active={color === activeColor}
        onClick={() => onClick(color)}
-      >
-        <Selected />
-      </ColorButton>
-    ))}
-  </Flex>
-);
-
-const CustomColor = ({
-  value,
-  setLocalValue,
-  onValidHex,
-  className,
-}: {
-  value: string;
-  setLocalValue: (value: string) => void;
-  onValidHex: (color: string) => void;
-  className?: string;
-}) => {
-  const hasHexChars = React.useCallback(
-    (color: string) => /(^#[0-9A-F]{1,6}$)/i.test(color),
-    []
-  );
-
-  const handleInputChange = React.useCallback(
-    (ev: React.ChangeEvent<HTMLInputElement>) => {
-      const val = ev.target.value;
-
-      if (val === "" || val === "#") {
-        setLocalValue("#");
-        return;
-      }
-
-      const uppercasedVal = val.toUpperCase();
-
-      if (hasHexChars(uppercasedVal)) {
-        setLocalValue(uppercasedVal);
-      }
-
-      if (validateColorHex(uppercasedVal)) {
-        onValidHex(uppercasedVal);
-      }
-    },
-    [setLocalValue, hasHexChars, onValidHex]
-  );
-
-  return (
-    <Flex className={className} align="center" gap={8}>
-      <Text type="tertiary" size="small">
-        HEX
-      </Text>
-      <CustomColorInput
-        maxLength={7}
-        value={value}
-        onChange={handleInputChange}
-        autoFocus
      />
-    </Flex>
-  );
-};
+    ))}
+    {children}
+  </Container>
+);

 const Container = styled(Flex)`
  height: 48px;
@@ -148,71 +91,4 @@ const Container = styled(Flex)`
  border-bottom: 1px solid ${s("inputBorder")};
 `;

-const Selected = styled.span`
-  width: 10px;
-  height: 5px;
-  border-left: 2px solid white;
-  border-bottom: 2px solid white;
-  transform: translateY(-25%) rotate(-45deg);
-`;
-
-const ColorButton = styled(NudeButton)<{ $color: string; $active: boolean }>`
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-  width: 24px;
-  height: 24px;
-  border-radius: 50%;
-  background-color: ${({ $color }) => $color};
-
-  &: ${hover} {
-    outline: 2px solid ${s("menuBackground")} !important;
-    box-shadow: ${({ $color }) => `0px 0px 3px 3px ${$color}`};
-  }
-
-  & ${Selected} {
-    display: ${({ $active }) => ($active ? "block" : "none")};
-  }
-`;
-
-const PanelSwitcher = styled(Flex)`
-  width: 40px;
-  border-right: 1px solid ${s("inputBorder")};
-`;
-
-const SwitcherButton = styled(NudeButton)<{ panel: Panel }>`
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-  font-size: 14px;
-  border: 1px solid ${s("inputBorder")};
-  transition: all 100ms ease-in-out;
-
-  &: ${hover} {
-    border-color: ${s("inputBorderFocused")};
-  }
-`;
-
-const LargeMobileBuiltinColors = styled(BuiltinColors)`
-  max-width: 400px;
-  padding-right: 8px;
-`;
-
-const LargeMobileCustomColor = styled(CustomColor)`
-  padding-left: 8px;
-  border-left: 1px solid ${s("inputBorder")};
-  width: 120px;
-`;
-
-const CustomColorInput = styled.input.attrs(() => ({
-  type: "text",
-  autocomplete: "off",
-}))`
-  font-size: 14px;
-  color: ${s("textSecondary")};
-  background: transparent;
-  border: 0;
-  outline: 0;
-`;
-
 export default ColorPicker;
@@ -0,0 +1,12 @@
+import Flex from "@shared/components/Flex";
+import styled from "styled-components";
+import InputSearch from "~/components/InputSearch";
+
+export const UserInputContainer = styled(Flex)`
+  height: 48px;
+  padding: 6px 12px 0px;
+`;
+
+export const StyledInputSearch = styled(InputSearch)`
+  flex-grow: 1;
+`;
@@ -0,0 +1,170 @@
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import Flex from "~/components/Flex";
+import useStores from "~/hooks/useStores";
+import GridTemplate, { DataNode, EmojiNode } from "./GridTemplate";
+import { IconType } from "@shared/types";
+import { DisplayCategory } from "../utils";
+import { StyledInputSearch, UserInputContainer } from "./Components";
+import { useIconState } from "../useIconState";
+import Emoji from "~/models/Emoji";
+
+const GRID_HEIGHT = 410;
+
+type Props = {
+  panelWidth: number;
+  height?: number;
+  query: string;
+  panelActive: boolean;
+  onEmojiChange: (emoji: string) => void;
+  onQueryChange: (query: string) => void;
+};
+
+const CustomEmojiPanel = ({
+  query,
+  panelActive,
+  panelWidth,
+  height = GRID_HEIGHT,
+  onEmojiChange,
+  onQueryChange,
+}: Props) => {
+  const { t } = useTranslation();
+  const searchRef = React.useRef<HTMLInputElement | null>(null);
+  const scrollableRef = React.useRef<HTMLDivElement | null>(null);
+  const [searchData, setSearchData] = useState<DataNode[]>([]);
+  const [freqEmojis, setFreqEmojis] = useState<EmojiNode[]>([]);
+  const { getFrequentIcons, incrementIconCount } = useIconState(
+    IconType.Custom
+  );
+
+  const { emojis } = useStores();
+
+  const handleFilter = React.useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      onQueryChange(event.target.value);
+    },
+    [onQueryChange]
+  );
+
+  useEffect(() => {
+    if (query.trim()) {
+      const initialData = emojis.findByQuery(query);
+      if (initialData.length) {
+        setSearchData([
+          {
+            category: DisplayCategory.Search,
+            icons: initialData?.map(toIcon),
+          },
+        ]);
+      }
+
+      emojis
+        .fetchAll({
+          query,
+        })
+        .then((data) => {
+          if (data.length) {
+            const iconMap = new Map([
+              ...initialData.map((emoji): [string, EmojiNode] => [
+                emoji.name,
+                toIcon(emoji),
+              ]),
+              ...data.map((emoji): [string, EmojiNode] => [
+                emoji.name,
+                toIcon(emoji),
+              ]),
+            ]);
+
+            setSearchData([
+              {
+                category: DisplayCategory.Search,
+                icons: Array.from(iconMap.values()),
+              },
+            ]);
+            return;
+          }
+
+          setSearchData([]);
+        });
+    } else {
+      setSearchData([]);
+    }
+  }, [query, emojis]);
+
+  useEffect(() => {
+    getFrequentIcons().forEach((id) => {
+      emojis
+        .fetch(id)
+        .then((emoji) => {
+          setFreqEmojis((prev) => {
+            if (prev.some((item) => item.id === id)) {
+              return prev;
+            }
+            return [...prev, toIcon(emoji)];
+          });
+        })
+        .catch(() => {
+          // ignore
+        });
+    });
+  }, [getFrequentIcons, emojis]);
+
+  const handleEmojiSelection = React.useCallback(
+    ({ id }: { id: string }) => {
+      onEmojiChange(id);
+      incrementIconCount(id);
+    },
+    [onEmojiChange, incrementIconCount]
+  );
+
+  const templateData: DataNode[] = React.useMemo(
+    () => [
+      {
+        category: DisplayCategory.Frequent,
+        icons: freqEmojis,
+      },
+      {
+        category: DisplayCategory.All,
+        icons: emojis.orderedData.map(toIcon),
+      },
+    ],
+    [emojis.orderedData, freqEmojis]
+  );
+
+  React.useLayoutEffect(() => {
+    if (!panelActive) {
+      return;
+    }
+    scrollableRef.current?.scroll({ top: 0 });
+    requestAnimationFrame(() => searchRef.current?.focus());
+  }, [panelActive]);
+
+  return (
+    <Flex column>
+      <UserInputContainer align="center" gap={12}>
+        <StyledInputSearch
+          ref={searchRef}
+          value={query}
+          placeholder={`${t("Search")}…`}
+          onChange={handleFilter}
+        />
+      </UserInputContainer>
+      <GridTemplate
+        ref={scrollableRef}
+        width={panelWidth}
+        height={height - 48}
+        data={searchData.length ? searchData : templateData}
+        onIconSelect={handleEmojiSelection}
+      />
+    </Flex>
+  );
+};
+
+const toIcon = (emoji: Emoji): EmojiNode => ({
+  type: IconType.Custom,
+  id: emoji.id,
+  value: emoji.id,
+  name: emoji.name,
+});
+
+export default CustomEmojiPanel;
@@ -1,77 +1,17 @@
 import concat from "lodash/concat";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import styled from "styled-components";
 import { EmojiCategory, EmojiSkinTone, IconType } from "@shared/types";
 import { getEmojis, getEmojisWithCategory, search } from "@shared/utils/emoji";
 import Flex from "~/components/Flex";
-import InputSearch from "~/components/InputSearch";
-import usePersistedState from "~/hooks/usePersistedState";
-import {
-  FREQUENTLY_USED_COUNT,
-  DisplayCategory,
-  emojiSkinToneKey,
-  emojisFreqKey,
-  lastEmojiKey,
-  sortFrequencies,
-} from "../utils";
+import { DisplayCategory } from "../utils";
 import GridTemplate, { DataNode } from "./GridTemplate";
 import SkinTonePicker from "./SkinTonePicker";
+import { StyledInputSearch, UserInputContainer } from "./Components";
+import { useIconState } from "../useIconState";

 const GRID_HEIGHT = 410;

-const useEmojiState = () => {
-  const [emojiSkinTone, setEmojiSkinTone] = usePersistedState<EmojiSkinTone>(
-    emojiSkinToneKey,
-    EmojiSkinTone.Default
-  );
-  const [emojisFreq, setEmojisFreq] = usePersistedState<Record<string, number>>(
-    emojisFreqKey,
-    {}
-  );
-  const [lastEmoji, setLastEmoji] = usePersistedState<string | undefined>(
-    lastEmojiKey,
-    undefined
-  );
-
-  const incrementEmojiCount = React.useCallback(
-    (emoji: string) => {
-      emojisFreq[emoji] = (emojisFreq[emoji] ?? 0) + 1;
-      setEmojisFreq({ ...emojisFreq });
-      setLastEmoji(emoji);
-    },
-    [emojisFreq, setEmojisFreq, setLastEmoji]
-  );
-
-  const getFreqEmojis = React.useCallback(() => {
-    const freqs = Object.entries(emojisFreq);
-
-    if (freqs.length > FREQUENTLY_USED_COUNT.Track) {
-      sortFrequencies(freqs).splice(FREQUENTLY_USED_COUNT.Track);
-      setEmojisFreq(Object.fromEntries(freqs));
-    }
-
-    const emojis = sortFrequencies(freqs)
-      .slice(0, FREQUENTLY_USED_COUNT.Get)
-      .map(([emoji, _]) => emoji);
-
-    const isLastPresent = emojis.includes(lastEmoji ?? "");
-    if (lastEmoji && !isLastPresent) {
-      emojis.pop();
-      emojis.push(lastEmoji);
-    }
-
-    return emojis;
-  }, [emojisFreq, setEmojisFreq, lastEmoji]);
-
-  return {
-    emojiSkinTone,
-    setEmojiSkinTone,
-    incrementEmojiCount,
-    getFreqEmojis,
-  };
-};
-
 type Props = {
  panelWidth: number;
  query: string;
@@ -97,11 +37,14 @@ const EmojiPanel = ({
  const {
    emojiSkinTone: skinTone,
    setEmojiSkinTone,
-    incrementEmojiCount,
-    getFreqEmojis,
-  } = useEmojiState();
+    incrementIconCount,
+    getFrequentIcons,
+  } = useIconState(IconType.Emoji);

-  const freqEmojis = React.useMemo(() => getFreqEmojis(), [getFreqEmojis]);
+  const freqEmojis = React.useMemo(
+    () => getFrequentIcons(),
+    [getFrequentIcons]
+  );

  const handleFilter = React.useCallback(
    (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -120,9 +63,9 @@ const EmojiPanel = ({
  const handleEmojiSelection = React.useCallback(
    ({ id, value }: { id: string; value: string }) => {
      onEmojiChange(value);
-      incrementEmojiCount(id);
+      incrementIconCount(id);
    },
-    [onEmojiChange, incrementEmojiCount]
+    [onEmojiChange, incrementIconCount]
  );

  const isSearch = query !== "";
@@ -195,7 +138,7 @@ const getAllEmojis = ({
 }): DataNode[] => {
  const emojisWithCategory = getEmojisWithCategory({ skinTone });

-  const getFrequentEmojis = (): DataNode => {
+  const getFrequentIcons = (): DataNode => {
    const emojis = getEmojis({ ids: freqEmojis, skinTone });
    return {
      category: DisplayCategory.Frequent,
@@ -220,7 +163,7 @@ const getAllEmojis = ({
  };

  return concat(
-    getFrequentEmojis(),
+    getFrequentIcons(),
    getCategoryData(EmojiCategory.People),
    getCategoryData(EmojiCategory.Nature),
    getCategoryData(EmojiCategory.Foods),
@@ -232,13 +175,4 @@ const getAllEmojis = ({
  );
 };

-const UserInputContainer = styled(Flex)`
-  height: 48px;
-  padding: 6px 12px 0px;
-`;
-
-const StyledInputSearch = styled(InputSearch)`
-  flex-grow: 1;
-`;
-
 export default EmojiPanel;
@@ -9,6 +9,7 @@ import Text from "~/components/Text";
 import { TRANSLATED_CATEGORIES } from "../utils";
 import Grid from "./Grid";
 import { IconButton } from "./IconButton";
+import { CustomEmoji } from "@shared/components/CustomEmoji";

 /**
 * icon/emoji size is 24px; and we add 4px padding on all sides,
@@ -23,10 +24,11 @@ type OutlineNode = {
  delay: number;
 };

-type EmojiNode = {
-  type: IconType.Emoji;
+export type EmojiNode = {
+  type: IconType.Emoji | IconType.Custom;
  id: string;
  value: string;
+  name?: string;
 };

 export type DataNode = {
@@ -86,7 +88,11 @@ const GridTemplate = (
            onClick={() => onIconSelect({ id: item.id, value: item.value })}
          >
            <Emoji width={24} height={24}>
-              {item.value}
+              {item.type === IconType.Custom ? (
+                <CustomEmoji value={item.value} title={item.name} />
+              ) : (
+                item.value
+              )}
            </Emoji>
          </IconButton>
        );
@@ -5,16 +5,10 @@ import { IconType } from "@shared/types";
 import { IconLibrary } from "@shared/utils/IconLibrary";
 import Flex from "~/components/Flex";
 import InputSearch from "~/components/InputSearch";
-import usePersistedState from "~/hooks/usePersistedState";
-import {
-  FREQUENTLY_USED_COUNT,
-  DisplayCategory,
-  iconsFreqKey,
-  lastIconKey,
-  sortFrequencies,
-} from "../utils";
+import { DisplayCategory } from "../utils";
 import ColorPicker from "./ColorPicker";
 import GridTemplate, { DataNode } from "./GridTemplate";
+import { useIconState } from "../useIconState";

 const IconNames = Object.keys(IconLibrary.mapping);
 const TotalIcons = IconNames.length;
@@ -25,52 +19,6 @@ const TotalIcons = IconNames.length;
 */
 const GRID_HEIGHT = 314;

-const useIconState = () => {
-  const [iconsFreq, setIconsFreq] = usePersistedState<Record<string, number>>(
-    iconsFreqKey,
-    {}
-  );
-  const [lastIcon, setLastIcon] = usePersistedState<string | undefined>(
-    lastIconKey,
-    undefined
-  );
-
-  const incrementIconCount = React.useCallback(
-    (icon: string) => {
-      iconsFreq[icon] = (iconsFreq[icon] ?? 0) + 1;
-      setIconsFreq({ ...iconsFreq });
-      setLastIcon(icon);
-    },
-    [iconsFreq, setIconsFreq, setLastIcon]
-  );
-
-  const getFreqIcons = React.useCallback(() => {
-    const freqs = Object.entries(iconsFreq);
-
-    if (freqs.length > FREQUENTLY_USED_COUNT.Track) {
-      sortFrequencies(freqs).splice(FREQUENTLY_USED_COUNT.Track);
-      setIconsFreq(Object.fromEntries(freqs));
-    }
-
-    const icons = sortFrequencies(freqs)
-      .slice(0, FREQUENTLY_USED_COUNT.Get)
-      .map(([icon, _]) => icon);
-
-    const isLastPresent = icons.includes(lastIcon ?? "");
-    if (lastIcon && !isLastPresent) {
-      icons.pop();
-      icons.push(lastIcon);
-    }
-
-    return icons;
-  }, [iconsFreq, setIconsFreq, lastIcon]);
-
-  return {
-    incrementIconCount,
-    getFreqIcons,
-  };
-};
-
 type Props = {
  panelWidth: number;
  initial: string;
@@ -97,9 +45,9 @@ const IconPanel = ({
  const searchRef = React.useRef<HTMLInputElement | null>(null);
  const scrollableRef = React.useRef<HTMLDivElement | null>(null);

-  const { incrementIconCount, getFreqIcons } = useIconState();
+  const { incrementIconCount, getFrequentIcons } = useIconState(IconType.SVG);

-  const freqIcons = React.useMemo(() => getFreqIcons(), [getFreqIcons]);
+  const freqIcons = React.useMemo(() => getFrequentIcons(), [getFrequentIcons]);
  const totalFreqIcons = freqIcons.length;

  const filteredIcons = React.useMemo(
@@ -21,10 +21,13 @@ import { Drawer, DrawerContent, DrawerTrigger } from "../primitives/Drawer";
 import EmojiPanel from "./components/EmojiPanel";
 import IconPanel from "./components/IconPanel";
 import { PopoverButton } from "./components/PopoverButton";
+import CustomEmojiPanel from "./components/CustomEmojiPanel";
+import useStores from "~/hooks/useStores";

 const TAB_NAMES = {
  Icon: "icon",
  Emoji: "emoji",
+  Custom: "custom",
 } as const;

 type TabName = (typeof TAB_NAMES)[keyof typeof TAB_NAMES];
@@ -61,7 +64,7 @@ const IconPicker = ({
  children,
 }: Props) => {
  const { t } = useTranslation();
-
+  const { emojis } = useStores();
  const { width: windowWidth } = useWindowSize();
  const isMobile = useMobile();

@@ -168,6 +171,12 @@ const IconPicker = ({
    setActiveTab(defaultTab);
  }, [defaultTab]);

+  React.useEffect(() => {
+    if (open) {
+      void emojis.fetchAll();
+    }
+  }, [open]);
+
  if (isMobile) {
    return (
      <Drawer open={open} onOpenChange={setOpen}>
@@ -245,6 +254,13 @@ const Content = ({
          >
            {t("Emojis")}
          </StyledTab>
+          <StyledTab
+            value={TAB_NAMES["Custom"]}
+            aria-label={t("Custom Emojis")}
+            $active={activeTab === TAB_NAMES["Custom"]}
+          >
+            {t("Custom")}
+          </StyledTab>
        </Tabs.List>
        {allowDelete && (
          <RemoveButton onClick={onIconRemove}>{t("Remove")}</RemoveButton>
@@ -271,6 +287,15 @@ const Content = ({
          onQueryChange={onQueryChange}
        />
      </StyledTabContent>
+      <StyledTabContent value={TAB_NAMES["Custom"]}>
+        <CustomEmojiPanel
+          panelWidth={panelWidth}
+          query={query}
+          panelActive={open && activeTab === TAB_NAMES["Custom"]}
+          onEmojiChange={onIconChange}
+          onQueryChange={onQueryChange}
+        />
+      </StyledTabContent>
    </Tabs.Root>
  );
 };
@@ -0,0 +1,89 @@
+import {
+  customEmojisFreqKey,
+  emojisFreqKey,
+  emojiSkinToneKey,
+  FREQUENTLY_USED_COUNT,
+  iconsFreqKey,
+  lastCustomEmojiKey,
+  lastEmojiKey,
+  lastIconKey,
+  sortFrequencies,
+} from "./utils";
+import usePersistedState from "~/hooks/usePersistedState";
+import { EmojiSkinTone, IconType } from "@shared/types";
+import React from "react";
+
+const lastIconKeys = {
+  [IconType.Custom]: lastCustomEmojiKey,
+  [IconType.Emoji]: lastEmojiKey,
+  [IconType.SVG]: lastIconKey,
+};
+
+const freqIconKeys = {
+  [IconType.Custom]: customEmojisFreqKey,
+  [IconType.Emoji]: emojisFreqKey,
+  [IconType.SVG]: iconsFreqKey,
+};
+
+const skinToneKeys = {
+  [IconType.Custom]: "",
+  [IconType.Emoji]: emojiSkinToneKey,
+  [IconType.SVG]: "",
+};
+
+export const useIconState = (type: IconType) => {
+  const [emojiSkinTone, setEmojiSkinTone] = usePersistedState<EmojiSkinTone>(
+    skinToneKeys[type],
+    EmojiSkinTone.Default
+  );
+
+  const [iconFreq, setIconFreq] = usePersistedState<Record<string, number>>(
+    freqIconKeys[type],
+    {}
+  );
+
+  const [lastIcon, setLastIcon] = usePersistedState<string | undefined>(
+    lastIconKeys[type],
+    undefined
+  );
+
+  const incrementIconCount = React.useCallback(
+    (emoji: string) => {
+      iconFreq[emoji] = (iconFreq[emoji] ?? 0) + 1;
+      setIconFreq({ ...iconFreq });
+      setLastIcon(emoji);
+    },
+    [iconFreq, setIconFreq, setLastIcon]
+  );
+
+  const getFrequentIcons = React.useCallback((): string[] => {
+    const freqs = Object.entries(iconFreq);
+
+    if (freqs.length > FREQUENTLY_USED_COUNT.Track) {
+      const trimmed = sortFrequencies(freqs).slice(
+        0,
+        FREQUENTLY_USED_COUNT.Track
+      );
+      setIconFreq(Object.fromEntries(trimmed));
+    }
+
+    const emojis = sortFrequencies(freqs)
+      .slice(0, FREQUENTLY_USED_COUNT.Get)
+      .map(([emoji, _]) => emoji);
+
+    const isLastPresent = emojis.includes(lastIcon ?? "");
+    if (lastIcon && !isLastPresent) {
+      emojis.pop();
+      emojis.push(lastIcon);
+    }
+
+    return emojis;
+  }, [iconFreq, lastIcon, setIconFreq]);
+
+  return {
+    emojiSkinTone,
+    setEmojiSkinTone,
+    incrementIconCount,
+    getFrequentIcons,
+  };
+};
@@ -18,6 +18,7 @@ export const TRANSLATED_CATEGORIES = {
  Objects: i18next.t("Objects"),
  Symbols: i18next.t("Symbols"),
  Flags: i18next.t("Flags"),
+  Custom: i18next.t("Custom"),
 };

 export const FREQUENTLY_USED_COUNT = {
@@ -32,6 +33,8 @@ const STORAGE_KEYS = {
  EmojisFrequency: "emojis-freq",
  LastIcon: "last-icon",
  LastEmoji: "last-emoji",
+  CustomEmojisFrequency: "custom-emojis-freq",
+  LastCustomEmoji: "last-custom-emoji",
 };

 const getStorageKey = (key: string) => `${STORAGE_KEYS.Base}.${key}`;
@@ -46,5 +49,11 @@ export const lastIconKey = getStorageKey(STORAGE_KEYS.LastIcon);

 export const lastEmojiKey = getStorageKey(STORAGE_KEYS.LastEmoji);

+export const customEmojisFreqKey = getStorageKey(
+  STORAGE_KEYS.CustomEmojisFrequency
+);
+
+export const lastCustomEmojiKey = getStorageKey(STORAGE_KEYS.LastCustomEmoji);
+
 export const sortFrequencies = (freqs: [string, number][]) =>
  freqs.sort((a, b) => (a[1] >= b[1] ? -1 : 1));
@@ -1,85 +1,41 @@
 import * as React from "react";
-import { useTranslation } from "react-i18next";
 import styled from "styled-components";
-import { s } from "@shared/styles";
-import lazyWithRetry from "~/utils/lazyWithRetry";
-import DelayedMount from "./DelayedMount";
 import Input, { Props as InputProps } from "./Input";
-import NudeButton from "./NudeButton";
 import Relative from "./Sidebar/components/Relative";
-import Text from "./Text";
-import { Popover, PopoverContent, PopoverTrigger } from "./primitives/Popover";
+import { SwatchButton } from "./SwatchButton";

+/**
+ * Props for the InputColor component.
+ */
 type Props = Omit<InputProps, "onChange"> & {
+  /** The current color value in hex format */
  value: string | undefined;
+  /** Callback function invoked when the color value changes */
  onChange: (value: string) => void;
 };

-const InputColor: React.FC<Props> = ({ value, onChange, ...rest }: Props) => {
-  const { t } = useTranslation();
+/**
+ * A color input component that combines a text input with a color picker swatch button.
+ * Automatically formats hex color values with a leading # character.
+ */
+const InputColor: React.FC<Props> = ({ value, onChange, ...rest }: Props) => (
+  <Relative>
+    <Input
+      value={value}
+      onChange={(event) => onChange(event.target.value.replace(/^#?/, "#"))}
+      placeholder="#"
+      maxLength={7}
+      {...rest}
+    />
+    <PositionedSwatchButton color={value} onChange={onChange} size={22} />
+  </Relative>
+);

-  return (
-    <Relative>
-      <Input
-        value={value}
-        onChange={(event) => onChange(event.target.value.replace(/^#?/, "#"))}
-        placeholder="#"
-        maxLength={7}
-        {...rest}
-      />
-      <Popover modal={true}>
-        <PopoverTrigger>
-          <SwatchButton aria-label={t("Show menu")} $background={value} />
-        </PopoverTrigger>
-        <StyledContent aria-label={t("Select a color")} align="end">
-          <React.Suspense
-            fallback={
-              <DelayedMount>
-                <Text>{t("Loading")}…</Text>
-              </DelayedMount>
-            }
-          >
-            <StyledColorPicker
-              disableAlpha
-              color={value}
-              onChange={(color) => onChange(color.hex)}
-            />
-          </React.Suspense>
-        </StyledContent>
-      </Popover>
-    </Relative>
-  );
-};
-
-const SwatchButton = styled(NudeButton)<{ $background: string | undefined }>`
-  background: ${(props) => props.$background};
-  border: 1px solid ${s("inputBorder")};
-  border-radius: 50%;
+const PositionedSwatchButton = styled(SwatchButton)`
+  border: 1px solid ${(props) => props.theme.inputBorder};
  position: absolute;
-  bottom: 20px;
+  bottom: 21px;
  right: 6px;
 `;

-const StyledContent = styled(PopoverContent)`
-  width: auto;
-  padding: 8px;
-`;
-
-const ColorPicker = lazyWithRetry(
-  () => import("react-color/lib/components/chrome/Chrome")
-);
-
-const StyledColorPicker = styled(ColorPicker)`
-  background: inherit !important;
-  box-shadow: none !important;
-  border: 0 !important;
-  border-radius: 0 !important;
-  user-select: none;
-
-  input {
-    user-select: text;
-    color: ${s("text")} !important;
-  }
-`;
-
 export default InputColor;
@@ -50,7 +50,7 @@ export type Item = {

 export type Option = Item | Separator;

-type Props = {
+type Props = Omit<React.HTMLAttributes<HTMLButtonElement>, "onChange"> & {
  /* Options to display in the select menu. */
  options: Option[];
  /* Current chosen value. */
@@ -4,20 +4,21 @@ import { Helmet } from "react-helmet-async";
 import styled, { DefaultTheme } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import { s } from "@shared/styles";
-import { isModKey } from "@shared/utils/keyboard";
 import Flex from "~/components/Flex";
 import { LoadingIndicatorBar } from "~/components/LoadingIndicator";
 import SkipNavContent from "~/components/SkipNavContent";
 import SkipNavLink from "~/components/SkipNavLink";
 import env from "~/env";
-import useAutoRefresh from "~/hooks/useAutoRefresh";
-import useKeyDown from "~/hooks/useKeyDown";
 import useStores from "~/hooks/useStores";

 type Props = {
+  /** Main content to render in the layout. */
  children?: React.ReactNode;
+  /** Page title to display in the browser tab. Defaults to app name if not provided. */
  title?: string;
+  /** Left sidebar content. */
  sidebar?: React.ReactNode;
+  /** Right sidebar content. */
  sidebarRight?: React.ReactNode;
 };

@@ -28,14 +29,6 @@ const Layout = React.forwardRef(function Layout_(
  const { ui } = useStores();
  const sidebarCollapsed = !sidebar || ui.sidebarIsClosed;

-  useAutoRefresh();
-
-  useKeyDown(".", (event) => {
-    if (isModKey(event)) {
-      ui.toggleCollapsedSidebar();
-    }
-  });
-
  return (
    <Container column auto ref={ref}>
      <Helmet>
@@ -25,6 +25,7 @@ import {
  NextIcon,
  ZoomInIcon,
  ZoomOutIcon,
+  EditIcon,
 } from "outline-icons";
 import { depths, extraArea, s } from "@shared/styles";
 import NudeButton from "./NudeButton";
@@ -50,6 +51,10 @@ import {
 } from "react-zoom-pan-pinch";
 import { transparentize } from "polished";
 import { mergeRefs } from "react-merge-refs";
+import { useEditor } from "~/editor/components/EditorContext";
+import { NodeSelection } from "prosemirror-state";
+import { ImageSource } from "@shared/editor/lib/FileHelper";
+import Desktop from "~/utils/Desktop";

 export enum LightboxStatus {
  READY_TO_OPEN,
@@ -86,7 +91,7 @@ const ANIMATION_DURATION = 0.3 * Second.ms;
 type Props = {
  /** List of allowed images */
  images: LightboxImage[];
-  /** The position of the currently active image in the document */
+  /** The currently active image in the document */
  activeImage: LightboxImage;
  /** Callback triggered when the active image is updated */
  onUpdate: (activeImage: LightboxImage | null) => void;
@@ -225,10 +230,11 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
    height: number;
  } | null>(null);
  const zoomPanPinchRef = useRef<ReactZoomPanPinchRef>(null);
+  const editor = useEditor();

  const currentImageIndex = findIndex(
    images,
-    (img) => img.getPos() === activeImage.getPos()
+    (img) => img.pos === activeImage.pos
  );

  // Debugging status changes
@@ -617,9 +623,9 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
    URL.revokeObjectURL(imageURL);
  };

-  const download = useCallback(() => {
+  const handleDownload = useCallback(() => {
    if (activeImage && status.lightbox === LightboxStatus.OPENED) {
-      void downloadImage(activeImage.getSrc(), activeImage.getAlt());
+      void downloadImage(activeImage.src, activeImage.alt);
    }
  }, [activeImage, status.lightbox]);

@@ -670,6 +676,17 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
    }
  };

+  const handleEditDiagram = () => {
+    const { state, dispatch } = editor.view;
+
+    // Select the node at the position
+    const tr = state.tr.setSelection(
+      NodeSelection.create(state.doc, activeImage.pos)
+    );
+    dispatch(tr);
+    editor.commands.editDiagram();
+  };
+
  return (
    <Dialog.Root open={true}>
      <Dialog.Portal>
@@ -745,7 +762,7 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
              <ActionButton
                tabIndex={-1}
                disabled={status.image === ImageStatus.ERROR}
-                onClick={download}
+                onClick={handleDownload}
                aria-label={t("Download")}
                size={32}
                icon={<DownloadIcon />}
@@ -753,6 +770,21 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
                neutral
              />
            </Tooltip>
+            {activeImage.source === ImageSource.DiagramsNet &&
+              !Desktop.isElectron() && (
+                <Tooltip content={t("Edit diagram")} placement="bottom">
+                  <ActionButton
+                    tabIndex={-1}
+                    disabled={status.image === ImageStatus.ERROR}
+                    onClick={handleEditDiagram}
+                    aria-label={t("Edit diagram")}
+                    size={32}
+                    icon={<EditIcon />}
+                    borderOnHover
+                    neutral
+                  />
+                </Tooltip>
+              )}
            <Separator />
            <Dialog.Close asChild>
              <Tooltip content={t("Close")} shortcut="Esc" placement="bottom">
@@ -792,8 +824,8 @@ function Lightbox({ images, activeImage, onUpdate, onClose }: Props) {
          >
            <Image
              ref={imgRef}
-              src={activeImage.getSrc()}
-              alt={activeImage.getAlt()}
+              src={activeImage.src}
+              alt={activeImage.alt}
              onLoading={() =>
                setStatus({
                  lightbox: status.lightbox,
@@ -1,8 +1,8 @@
 import * as React from "react";
-import { actionV2ToMenuItem } from "~/actions";
+import { actionToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import useMobile from "~/hooks/useMobile";
-import { ActionV2Variant, ActionV2WithChildren } from "~/types";
+import { ActionVariant, ActionWithChildren } from "~/types";
 import { toMenuItems } from "./transformer";
 import { observer } from "mobx-react";
 import { useComputed } from "~/hooks/useComputed";
@@ -11,7 +11,7 @@ import { MenuProvider } from "~/components/primitives/Menu/MenuContext";

 type Props = {
  /** Root action with children representing the menu items */
-  action?: ActionV2WithChildren;
+  action?: ActionWithChildren;
  /** Trigger for the menu */
  children: React.ReactNode;
  /** ARIA label for the menu */
@@ -30,15 +30,13 @@ export const ContextMenu = observer(
      isMenu: true,
    });

-    const menuItems = useComputed(() => {
-      if (!open) {
-        return [];
-      }
-
-      return ((action?.children as ActionV2Variant[]) ?? []).map(
-        (childAction) => actionV2ToMenuItem(childAction, actionContext)
-      );
-    }, [open, action?.children, actionContext]);
+    const menuItems = useComputed(
+      () =>
+        ((action?.children as ActionVariant[]) ?? []).map((childAction) =>
+          actionToMenuItem(childAction, actionContext)
+        ),
+      [action?.children, actionContext]
+    );

    const handleOpenChange = React.useCallback(
      (open: boolean) => {
@@ -48,7 +46,7 @@ export const ContextMenu = observer(
          onClose?.();
        }
      },
-      [onOpen, onClose]
+      [open, onOpen, onClose]
    );

    const enablePointerEvents = React.useCallback(() => {
@@ -10,12 +10,12 @@ import {
 } from "~/components/primitives/Drawer";
 import { Menu, MenuContent, MenuTrigger } from "~/components/primitives/Menu";
 import { MenuProvider } from "~/components/primitives/Menu/MenuContext";
-import { actionV2ToMenuItem } from "~/actions";
+import { actionToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import useMobile from "~/hooks/useMobile";
 import {
-  ActionV2Variant,
-  ActionV2WithChildren,
+  ActionVariant,
+  ActionWithChildren,
  MenuItem,
  MenuItemWithChildren,
 } from "~/types";
@@ -25,7 +25,7 @@ import { useComputed } from "~/hooks/useComputed";

 type Props = {
  /** Root action with children representing the menu items */
-  action: ActionV2WithChildren;
+  action: ActionWithChildren;
  /** Trigger for the menu */
  children: React.ReactNode;
  /** Alignment w.r.t trigger - defaults to start */
@@ -69,8 +69,8 @@ export const DropdownMenu = observer(
          return [];
        }

-        return (action.children as ActionV2Variant[]).map((childAction) =>
-          actionV2ToMenuItem(childAction, actionContext)
+        return (action.children as ActionVariant[]).map((childAction) =>
+          actionToMenuItem(childAction, actionContext)
        );
      }, [open, action.children, actionContext]);

@@ -166,7 +166,7 @@ export function toMobileMenuItems(
            <Components.MenuLabel>{item.title}</Components.MenuLabel>
            {item.selected !== undefined && (
              <Components.SelectedIconWrapper aria-hidden>
-                {item.selected ? <CheckmarkIcon /> : null}
+                {item.selected ? <CheckmarkIcon size={18} /> : null}
              </Components.SelectedIconWrapper>
            )}
          </Components.MenuButton>
@@ -88,7 +88,7 @@ const Modal: React.FC<Props> = ({
                column
                reverse
              >
-                <DesktopContent style={style} shadow>
+                <DesktopContent style={style} topShadow>
                  <ErrorBoundary component="div">{children}</ErrorBoundary>
                </DesktopContent>
                <Header>
@@ -213,6 +213,7 @@ const Header = styled(Flex)`
  justify-content: space-between;
  font-weight: 600;
  padding: 24px 24px 12px;
+  flex-shrink: 0;
 `;

 const Wrapper = styled.div<{
@@ -12,17 +12,11 @@ type Props = React.ComponentProps<typeof NavLink> & {
      | null,
    location: LocationDescriptorObject
  ) => React.ReactNode;
-  /**
-   * If true, the tab will only be active if the path matches exactly.
-   */
+  /** If true, the tab will only be active if the path matches exactly */
  exact?: boolean;
-  /**
-   * CSS properties to apply to the link when it is active.
-   */
+  /** CSS properties to apply to the link when it is active */
  activeStyle?: React.CSSProperties;
-  /**
-   * The path to match against the current location.
-   */
+  /** The path to match against the current location */
  to: LocationDescriptor;
 };

@@ -0,0 +1,37 @@
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import { InputSelect } from "../InputSelect";
+
+/**
+ * An input that allows a choice of OAuth client type.
+ */
+export const InputClientType = React.forwardRef(
+  (
+    props: Omit<React.ComponentProps<typeof InputSelect>, "options" | "label">,
+    ref: React.Ref<HTMLButtonElement>
+  ) => {
+    const { t } = useTranslation();
+    return (
+      <InputSelect
+        {...props}
+        label={t("Client type")}
+        ref={ref}
+        style={{ marginBottom: "1em" }}
+        options={[
+          {
+            type: "item",
+            label: t("Confidential"),
+            value: "confidential",
+            description: t("Suitable for server-side applications"),
+          },
+          {
+            type: "item",
+            label: t("Public"),
+            value: "public",
+            description: t("Suitable for client-side or mobile applications"),
+          },
+        ]}
+      />
+    );
+  }
+);
@@ -10,6 +10,8 @@ import Flex from "~/components/Flex";
 import Input, { LabelText } from "~/components/Input";
 import isCloudHosted from "~/utils/isCloudHosted";
 import Switch from "../Switch";
+import EventBoundary from "@shared/components/EventBoundary";
+import { InputClientType } from "./InputClientType";

 export interface FormData {
  name: string;
@@ -19,6 +21,7 @@ export interface FormData {
  avatarUrl: string;
  redirectUris: string[];
  published: boolean;
+  clientType: "confidential" | "public";
 }

 export const OAuthClientForm = observer(function OAuthClientForm_({
@@ -46,6 +49,7 @@ export const OAuthClientForm = observer(function OAuthClientForm_({
      avatarUrl: oauthClient?.avatarUrl ?? "",
      redirectUris: oauthClient?.redirectUris ?? [],
      published: oauthClient?.published ?? false,
+      clientType: oauthClient?.clientType ?? "confidential",
    },
  });

@@ -62,20 +66,33 @@ export const OAuthClientForm = observer(function OAuthClientForm_({
            control={control}
            name="avatarUrl"
            render={({ field }) => (
-              <ImageInput
-                alt={t("OAuth client icon")}
-                onSuccess={(url) => field.onChange(url)}
-                onError={(err) => setError("avatarUrl", { message: err })}
-                model={{
-                  id: oauthClient?.id,
-                  avatarUrl: field.value,
-                  initial: getValues().name[0],
-                }}
-                borderRadius={0}
-              />
+              <EventBoundary>
+                <ImageInput
+                  alt={t("OAuth client icon")}
+                  onSuccess={(url) => field.onChange(url)}
+                  onError={(err) => setError("avatarUrl", { message: err })}
+                  model={{
+                    id: oauthClient?.id,
+                    avatarUrl: field.value,
+                    initial: getValues().name[0],
+                  }}
+                  borderRadius={0}
+                />
+              </EventBoundary>
            )}
          />
        </label>
+        <Controller
+          control={control}
+          name="clientType"
+          render={({ field }) => (
+            <InputClientType
+              value={field.value}
+              onChange={field.onChange}
+              ref={field.ref}
+            />
+          )}
+        />
        <Input
          type="text"
          label={t("Name")}
@@ -13,12 +13,28 @@ const ReadingTime = ({ document }: { document: Document }) => {
  );
  const stats = useTextStats(markdown);

+  const readingTimeMinutes = stats.total.readingTime;
+  const hours = Math.floor(readingTimeMinutes / 60);
+  const minutes = readingTimeMinutes % 60;
+
+  let readingTimeText;
+  if (hours > 0) {
+    if (minutes > 0) {
+      readingTimeText = t(`{{ hours }}h {{ minutes }}m read`, {
+        hours,
+        minutes,
+      });
+    } else {
+      readingTimeText = t(`{{ hours }}h read`, { hours });
+    }
+  } else {
+    readingTimeText = t(`{{ minutes }}m read`, { minutes: readingTimeMinutes });
+  }
+
  return (
    <>
      <EyeIcon size={18} />
-      {t(`{{ minutes }}m read`, {
-        minutes: stats.total.readingTime,
-      })}
+      {readingTimeText}
    </>
  );
 };
@@ -48,6 +48,11 @@ function SearchPopover({ shareId, className }: Props) {
    }
  }, [searchResults, query]);

+  // Clear search results when the query changes to prevent stale results
+  React.useEffect(() => {
+    setSearchResults(undefined);
+  }, [query]);
+
  const performSearch = React.useCallback(
    async ({ query: searchQuery, ...options }) => {
      if (searchQuery?.length > 0) {
@@ -58,7 +63,7 @@ function SearchPopover({ shareId, className }: Props) {
        });

        if (response.length) {
-          setSearchResults(response);
+          setSearchResults((state) => [...(state ?? []), ...response]);
        }

        return response;
@@ -23,6 +23,7 @@ import { Separator } from "../components";
 import { ListItem } from "../components/ListItem";
 import { Placeholder } from "../components/Placeholder";
 import { PublicAccess } from "./PublicAccess";
+import Flex from "@shared/components/Flex";

 type Props = {
  /** Collection to which team members are supposed to be invited */
@@ -77,9 +78,12 @@ export const AccessControlList = observer(
    }, [fetchMemberships, fetchGroupMemberships]);

    const containerRef = React.useRef<HTMLDivElement | null>(null);
+    const publicAccessRef = React.useRef<HTMLDivElement | null>(null);
+    const publicAccessHeight = publicAccessRef.current?.clientHeight || 0;
    const { maxHeight, calcMaxHeight } = useMaxHeight({
      elementRef: containerRef,
      maxViewportPercentage: 70,
+      margin: 24,
    });

    React.useEffect(() => {
@@ -111,162 +115,177 @@ export const AccessControlList = observer(
    );

    return (
-      <ScrollableContainer
-        ref={containerRef}
-        hiddenScrollbars
-        style={{ maxHeight }}
-      >
-        {showLoading ? (
-          <Placeholder count={2} />
-        ) : (
-          <>
-            <ListItem
-              image={
-                <Squircle color={theme.accent} size={AvatarSize.Medium}>
-                  <UserIcon color={theme.accentText} size={16} />
-                </Squircle>
-              }
-              title={t("All members")}
-              subtitle={t("Everyone in the workspace")}
-              actions={
-                <div style={{ marginRight: -8 }}>
-                  <InputSelectPermission
-                    onChange={(
-                      value: CollectionPermission | typeof EmptySelectValue
-                    ) => {
-                      void collection.save({
-                        permission: value === EmptySelectValue ? null : value,
-                      });
-                    }}
-                    disabled={!can.update}
-                    value={collection?.permission}
-                    hideLabel
-                    nude
-                    shrink
-                  />
-                </div>
-              }
-            />
-            {groupMembershipsInCollection
-              .filter((membership) => membership.group)
-              .sort((a, b) =>
-                (
-                  (invitedInSession.includes(a.group.id) ? "_" : "") +
-                  a.group.name
-                ).localeCompare(b.group.name)
-              )
-              .map((membership) => (
-                <ListItem
-                  key={membership.id}
-                  image={
-                    <GroupAvatar
-                      group={membership.group}
-                      backgroundColor={theme.modalBackground}
+      <Wrapper>
+        <ScrollableContainer
+          ref={containerRef}
+          hiddenScrollbars
+          style={{
+            maxHeight: maxHeight ? maxHeight - publicAccessHeight : undefined,
+          }}
+        >
+          {showLoading ? (
+            <Placeholder count={2} />
+          ) : (
+            <>
+              <ListItem
+                image={
+                  <Squircle color={theme.accent} size={AvatarSize.Medium}>
+                    <UserIcon color={theme.accentText} size={16} />
+                  </Squircle>
+                }
+                title={t("All members")}
+                subtitle={t("Everyone in the workspace")}
+                actions={
+                  <div style={{ marginRight: -8 }}>
+                    <InputSelectPermission
+                      onChange={(
+                        value: CollectionPermission | typeof EmptySelectValue
+                      ) => {
+                        void collection.save({
+                          permission: value === EmptySelectValue ? null : value,
+                        });
+                      }}
+                      disabled={!can.update}
+                      value={collection?.permission}
+                      hideLabel
+                      nude
+                      shrink
                    />
-                  }
-                  title={membership.group.name}
-                  subtitle={t("{{ count }} member", {
-                    count: membership.group.memberCount,
-                  })}
-                  actions={
-                    <div style={{ marginRight: -8 }}>
-                      <InputMemberPermissionSelect
-                        permissions={permissions}
-                        onChange={async (
-                          permission:
-                            | CollectionPermission
-                            | typeof EmptySelectValue
-                        ) => {
-                          try {
-                            if (permission === EmptySelectValue) {
-                              await groupMemberships.delete({
-                                collectionId: collection.id,
-                                groupId: membership.groupId,
-                              });
-                            } else {
-                              await groupMemberships.create({
-                                collectionId: collection.id,
-                                groupId: membership.groupId,
-                                permission,
-                              });
-                            }
-                          } catch (err) {
-                            toast.error(err.message);
-                            return false;
-                          }
-                          return true;
-                        }}
-                        disabled={!can.update}
-                        value={membership.permission}
+                  </div>
+                }
+              />
+              {groupMembershipsInCollection
+                .filter((membership) => membership.group)
+                .sort((a, b) =>
+                  (
+                    (invitedInSession.includes(a.group.id) ? "_" : "") +
+                    a.group.name
+                  ).localeCompare(b.group.name)
+                )
+                .map((membership) => (
+                  <ListItem
+                    key={membership.id}
+                    image={
+                      <GroupAvatar
+                        group={membership.group}
+                        backgroundColor={theme.modalBackground}
                      />
-                    </div>
-                  }
-                />
-              ))}
-            {membershipsInCollection
-              .filter((membership) => membership.user)
-              .sort((a, b) =>
-                (
-                  (invitedInSession.includes(a.user.id) ? "_" : "") +
-                  a.user.name
-                ).localeCompare(b.user.name)
-              )
-              .map((membership) => (
-                <ListItem
-                  key={membership.id}
-                  image={
-                    <Avatar model={membership.user} size={AvatarSize.Medium} />
-                  }
-                  title={membership.user.name}
-                  subtitle={membership.user.email}
-                  actions={
-                    <div style={{ marginRight: -8 }}>
-                      <InputMemberPermissionSelect
-                        permissions={permissions}
-                        onChange={async (
-                          permission:
-                            | CollectionPermission
-                            | typeof EmptySelectValue
-                        ) => {
-                          try {
-                            if (permission === EmptySelectValue) {
-                              await memberships.delete({
-                                collectionId: collection.id,
-                                userId: membership.userId,
-                              });
-                            } else {
-                              await memberships.create({
-                                collectionId: collection.id,
-                                userId: membership.userId,
-                                permission,
-                              });
+                    }
+                    title={membership.group.name}
+                    subtitle={t("{{ count }} member", {
+                      count: membership.group.memberCount,
+                    })}
+                    actions={
+                      <div style={{ marginRight: -8 }}>
+                        <InputMemberPermissionSelect
+                          permissions={permissions}
+                          onChange={async (
+                            permission:
+                              | CollectionPermission
+                              | typeof EmptySelectValue
+                          ) => {
+                            try {
+                              if (permission === EmptySelectValue) {
+                                await groupMemberships.delete({
+                                  collectionId: collection.id,
+                                  groupId: membership.groupId,
+                                });
+                              } else {
+                                await groupMemberships.create({
+                                  collectionId: collection.id,
+                                  groupId: membership.groupId,
+                                  permission,
+                                });
+                              }
+                            } catch (err) {
+                              toast.error(err.message);
+                              return false;
                            }
-                          } catch (err) {
-                            toast.error(err.message);
-                            return false;
-                          }
-                          return true;
-                        }}
-                        disabled={!can.update}
-                        value={membership.permission}
+                            return true;
+                          }}
+                          disabled={!can.update}
+                          value={membership.permission}
+                        />
+                      </div>
+                    }
+                  />
+                ))}
+              {membershipsInCollection
+                .filter((membership) => membership.user)
+                .sort((a, b) =>
+                  (
+                    (invitedInSession.includes(a.user.id) ? "_" : "") +
+                    a.user.name
+                  ).localeCompare(b.user.name)
+                )
+                .map((membership) => (
+                  <ListItem
+                    key={membership.id}
+                    image={
+                      <Avatar
+                        model={membership.user}
+                        size={AvatarSize.Medium}
                      />
-                    </div>
-                  }
-                />
-              ))}
-          </>
-        )}
+                    }
+                    title={membership.user.name}
+                    subtitle={membership.user.email}
+                    actions={
+                      <div style={{ marginRight: -8 }}>
+                        <InputMemberPermissionSelect
+                          permissions={permissions}
+                          onChange={async (
+                            permission:
+                              | CollectionPermission
+                              | typeof EmptySelectValue
+                          ) => {
+                            try {
+                              if (permission === EmptySelectValue) {
+                                await memberships.delete({
+                                  collectionId: collection.id,
+                                  userId: membership.userId,
+                                });
+                              } else {
+                                await memberships.create({
+                                  collectionId: collection.id,
+                                  userId: membership.userId,
+                                  permission,
+                                });
+                              }
+                            } catch (err) {
+                              toast.error(err.message);
+                              return false;
+                            }
+                            return true;
+                          }}
+                          disabled={!can.update}
+                          value={membership.permission}
+                        />
+                      </div>
+                    }
+                  />
+                ))}
+            </>
+          )}
+        </ScrollableContainer>
        {team.sharing && can.share && collection.sharing && visible && (
          <Sticky>
            {collection.members.length ? <Separator /> : null}
-            <PublicAccess collection={collection} share={share} />
+            <PublicAccess
+              ref={publicAccessRef}
+              collection={collection}
+              share={share}
+            />
          </Sticky>
        )}
-      </ScrollableContainer>
+      </Wrapper>
    );
  }
 );

+const Wrapper = styled(Flex)`
+  flex-direction: column;
+`;
+
 const ScrollableContainer = styled(Scrollable)`
  padding: 12px 24px;
  margin: -12px -24px;
@@ -2,7 +2,7 @@ import debounce from "lodash/debounce";
 import isEmpty from "lodash/isEmpty";
 import { observer } from "mobx-react";
 import { CopyIcon, GlobeIcon, InfoIcon, QuestionMarkIcon } from "outline-icons";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import styled, { useTheme } from "styled-components";
@@ -31,21 +31,24 @@ type Props = {
  share: Share | null | undefined;
 };

-function InnerPublicAccess({ collection, share }: Props) {
+function InnerPublicAccess(
+  { collection, share }: Props,
+  ref: React.RefObject<HTMLDivElement>
+) {
  const { t } = useTranslation();
  const theme = useTheme();
-  const [validationError, setValidationError] = useState("");
-  const [urlId, setUrlId] = useState(share?.urlId);
-  const inputRef = useRef<HTMLInputElement>(null);
+  const [validationError, setValidationError] = React.useState("");
+  const [urlId, setUrlId] = React.useState(share?.urlId);
+  const inputRef = React.useRef<HTMLInputElement>(null);
  const can = usePolicy(share);
  const collectionAbilities = usePolicy(collection);
  const canPublish = can.update && collectionAbilities.share;

-  useEffect(() => {
+  React.useEffect(() => {
    setUrlId(share?.urlId);
  }, [share?.urlId]);

-  const handleIndexingChanged = useCallback(
+  const handleIndexingChanged = React.useCallback(
    async (checked: boolean) => {
      try {
        await share?.save({
@@ -58,7 +61,7 @@ function InnerPublicAccess({ collection, share }: Props) {
    [share]
  );

-  const handleShowLastModifiedChanged = useCallback(
+  const handleShowLastModifiedChanged = React.useCallback(
    async (checked: boolean) => {
      try {
        await share?.save({
@@ -71,7 +74,7 @@ function InnerPublicAccess({ collection, share }: Props) {
    [share]
  );

-  const handleShowTOCChanged = useCallback(
+  const handleShowTOCChanged = React.useCallback(
    async (checked: boolean) => {
      try {
        await share?.save({
@@ -84,7 +87,7 @@ function InnerPublicAccess({ collection, share }: Props) {
    [share]
  );

-  const handlePublishedChange = useCallback(
+  const handlePublishedChange = React.useCallback(
    async (checked: boolean) => {
      try {
        await share?.save({
@@ -97,7 +100,7 @@ function InnerPublicAccess({ collection, share }: Props) {
    [share]
  );

-  const handleUrlChange = useMemo(
+  const handleUrlChange = React.useMemo(
    () =>
      debounce(async (ev) => {
        if (!share) {
@@ -128,7 +131,7 @@ function InnerPublicAccess({ collection, share }: Props) {
    [t, share]
  );

-  const handleCopied = useCallback(() => {
+  const handleCopied = React.useCallback(() => {
    toast.success(t("Public link copied to clipboard"));
  }, [t]);

@@ -143,7 +146,7 @@ function InnerPublicAccess({ collection, share }: Props) {
  );

  return (
-    <Wrapper>
+    <Wrapper ref={ref}>
      <ListItem
        title={t("Web")}
        subtitle={<>{t("Allow anyone with the link to access")}</>}
@@ -302,4 +305,4 @@ const StyledInfoIcon = styled(InfoIcon)`
  flex-shrink: 0;
 `;

-export const PublicAccess = observer(InnerPublicAccess);
+export const PublicAccess = observer(React.forwardRef(InnerPublicAccess));
@@ -67,9 +67,11 @@ export const AccessControlList = observer(
    const documentId = document.id;

    const containerRef = React.useRef<HTMLDivElement | null>(null);
+    const publicAccessRef = React.useRef<HTMLDivElement | null>(null);
+    const publicAccessHeight = publicAccessRef.current?.clientHeight || 0;
    const { maxHeight, calcMaxHeight } = useMaxHeight({
      elementRef: containerRef,
-      maxViewportPercentage: 65,
+      maxViewportPercentage: 45,
      margin: 24,
    });

@@ -109,101 +111,106 @@ export const AccessControlList = observer(
    });

    return (
-      <ScrollableContainer
-        ref={containerRef}
-        hiddenScrollbars
-        style={{ maxHeight }}
-      >
-        {showLoading ? (
-          <Placeholder />
-        ) : (
-          <>
-            {collection && canCollection.readDocument ? (
-              <>
-                {collection.permission ? (
+      <Wrapper>
+        <ScrollableContainer
+          ref={containerRef}
+          hiddenScrollbars
+          style={{
+            maxHeight: maxHeight ? maxHeight - publicAccessHeight : undefined,
+          }}
+        >
+          {showLoading ? (
+            <Placeholder />
+          ) : (
+            <>
+              {collection && canCollection.readDocument ? (
+                <>
+                  {collection.permission ? (
+                    <ListItem
+                      image={
+                        <Squircle color={theme.accent} size={AvatarSize.Medium}>
+                          <UserIcon color={theme.accentText} size={16} />
+                        </Squircle>
+                      }
+                      title={t("All members")}
+                      subtitle={t("Everyone in the workspace")}
+                      actions={
+                        <AccessTooltip>
+                          {collection?.permission ===
+                          CollectionPermission.ReadWrite
+                            ? t("Can edit")
+                            : t("Can view")}
+                        </AccessTooltip>
+                      }
+                    />
+                  ) : usersInCollection ? (
+                    <ListItem
+                      image={<CollectionSquircle collection={collection} />}
+                      title={collection.name}
+                      subtitle={t("Everyone in the collection")}
+                      actions={<AccessTooltip>{t("Can view")}</AccessTooltip>}
+                    />
+                  ) : (
+                    <ListItem
+                      image={<Avatar model={user} />}
+                      title={user.name}
+                      subtitle={t("You have full access")}
+                      actions={<AccessTooltip>{t("Can edit")}</AccessTooltip>}
+                    />
+                  )}
+                  <DocumentMemberList
+                    document={document}
+                    invitedInSession={invitedInSession}
+                  />
+                </>
+              ) : document.isDraft ? (
+                <>
                  <ListItem
-                    image={
-                      <Squircle color={theme.accent} size={AvatarSize.Medium}>
-                        <UserIcon color={theme.accentText} size={16} />
-                      </Squircle>
-                    }
-                    title={t("All members")}
-                    subtitle={t("Everyone in the workspace")}
+                    image={<Avatar model={document.createdBy} />}
+                    title={document.createdBy?.name}
                    actions={
-                      <AccessTooltip>
-                        {collection?.permission ===
-                        CollectionPermission.ReadWrite
-                          ? t("Can edit")
-                          : t("Can view")}
+                      <AccessTooltip content={t("Created the document")}>
+                        {t("Can edit")}
                      </AccessTooltip>
                    }
                  />
-                ) : usersInCollection ? (
-                  <ListItem
-                    image={<CollectionSquircle collection={collection} />}
-                    title={collection.name}
-                    subtitle={t("Everyone in the collection")}
-                    actions={<AccessTooltip>{t("Can view")}</AccessTooltip>}
+                  <DocumentMemberList
+                    document={document}
+                    invitedInSession={invitedInSession}
                  />
-                ) : (
-                  <ListItem
-                    image={<Avatar model={user} />}
-                    title={user.name}
-                    subtitle={t("You have full access")}
-                    actions={<AccessTooltip>{t("Can edit")}</AccessTooltip>}
+                </>
+              ) : (
+                <>
+                  <DocumentMemberList
+                    document={document}
+                    invitedInSession={invitedInSession}
                  />
-                )}
-                <DocumentMemberList
-                  document={document}
-                  invitedInSession={invitedInSession}
-                />
-              </>
-            ) : document.isDraft ? (
-              <>
-                <ListItem
-                  image={<Avatar model={document.createdBy} />}
-                  title={document.createdBy?.name}
-                  actions={
-                    <AccessTooltip content={t("Created the document")}>
-                      {t("Can edit")}
-                    </AccessTooltip>
-                  }
-                />
-                <DocumentMemberList
-                  document={document}
-                  invitedInSession={invitedInSession}
-                />
-              </>
-            ) : (
-              <>
-                <DocumentMemberList
-                  document={document}
-                  invitedInSession={invitedInSession}
-                />
-                <ListItem
-                  image={
-                    <Squircle color={theme.accent} size={AvatarSize.Medium}>
-                      <MoreIcon color={theme.accentText} size={16} />
-                    </Squircle>
-                  }
-                  title={t("Other people")}
-                  subtitle={t("Other workspace members may have access")}
-                  actions={
-                    <AccessTooltip
-                      content={t(
-                        "This document may be shared with more workspace members through a parent document or collection you do not have access to"
-                      )}
-                    />
-                  }
-                />
-              </>
-            )}
-          </>
-        )}
+                  <ListItem
+                    image={
+                      <Squircle color={theme.accent} size={AvatarSize.Medium}>
+                        <MoreIcon color={theme.accentText} size={16} />
+                      </Squircle>
+                    }
+                    title={t("Other people")}
+                    subtitle={t("Other workspace members may have access")}
+                    actions={
+                      <AccessTooltip
+                        content={t(
+                          "This document may be shared with more workspace members through a parent document or collection you do not have access to"
+                        )}
+                      />
+                    }
+                  />
+                </>
+              )}
+            </>
+          )}
+        </ScrollableContainer>
        {team.sharing && can.share && !collectionSharingDisabled && visible && (
          <Sticky>
            {document.members.length ? <Separator /> : null}
            <PublicAccess
+              ref={publicAccessRef}
              document={document}
              share={share}
              sharedParent={sharedParent}
@@ -211,7 +218,7 @@ export const AccessControlList = observer(
            />
          </Sticky>
        )}
-      </ScrollableContainer>
+      </Wrapper>
    );
  }
 );
@@ -276,10 +283,14 @@ function useUsersInCollection(collection?: Collection) {
    : false;
 }

+const Wrapper = styled(Flex)`
+  flex-direction: column;
+`;
+
 const Sticky = styled.div`
  background: ${s("menuBackground")};
  position: sticky;
-  bottom: -12px;
+  bottom: 0;
 `;

 const ScrollableContainer = styled(Scrollable)`
@@ -37,7 +37,10 @@ type Props = {
  onRequestClose?: () => void;
 };

-function PublicAccess({ document, share, sharedParent }: Props) {
+function PublicAccess(
+  { document, share, sharedParent }: Props,
+  ref: React.RefObject<HTMLDivElement>
+) {
  const { t } = useTranslation();
  const theme = useTheme();
  const [validationError, setValidationError] = React.useState("");
@@ -153,7 +156,7 @@ function PublicAccess({ document, share, sharedParent }: Props) {
  );

  return (
-    <Wrapper>
+    <Wrapper ref={ref}>
      <ListItem
        title={t("Web")}
        subtitle={
@@ -353,4 +356,4 @@ const StyledLink = styled(Link)`
  text-decoration: underline;
 `;

-export default observer(PublicAccess);
+export default observer(React.forwardRef(PublicAccess));
@@ -14,7 +14,7 @@ export const Wrapper = styled.div`

 export const Separator = styled.div`
  border-top: 1px dashed ${s("divider")};
-  margin: 8px 0;
+  margin: 0 0 8px 0;
 `;

 export const HeaderInput = styled(Flex)`
@@ -23,6 +23,7 @@ import { SharedDocumentLink } from "./components/SharedDocumentLink";
 import SidebarButton from "./components/SidebarButton";
 import ToggleButton from "./components/ToggleButton";
 import { useEffect } from "react";
+import { ProsemirrorHelper } from "@shared/utils/ProsemirrorHelper";

 type Props = {
  share: Share;
@@ -31,12 +32,16 @@ type Props = {
 function SharedSidebar({ share }: Props) {
  const team = useTeamContext();
  const user = useCurrentUser({ rejectOnEmpty: false });
-  const { ui, documents } = useStores();
+  const { ui, documents, collections } = useStores();
  const { t } = useTranslation();

  const teamAvailable = !!team?.name;
  const rootNode = share.tree;
  const shareId = share.urlId || share.id;
+  const collection = collections.get(rootNode?.id);
+  const hideRootNode = collection
+    ? ProsemirrorHelper.isEmptyData(collection?.data)
+    : false;

  useEffect(() => {
    ui.tocVisible = share.showTOC;
@@ -47,15 +52,18 @@ function SharedSidebar({ share }: Props) {
  }

  return (
-    <StyledSidebar $hoverTransition={!teamAvailable} canResize={false}>
+    <StyledSidebar $hoverTransition={!teamAvailable} canCollapse={false}>
      {teamAvailable && (
        <SidebarButton
          title={team.name}
          image={
            <TeamLogo model={team} size={AvatarSize.XLarge} alt={t("Logo")} />
          }
-          onClick={() =>
-            history.push(user ? homePath() : sharedModelPath(shareId))
+          disabled={hideRootNode}
+          onClick={
+            hideRootNode
+              ? undefined
+              : () => history.push(user ? homePath() : sharedModelPath(shareId))
          }
        />
      )}
@@ -72,7 +80,11 @@ function SharedSidebar({ share }: Props) {
        </TopSection>
        <Section>
          {share.collectionId ? (
-            <SharedCollectionLink node={rootNode} shareId={shareId} />
+            <SharedCollectionLink
+              node={rootNode}
+              shareId={shareId}
+              hideRootNode={hideRootNode}
+            />
          ) : (
            <SharedDocumentLink
              index={0}
@@ -21,19 +21,24 @@ import ResizeBorder from "./components/ResizeBorder";
 import SidebarButton from "./components/SidebarButton";
 import ToggleButton from "./components/ToggleButton";
 import { useTranslation } from "react-i18next";
+import useKeyDown from "~/hooks/useKeyDown";
+import { isModKey } from "@shared/utils/keyboard";

 const ANIMATION_MS = 250;

 type Props = {
+  /** Whether to hide the sidebar content (sets opacity to 0). */
  hidden?: boolean;
-  /**  Whether the sidebar can be resized and collapsed, defaults to true. */
-  canResize?: boolean;
+  /** Whether the sidebar can be collapsed, defaults to true. */
+  canCollapse?: boolean;
+  /** CSS class name(s) to apply to the sidebar container. */
  className?: string;
+  /** Content to render inside the sidebar. */
  children: React.ReactNode;
 };

 const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
-  { children, hidden = false, canResize = true, className }: Props,
+  { children, hidden = false, canCollapse = true, className }: Props,
  ref: React.RefObject<HTMLDivElement>
 ) {
  const [isCollapsing, setCollapsing] = React.useState(false);
@@ -45,7 +50,7 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
  const user = useCurrentUser({ rejectOnEmpty: false });
  const isMobile = useMobile();
  const width = ui.sidebarWidth;
-  const collapsed = ui.sidebarIsClosed && canResize;
+  const collapsed = ui.sidebarIsClosed && canCollapse;
  const maxWidth = theme.sidebarMaxWidth;
  const minWidth = theme.sidebarMinWidth + 16; // padding

@@ -55,9 +60,14 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
  const [isResizing, setResizing] = React.useState(false);
  const [hasPointerMoved, setPointerMoved] = React.useState(false);
  const isSmallerThanMinimum = width < minWidth;
-
  const hoverTimeoutRef = React.useRef<NodeJS.Timeout | null>(null);

+  useKeyDown(".", (event) => {
+    if (isModKey(event)) {
+      ui.toggleCollapsedSidebar();
+    }
+  });
+
  const handleDrag = React.useCallback(
    (event: MouseEvent) => {
      // suppresses text selection
@@ -66,11 +76,15 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
      const newWidth = Math.min(event.pageX - offset, maxWidth);
      const isSmallerThanCollapsePoint = newWidth < minWidth / 2;

-      ui.set({
-        sidebarWidth: isSmallerThanCollapsePoint
-          ? theme.sidebarCollapsedWidth
-          : newWidth,
-      });
+      if (canCollapse) {
+        ui.set({
+          sidebarWidth: isSmallerThanCollapsePoint
+            ? theme.sidebarCollapsedWidth
+            : newWidth,
+        });
+      } else {
+        ui.set({ sidebarWidth: Math.max(newWidth, minWidth) });
+      }
    },
    [ui, theme, offset, minWidth, maxWidth]
  );
@@ -85,7 +99,7 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
    if (isSmallerThanMinimum) {
      const isSmallerThanCollapsePoint = width < minWidth / 2;

-      if (isSmallerThanCollapsePoint) {
+      if (isSmallerThanCollapsePoint && canCollapse) {
        setAnimating(false);
        setCollapsing(true);
        ui.collapseSidebar();
@@ -256,12 +270,10 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
            </SidebarButton>
          </AccountMenu>
        )}
-        {canResize && (
-          <ResizeBorder
-            onMouseDown={handleMouseDown}
-            onDoubleClick={ui.sidebarIsClosed ? undefined : handleReset}
-          />
-        )}
+        <ResizeBorder
+          onMouseDown={handleMouseDown}
+          onDoubleClick={ui.sidebarIsClosed ? undefined : handleReset}
+        />
      </Container>
      {ui.mobileSidebarVisible && <Backdrop onClick={ui.toggleMobileSidebar} />}
    </TooltipProvider>
@@ -2,8 +2,6 @@ import { useState, useCallback } 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;
@@ -12,7 +10,6 @@ type Props = {

 export function ArchivedCollectionLink({ collection, depth }: Props) {
  const { documents } = useStores();
-
  const [expanded, setExpanded] = useState(false);

  const handleDisclosureClick = useCallback((ev) => {
@@ -26,22 +23,13 @@ export function ArchivedCollectionLink({ collection, depth }: Props) {
  }, []);

  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>
-    </>
+    <CollectionLink
+      depth={depth ? depth : 0}
+      collection={collection}
+      expanded={expanded}
+      activeDocument={documents.active}
+      onDisclosureClick={handleDisclosureClick}
+      onClick={handleClick}
+    />
  );
 }
@@ -27,11 +27,12 @@ import { SidebarContextType, useSidebarContext } from "./SidebarContext";
 import SidebarLink from "./SidebarLink";
 import { useCollectionMenuAction } from "~/hooks/useCollectionMenuAction";
 import { ActionContextProvider } from "~/hooks/useActionContext";
+import CollectionLinkChildren from "./CollectionLinkChildren";

 type Props = {
  collection: Collection;
  expanded?: boolean;
-  onDisclosureClick: (ev?: React.MouseEvent<HTMLButtonElement>) => void;
+  onDisclosureClick: (ev?: React.MouseEvent<HTMLElement>) => void;
  activeDocument: Document | undefined;
  isDraggingAnyCollection?: boolean;
  depth?: number;
@@ -185,24 +186,30 @@ const CollectionLink: React.FC<Props> = ({
          />
        </DropToImport>
      </Relative>
-      {isAddingNewChild && (
-        <SidebarLink
-          depth={2}
-          isActive={() => true}
-          label={
-            <EditableTitle
-              title=""
-              canUpdate
-              isEditing
-              placeholder={`${t("New doc")}…`}
-              onCancel={closeAddingNewChild}
-              onSubmit={handleNewDoc}
-              maxLength={DocumentValidation.maxTitleLength}
-              ref={newChildTitleRef}
-            />
-          }
-        />
-      )}
+      <CollectionLinkChildren
+        collection={collection}
+        expanded={!!expanded}
+        prefetchDocument={documents.prefetchDocument}
+      >
+        {isAddingNewChild ? (
+          <SidebarLink
+            depth={2}
+            isActive={() => true}
+            label={
+              <EditableTitle
+                title=""
+                canUpdate
+                isEditing
+                placeholder={`${t("New doc")}…`}
+                onCancel={closeAddingNewChild}
+                onSubmit={handleNewDoc}
+                maxLength={DocumentValidation.maxTitleLength}
+                ref={newChildTitleRef}
+              />
+            }
+          />
+        ) : undefined}
+      </CollectionLinkChildren>
    </ActionContextProvider>
  );
 };
@@ -29,12 +29,15 @@ type Props = {
  expanded: boolean;
  /** Function to prefetch a document by ID. */
  prefetchDocument?: (documentId: string) => Promise<Document | void>;
+  /** Element to display above the child documents */
+  children?: React.ReactNode;
 };

 function CollectionLinkChildren({
  collection,
  expanded,
  prefetchDocument,
+  children,
 }: Props) {
  const pageSize = DEFAULT_PAGE_SIZE;
  const { documents } = useStores();
@@ -58,6 +61,7 @@ function CollectionLinkChildren({
    <Folder expanded={expanded}>
      <DynamicDropCursor collection={collection} />
      <DocumentsLoader collection={collection} enabled={expanded}>
+        {children}
        {!childDocuments && (
          <ResizingHeightContainer hideOverflow>
            <Loading />
@@ -75,7 +79,7 @@ function CollectionLinkChildren({
            index={index}
          />
        ))}
-        {childDocuments?.length === 0 && (
+        {childDocuments?.length === 0 && !children && (
          <SidebarLink
            label={
              <Text type="tertiary" size="small" italic>
@@ -92,7 +92,6 @@ function Collections() {
                  key={item.id}
                  collection={item}
                  activeDocument={documents.active}
-                  prefetchDocument={documents.prefetchDocument}
                  belowCollection={orderedCollections[index + 1]}
                />
              )}
@@ -1,24 +1,22 @@
 import { CollapsedIcon } from "outline-icons";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
-import styled, { css } from "styled-components";
-import { s } from "@shared/styles";
+import styled from "styled-components";
+import { extraArea, s } from "@shared/styles";
 import NudeButton from "~/components/NudeButton";

 type Props = React.ComponentProps<typeof Button> & {
  onClick?: React.MouseEventHandler<HTMLButtonElement>;
  expanded: boolean;
-  root?: boolean;
 };

-function Disclosure({ onClick, root, expanded, ...rest }: Props) {
+function Disclosure({ onClick, expanded, ...rest }: Props) {
  const { t } = useTranslation();

  return (
    <Button
      size={20}
      onClick={onClick}
-      $root={root}
      aria-label={expanded ? t("Collapse") : t("Expand")}
      {...rest}
    >
@@ -27,28 +25,18 @@ function Disclosure({ onClick, root, expanded, ...rest }: Props) {
  );
 }

-const Button = styled(NudeButton)<{ $root?: boolean }>`
+const Button = styled(NudeButton)`
  position: absolute;
  left: -24px;
  flex-shrink: 0;
  color: ${s("textSecondary")};
+  margin: 2px;
+  ${extraArea(4)}

  &:hover {
    color: ${s("text")};
    background: ${s("sidebarControlHoverBackground")};
  }
-
-  ${(props) =>
-    props.$root &&
-    css`
-      opacity: 0;
-      left: -18px;
-
-      &:hover {
-        opacity: 1;
-        background: none;
-      }
-    `}
 `;

 const StyledCollapsedIcon = styled(CollapsedIcon)<{
@@ -130,17 +130,13 @@ function InnerDocumentLink(
    }
  }, [setCollapsed, expanded, hasChildDocuments]);

-  const handleDisclosureClick = React.useCallback(
-    (ev) => {
-      ev?.preventDefault();
-      if (expanded) {
-        setCollapsed();
-      } else {
-        setExpanded();
-      }
-    },
-    [setCollapsed, setExpanded, expanded]
-  );
+  const handleDisclosureClick = React.useCallback(() => {
+    if (expanded) {
+      setCollapsed();
+    } else {
+      setExpanded();
+    }
+  }, [setCollapsed, setExpanded, expanded]);

  const handlePrefetch = React.useCallback(() => {
    void prefetchDocument?.(node.id);
@@ -217,6 +213,19 @@ function InnerDocumentLink(
    useDropToReparentDocument(node, setExpanded, parentRef);

  // Drop to reorder
+  const [{ isOverReorder: isOverReorderAbove }, dropToReorderAbove] =
+    useDropToReorderDocument(node, collection, (item) => {
+      if (!collection) {
+        return;
+      }
+      return {
+        documentId: item.id,
+        collectionId: collection.id,
+        parentDocumentId: parentId,
+        index,
+      };
+    });
+
  const [{ isOverReorder, isDraggingAnyDocument }, dropToReorder] =
    useDropToReorderDocument(node, collection, (item) => {
      if (!collection) {
@@ -302,6 +311,7 @@ function InnerDocumentLink(
          { publish: true }
        );
        collection?.addDocument(newDocument, node.id);
+        membership?.addDocument(newDocument, node.id);

        closeAddingNewChild();
        history.push({
@@ -389,6 +399,13 @@ function InnerDocumentLink(
      }}
    >
      <Relative ref={parentRef}>
+        {isDraggingAnyDocument && collection?.isManualSort && index === 0 && (
+          <DropCursor
+            isActiveDrop={isOverReorderAbove}
+            innerRef={dropToReorderAbove}
+            position="top"
+          />
+        )}
        <Draggable
          key={node.id}
          ref={drag}
@@ -397,7 +414,7 @@ function InnerDocumentLink(
          onKeyDown={handleKeyDown}
        >
          <div ref={dropToReparent}>
-            <DropToImport documentId={node.id} activeClassName="activeDropZone">
+            <DropToImport documentId={node.id}>
              <SidebarLink
                // @ts-expect-error react-router type is wrong, string component is fine.
                component={isEditing ? "div" : undefined}
@@ -11,7 +11,6 @@ import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
 import useStores from "~/hooks/useStores";
 import { DragObject } from "../hooks/useDragAndDrop";
 import CollectionLink from "./CollectionLink";
-import CollectionLinkChildren from "./CollectionLinkChildren";
 import DropCursor from "./DropCursor";
 import Relative from "./Relative";
 import { useSidebarContext } from "./SidebarContext";
@@ -19,14 +18,12 @@ import { useSidebarContext } from "./SidebarContext";
 type Props = {
  collection: Collection;
  activeDocument: Document | undefined;
-  prefetchDocument: (id: string) => Promise<Document | void>;
  belowCollection: Collection | void;
 };

 function DraggableCollectionLink({
  collection,
  activeDocument,
-  prefetchDocument,
  belowCollection,
 }: Props) {
  const locationSidebarContext = useLocationSidebarContext();
@@ -116,11 +113,6 @@ function DraggableCollectionLink({
        />
      </Draggable>
      <Relative>
-        <CollectionLinkChildren
-          collection={collection}
-          expanded={displayChildDocuments}
-          prefetchDocument={prefetchDocument}
-        />
        {isDraggingAnyCollection && (
          <DropCursor
            isActiveDrop={isCollectionDropping}
@@ -1,12 +1,13 @@
 import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
 import invariant from "invariant";
 import { observer } from "mobx-react";
-import { useCallback } from "react";
+import { useCallback, useState } from "react";
 import Dropzone from "react-dropzone";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import styled, { css } from "styled-components";
 import LoadingIndicator from "~/components/LoadingIndicator";
+import useEventListener from "~/hooks/useEventListener";
 import useImportDocument from "~/hooks/useImportDocument";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
@@ -22,6 +23,7 @@ type Props = {
 function DropToImport({ disabled, children, collectionId, documentId }: Props) {
  const { t } = useTranslation();
  const { documents } = useStores();
+  const [prerender, setPreRendered] = useState(false);
  const { handleFiles, isImporting } = useImportDocument(
    collectionId,
    documentId
@@ -30,6 +32,7 @@ function DropToImport({ disabled, children, collectionId, documentId }: Props) {
    collectionId || documentId,
    "Must provide either collectionId or documentId"
  );
+  useEventListener("dragenter", () => setPreRendered(true));

  const canCollection = usePolicy(collectionId);
  const canDocument = usePolicy(documentId);
@@ -42,6 +45,7 @@ function DropToImport({ disabled, children, collectionId, documentId }: Props) {

  if (
    disabled ||
+    !prerender ||
    (collectionId && !canCollection.createDocument) ||
    (documentId && !canDocument.createChildDocument)
  ) {
@@ -50,7 +54,7 @@ function DropToImport({ disabled, children, collectionId, documentId }: Props) {

  return (
    <Dropzone
-      accept={documents.importFileTypes.join(", ")}
+      accept={documents.importFileTypesString}
      onDropAccepted={handleFiles}
      onDropRejected={handleRejection}
      noClick
@@ -1,30 +1,14 @@
-import * as React from "react";
-import styled from "styled-components";
-
 type Props = {
  expanded: boolean;
  children?: React.ReactNode;
 };

 const Folder: React.FC<Props> = ({ expanded, children }: Props) => {
-  const [openedOnce, setOpenedOnce] = React.useState(expanded);
-
-  // allows us to avoid rendering all children when the folder hasn't been opened
-  React.useEffect(() => {
-    if (expanded) {
-      setOpenedOnce(true);
-    }
-  }, [expanded]);
-
-  if (!openedOnce) {
+  if (!expanded) {
    return null;
  }

-  return <Wrapper $expanded={expanded}>{children}</Wrapper>;
+  return <>{children}</>;
 };

-const Wrapper = styled.div<{ $expanded?: boolean }>`
-  display: ${(props) => (props.$expanded ? "block" : "none")};
-`;
-
 export default Folder;
@@ -29,18 +29,33 @@ const normalizeToLocation = (
 const joinClassnames = (...classnames: (string | undefined)[]) =>
  classnames.filter((i) => i).join(" ");

+/**
+ * Props for the NavLink component.
+ * Extends standard anchor element attributes with React Router navigation functionality.
+ */
 export interface Props extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
+  /** CSS class name to apply when the link is active */
  activeClassName?: string;
+  /** Inline styles to apply when the link is active */
  activeStyle?: React.CSSProperties;
+  /** Whether to automatically scroll the link into view when it becomes active */
  scrollIntoViewIfNeeded?: boolean;
+  /** If true, only matches when the path matches the location.pathname exactly */
  exact?: boolean;
+  /** If true, use history.replace instead of history.push when navigating */
  replace?: boolean;
+  /** Custom function to determine if the link is active */
  isActive?: (match: match | null, location: Location) => boolean;
+  /** The location to match against. Defaults to the current history location */
  location?: Location;
+  /** If true, trailing slashes on the path will be considered when matching */
  strict?: boolean;
+  /** The location to navigate to. Can be a string path or location descriptor object */
  to: LocationDescriptor;
+  /** Custom component to use instead of the default anchor element */
  component?: React.ComponentType;
-  onBeforeClick?: () => void;
+  /** Callback fired when an active link is clicked */
+  onActiveClick?: (event: React.MouseEvent<HTMLAnchorElement>) => void;
 }

 /**
@@ -59,7 +74,7 @@ const NavLink = ({
  style: styleProp,
  scrollIntoViewIfNeeded,
  onClick,
-  onBeforeClick,
+  onActiveClick,
  to,
  ...rest
 }: Props) => {
@@ -126,6 +141,10 @@ const NavLink = ({
    (event: React.MouseEvent<HTMLAnchorElement>) => {
      onClick?.(event);

+      if (isActive) {
+        onActiveClick?.(event);
+      }
+
      if (shouldFastClick(event)) {
        event.currentTarget.focus();

@@ -138,7 +157,16 @@ const NavLink = ({
        });
      }
    },
-    [onClick, navigateTo, shouldFastClick]
+    [onClick, navigateTo, isActive, shouldFastClick]
+  );
+
+  const handleClick = React.useCallback(
+    (event: React.MouseEvent<HTMLAnchorElement>) => {
+      if (isActive) {
+        event.preventDefault();
+      }
+    },
+    [isActive]
  );

  React.useEffect(() => {
@@ -162,6 +190,7 @@ const NavLink = ({
      // Note do not use `onPointerDown` here as it makes the mobile sidebar unscrollable
      onMouseDown={handleMouseDown}
      onKeyDown={handleKeyDown}
+      onClick={handleClick}
      aria-current={(isActive && ariaCurrent) || undefined}
      className={className}
      style={style}
@@ -10,35 +10,37 @@ import SidebarLink from "./SidebarLink";
 type Props = {
  node: NavigationNode;
  shareId: string;
+  hideRootNode?: boolean;
 };

-function CollectionLink({ node, shareId }: Props) {
+function CollectionLink({ node, shareId, hideRootNode }: Props) {
  const { t } = useTranslation();
  const { documents, ui } = useStores();
-
  const icon = node.icon ?? node.emoji;

  return (
    <>
-      <SidebarLink
-        to={{
-          pathname: sharedModelPath(shareId),
-          state: {
-            title: node.title,
-          },
-        }}
-        icon={icon && <Icon value={icon} color={node.color} />}
-        label={node.title || t("Untitled")}
-        depth={0}
-        exact={false}
-        scrollIntoViewIfNeeded={true}
-        isActive={() => ui.activeCollectionId === node.id}
-      />
+      {!hideRootNode && (
+        <SidebarLink
+          to={{
+            pathname: sharedModelPath(shareId),
+            state: {
+              title: node.title,
+            },
+          }}
+          icon={icon && <Icon value={icon} color={node.color} />}
+          label={node.title || t("Untitled")}
+          depth={0}
+          exact={false}
+          scrollIntoViewIfNeeded={true}
+          isActive={() => ui.activeCollectionId === node.id}
+        />
+      )}
      {node.children.map((childNode, index) => (
        <SharedDocumentLink
          key={childNode.id}
          index={index}
-          depth={2}
+          depth={hideRootNode ? 1 : 2}
          shareId={shareId}
          node={childNode}
          prefetchDocument={documents.prefetchDocument}
@@ -8,7 +8,7 @@ import Collection from "~/models/Collection";
 import Document from "~/models/Document";
 import useStores from "~/hooks/useStores";
 import { sharedModelPath } from "~/utils/routeHelpers";
-import { descendants } from "~/utils/tree";
+import { descendants } from "@shared/utils/tree";
 import SidebarLink from "./SidebarLink";

 type Props = {
@@ -108,6 +108,7 @@ function DocumentLink(
    t("Untitled");

  const icon = node.icon ?? node.emoji;
+  const initial = title ? title.charAt(0).toUpperCase() : "?";

  return (
    <>
@@ -121,7 +122,9 @@ function DocumentLink(
        expanded={hasChildDocuments && depth !== 0 ? expanded : undefined}
        onDisclosureClick={handleDisclosureClick}
        onClickIntent={handlePrefetch}
-        icon={icon && <Icon value={icon} color={node.color} />}
+        icon={
+          icon && <Icon value={icon} color={node.color} initial={initial} />
+        }
        label={title}
        depth={depth}
        exact={false}
@@ -2,11 +2,11 @@ import invariant from "invariant";
 import { observer } from "mobx-react";
 import { actionToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
-import { Action } from "~/types";
+import { ActionVariant, ActionWithChildren } from "~/types";
 import SidebarLink from "./SidebarLink";

 type Props = {
-  action: Action;
+  action: Exclude<ActionVariant, ActionWithChildren>;
  depth?: number;
 };

@@ -25,6 +25,7 @@ const SidebarButton = React.forwardRef<HTMLButtonElement, SidebarButtonProps>(
      image,
      title,
      children,
+      onClick,
      ...rest
    }: SidebarButtonProps,
    ref
@@ -38,6 +39,7 @@ const SidebarButton = React.forwardRef<HTMLButtonElement, SidebarButtonProps>(
      >
        <Button
          {...rest}
+          onClick={onClick}
          $position={position}
          as="button"
          ref={ref}
@@ -96,17 +98,19 @@ const Button = styled(Flex)<{
  text-decoration: none;
  text-align: left;
  user-select: none;
-  cursor: var(--pointer);
  position: relative;

  ${undraggableOnDesktop()}
  ${extraArea(4)}

-  &:active,
-  &:${hover},
-  &[aria-expanded="true"] {
-    color: ${s("sidebarText")};
-    background: ${s("sidebarActiveBackground")};
+  &:not(:disabled) {
+    &:active,
+    &:${hover},
+    &[aria-expanded="true"] {
+      color: ${s("sidebarText")};
+      background: ${s("sidebarActiveBackground")};
+      cursor: var(--pointer);
+    }
  }

  &:last-child {
@@ -3,7 +3,7 @@ import * as React from "react";
 import styled, { useTheme, css } from "styled-components";
 import breakpoint from "styled-components-breakpoint";
 import EventBoundary from "@shared/components/EventBoundary";
-import { s } from "@shared/styles";
+import { ellipsis, hover, s } from "@shared/styles";
 import { isMobile } from "@shared/utils/browser";
 import NudeButton from "~/components/NudeButton";
 import { UnreadBadge } from "~/components/UnreadBadge";
@@ -11,32 +11,51 @@ import useClickIntent from "~/hooks/useClickIntent";
 import { undraggableOnDesktop } from "~/styles";
 import Disclosure from "./Disclosure";
 import NavLink, { Props as NavLinkProps } from "./NavLink";
-import { ActionV2WithChildren } from "~/types";
+import { ActionWithChildren } from "~/types";
 import { ContextMenu } from "~/components/Menu/ContextMenu";
 import { useTranslation } from "react-i18next";
-import useBoolean from "~/hooks/useBoolean";

+/**
+ * Props for the SidebarLink component.
+ * Extends NavLink props with additional sidebar-specific functionality.
+ */
 type Props = Omit<NavLinkProps, "to"> & {
+  /** The location to navigate to when the link is clicked */
  to?: LocationDescriptor;
+  /** Ref callback to access the underlying HTML element */
  innerRef?: (ref: HTMLElement | null | undefined) => void;
+  /** Callback fired when the link is clicked */
  onClick?: React.MouseEventHandler<HTMLAnchorElement>;
  /** Callback when we expect the user to click on the link. Used for prefetching data. */
-  onClickIntent?: () => void;
-  onDisclosureClick?: React.MouseEventHandler<HTMLButtonElement>;
+  onClickIntent?: React.MouseEventHandler<HTMLElement>;
+  /** Callback fired when the disclosure icon is clicked */
+  onDisclosureClick?: React.MouseEventHandler<HTMLElement>;
+  /** Icon to display on the left side of the link */
  icon?: React.ReactNode;
+  /** Text label or content to display for the link */
  label?: React.ReactNode;
+  /** Optional menu to display on hover or interaction */
  menu?: React.ReactNode;
+  /** Whether to show an unread badge indicator */
  unreadBadge?: boolean;
+  /** Whether to show action buttons on hover */
  showActions?: boolean;
+  /** Whether the link is disabled and non-interactive */
  disabled?: boolean;
+  /** Whether the link is currently active */
  active?: boolean;
  /** If set, a disclosure will be rendered to the left of any icon */
  expanded?: boolean;
+  /** Whether this link is the current active drop target for drag and drop */
  isActiveDrop?: boolean;
+  /** Whether this link represents a draft document */
  isDraft?: boolean;
+  /** Nesting depth level for indentation (0-based) */
  depth?: number;
+  /** Whether to automatically scroll this link into view if needed */
  scrollIntoViewIfNeeded?: boolean;
-  contextAction?: ActionV2WithChildren;
+  /** Optional context menu action to display */
+  contextAction?: ActionWithChildren;
 };

 const activeDropStyle = {
@@ -45,6 +64,7 @@ const activeDropStyle = {

 const preventDefault = (ev: React.MouseEvent) => {
  ev.preventDefault();
+  ev.stopPropagation();
 };

 function SidebarLink(
@@ -72,15 +92,16 @@ function SidebarLink(
  }: Props,
  ref: React.RefObject<HTMLAnchorElement>
 ) {
+  const hasDisclosure = expanded !== undefined;
  const { t } = useTranslation();
  const theme = useTheme();
  const { handleMouseEnter, handleMouseLeave } = useClickIntent(onClickIntent);
  const style = React.useMemo(
    () => ({
-      paddingLeft: `${(depth || 0) * 16 + 12}px`,
+      paddingLeft: `${(depth || 0) * 16 + (icon ? -8 : 12)}px`,
      paddingRight: unreadBadge ? "32px" : undefined,
    }),
-    [depth]
+    [depth, icon, unreadBadge]
  );

  const unreadStyle = React.useMemo(
@@ -99,94 +120,97 @@ function SidebarLink(
    [theme.text, theme.sidebarActiveBackground, style]
  );

-  const hoverStyle = React.useMemo(
-    () => ({
-      color: theme.text,
-      ...style,
-    }),
-    [theme.text, style]
+  const handleClick = React.useCallback(
+    (ev: React.MouseEvent<HTMLAnchorElement>) => {
+      if (onClick && !disabled && ev.isDefaultPrevented() === false) {
+        onClick(ev);
+      }
+    },
+    [onClick, disabled, expanded]
  );

-  const [openContextMenu, setOpen, setClosed] = useBoolean(false);
+  const handleDisclosureClick = React.useCallback(
+    (ev: React.MouseEvent<HTMLElement>) => {
+      if (!hasDisclosure) {
+        return;
+      }
+      ev.preventDefault();
+      ev.stopPropagation();
+      onDisclosureClick?.(ev);
+    },
+    [onDisclosureClick]
+  );
+
+  const DisclosureComponent = icon ? HiddenDisclosure : Disclosure;

  return (
-    <>
-      <ContextMenu
-        action={contextAction}
-        ariaLabel={t("Link options")}
-        onOpen={setOpen}
-        onClose={setClosed}
+    <ContextMenu action={contextAction} ariaLabel={t("Link options")}>
+      <Link
+        $isActiveDrop={isActiveDrop}
+        $isDraft={isDraft}
+        $disabled={disabled}
+        style={style}
+        activeStyle={isActiveDrop ? activeDropStyle : activeStyle}
+        onClick={handleClick}
+        onActiveClick={handleDisclosureClick}
+        onMouseEnter={handleMouseEnter}
+        onMouseLeave={handleMouseLeave}
+        onDragEnter={handleMouseEnter}
+        // @ts-expect-error exact does not exist on div
+        exact={exact !== false}
+        to={to}
+        as={to ? undefined : href ? "a" : "div"}
+        href={href}
+        className={className}
+        ref={ref}
+        {...rest}
      >
-        <Link
-          $isActiveDrop={isActiveDrop}
-          $isDraft={isDraft}
-          $disabled={disabled}
-          activeStyle={isActiveDrop ? activeDropStyle : activeStyle}
-          style={openContextMenu ? hoverStyle : active ? activeStyle : style}
-          onClick={onClick}
-          onMouseEnter={handleMouseEnter}
-          onMouseLeave={handleMouseLeave}
-          // @ts-expect-error exact does not exist on div
-          exact={exact !== false}
-          to={to}
-          as={to ? undefined : href ? "a" : "div"}
-          href={href}
-          className={className}
-          ref={ref}
-          {...rest}
-        >
-          <Content>
-            {expanded !== undefined && (
-              <Disclosure
-                expanded={expanded}
-                onMouseDown={onDisclosureClick}
-                onClick={preventDefault}
-                root={depth === 0}
-                tabIndex={-1}
-              />
-            )}
-            {icon && <IconWrapper>{icon}</IconWrapper>}
-            <Label>{label}</Label>
-            {unreadBadge && <UnreadBadge style={unreadStyle} />}
-          </Content>
-        </Link>
-      </ContextMenu>
-      {menu && <Actions showActions={showActions}>{menu}</Actions>}
-    </>
+        <Content>
+          {hasDisclosure && (
+            <DisclosureComponent
+              expanded={expanded}
+              onClick={preventDefault}
+              onPointerDown={handleDisclosureClick}
+              tabIndex={-1}
+            />
+          )}
+          {icon && <IconWrapper>{icon}</IconWrapper>}
+          <Label $ellipsis={typeof label === "string"}>{label}</Label>
+          {unreadBadge && <UnreadBadge style={unreadStyle} />}
+        </Content>
+        {menu && <Actions showActions={showActions}>{menu}</Actions>}
+      </Link>
+    </ContextMenu>
  );
 }

+// accounts for whitespace around icon
+export const IconWrapper = styled.span`
+  margin-left: -4px;
+  height: 24px;
+  overflow: hidden;
+  flex-shrink: 0;
+  transition: opacity 200ms ease-in-out;
+`;
+
 const Content = styled.span`
  display: flex;
  align-items: start;
  position: relative;
  width: 100%;
-
-  ${Disclosure} {
-    margin-top: 2px;
-    margin-left: 2px;
-  }
-`;
-
-// accounts for whitespace around icon
-export const IconWrapper = styled.span`
-  margin-left: -4px;
-  margin-right: 4px;
-  height: 24px;
-  overflow: hidden;
-  flex-shrink: 0;
 `;

 const Actions = styled(EventBoundary)<{ showActions?: boolean }>`
  display: inline-flex;
  visibility: ${(props) => (props.showActions ? "visible" : "hidden")};
  position: absolute;
-  top: 4px;
+  top: 3px;
  right: 4px;
  gap: 4px;
  color: ${s("textTertiary")};
  transition: opacity 50ms;
  height: 24px;
+  background: var(--background);

  svg {
    color: ${s("textSecondary")};
@@ -203,21 +227,41 @@ const Actions = styled(EventBoundary)<{ showActions?: boolean }>`
  }
 `;

+const HiddenDisclosure = styled(Disclosure)`
+  position: inherit;
+  left: initial;
+  display: none;
+  margin-left: -2px;
+  margin-right: 6px;
+`;
+
 const Link = styled(NavLink)<{
  $isActiveDrop?: boolean;
  $isDraft?: boolean;
  $disabled?: boolean;
 }>`
+  &:hover,
+  &:active {
+    --background: ${s("sidebarHoverBackground")};
+  }
+
+  &[aria-current="page"] ${Actions} {
+    --background: ${s("sidebarActiveBackground")};
+  }
+
+  ${(props) => props.$isActiveDrop && `--background: ${props.theme.slateDark};`}
+
  display: flex;
  position: relative;
  text-overflow: ellipsis;
  font-weight: 475;
  padding: ${isMobile() ? 12 : 6}px 16px;
  border-radius: 4px;
-  min-height: 32px;
+  min-height: 30px;
  user-select: none;
-  background: ${(props) =>
-    props.$isActiveDrop ? props.theme.slateDark : "inherit"};
+  white-space: nowrap;
+  margin-top: 1px;
+  background: var(--background);
  color: ${(props) =>
    props.$isActiveDrop ? props.theme.white : props.theme.sidebarText};
  font-size: 16px;
@@ -253,34 +297,24 @@ const Link = styled(NavLink)<{
    transition: fill 50ms;
  }

-  &:hover svg {
-    display: inline;
-  }
-
-  & + ${Actions} {
-    background: ${s("sidebarBackground")};
-
-    ${NudeButton} {
-      background: transparent;
-
-      &:hover,
-      &[aria-expanded="true"] {
-        background: ${s("sidebarControlHoverBackground")};
-      }
+  &: ${hover} {
+    ${HiddenDisclosure} {
+      display: block;
+    }
+    ${HiddenDisclosure} + ${IconWrapper} {
+      visibility: hidden;
+      opacity: 0;
+      width: 0;
    }
  }

-  &[aria-current="page"] + ${Actions} {
-    background: ${s("sidebarActiveBackground")};
-  }
-
  ${breakpoint("tablet")`
-    padding: 4px 8px 4px 16px;
+    padding: 3px 8px 3px 12px;
    font-size: 14px;
  `}

  @media (hover: hover) {
-    &:hover + ${Actions}, &:active + ${Actions} {
+    &:hover ${Actions}, &:active ${Actions} {
      visibility: visible;

      svg {
@@ -294,17 +328,24 @@ const Link = styled(NavLink)<{
    }
  }

-  &:hover {
-    ${Disclosure} {
-      opacity: 1;
+  & ${Actions} {
+    ${NudeButton} {
+      background: transparent;
+
+      &:hover,
+      &[aria-expanded="true"] {
+        background: ${s("sidebarControlHoverBackground")};
+      }
    }
  }
 `;

-const Label = styled.div`
+const Label = styled.div<{ $ellipsis: boolean }>`
  position: relative;
  width: 100%;
  line-height: 24px;
+  margin-left: 2px;
+  ${(props) => props.$ellipsis && ellipsis()}

  * {
    unicode-bidi: plaintext;
@@ -18,7 +18,6 @@ import {
 } from "../hooks/useDragAndDrop";
 import { useSidebarLabelAndIcon } from "../hooks/useSidebarLabelAndIcon";
 import CollectionLink from "./CollectionLink";
-import CollectionLinkChildren from "./CollectionLinkChildren";
 import DocumentLink from "./DocumentLink";
 import DropCursor from "./DropCursor";
 import Folder from "./Folder";
@@ -42,7 +41,7 @@ type StarredDocumentLinkProps = {
  expanded: boolean;
  sidebarContext: SidebarContextType;
  isDragging: boolean;
-  handleDisclosureClick: (ev?: React.MouseEvent<HTMLButtonElement>) => void;
+  handleDisclosureClick: React.MouseEventHandler<HTMLElement>;
  handlePrefetch: () => void;
  icon: React.ReactNode;
  label: React.ReactNode;
@@ -185,13 +184,7 @@ function StarredCollectionLink({
          isDraggingAnyCollection={reorderStarProps.isDragging}
        />
      </Draggable>
-      <Relative>
-        <CollectionLinkChildren
-          collection={collection}
-          expanded={displayChildDocuments}
-        />
-        {cursor}
-      </Relative>
+      <Relative>{cursor}</Relative>
    </SidebarContext.Provider>
  );
 }
@@ -241,7 +234,7 @@ function StarredLink({ star }: Props) {
  }, [documentId, documents]);

  const handleDisclosureClick = React.useCallback(
-    (ev?: React.MouseEvent<HTMLButtonElement>) => {
+    (ev?: React.MouseEvent<HTMLElement>) => {
      ev?.preventDefault();
      ev?.stopPropagation();
      setExpanded((prevExpanded) => !prevExpanded);
@@ -0,0 +1,115 @@
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import styled from "styled-components";
+import { s } from "@shared/styles";
+import lazyWithRetry from "~/utils/lazyWithRetry";
+import useMobile from "~/hooks/useMobile";
+import DelayedMount from "./DelayedMount";
+import { Drawer, DrawerContent, DrawerTrigger } from "./primitives/Drawer";
+import { Popover, PopoverTrigger, PopoverContent } from "./primitives/Popover";
+import Text from "./Text";
+import { ColorButton } from "./ColorButton";
+
+/**
+ * Props for the SwatchButton component.
+ */
+type SwatchButtonProps = {
+  /** The current color value in hex format. If no color is passed a radial gradient will be shown */
+  color?: string;
+  /** Whether the swatch button is currently active/selected */
+  active?: boolean;
+  /** The size of the button in pixels */
+  size?: number;
+  /** Callback function invoked when the color is changed */
+  onChange: (color: string) => void;
+  /** Additional CSS class name to apply to the button */
+  className?: string;
+  /** Whether to render the color picker in a modal popover. Defaults to true */
+  pickerInModal?: boolean;
+};
+
+export const SwatchButton: React.FC<SwatchButtonProps> = ({
+  color,
+  active = false,
+  size = 24,
+  onChange,
+  className,
+  pickerInModal = true,
+}) => {
+  const { t } = useTranslation();
+  const isMobile = useMobile();
+
+  const pickerTrigger = (
+    <ColorButton
+      aria-label={t("Select a color")}
+      className={className}
+      color={color}
+      active={active}
+      size={size}
+    />
+  );
+
+  const pickerContent = (
+    <React.Suspense
+      fallback={
+        <DelayedMount>
+          <Text>{t("Loading")}…</Text>
+        </DelayedMount>
+      }
+    >
+      <StyledColorPicker
+        disableAlpha
+        color={color}
+        onChange={(c) => onChange(c.hex)}
+      />
+    </React.Suspense>
+  );
+
+  if (isMobile) {
+    return (
+      <Drawer>
+        <DrawerTrigger asChild>{pickerTrigger}</DrawerTrigger>
+        <DrawerContent aria-label={t("Select a color")}>
+          {pickerContent}
+        </DrawerContent>
+      </Drawer>
+    );
+  }
+
+  return (
+    <Popover modal={pickerInModal}>
+      <PopoverTrigger>{pickerTrigger}</PopoverTrigger>
+      <StyledContent
+        side="bottom"
+        align="end"
+        aria-label={t("Select a color")}
+        shrink
+      >
+        {pickerContent}
+      </StyledContent>
+    </Popover>
+  );
+};
+
+const StyledContent = styled(PopoverContent)`
+  width: auto;
+  padding: 8px;
+`;
+
+const ColorPicker = lazyWithRetry(
+  () => import("react-color/lib/components/chrome/Chrome")
+);
+
+const StyledColorPicker = styled(ColorPicker)`
+  background: inherit !important;
+  box-shadow: none !important;
+  border: 0 !important;
+  border-radius: 0 !important;
+  user-select: none;
+  width: auto !important;
+
+  input {
+    user-select: text;
+    color: ${s("text")} !important;
+  }
+`;
@@ -219,7 +219,11 @@ function Table<TData>({
                $columns={gridColumns}
              >
                {row.getAllCells().map((cell) => (
-                  <TD role="cell" key={cell.id}>
+                  <TD
+                    role="cell"
+                    key={cell.id}
+                    className={cell.column.id === "action" ? "actions" : ""}
+                  >
                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
                  </TD>
                ))}
@@ -384,6 +388,8 @@ const TD = styled.span`
  }

  ${NudeButton}[aria-haspopup="menu"] {
+    vertical-align: middle;
+
    &:hover,
    &[aria-expanded="true"] {
      background: ${s("sidebarControlHoverBackground")};
@@ -1,5 +1,4 @@
 import styled from "styled-components";
-import { s } from "@shared/styles";
 import { Avatar } from "./Avatar";
 import { AvatarVariant } from "./Avatar/Avatar";

@@ -7,7 +6,6 @@ const TeamLogo = styled(Avatar).attrs({
  variant: AvatarVariant.Square,
 })`
  border-radius: 4px;
-  box-shadow: inset 0 0 0 1px ${s("divider")};
  border: 0;
 `;

@@ -30,9 +30,10 @@ const Theme: React.FC = ({ children }: Props) => {
    <ThemeProvider theme={theme}>
      <>
        <GlobalStyles
-          useCursorPointer={auth.user?.getPreference(
-            UserPreference.UseCursorPointer
-          )}
+          useCursorPointer={
+            // Default to showing the cursor pointer if no user is logged in (public share)
+            auth.user?.getPreference(UserPreference.UseCursorPointer) ?? true
+          }
        />
        {children}
      </>
@@ -276,7 +276,7 @@ const MenuButton = React.forwardRef<
        <Components.MenuLabel>{label}</Components.MenuLabel>
        {selected !== undefined && (
          <Components.SelectedIconWrapper aria-hidden>
-            {selected ? <CheckmarkIcon /> : null}
+            {selected ? <CheckmarkIcon size={18} /> : null}
          </Components.SelectedIconWrapper>
        )}
      </Components.MenuButton>
@@ -38,6 +38,7 @@ const PopoverContent = React.forwardRef<
  ContentProps
 >((props, forwardedRef) => {
  const ref = React.useRef<React.ElementRef<typeof PopoverPrimitive.Content>>();
+  const timeoutRef = React.useRef<NodeJS.Timeout>();

  const {
    width = 380,
@@ -50,6 +51,9 @@ const PopoverContent = React.forwardRef<
  } = props;

  const enablePointerEvents = React.useCallback(() => {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current);
+    }
    if (ref.current) {
      ref.current.style.pointerEvents = "auto";
    }
@@ -59,7 +63,11 @@ const PopoverContent = React.forwardRef<
    if (ref.current) {
      ref.current.style.pointerEvents = "none";
    }
-  }, []);
+    // Fallback: re-enable pointer events after 500ms, onAnimationEnd is not always called.
+    timeoutRef.current = setTimeout(() => {
+      enablePointerEvents();
+    }, 500);
+  }, [enablePointerEvents]);

  return (
    <PopoverPrimitive.Portal>
@@ -66,6 +66,7 @@ const BaseMenuItemCSS = css<BaseMenuItemProps>`
  ${(props) =>
    !props.disabled &&
    `
+      &[data-highlighted],
      &:focus-visible {
        color: ${props.theme.accentText};
        background: ${props.$dangerous ? props.theme.danger : props.theme.accent};
@@ -143,6 +144,9 @@ export const MenuIconWrapper = styled.span`
  margin-left: -4px;
  color: ${s("textSecondary")};
  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 `;

 export const SelectedIconWrapper = styled.span`
@@ -151,6 +155,9 @@ export const SelectedIconWrapper = styled.span`
  margin-right: -6px;
  color: ${s("textSecondary")};
  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 `;

 export const MenuContent = styled(Scrollable)<{
@@ -5,7 +5,7 @@ export const Overlay = styled.div`
  position: fixed;
  inset: 0;
  background: ${s("backdrop")};
-  z-index: ${depths.overlay};
+  z-index: ${depths.menu};
  transition: opacity 50ms ease-in-out;
  opacity: 0;

@@ -17,8 +17,7 @@ function BlockMenu(props: Props) {
  const renderMenuItem = useCallback(
    (item, _index, options) => (
      <SuggestionsMenuItem
-        onClick={options.onClick}
-        selected={options.selected}
+        {...options}
        icon={item.icon}
        title={item.title}
        shortcut={item.shortcut}
@@ -1,11 +1,14 @@
 import capitalize from "lodash/capitalize";
-import { useCallback, useMemo } from "react";
+import { useCallback, useMemo, useEffect } from "react";
 import { emojiMartToGemoji, snakeCase } from "@shared/editor/lib/emoji";
 import { search as emojiSearch } from "@shared/utils/emoji";
 import EmojiMenuItem from "./EmojiMenuItem";
 import SuggestionsMenu, {
  Props as SuggestionsMenuProps,
 } from "./SuggestionsMenu";
+import useStores from "~/hooks/useStores";
+import { determineIconType } from "@shared/utils/icon";
+import { IconType } from "@shared/types";

 type Emoji = {
  name: string;
@@ -21,38 +24,45 @@ type Props = Omit<
 >;

 const EmojiMenu = (props: Props) => {
+  const { emojis } = useStores();
  const { search = "" } = props;

+  useEffect(() => {
+    if (search) {
+      void emojis.fetchPage({ query: search });
+    }
+  }, [emojis, search]);
+
  const items = useMemo(
    () =>
-      emojiSearch({ query: search })
+      emojiSearch({ customEmojis: emojis.orderedData, query: search })
        .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 id = emojiMartToGemoji[item.id] || item.id;
+          const type = determineIconType(id);
+          const shortcode = type === IconType.Custom ? id : snakeCase(id);
          const emoji = item.value;

          return {
            name: "emoji",
            title: emoji,
-            description: capitalize(item.name.toLowerCase()),
+            description:
+              type === IconType.Custom
+                ? item.name
+                : capitalize(item.name.toLowerCase()),
            emoji,
            attrs: { markup: shortcode, "data-name": shortcode },
          };
        })
        .slice(0, 15),
-    [search]
+    [search, emojis.orderedData]
  );

  const renderMenuItem = useCallback(
    (item, _index, options) => (
-      <EmojiMenuItem
-        onClick={options.onClick}
-        selected={options.selected}
-        title={item.description}
-        emoji={item.emoji}
-      />
+      <EmojiMenuItem {...options} title={item.description} emoji={item.emoji} />
    ),
    []
  );
@@ -1,12 +1,9 @@
-import styled from "styled-components";
 import SuggestionsMenuItem, {
  Props as SuggestionsMenuItemProps,
 } from "./SuggestionsMenuItem";
-
-const Emoji = styled.span`
-  font-size: 16px;
-  line-height: 1.6em;
-`;
+import { Emoji } from "~/components/Emoji";
+import { CustomEmoji } from "@shared/components/CustomEmoji";
+import { isUUID } from "validator";

 type EmojiMenuItemProps = Omit<
  SuggestionsMenuItemProps,
@@ -19,7 +16,9 @@ export default function EmojiMenuItem({ emoji, ...rest }: EmojiMenuItemProps) {
  return (
    <SuggestionsMenuItem
      {...rest}
-      icon={<Emoji className="emoji">{emoji}</Emoji>}
+      icon={
+        isUUID(emoji) ? <CustomEmoji value={emoji} /> : <Emoji>{emoji}</Emoji>
+      }
    />
  );
 }
@@ -5,7 +5,6 @@ import { Selection } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
 import * as React from "react";
 import { useEffect, useRef, useState } from "react";
-import { toast } from "sonner";
 import styled from "styled-components";
 import Icon from "@shared/components/Icon";
 import { hideScrollbars, s } from "@shared/styles";
@@ -22,41 +21,21 @@ import Input from "./Input";
 import SuggestionsMenuItem from "./SuggestionsMenuItem";
 import ToolbarButton from "./ToolbarButton";
 import Tooltip from "./Tooltip";
+import useOnClickOutside from "~/hooks/useOnClickOutside";
+import { useEditor } from "./EditorContext";

 type Props = {
  mark?: Mark;
-  from: number;
-  to: number;
  dictionary: Dictionary;
-  onRemoveLink?: () => void;
-  onSelectLink: (options: {
-    href: string;
-    title?: string;
-    from: number;
-    to: number;
-  }) => void;
-  onClickLink: (
-    href: string,
-    event: React.MouseEvent<HTMLButtonElement>
-  ) => void;
  view: EditorView;
 };

-const LinkEditor: React.FC<Props> = ({
-  mark,
-  from,
-  to,
-  dictionary,
-  onRemoveLink,
-  onSelectLink,
-  onClickLink,
-  view,
-}) => {
+const LinkEditor: React.FC<Props> = ({ mark, dictionary, view }) => {
  const getHref = () => sanitizeUrl(mark?.attrs.href) ?? "";
  const initialValue = getHref();
-  const initialSelectionLength = to - from;
+  const { commands } = useEditor();
  const inputRef = useRef<HTMLInputElement>(null);
-  const discardRef = useRef(false);
+  const wrapperRef = useRef<HTMLDivElement>(null);
  const [query, setQuery] = useState(initialValue);
  const [selectedIndex, setSelectedIndex] = useState(-1);
  const { documents } = useStores();
@@ -79,52 +58,42 @@ const LinkEditor: React.FC<Props> = ({
    }
  }, [trimmedQuery, request]);

-  useEffect(() => {
-    const handleGlobalKeyDown = (event: KeyboardEvent) => {
-      if (event.key === "k" && event.metaKey) {
-        inputRef.current?.select();
-      }
-    };
+  useOnClickOutside(wrapperRef, () => {
+    // If the link is totally empty or only spaces then remove the mark
+    if (!trimmedQuery) {
+      return removeLink();
+    }

-    window.addEventListener("keydown", handleGlobalKeyDown);
-    return () => {
-      window.removeEventListener("keydown", handleGlobalKeyDown);
-
-      // If we discarded the changes then nothing to do
-      if (discardRef.current) {
-        return;
-      }
-
-      // If the link is the same as it was when the editor opened, nothing to do
-      if (trimmedQuery === initialValue) {
-        return;
-      }
-
-      // If the link is totally empty or only spaces then remove the mark
-      if (!trimmedQuery) {
-        return handleRemoveLink();
-      }
-
-      save(trimmedQuery, trimmedQuery);
-    };
-  }, [trimmedQuery, initialValue]);
-
-  const save = (href: string, title?: string) => {
-    href = href.trim();
-
-    if (href.length === 0) {
+    // If the link in input is non-empty and same as it was when the editor opened, nothing to do
+    if (trimmedQuery === initialValue) {
      return;
    }

-    discardRef.current = true;
-    href = sanitizeUrl(href) ?? "";
+    updateLink(trimmedQuery);
+  });

-    onSelectLink({ href, title, from, to });
+  const openLink = React.useCallback(() => {
+    commands["openLink"]();
+  }, []);
+
+  const removeLink = React.useCallback(() => {
+    commands["removeLink"]();
+  }, []);
+
+  const updateLink = (link: string) => {
+    if (!link) {
+      return;
+    }
+    commands["updateLink"]({ href: sanitizeUrl(link) ?? "" });
  };

  const moveSelectionToEnd = () => {
    const { state, dispatch } = view;
-    const nextSelection = Selection.findFrom(state.tr.doc.resolve(to), 1, true);
+    const nextSelection = Selection.findFrom(
+      state.tr.doc.resolve(state.selection.to),
+      1,
+      true
+    );
    if (nextSelection) {
      dispatch(state.tr.setSelection(nextSelection));
    }
@@ -150,26 +119,27 @@ const LinkEditor: React.FC<Props> = ({

        if (selectedIndex >= 0 && results[selectedIndex]) {
          const selectedDoc = results[selectedIndex];
-          const href = selectedDoc.url;
-          save(href, selectedDoc.title);
+          updateLink(selectedDoc.url);
+        } else if (!trimmedQuery) {
+          removeLink();
        } else {
-          save(trimmedQuery, trimmedQuery);
+          updateLink(trimmedQuery);
        }

-        if (initialSelectionLength) {
-          moveSelectionToEnd();
-        }
        return;
      }
      case "Escape": {
        event.preventDefault();

-        if (initialValue) {
-          setQuery(initialValue);
-          moveSelectionToEnd();
-        } else {
-          handleRemoveLink();
+        if (!initialValue) {
+          return removeLink();
        }
+
+        // Moving selection to end causes editor state to change,
+        // forcing a re-render of the top-level editor component. As
+        // a result, the new selection, being devoid of any link mark,
+        // prevents LinkEditor from re-rendering.
+        moveSelectionToEnd();
        return;
      }
    }
@@ -181,75 +151,64 @@ const LinkEditor: React.FC<Props> = ({
    setSelectedIndex(-1);
  };

-  const handlePaste = () => {
-    setTimeout(() => save(query, query), 0);
-  };
-
-  const handleOpenLink = (event: React.MouseEvent<HTMLButtonElement>) => {
-    event.preventDefault();
-
-    try {
-      onClickLink(getHref(), event);
-    } catch (_err) {
-      toast.error(dictionary.openLinkError);
-    }
-  };
-
-  const handleRemoveLink = () => {
-    discardRef.current = true;
-
-    const { state, dispatch } = view;
-    if (mark) {
-      dispatch(state.tr.removeMark(from, to, mark));
-    }
-
-    onRemoveLink?.();
-    view.focus();
-  };
-
-  const isInternal = isInternalUrl(query);
  const hasResults = !!results.length;

+  const isInternal = isInternalUrl(query);
+  const actions = [
+    {
+      tooltip: isInternal ? dictionary.goToLink : dictionary.openLink,
+      icon: isInternal ? <ArrowIcon /> : <OpenIcon />,
+      visible: true,
+      disabled: !query,
+      handler: openLink,
+    },
+    {
+      tooltip: dictionary.removeLink,
+      icon: <CloseIcon />,
+      visible: view.editable,
+      disabled: false,
+      handler: removeLink,
+    },
+  ];
+
  return (
-    <>
-      <Wrapper>
+    <div ref={wrapperRef}>
+      <InputWrapper ref={wrapperRef}>
        <Input
          ref={inputRef}
          value={query}
          placeholder={dictionary.searchOrPasteLink}
          onKeyDown={handleKeyDown}
-          onPaste={handlePaste}
          onChange={handleSearch}
          onFocus={handleSearch}
          autoFocus={getHref() === ""}
          readOnly={!view.editable}
        />
-        <Tooltip
-          content={isInternal ? dictionary.goToLink : dictionary.openLink}
-        >
-          <ToolbarButton onClick={handleOpenLink} disabled={!query}>
-            {isInternal ? <ArrowIcon /> : <OpenIcon />}
-          </ToolbarButton>
-        </Tooltip>
-        {view.editable && (
-          <Tooltip content={dictionary.removeLink}>
-            <ToolbarButton onClick={handleRemoveLink}>
-              <CloseIcon />
-            </ToolbarButton>
-          </Tooltip>
-        )}
-      </Wrapper>
+        {actions.map((action, index) => {
+          if (!action.visible) {
+            return null;
+          }
+
+          return (
+            <Tooltip key={index} content={action.tooltip}>
+              <ToolbarButton
+                onClick={action.handler}
+                disabled={action.disabled}
+              >
+                {action.icon}
+              </ToolbarButton>
+            </Tooltip>
+          );
+        })}
+      </InputWrapper>
      <SearchResults $hasResults={hasResults}>
        <ResizingHeightContainer>
          {hasResults && (
            <>
              {results.map((doc, index) => (
                <SuggestionsMenuItem
-                  onClick={() => {
-                    save(doc.url, doc.title);
-                    if (initialSelectionLength) {
-                      moveSelectionToEnd();
-                    }
+                  onPointerDown={() => {
+                    updateLink(doc.url);
                  }}
                  onPointerMove={() => setSelectedIndex(index)}
                  selected={index === selectedIndex}
@@ -276,11 +235,11 @@ const LinkEditor: React.FC<Props> = ({
          )}
        </ResizingHeightContainer>
      </SearchResults>
-    </>
+    </div>
  );
 };

-const Wrapper = styled(Flex)`
+const InputWrapper = styled(Flex)`
  pointer-events: all;
  gap: 6px;
  padding: 6px;
@@ -123,6 +123,7 @@ function MentionMenu({ search, isActive, ...rest }: Props) {
                </Flex>
              ),
              title: group.name,
+              subtitle: t("{{ count }} members", { count: group.memberCount }),
              section: GroupSection,
              appendSpace: true,
              attrs: {
@@ -284,8 +285,7 @@ function MentionMenu({ search, isActive, ...rest }: Props) {
  const renderMenuItem = useCallback(
    (item, _index, options) => (
      <SuggestionsMenuItem
-        onClick={options.onClick}
-        selected={options.selected}
+        {...options}
        subtitle={item.subtitle}
        title={item.title}
        icon={item.icon}
@@ -29,12 +29,7 @@ export const PasteMenu = observer(({ pastedText, embeds, ...props }: Props) => {

  const renderMenuItem = useCallback(
    (item, _index, options) => (
-      <SuggestionsMenuItem
-        onClick={options.onClick}
-        selected={options.selected}
-        title={item.title}
-        icon={item.icon}
-      />
+      <SuggestionsMenuItem {...options} title={item.title} icon={item.icon} />
    ),
    []
  );
--- a/Show More
+++ b/Show More