chore: Compressed inefficient images automatically

2026-06-13 19:35:02 +03:00 · 2025-09-06 20:03:17 +00:00
196 changed files with 1706 additions and 2846 deletions
@@ -27,8 +27,8 @@ export const createApiKey = createAction({

 export const revokeApiKeyFactory = ({ apiKey }: { apiKey: ApiKey }) =>
  createActionV2({
-    name: ({ t, isMenu }) =>
-      isMenu
+    name: ({ t, isContextMenu }) =>
+      isContextMenu
        ? apiKey.isExpired
          ? t("Delete")
          : `${t("Revoke")}…`
@@ -81,7 +81,8 @@ export const createCollection = createAction({
 });

 export const editCollection = createActionV2({
-  name: ({ t, isMenu }) => (isMenu ? `${t("Edit")}…` : t("Edit collection")),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? `${t("Edit")}…` : t("Edit collection"),
  analyticsName: "Edit collection",
  section: ActiveCollectionSection,
  icon: <EditIcon />,
@@ -106,8 +107,8 @@ export const editCollection = createActionV2({
 });

 export const editCollectionPermissions = createActionV2({
-  name: ({ t, isMenu }) =>
-    isMenu ? `${t("Permissions")}…` : t("Collection permissions"),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? `${t("Permissions")}…` : t("Collection permissions"),
  analyticsName: "Collection permissions",
  section: ActiveCollectionSection,
  icon: <PadlockIcon />,
@@ -384,8 +384,8 @@ export const subscribeDocument = createActionV2({
  analyticsName: "Subscribe to document",
  section: ActiveDocumentSection,
  icon: <SubscribeIcon />,
-  tooltip: ({ activeCollectionId, isMenu, stores, t }) => {
-    if (!isMenu || !activeCollectionId) {
+  tooltip: ({ activeCollectionId, isContextMenu, stores, t }) => {
+    if (!isContextMenu || !activeCollectionId) {
      return undefined;
    }

@@ -393,8 +393,8 @@ export const subscribeDocument = createActionV2({
      ? t("Subscription inherited from collection")
      : undefined;
  },
-  disabled: ({ activeCollectionId, isMenu, stores }) => {
-    if (!isMenu || !activeCollectionId) {
+  disabled: ({ activeCollectionId, isContextMenu, stores }) => {
+    if (!isContextMenu || !activeCollectionId) {
      return false;
    }

@@ -430,8 +430,8 @@ export const unsubscribeDocument = createActionV2({
  analyticsName: "Unsubscribe from document",
  section: ActiveDocumentSection,
  icon: <UnsubscribeIcon />,
-  tooltip: ({ activeCollectionId, isMenu, stores, t }) => {
-    if (!isMenu || !activeCollectionId) {
+  tooltip: ({ activeCollectionId, isContextMenu, stores, t }) => {
+    if (!isContextMenu || !activeCollectionId) {
      return undefined;
    }

@@ -439,8 +439,8 @@ export const unsubscribeDocument = createActionV2({
      ? t("Subscription inherited from collection")
      : undefined;
  },
-  disabled: ({ activeCollectionId, isMenu, stores }) => {
-    if (!isMenu || !activeCollectionId) {
+  disabled: ({ activeCollectionId, isContextMenu, stores }) => {
+    if (!isContextMenu || !activeCollectionId) {
      return false;
    }

@@ -571,7 +571,8 @@ export const downloadDocumentAsMarkdown = createActionV2({
 });

 export const downloadDocument = createActionV2WithChildren({
-  name: ({ t, isMenu }) => (isMenu ? t("Download") : t("Download document")),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Download") : t("Download document"),
  analyticsName: "Download document",
  section: ActiveDocumentSection,
  icon: <DownloadIcon />,
@@ -677,7 +678,8 @@ export const copyDocument = createActionV2WithChildren({
 });

 export const duplicateDocument = createActionV2({
-  name: ({ t, isMenu }) => (isMenu ? t("Duplicate") : t("Duplicate document")),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Duplicate") : t("Duplicate document"),
  analyticsName: "Duplicate document",
  section: ActiveDocumentSection,
  icon: <DuplicateIcon />,
@@ -827,7 +829,8 @@ export const searchInDocument = createInternalLinkActionV2({
 });

 export const printDocument = createActionV2({
-  name: ({ t, isMenu }) => (isMenu ? t("Print") : t("Print document")),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Print") : t("Print document"),
  analyticsName: "Print document",
  section: ActiveDocumentSection,
  icon: <PrintIcon />,
@@ -131,8 +131,8 @@ export const navigateToTemplateSettings = createAction({
 });

 export const navigateToNotificationSettings = createInternalLinkActionV2({
-  name: ({ t, isMenu }) =>
-    isMenu ? t("Notification settings") : t("Notifications"),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Notification settings") : t("Notifications"),
  analyticsName: "Navigate to notification settings",
  section: NavigationSection,
  iconInContextMenu: false,
@@ -37,7 +37,8 @@ export const changeToSystemTheme = createActionV2({
 });

 export const changeTheme = createActionV2WithChildren({
-  name: ({ t, isMenu }) => (isMenu ? t("Appearance") : t("Change theme")),
+  name: ({ t, isContextMenu }) =>
+    isContextMenu ? t("Appearance") : t("Change theme"),
  analyticsName: "Change theme",
  placeholder: ({ t }) => t("Change theme to"),
  icon: ({ stores }) =>
@@ -3,8 +3,12 @@ import * as React from "react";
 import Tooltip, { Props as TooltipProps } from "~/components/Tooltip";
 import { performAction, performActionV2, resolve } from "~/actions";
 import useIsMounted from "~/hooks/useIsMounted";
-import { Action, ActionV2Variant, ActionV2WithChildren } from "~/types";
-import useActionContext from "~/hooks/useActionContext";
+import {
+  Action,
+  ActionContext,
+  ActionV2Variant,
+  ActionV2WithChildren,
+} from "~/types";

 export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  /** Show the button in a disabled state */
@@ -13,6 +17,8 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
  hideOnActionDisabled?: boolean;
  /** Action to use on button */
  action?: Action | Exclude<ActionV2Variant, ActionV2WithChildren>;
+  /** Context of action, must be provided with action */
+  context?: ActionContext;
  /** If tooltip props are provided the button will be wrapped in a tooltip */
  tooltip?: Omit<TooltipProps, "children">;
 };
@@ -22,20 +28,22 @@ export type Props = React.HTMLAttributes<HTMLButtonElement> & {
 */
 const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
  function _ActionButton(
-    { action, tooltip, hideOnActionDisabled, ...rest }: Props,
+    { action, context, tooltip, hideOnActionDisabled, ...rest }: Props,
    ref: React.Ref<HTMLButtonElement>
  ) {
-    const actionContext = useActionContext({
-      isButton: true,
-    });
    const isMounted = useIsMounted();
    const [executing, setExecuting] = React.useState(false);
    const disabled = rest.disabled;

-    if (!actionContext || !action) {
+    if (action && !context) {
+      throw new Error("Context must be provided with action");
+    }
+    if (!context || !action) {
      return <button {...rest} ref={ref} />;
    }

+    const actionContext = { ...context, isButton: true };
+
    if (
      action.visible &&
      !resolve<boolean>(action.visible, actionContext) &&
@@ -45,10 +53,9 @@ const ActionButton = React.forwardRef<HTMLButtonElement, Props>(
    }

    const label =
-      rest["aria-label"] ??
-      (typeof action.name === "function"
+      typeof action.name === "function"
        ? action.name(actionContext)
-        : action.name);
+        : action.name;

    const button = (
      <button
@@ -6,6 +6,7 @@ import Flex from "~/components/Flex";
 export const Action = styled(Flex)`
  justify-content: center;
  align-items: center;
+  padding: 0 0 0 12px;
  height: 32px;
  font-size: 15px;
  flex-shrink: 0;
@@ -17,6 +18,7 @@ export const Action = styled(Flex)`

 export const Separator = styled.div`
  flex-shrink: 0;
+  margin-left: 12px;
  width: 1px;
  height: 28px;
  background: ${s("divider")};
@@ -31,7 +33,6 @@ const Actions = styled(Flex)`
  background: ${s("background")};
  padding: 12px;
  backdrop-filter: blur(20px);
-  gap: 12px;

  @media print {
    display: none;
@@ -25,8 +25,6 @@ type Props = {
  onClick?: React.MouseEventHandler<HTMLImageElement>;
  /** Size of the avatar, defaults to AvatarSize.Large */
  size?: AvatarSize;
-  /** Optional alt text for the avatar image */
-  alt?: string;
  /** Optional inline styles to apply to the avatar wrapper */
  style?: React.CSSProperties;
 };
@@ -55,7 +53,6 @@ function AvatarWithPresence({
  isCurrentUser,
  size = AvatarSize.Large,
  style,
-  alt,
 }: Props) {
  const { t } = useTranslation();
  const status = isPresent
@@ -86,7 +83,7 @@ function AvatarWithPresence({
          $color={user.color}
          style={style}
        >
-          <Avatar model={user} onClick={onClick} size={size} alt={alt} />
+          <Avatar model={user} onClick={onClick} size={size} />
        </AvatarPresence>
      </Tooltip>
    </>
@@ -25,7 +25,7 @@ function Breadcrumb(
  { actions, highlightFirstItem, children, max = 2 }: Props,
  ref: React.RefObject<HTMLDivElement> | null
 ) {
-  const actionContext = useActionContext({ isMenu: true });
+  const actionContext = useActionContext({ isContextMenu: true });

  const visibleActions = useComputed(
    () =>
@@ -132,7 +132,6 @@ function Collaborators(props: Props) {
          isEditing={isEditing}
          isObserving={isObserving}
          isCurrentUser={currentUserId === collaborator.id}
-          alt={t("Avatar of {{ name }}", { name: collaborator.name })}
          onClick={
            isObservable
              ? handleAvatarClick(
@@ -143,14 +143,13 @@ const ContentEditable = React.forwardRef(function _ContentEditable(
    },
    []
  );
-  const contentEditable = !disabled && !readOnly;

  return (
    <div className={className} dir={dir} onClick={onClick} tabIndex={-1}>
      {children}
      <Content
        ref={contentRef}
-        contentEditable={contentEditable}
+        contentEditable={!disabled && !readOnly}
        onInput={wrappedEvent(onInput)}
        onFocus={wrappedEvent(onFocus)}
        onBlur={wrappedEvent(onBlur)}
@@ -158,7 +157,7 @@ const ContentEditable = React.forwardRef(function _ContentEditable(
        onPaste={handlePaste}
        data-placeholder={placeholder}
        suppressContentEditableWarning
-        role={contentEditable ? "textbox" : undefined}
+        role="textbox"
        {...rest}
      >
        {innerValue}
@@ -1,6 +1,5 @@
 import { MoreIcon } from "outline-icons";
 import * as React from "react";
-import { useTranslation } from "react-i18next";
 import { MenuButton } from "reakit/Menu";
 import NudeButton from "~/components/NudeButton";

@@ -9,16 +8,10 @@ type Props = React.ComponentProps<typeof MenuButton> & {
 };

 export default function OverflowMenuButton({ className, ...rest }: Props) {
-  const { t } = useTranslation();
-
  return (
    <MenuButton {...rest}>
      {(props) => (
-        <NudeButton
-          className={className}
-          aria-label={t("More options")}
-          {...props}
-        >
+        <NudeButton className={className} {...props}>
          <MoreIcon />
        </NudeButton>
      )}
@@ -104,7 +104,7 @@ export function filterTemplateItems(items: TMenuItem[]): TMenuItem[] {

 function Template({ items, actions, context, showIcons, ...menu }: Props) {
  const ctx = useActionContext({
-    isMenu: true,
+    isContextMenu: true,
  });

  const templateItems = actions
@@ -25,7 +25,7 @@ import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
 import DocumentMenu from "~/menus/DocumentMenu";
 import { documentPath } from "~/utils/routeHelpers";
 import { determineSidebarContext } from "./Sidebar/components/SidebarContext";
-import { ActionContextProvider } from "~/hooks/useActionContext";
+import useActionContext from "~/hooks/useActionContext";
 import { useDocumentMenuAction } from "~/hooks/useDocumentMenuAction";
 import { ContextMenu } from "./Menu/ContextMenu";
 import useStores from "~/hooks/useStores";
@@ -94,99 +94,98 @@ function DocumentListItem(
    currentContext: locationSidebarContext,
  });

+  const actionContext = useActionContext({
+    isContextMenu: true,
+    activeDocumentId: document.id,
+    activeCollectionId:
+      !isShared && document.collectionId ? document.collectionId : undefined,
+  });
+
  const contextMenuAction = useDocumentMenuAction({ document });

  return (
-    <ActionContextProvider
-      value={{
-        activeDocumentId: document.id,
-        activeCollectionId:
-          !isShared && document.collectionId
-            ? document.collectionId
-            : undefined,
-      }}
+    <ContextMenu
+      action={contextMenuAction}
+      context={actionContext}
+      ariaLabel={t("Document options")}
+      onOpen={handleMenuOpen}
+      onClose={handleMenuClose}
    >
-      <ContextMenu
-        action={contextMenuAction}
-        ariaLabel={t("Document options")}
-        onOpen={handleMenuOpen}
-        onClose={handleMenuClose}
+      <DocumentLink
+        ref={itemRef}
+        dir={document.dir}
+        role="menuitem"
+        $isStarred={document.isStarred}
+        $menuOpen={menuOpen}
+        to={{
+          pathname: documentPath(document),
+          state: {
+            title: document.titleWithDefault,
+            sidebarContext,
+          },
+        }}
+        {...rest}
+        {...rovingTabIndex}
      >
-        <DocumentLink
-          ref={itemRef}
-          dir={document.dir}
-          $isStarred={document.isStarred}
-          $menuOpen={menuOpen}
-          to={{
-            pathname: documentPath(document),
-            state: {
-              title: document.titleWithDefault,
-              sidebarContext,
-            },
-          }}
-          {...rest}
-          {...rovingTabIndex}
-        >
-          <Content>
-            <Heading dir={document.dir}>
-              {document.icon && (
-                <>
-                  <Icon
-                    value={document.icon}
-                    color={document.color ?? undefined}
-                    initial={document.initial}
-                  />
-                  &nbsp;
-                </>
-              )}
-              <Title
-                text={document.titleWithDefault}
-                highlight={highlight}
-                dir={document.dir}
-              />
-              {document.isBadgedNew && document.createdBy?.id !== user.id && (
-                <Badge yellow>{t("New")}</Badge>
-              )}
-              {document.isDraft && showDraft && (
-                <Tooltip content={t("Only visible to you")} placement="top">
-                  <Badge>{t("Draft")}</Badge>
-                </Tooltip>
-              )}
-              {canStar && (
-                <StarPositioner>
-                  <StarButton document={document} />
-                </StarPositioner>
-              )}
-              {document.isTemplate && showTemplate && (
-                <Badge primary>{t("Template")}</Badge>
-              )}
-            </Heading>
-
-            {!queryIsInTitle && (
-              <ResultContext
-                text={context}
-                highlight={highlight ? SEARCH_RESULT_REGEX : undefined}
-                processResult={replaceResultMarks}
-              />
+        <Content>
+          <Heading dir={document.dir}>
+            {document.icon && (
+              <>
+                <Icon
+                  value={document.icon}
+                  color={document.color ?? undefined}
+                  initial={document.initial}
+                />
+                &nbsp;
+              </>
            )}
-            <DocumentMeta
-              document={document}
-              showCollection={showCollection}
-              showPublished={showPublished}
-              showParentDocuments={showParentDocuments}
-              showLastViewed
+            <Title
+              text={document.titleWithDefault}
+              highlight={highlight}
+              dir={document.dir}
            />
-          </Content>
-          <Actions>
-            <DocumentMenu
-              document={document}
-              onOpen={handleMenuOpen}
-              onClose={handleMenuClose}
+            {document.isBadgedNew && document.createdBy?.id !== user.id && (
+              <Badge yellow>{t("New")}</Badge>
+            )}
+            {document.isDraft && showDraft && (
+              <Tooltip content={t("Only visible to you")} placement="top">
+                <Badge>{t("Draft")}</Badge>
+              </Tooltip>
+            )}
+            {canStar && (
+              <StarPositioner>
+                <StarButton document={document} />
+              </StarPositioner>
+            )}
+            {document.isTemplate && showTemplate && (
+              <Badge primary>{t("Template")}</Badge>
+            )}
+          </Heading>
+
+          {!queryIsInTitle && (
+            <ResultContext
+              text={context}
+              highlight={highlight ? SEARCH_RESULT_REGEX : undefined}
+              processResult={replaceResultMarks}
            />
-          </Actions>
-        </DocumentLink>
-      </ContextMenu>
-    </ActionContextProvider>
+          )}
+          <DocumentMeta
+            document={document}
+            showCollection={showCollection}
+            showPublished={showPublished}
+            showParentDocuments={showParentDocuments}
+            showLastViewed
+          />
+        </Content>
+        <Actions>
+          <DocumentMenu
+            document={document}
+            onOpen={handleMenuOpen}
+            onClose={handleMenuClose}
+          />
+        </Actions>
+      </DocumentLink>
+    </ContextMenu>
  );
 }

@@ -280,7 +279,7 @@ const DocumentLink = styled(Link)<{
    `}
 `;

-const Heading = styled.span<{ rtl?: boolean }>`
+const Heading = styled.h3<{ rtl?: boolean }>`
  display: flex;
  justify-content: ${(props) => (props.rtl ? "flex-end" : "flex-start")};
  align-items: center;
@@ -290,8 +289,6 @@ const Heading = styled.span<{ rtl?: boolean }>`
  color: ${s("text")};
  font-family: ${s("fontFamily")};
  font-weight: 500;
-  font-size: 20px;
-  line-height: 1.2;
 `;

 const StarPositioner = styled(Flex)`
@@ -168,7 +168,13 @@ const DocumentMeta: React.FC<Props> = ({
  };

  return (
-    <Container align="center" rtl={document.dir === "rtl"} {...rest} dir="ltr">
+    <Container
+      align="center"
+      rtl={document.dir === "rtl"}
+      {...rest}
+      dir="ltr"
+      lang=""
+    >
      {to ? (
        <Link to={to} replace={replace}>
          {content}
@@ -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 } from "@shared/styles";

 type Props = Omit<React.HTMLAttributes<HTMLInputElement>, "onSubmit"> & {
  /** A callback when the title is submitted. */
@@ -128,21 +128,17 @@ function EditableTitle(
          />
        </form>
      ) : (
-        <Text
+        <span
          onDoubleClick={canUpdate ? handleDoubleClick : undefined}
          className={rest.className}
        >
          {value}
-        </Text>
+        </span>
      )}
    </>
  );
 }

-const Text = styled.span`
-  ${truncateMultiline(3)}
-`;
-
 const Input = styled.input`
  color: ${s("text")};
  background: ${s("background")};
@@ -1,19 +1,22 @@
 import deburr from "lodash/deburr";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import { MenuButton } from "reakit/Menu";
 import styled from "styled-components";
 import { s } from "@shared/styles";
 import type { FetchPageParams } from "~/stores/base/Store";
 import Button, { Inner } from "~/components/Button";
+import ContextMenu from "~/components/ContextMenu";
+import MenuItem from "~/components/ContextMenu/MenuItem";
 import Text from "~/components/Text";
+import { useMenuState } from "~/hooks/useMenuState";
 import Input, { NativeInput, Outline } from "./Input";
 import PaginatedList, { PaginatedItem } from "./PaginatedList";
-import { MenuProvider } from "./primitives/Menu/MenuContext";
-import { Menu, MenuContent, MenuTrigger, MenuButton } from "./primitives/Menu";

 interface TFilterOption extends PaginatedItem {
  key: string;
  label: string;
+  note?: string;
  icon?: React.ReactNode;
 }

@@ -31,17 +34,19 @@ type Props = {
 const FilterOptions = ({
  options,
  selectedKeys = [],
+  defaultLabel = "Filter options",
  className,
  onSelect,
  showFilter,
  fetchQuery,
  fetchQueryOptions,
-  ...rest
 }: Props) => {
  const { t } = useTranslation();
  const searchInputRef = React.useRef<HTMLInputElement>(null);
  const listRef = React.useRef<HTMLDivElement | null>(null);
-  const [open, setOpen] = React.useState(false);
+  const menu = useMenuState({
+    modal: false,
+  });
  const selectedItems = options.filter((option) =>
    selectedKeys.includes(option.key)
  );
@@ -53,26 +58,32 @@ const FilterOptions = ({

  const renderItem = React.useCallback(
    (option) => (
-      <MenuButton
+      <MenuItem
        key={option.key}
-        icon={option.icon}
-        label={option.label}
        onClick={() => {
          onSelect(option.key);
-          setOpen(false);
+          menu.hide();
        }}
        selected={selectedKeys.includes(option.key)}
-      />
+        {...menu}
+      >
+        {option.icon}
+        {option.note ? (
+          <LabelWithNote>
+            {option.label}
+            <Note>{option.note}</Note>
+          </LabelWithNote>
+        ) : (
+          option.label
+        )}
+      </MenuItem>
    ),
-    [onSelect, selectedKeys]
+    [menu, onSelect, selectedKeys]
  );

-  const handleFilter = React.useCallback(
-    (ev: React.ChangeEvent<HTMLInputElement>) => {
-      setQuery(ev.target.value);
-    },
-    []
-  );
+  const handleFilter = (ev: React.ChangeEvent<HTMLInputElement>) => {
+    setQuery(ev.target.value);
+  };

  const filteredOptions = React.useMemo(() => {
    const normalizedQuery = deburr(query.toLowerCase());
@@ -110,13 +121,13 @@ const FilterOptions = ({

      switch (ev.key) {
        case "Escape":
-          setOpen(false);
+          menu.hide();
          break;
        case "Enter":
          if (filteredOptions.length === 1) {
            ev.preventDefault();
            onSelect(filteredOptions[0].key);
-            setOpen(false);
+            menu.hide();
          }
          break;
        case "ArrowDown":
@@ -127,7 +138,7 @@ const FilterOptions = ({
          break;
      }
    },
-    [filteredOptions, onSelect]
+    [filteredOptions, menu, onSelect]
  );

  const handleEscapeFromList = React.useCallback((ev: React.KeyboardEvent) => {
@@ -139,21 +150,21 @@ const FilterOptions = ({
  }, []);

  React.useEffect(() => {
-    if (open) {
+    if (menu.visible) {
      searchInputRef.current?.focus();
    } else {
      setQuery("");
    }
-  }, [open]);
+  }, [menu.visible]);

  const showFilterInput = showFilter || options.length > 10;
-  const defaultLabel = rest.defaultLabel || t("Filter options");

  return (
-    <MenuProvider variant="dropdown">
-      <Menu open={open} onOpenChange={setOpen}>
-        <MenuTrigger>
+    <>
+      <MenuButton {...menu}>
+        {(props) => (
          <StyledButton
+            {...props}
            className={className}
            icon={selectedItems[0]?.key && selectedItems[0]?.icon}
            neutral
@@ -161,31 +172,31 @@ const FilterOptions = ({
          >
            {selectedItems.length ? selectedLabel : defaultLabel}
          </StyledButton>
-        </MenuTrigger>
-        <MenuContent aria-label={defaultLabel} align="start">
-          <PaginatedList<TFilterOption>
-            listRef={listRef}
-            options={{ query, ...fetchQueryOptions }}
-            items={filteredOptions}
-            fetch={fetchQuery}
-            renderItem={renderItem}
-            onEscape={handleEscapeFromList}
-            heading={showFilterInput ? <Spacer /> : undefined}
-            empty={<Empty />}
+        )}
+      </MenuButton>
+      <ContextMenu aria-label={defaultLabel} minHeight={66} {...menu}>
+        <PaginatedList<TFilterOption>
+          listRef={listRef}
+          options={{ query, ...fetchQueryOptions }}
+          items={filteredOptions}
+          fetch={fetchQuery}
+          renderItem={renderItem}
+          onEscape={handleEscapeFromList}
+          heading={showFilterInput ? <Spacer /> : undefined}
+          empty={<Empty />}
+        />
+        {showFilterInput && (
+          <SearchInput
+            ref={searchInputRef}
+            value={query}
+            onChange={handleFilter}
+            onKeyDown={handleKeyDown}
+            placeholder={`${t("Filter")}…`}
+            autoFocus
          />
-          {showFilterInput && (
-            <SearchInput
-              ref={searchInputRef}
-              value={query}
-              onChange={handleFilter}
-              onKeyDown={handleKeyDown}
-              placeholder={`${t("Filter")}…`}
-              autoFocus
-            />
-          )}
-        </MenuContent>
-      </Menu>
-    </MenuProvider>
+        )}
+      </ContextMenu>
+    </>
  );
 };

@@ -231,6 +242,24 @@ const SearchInput = styled(Input)`
  }
 `;

+const Note = styled(Text)`
+  display: block;
+  margin: 2px 0;
+  line-height: 1.2em;
+  font-size: 14px;
+  font-weight: 500;
+  color: ${s("textTertiary")};
+`;
+
+const LabelWithNote = styled.div`
+  font-weight: 500;
+  text-align: left;
+
+  &:hover ${Note} {
+    color: ${(props) => props.theme.white50};
+  }
+`;
+
 export const StyledButton = styled(Button)`
  box-shadow: none;
  text-transform: none;
@@ -125,7 +125,6 @@ const Actions = styled(Flex)`
  flex-basis: 0;
  min-width: auto;
  padding-left: 8px;
-  gap: 12px;

  ${breakpoint("tablet")`
    position: unset;
@@ -1,16 +0,0 @@
-import { ArrowIcon as ArrowRightIcon } from "outline-icons";
-import styled from "styled-components";
-
-export { ArrowIcon as ArrowRightIcon } from "outline-icons";
-
-export const ArrowUpIcon = styled(ArrowRightIcon)`
-  transform: rotate(-90deg);
-`;
-
-export const ArrowDownIcon = styled(ArrowRightIcon)`
-  transform: rotate(90deg);
-`;
-
-export const ArrowLeftIcon = styled(ArrowRightIcon)`
-  transform: rotate(180deg);
-`;
@@ -12,7 +12,6 @@ import {
  CloseIcon,
  CrossIcon,
  DownloadIcon,
-  LinkIcon,
  NextIcon,
 } from "outline-icons";
 import { depths, extraArea, s } from "@shared/styles";
@@ -26,9 +25,6 @@ import Tooltip from "~/components/Tooltip";
 import LoadingIndicator from "./LoadingIndicator";
 import Fade from "./Fade";
 import Button from "./Button";
-import CopyToClipboard from "./CopyToClipboard";
-import { Separator } from "./Actions";
-import useSwipe from "~/hooks/useSwipe";

 export enum LightboxStatus {
  READY_TO_OPEN,
@@ -291,7 +287,7 @@ function Lightbox({ onUpdate, activePos }: Props) {
      // in editor
      const editorImageEl = imageElements[currentImageIndex];
      let to;
-      if (editorImageEl?.isConnected) {
+      if (editorImageEl) {
        const editorImgDOMRect = editorImageEl.getBoundingClientRect();
        const {
          top: editorImgTop,
@@ -443,8 +439,6 @@ function Lightbox({ onUpdate, activePos }: Props) {
    if (animation.current?.fadeIn) {
      animation.current = {
        ...(animation.current ?? {}),
-        zoomIn: undefined,
-        fadeIn: undefined,
        startTime: undefined,
      };
      setStatus({
@@ -463,8 +457,6 @@ function Lightbox({ onUpdate, activePos }: Props) {
    return null;
  }

-  const src = sanitizeUrl(currentImageNode.attrs.src) ?? "";
-
  return (
    <Dialog.Root open={!!activePos}>
      <Dialog.Portal>
@@ -482,18 +474,6 @@ function Lightbox({ onUpdate, activePos }: Props) {
            </Dialog.Description>
          </VisuallyHidden.Root>
          <Actions animation={animation.current}>
-            <Tooltip content={t("Copy link")} placement="bottom">
-              <CopyToClipboard text={imgRef.current?.src ?? ""}>
-                <Button
-                  tabIndex={-1}
-                  aria-label={t("Copy link")}
-                  size={32}
-                  icon={<LinkIcon />}
-                  borderOnHover
-                  neutral
-                />
-              </CopyToClipboard>
-            </Tooltip>
            <Tooltip content={t("Download")} placement="bottom">
              <Button
                tabIndex={-1}
@@ -505,7 +485,6 @@ function Lightbox({ onUpdate, activePos }: Props) {
                neutral
              />
            </Tooltip>
-            <Separator />
            <Dialog.Close asChild>
              <Tooltip content={t("Close")} shortcut="Esc" placement="bottom">
                <Button
@@ -529,7 +508,7 @@ function Lightbox({ onUpdate, activePos }: Props) {
          )}
          <Image
            ref={imgRef}
-            src={src}
+            src={sanitizeUrl(currentImageNode.attrs.src) ?? ""}
            alt={currentImageNode.attrs.alt ?? ""}
            onLoading={() =>
              setStatus({
@@ -551,8 +530,7 @@ function Lightbox({ onUpdate, activePos }: Props) {
            }
            onSwipeRight={prev}
            onSwipeLeft={next}
-            onSwipeUp={close}
-            onSwipeDown={close}
+            onSwipeUpOrDown={close}
            status={status}
            animation={animation.current}
          />
@@ -577,8 +555,7 @@ type ImageProps = {
  onError: () => void;
  onSwipeRight: () => void;
  onSwipeLeft: () => void;
-  onSwipeUp: () => void;
-  onSwipeDown: () => void;
+  onSwipeUpOrDown: () => void;
  status: Status;
  animation: Animation | null;
 };
@@ -592,21 +569,59 @@ const Image = forwardRef<HTMLImageElement, ImageProps>(function _Image(
    onError,
    onSwipeRight,
    onSwipeLeft,
-    onSwipeUp,
-    onSwipeDown,
+    onSwipeUpOrDown,
    status,
    animation,
  }: ImageProps,
  ref
 ) {
  const { t } = useTranslation();
+  const touchXStart = useRef<number>();
+  const touchXEnd = useRef<number>();
+  const touchYStart = useRef<number>();
+  const touchYEnd = useRef<number>();

-  const swipeHandlers = useSwipe({
-    onSwipeRight,
-    onSwipeLeft,
-    onSwipeUp,
-    onSwipeDown,
-  });
+  const handleTouchStart = (e: React.TouchEvent<HTMLImageElement>) => {
+    touchXStart.current = e.changedTouches[0].screenX;
+    touchYStart.current = e.changedTouches[0].screenY;
+  };
+
+  const handleTouchMove = (e: React.TouchEvent<HTMLImageElement>) => {
+    touchXEnd.current = e.changedTouches[0].screenX;
+    touchYEnd.current = e.changedTouches[0].screenY;
+    const dx = touchXEnd.current - (touchXStart.current ?? 0);
+    const dy = touchYEnd.current - (touchYStart.current ?? 0);
+
+    const swipeRight = dx > 0 && Math.abs(dy) < Math.abs(dx);
+    if (swipeRight) {
+      return onSwipeRight();
+    }
+
+    const swipeLeft = dx < 0 && Math.abs(dy) < Math.abs(dx);
+    if (swipeLeft) {
+      return onSwipeLeft();
+    }
+
+    const swipeDown = dy > 0 && Math.abs(dy) > Math.abs(dx);
+    const swipeUp = dy < 0 && Math.abs(dy) > Math.abs(dx);
+    if (swipeUp || swipeDown) {
+      return onSwipeUpOrDown();
+    }
+  };
+
+  const handleTouchEnd = () => {
+    touchXStart.current = undefined;
+    touchXEnd.current = undefined;
+    touchYStart.current = undefined;
+    touchYEnd.current = undefined;
+  };
+
+  const handleTouchCancel = () => {
+    touchXStart.current = undefined;
+    touchXEnd.current = undefined;
+    touchYStart.current = undefined;
+    touchYEnd.current = undefined;
+  };

  const [hidden, setHidden] = useState(
    status.image === null || status.image === ImageStatus.LOADING
@@ -625,7 +640,7 @@ const Image = forwardRef<HTMLImageElement, ImageProps>(function _Image(
  }, [status.image]);

  return status.image === ImageStatus.ERROR ? (
-    <StyledError animation={animation} {...swipeHandlers}>
+    <StyledError animation={animation}>
      <CrossIcon size={16} /> {t("Image failed to load")}
    </StyledError>
  ) : (
@@ -638,7 +653,10 @@ const Image = forwardRef<HTMLImageElement, ImageProps>(function _Image(
          alt={alt}
          animation={animation}
          onAnimationStart={() => setHidden(false)}
-          {...swipeHandlers}
+          onTouchStart={handleTouchStart}
+          onTouchMove={handleTouchMove}
+          onTouchEnd={handleTouchEnd}
+          onTouchCancel={handleTouchCancel}
          onError={onError}
          onLoad={onLoad}
          $hidden={hidden}
@@ -739,8 +757,7 @@ const Actions = styled.div<{
  right: 0;
  margin: 16px 12px;
  display: flex;
-  align-items: center;
-  gap: 8px;
+  gap: 4px;

  ${(props) =>
    props.animation === null
@@ -2,7 +2,7 @@ import * as React from "react";
 import { actionV2ToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import useMobile from "~/hooks/useMobile";
-import { ActionV2Variant, ActionV2WithChildren } from "~/types";
+import { ActionContext, ActionV2Variant, ActionV2WithChildren } from "~/types";
 import { toMenuItems } from "./transformer";
 import { observer } from "mobx-react";
 import { useComputed } from "~/hooks/useComputed";
@@ -12,6 +12,8 @@ import { MenuProvider } from "~/components/primitives/Menu/MenuContext";
 type Props = {
  /** Root action with children representing the menu items */
  action: ActionV2WithChildren;
+  /** Action context to use - new context will be created if not provided */
+  context?: ActionContext;
  /** Trigger for the menu */
  children: React.ReactNode;
  /** ARIA label for the menu */
@@ -23,12 +25,15 @@ type Props = {
 };

 export const ContextMenu = observer(
-  ({ action, children, ariaLabel, onOpen, onClose }: Props) => {
+  ({ action, children, ariaLabel, context, onOpen, onClose }: Props) => {
    const isMobile = useMobile();
    const contentRef = React.useRef<React.ElementRef<typeof MenuContent>>(null);
-    const actionContext = useActionContext({
-      isMenu: true,
-    });
+
+    const actionContext =
+      context ??
+      useActionContext({
+        isContextMenu: true,
+      });

    const menuItems = useComputed(() => {
      if (!open) {
@@ -75,7 +80,7 @@ export const ContextMenu = observer(
    const content = toMenuItems(menuItems);

    return (
-      <MenuProvider variant="context">
+      <MenuProvider variant={"context"}>
        <Menu onOpenChange={handleOpenChange}>
          <MenuTrigger aria-label={ariaLabel}>{children}</MenuTrigger>
          <MenuContent
@@ -14,6 +14,7 @@ import { actionV2ToMenuItem } from "~/actions";
 import useActionContext from "~/hooks/useActionContext";
 import useMobile from "~/hooks/useMobile";
 import {
+  ActionContext,
  ActionV2Variant,
  ActionV2WithChildren,
  MenuItem,
@@ -26,6 +27,8 @@ import { useComputed } from "~/hooks/useComputed";
 type Props = {
  /** Root action with children representing the menu items */
  action: ActionV2WithChildren;
+  /** Action context to use - new context will be created if not provided */
+  context?: ActionContext;
  /** Trigger for the menu */
  children: React.ReactNode;
  /** Alignment w.r.t trigger - defaults to start */
@@ -46,6 +49,7 @@ export const DropdownMenu = observer(
    (
      {
        action,
+        context,
        children,
        align = "start",
        ariaLabel,
@@ -60,9 +64,12 @@ export const DropdownMenu = observer(
      const isMobile = useMobile();
      const contentRef =
        React.useRef<React.ElementRef<typeof MenuContent>>(null);
-      const actionContext = useActionContext({
-        isMenu: true,
-      });
+
+      const actionContext =
+        context ??
+        useActionContext({
+          isContextMenu: true,
+        });

      const menuItems = useComputed(() => {
        if (!open) {
@@ -119,7 +126,7 @@ export const DropdownMenu = observer(
      const content = toMenuItems(menuItems);

      return (
-        <MenuProvider variant="dropdown">
+        <MenuProvider variant={"dropdown"}>
          <Menu open={open} onOpenChange={handleOpenChange}>
            <MenuTrigger ref={ref} aria-label={ariaLabel} {...rest}>
              {children}
@@ -6,6 +6,7 @@ import styled from "styled-components";
 import { s, hover } from "@shared/styles";
 import Notification from "~/models/Notification";
 import { markNotificationsAsRead } from "~/actions/definitions/notifications";
+import useActionContext from "~/hooks/useActionContext";
 import useStores from "~/hooks/useStores";
 import NotificationMenu from "~/menus/NotificationMenu";
 import Desktop from "~/utils/Desktop";
@@ -31,6 +32,7 @@ function Notifications(
  { onRequestClose }: Props,
  ref: React.RefObject<HTMLDivElement>
 ) {
+  const context = useActionContext();
  const { notifications } = useStores();
  const { t } = useTranslation();
  const isEmpty = notifications.active.length === 0;
@@ -65,10 +67,7 @@ function Notifications(
          <Flex gap={8}>
            {notifications.approximateUnreadCount > 0 && (
              <Tooltip content={t("Mark all as read")}>
-                <Button
-                  action={markNotificationsAsRead}
-                  aria-label={t("Mark all as read")}
-                >
+                <Button action={markNotificationsAsRead} context={context}>
                  <MarkAsReadIcon />
                </Button>
              </Tooltip>
@@ -63,7 +63,6 @@ export const OAuthClientForm = observer(function OAuthClientForm_({
            name="avatarUrl"
            render={({ field }) => (
              <ImageInput
-                alt={t("OAuth client icon")}
                onSuccess={(url) => field.onChange(url)}
                onError={(err) => setError("avatarUrl", { message: err })}
                model={{
@@ -0,0 +1,66 @@
+import "../stores";
+import { render } from "@testing-library/react";
+import { TFunction } from "i18next";
+import { Provider } from "mobx-react";
+import { getI18n } from "react-i18next";
+import { Pagination } from "@shared/constants";
+import PaginatedList from "./PaginatedList";
+
+describe("PaginatedList", () => {
+  const i18n = getI18n();
+  const authStore = {};
+
+  const props = {
+    i18n,
+    tReady: true,
+    t: ((key: string) => key) as TFunction,
+  } as any;
+
+  it("with no items renders nothing", () => {
+    const result = render(
+      <Provider auth={authStore}>
+        <PaginatedList items={[]} renderItem={render} {...props} />
+      </Provider>
+    );
+    expect(result.container.innerHTML).toEqual("");
+  });
+
+  it("with no items renders empty prop", async () => {
+    const result = render(
+      <Provider auth={authStore}>
+        <PaginatedList
+          items={[]}
+          empty={<p>Sorry, no results</p>}
+          renderItem={render}
+          {...props}
+        />{" "}
+      </Provider>
+    );
+    await expect(
+      result.findAllByText("Sorry, no results")
+    ).resolves.toHaveLength(1);
+  });
+
+  it("calls fetch with options + pagination on mount", () => {
+    const fetch = jest.fn();
+    const options = {
+      id: "one",
+    };
+    render(
+      <Provider auth={authStore}>
+        <PaginatedList
+          items={[]}
+          fetch={fetch}
+          options={options}
+          renderItem={render}
+          {...props}
+        />{" "}
+      </Provider>
+    );
+    expect(fetch).toHaveBeenCalledWith({
+      ...options,
+      limit: Pagination.defaultLimit,
+      offset: 0,
+    });
+  });
+});
@@ -255,7 +255,6 @@ const PaginatedList = <T extends PaginatedItem>({
    <React.Fragment>
      {heading}
      <ArrowKeyNavigation
-        role={rest.role}
        aria-label={rest["aria-label"]}
        onEscape={onEscape}
        className={className}
@@ -168,7 +168,6 @@ function SearchPopover({ shareId, className }: Props) {
    <Popover open={open} onOpenChange={setOpen} modal={true}>
      <PopoverAnchor>
        <StyledInputSearch
-          role="combobox"
          aria-controls="search-results"
          aria-expanded={open}
          aria-haspopup="listbox"
@@ -177,8 +176,6 @@ function SearchPopover({ shareId, className }: Props) {
          onFocus={handleSearchInputFocus}
          onKeyDown={handleKeyDown}
          className={className}
-          label={t("Search")}
-          labelHidden
        />
      </PopoverAnchor>
      <PopoverContent
@@ -197,7 +194,6 @@ function SearchPopover({ shareId, className }: Props) {
        }}
      >
        <PaginatedList<SearchResult>
-          role="listbox"
          options={{ query, snippetMinWords: 10, snippetMaxWords: 11 }}
          items={cachedSearchResults}
          fetch={performSearch}
@@ -25,11 +25,6 @@ export const AppearanceAction = observer(() => {
          onClick={() =>
            ui.setTheme(resolvedTheme === "light" ? Theme.Dark : Theme.Light)
          }
-          aria-label={
-            resolvedTheme === "light"
-              ? t("Switch to dark")
-              : t("Switch to light")
-          }
          neutral
          borderOnHover
        />
@@ -6,6 +6,7 @@ import { Inner } from "~/components/Button";
 import ButtonSmall from "~/components/ButtonSmall";
 import Fade from "~/components/Fade";
 import InputMemberPermissionSelect from "~/components/InputMemberPermissionSelect";
+import useActionContext from "~/hooks/useActionContext";
 import { Action, Permission } from "~/types";

 export function PermissionAction({
@@ -20,6 +21,7 @@ export function PermissionAction({
  onChange: (permission: CollectionPermission | DocumentPermission) => void;
 }) {
  const { t } = useTranslation();
+  const context = useActionContext();

  return (
    <Fade timing="150ms" key="invite">
@@ -29,7 +31,9 @@ export function PermissionAction({
          onChange={onChange}
          value={permission}
        />
-        <ButtonSmall action={action}>{t("Add")}</ButtonSmall>
+        <ButtonSmall action={action} context={context}>
+          {t("Add")}
+        </ButtonSmall>
      </Flex>
    </Fade>
  );
@@ -81,11 +81,6 @@ function AppSidebar() {
                <ToggleButton
                  position="bottom"
                  image={<SidebarIcon />}
-                  aria-label={
-                    ui.sidebarCollapsed
-                      ? t("Expand sidebar")
-                      : t("Collapse sidebar")
-                  }
                  onClick={() => {
                    ui.toggleCollapsedSidebar();
                    (document.activeElement as HTMLElement)?.blur();
@@ -52,9 +52,6 @@ function SettingsSidebar() {
      >
        <Tooltip content={t("Toggle sidebar")} shortcut={`${metaDisplay}+.`}>
          <ToggleButton
-            aria-label={
-              ui.sidebarCollapsed ? t("Expand sidebar") : t("Collapse sidebar")
-            }
            position="bottom"
            image={<SidebarIcon />}
            onClick={() => {
@@ -96,9 +96,6 @@ const ToggleSidebar = () => {
      <ToggleButton
        position="bottom"
        image={<SidebarIcon />}
-        aria-label={
-          ui.sidebarCollapsed ? t("Expand sidebar") : t("Collapse sidebar")
-        }
        onClick={() => {
          ui.toggleCollapsedSidebar();
          (document.activeElement as HTMLElement)?.blur();
@@ -21,7 +21,6 @@ import { TooltipProvider } from "../TooltipContext";
 import ResizeBorder from "./components/ResizeBorder";
 import SidebarButton from "./components/SidebarButton";
 import ToggleButton from "./components/ToggleButton";
-import { useTranslation } from "react-i18next";

 const ANIMATION_MS = 250;

@@ -36,7 +35,6 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
  ref: React.RefObject<HTMLDivElement>
 ) {
  const [isCollapsing, setCollapsing] = React.useState(false);
-  const { t } = useTranslation();
  const theme = useTheme();
  const { ui } = useStores();
  const location = useLocation();
@@ -239,7 +237,7 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
              position="bottom"
              image={
                <Avatar
-                  alt={t("Avatar of {{ name }}", { name: user.name })}
+                  alt={user.name}
                  model={user}
                  size={24}
                  style={{ marginLeft: 4 }}
@@ -247,11 +245,7 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(function _Sidebar(
              }
            >
              <NotificationsPopover>
-                <SidebarButton
-                  position="bottom"
-                  image={<NotificationIcon />}
-                  aria-label={t("Notifications")}
-                />
+                <SidebarButton position="bottom" image={<NotificationIcon />} />
              </NotificationsPopover>
            </SidebarButton>
          </AccountMenu>
@@ -150,7 +150,6 @@ const CollectionLink: React.FC<Props> = ({
                  {can.createDocument && (
                    <NudeButton
                      tooltip={{ content: t("New doc"), delay: 500 }}
-                      aria-label={t("New nested document")}
                      onClick={(ev) => {
                        ev.preventDefault();
                        setIsAddingNewChild();
@@ -364,6 +364,7 @@ function InnerDocumentLink(
                      {can.createChildDocument && (
                        <Tooltip content={t("New doc")}>
                          <NudeButton
+                            type={undefined}
                            aria-label={t("New nested document")}
                            onClick={(ev) => {
                              ev.preventDefault();
@@ -1,4 +1,3 @@
-import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
 import invariant from "invariant";
 import { observer } from "mobx-react";
 import { useCallback } from "react";
@@ -62,12 +61,7 @@ function DropToImport({ disabled, children, collectionId, documentId }: Props) {
          $isDragActive={isDragActive}
          tabIndex={-1}
        >
-          <VisuallyHidden>
-            <label>
-              {t("Import files")}
-              <input {...getInputProps()} />
-            </label>
-          </VisuallyHidden>
+          <input {...getInputProps()} />
          {isImporting && <LoadingIndicator />}
          {children}
        </DropzoneContainer>
@@ -1,7 +1,7 @@
 import { CollapsedIcon } from "outline-icons";
 import * as React from "react";
 import styled, { keyframes } from "styled-components";
-import { extraArea, s } from "@shared/styles";
+import { s } from "@shared/styles";
 import usePersistedState from "~/hooks/usePersistedState";
 import { undraggableOnDesktop } from "~/styles";

@@ -71,18 +71,17 @@ const Button = styled.button`
  font-size: 13px;
  font-weight: 600;
  user-select: none;
-  color: ${s("sidebarText")};
-  position: relative;
+  color: ${s("textTertiary")};
  letter-spacing: 0.03em;
  margin: 0;
  padding: 4px 2px 4px 12px;
+  height: 22px;
  border: 0;
  background: none;
  border-radius: 4px;
  -webkit-appearance: none;
  transition: all 100ms ease;
  ${undraggableOnDesktop()}
-  ${extraArea(4)}

  &:not(:disabled):hover,
  &:not(:disabled):active {
@@ -103,8 +102,7 @@ const Disclosure = styled(CollapsedIcon)<{ expanded?: boolean }>`
 const H3 = styled.h3`
  margin: 0;

-  &:hover,
-  &:focus-within {
+  &:hover {
    ${Disclosure} {
      opacity: 1;
    }
@@ -12,7 +12,7 @@ type Props = {

 function SidebarAction({ action, ...rest }: Props) {
  const context = useActionContext({
-    isMenu: false,
+    isContextMenu: false,
    isCommandBar: false,
    activeCollectionId: undefined,
    activeDocumentId: undefined,
@@ -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 { s, truncateMultiline } from "@shared/styles";
 import { isMobile } from "@shared/utils/browser";
 import NudeButton from "~/components/NudeButton";
 import { UnreadBadge } from "~/components/UnreadBadge";
@@ -273,6 +273,7 @@ const Label = styled.div`
  position: relative;
  width: 100%;
  line-height: 24px;
+  ${truncateMultiline(3)}

  * {
    unicode-bidi: plaintext;
@@ -10,7 +10,7 @@ import {
  unstarCollection,
 } from "~/actions/definitions/collections";
 import { starDocument, unstarDocument } from "~/actions/definitions/documents";
-import { ActionContextProvider } from "~/hooks/useActionContext";
+import useActionContext from "~/hooks/useActionContext";
 import NudeButton from "./NudeButton";

 type Props = {
@@ -27,6 +27,10 @@ type Props = {
 function Star({ size, document, collection, color, ...rest }: Props) {
  const { t } = useTranslation();
  const theme = useTheme();
+  const context = useActionContext({
+    activeDocumentId: document?.id,
+    activeCollectionId: collection?.id,
+  });

  const target = document || collection;

@@ -35,43 +39,37 @@ function Star({ size, document, collection, color, ...rest }: Props) {
  }

  return (
-    <ActionContextProvider
-      value={{
-        activeDocumentId: document?.id,
-        activeCollectionId: collection?.id,
+    <NudeButton
+      context={context}
+      hideOnActionDisabled
+      tooltip={{
+        content: target.isStarred ? t("Unstar document") : t("Star document"),
+        delay: 500,
      }}
+      action={
+        collection
+          ? collection.isStarred
+            ? unstarCollection
+            : starCollection
+          : document
+            ? document.isStarred
+              ? unstarDocument
+              : starDocument
+            : undefined
+      }
+      size={size}
+      {...rest}
    >
-      <NudeButton
-        hideOnActionDisabled
-        tooltip={{
-          content: target.isStarred ? t("Unstar document") : t("Star document"),
-          delay: 500,
-        }}
-        action={
-          collection
-            ? collection.isStarred
-              ? unstarCollection
-              : starCollection
-            : document
-              ? document.isStarred
-                ? unstarDocument
-                : starDocument
-              : undefined
-        }
-        size={size}
-        {...rest}
-      >
-        {target.isStarred ? (
-          <AnimatedStar size={size} color={theme.yellow} />
-        ) : (
-          <AnimatedStar
-            size={size}
-            color={color ?? theme.textTertiary}
-            as={UnstarredIcon}
-          />
-        )}
-      </NudeButton>
-    </ActionContextProvider>
+      {target.isStarred ? (
+        <AnimatedStar size={size} color={theme.yellow} />
+      ) : (
+        <AnimatedStar
+          size={size}
+          color={color ?? theme.textTertiary}
+          as={UnstarredIcon}
+        />
+      )}
+    </NudeButton>
  );
 }

@@ -347,7 +347,6 @@ export default function FindAndReplace({
        <ButtonLarge
          disabled={disabled}
          onClick={() => editor.commands.prevSearchMatch()}
-          aria-label={t("Previous match")}
        >
          <CaretUpIcon />
        </ButtonLarge>
@@ -356,7 +355,6 @@ export default function FindAndReplace({
        <ButtonLarge
          disabled={disabled}
          onClick={() => editor.commands.nextSearchMatch()}
-          aria-label={t("Next match")}
        >
          <CaretDownIcon />
        </ButtonLarge>
@@ -392,10 +390,7 @@ export default function FindAndReplace({
                  shortcut={`${altDisplay}+${metaDisplay}+c`}
                  placement="bottom"
                >
-                  <ButtonSmall
-                    onClick={handleCaseSensitive}
-                    aria-label={t("Match case")}
-                  >
+                  <ButtonSmall onClick={handleCaseSensitive}>
                    <CaseSensitiveIcon
                      color={caseSensitive ? theme.accent : theme.textSecondary}
                    />
@@ -406,10 +401,7 @@ export default function FindAndReplace({
                  shortcut={`${altDisplay}+${metaDisplay}+r`}
                  placement="bottom"
                >
-                  <ButtonSmall
-                    onClick={handleRegex}
-                    aria-label={t("Enable regex")}
-                  >
+                  <ButtonSmall onClick={handleRegex}>
                    <RegexIcon
                      color={regexEnabled ? theme.accent : theme.textSecondary}
                    />
@@ -424,10 +416,7 @@ export default function FindAndReplace({
                shortcut={`${altDisplay}+${metaDisplay}+f`}
                placement="bottom"
              >
-                <ButtonLarge
-                  onClick={handleMore}
-                  aria-label={t("Replace options")}
-                >
+                <ButtonLarge onClick={handleMore}>
                  <ReplaceIcon color={theme.textSecondary} />
                </ButtonLarge>
              </Tooltip>
@@ -7,7 +7,6 @@ import { EditorStyleHelper } from "@shared/editor/styles/EditorStyleHelper";
 import { extraArea } from "@shared/styles";
 import Input, { NativeInput, Outline } from "~/components/Input";
 import { useEditor } from "./EditorContext";
-import { useTranslation } from "react-i18next";

 type Dimension = {
  width: string;
@@ -21,7 +20,6 @@ export function MediaDimension() {
    width: { min: number; max: number };
    height: { min: number; max: number };
  }>();
-  const { t } = useTranslation();
  const { view, commands } = useEditor();
  const { state } = view;
  const { selection } = state;
@@ -33,8 +31,8 @@ export function MediaDimension() {
    height = node.attrs.height as number;

  const [localDimension, setLocalDimension] = useState<Dimension>(() => ({
-    width: width ? String(width) : "",
-    height: height ? String(height) : "",
+    width: String(width),
+    height: String(height),
    changed: "none",
  }));
  const [error, setError] = useState<{ width: boolean; height: boolean }>({
@@ -59,8 +57,8 @@ export function MediaDimension() {

  const reset = useCallback(() => {
    setLocalDimension({
-      width: width ? String(width) : "",
-      height: height ? String(height) : "",
+      width: String(width),
+      height: String(height),
      changed: "none",
    });
    setError({ width: false, height: false });
@@ -207,9 +205,6 @@ export function MediaDimension() {
  return (
    <StyledFlex ref={ref} align="center">
      <StyledInput
-        label={t("Image width")}
-        labelHidden
-        placeholder={t("Width")}
        value={localDimension.width}
        onChange={handleChange("width")}
        onBlur={handleBlur}
@@ -217,12 +212,9 @@ export function MediaDimension() {
        $error={error.width}
      />
      <Text size="xsmall" type="tertiary">
-        ×
+        x
      </Text>
      <StyledInput
-        label={t("Image height")}
-        labelHidden
-        placeholder={t("Height")}
        value={localDimension.height}
        onChange={handleChange("height")}
        onBlur={handleBlur}
@@ -64,11 +64,7 @@ function ToolbarDropdown(props: { active: boolean; item: MenuItem }) {
    <>
      <MenuButton {...menu}>
        {(buttonProps) => (
-          <ToolbarButton
-            {...buttonProps}
-            hovering={menu.visible}
-            aria-label={item.tooltip}
-          >
+          <ToolbarButton {...buttonProps} hovering={menu.visible}>
            {item.label && <Label>{item.label}</Label>}
            {item.icon}
          </ToolbarButton>
@@ -122,7 +118,6 @@ function ToolbarMenu(props: Props) {
                <ToolbarButton
                  onClick={handleClick(item)}
                  active={isActive && !item.label}
-                  aria-label={item.label ? undefined : item.tooltip}
                >
                  {item.label && <Label>{item.label}</Label>}
                  {item.icon}
@@ -291,12 +291,6 @@ export default class FindAndReplaceExtension extends Extension {
          const from = type === "inline" ? pos + i : pos;
          const to = from + (type === "inline" ? m[0].length : node.nodeSize);

-          // Prevent wrap around matches when the regex matches at the end of the deburred
-          // string and continues matching at the start of the original string
-          if (i + this.searchTerm.length > text.length) {
-            continue;
-          }
-
          // Check if already exists in results, possible due to duplicated
          // search string on L257
          if (this.results.some((r) => r.from === from && r.to === to)) {
@@ -459,7 +459,6 @@ export default class PasteHandler extends Extension {
    const { view, schema } = this.editor;
    const { state } = view;
    const { from } = state.selection;
-    let tr = state.tr;

    const links: string[] = [];
    let allLinks = true;
@@ -481,26 +480,22 @@ export default class PasteHandler extends Extension {
      return false;
    });

-    const showPasteMenu = allLinks && links.length;
+    if (!allLinks || !links.length) {
+      return;
+    }

-    // it's possible that the links can be converted to mentions
-    if (showPasteMenu) {
-      const placeholderId = links[0];
-      const to = from + listNode.nodeSize;
+    const placeholderId = links[0];
+    const to = from + listNode.nodeSize;

-      tr = state.tr.replaceSelectionWith(listNode).setMeta(this.key, {
+    const transaction = state.tr
+      .replaceSelectionWith(listNode)
+      .setMeta(this.key, {
        add: { from, to, id: placeholderId },
      });
-    } else {
-      // Paste as simple list
-      tr = tr.replaceSelectionWith(listNode, this.shiftKey);
-    }

-    view.dispatch(tr);
+    view.dispatch(transaction);

-    if (showPasteMenu) {
-      this.showPasteMenu(links);
-    }
+    this.showPasteMenu(links);
  }

  private placeholderId = () =>
@@ -498,7 +498,6 @@ export class Editor extends React.PureComponent<

    // Tell third-party libraries and screen-readers that this is an input
    view.dom.setAttribute("role", "textbox");
-    view.dom.setAttribute("aria-label", "Editor content");

    return view;
  }
@@ -5,15 +5,15 @@ import {
  AlignCenterIcon,
  InsertLeftIcon,
  InsertRightIcon,
+  ArrowIcon,
  MoreIcon,
  TableHeaderColumnIcon,
  TableMergeCellsIcon,
  TableSplitCellsIcon,
-  AlphabeticalSortIcon,
-  AlphabeticalReverseSortIcon,
 } from "outline-icons";
 import { EditorState } from "prosemirror-state";
-import { CellSelection, selectedRect } from "prosemirror-tables";
+import { CellSelection } from "prosemirror-tables";
+import styled from "styled-components";
 import { isNodeActive } from "@shared/editor/queries/isNodeActive";
 import {
  isMergedCellSelection,
@@ -21,7 +21,6 @@ import {
 } from "@shared/editor/queries/table";
 import { MenuItem } from "@shared/editor/types";
 import { Dictionary } from "~/hooks/useDictionary";
-import { ArrowLeftIcon, ArrowRightIcon } from "~/components/Icons/ArrowIcon";

 export default function tableColMenuItems(
  state: EditorState,
@@ -35,8 +34,6 @@ export default function tableColMenuItems(
    return [];
  }

-  const tableMap = selectedRect(state);
-
  return [
    {
      name: "setColumnAttr",
@@ -78,13 +75,13 @@ export default function tableColMenuItems(
      name: "sortTable",
      tooltip: dictionary.sortAsc,
      attrs: { index, direction: "asc" },
-      icon: <AlphabeticalSortIcon />,
+      icon: <SortAscIcon />,
    },
    {
      name: "sortTable",
      tooltip: dictionary.sortDesc,
      attrs: { index, direction: "desc" },
-      icon: <AlphabeticalReverseSortIcon />,
+      icon: <SortDescIcon />,
    },
    {
      name: "separator",
@@ -110,23 +107,6 @@ export default function tableColMenuItems(
          icon: <InsertRightIcon />,
          attrs: { index },
        },
-        {
-          name: "moveTableColumn",
-          label: dictionary.moveColumnLeft,
-          icon: <ArrowLeftIcon />,
-          attrs: { from: index, to: index - 1 },
-          visible: index > 0,
-        },
-        {
-          name: "moveTableColumn",
-          label: dictionary.moveColumnRight,
-          icon: <ArrowRightIcon />,
-          attrs: { from: index, to: index + 1 },
-          visible: index < tableMap.map.width - 1,
-        },
-        {
-          name: "separator",
-        },
        {
          name: "mergeCells",
          label: dictionary.mergeCells,
@@ -152,3 +132,11 @@ export default function tableColMenuItems(
    },
  ];
 }
+
+const SortAscIcon = styled(ArrowIcon)`
+  transform: rotate(-90deg);
+`;
+
+const SortDescIcon = styled(ArrowIcon)`
+  transform: rotate(90deg);
+`;
@@ -8,14 +8,13 @@ import {
  TableMergeCellsIcon,
 } from "outline-icons";
 import { EditorState } from "prosemirror-state";
-import { CellSelection, selectedRect } from "prosemirror-tables";
+import { CellSelection } from "prosemirror-tables";
 import {
  isMergedCellSelection,
  isMultipleCellSelection,
 } from "@shared/editor/queries/table";
 import { MenuItem } from "@shared/editor/types";
 import { Dictionary } from "~/hooks/useDictionary";
-import { ArrowDownIcon, ArrowUpIcon } from "~/components/Icons/ArrowIcon";

 export default function tableRowMenuItems(
  state: EditorState,
@@ -23,13 +22,10 @@ export default function tableRowMenuItems(
  dictionary: Dictionary
 ): MenuItem[] {
  const { selection } = state;
-
  if (!(selection instanceof CellSelection)) {
    return [];
  }

-  const tableMap = selectedRect(state);
-
  return [
    {
      icon: <MoreIcon />,
@@ -52,23 +48,6 @@ export default function tableRowMenuItems(
          icon: <InsertBelowIcon />,
          attrs: { index },
        },
-        {
-          name: "moveTableRow",
-          label: dictionary.moveRowUp,
-          icon: <ArrowUpIcon />,
-          attrs: { from: index, to: index - 1 },
-          visible: index > 0,
-        },
-        {
-          name: "moveTableRow",
-          label: dictionary.moveRowDown,
-          icon: <ArrowDownIcon />,
-          attrs: { from: index, to: index + 1 },
-          visible: index < tableMap.map.height - 1,
-        },
-        {
-          name: "separator",
-        },
        {
          name: "mergeCells",
          label: dictionary.mergeCells,
@@ -0,0 +1,33 @@
+import { useTranslation } from "react-i18next";
+import { useLocation } from "react-router";
+import useStores from "~/hooks/useStores";
+import { ActionContext } from "~/types";
+
+/**
+ * Hook to get the current action context, an object that is passed to all
+ * action definitions.
+ *
+ * @param overrides Overides of the default action context.
+ * @returns The current action context.
+ */
+export default function useActionContext(
+  overrides?: Partial<ActionContext>
+): ActionContext {
+  const stores = useStores();
+  const { t } = useTranslation();
+  const location = useLocation();
+
+  return {
+    isContextMenu: false,
+    isCommandBar: false,
+    isButton: false,
+    activeCollectionId: stores.ui.activeCollectionId ?? undefined,
+    activeDocumentId: stores.ui.activeDocumentId,
+    currentUserId: stores.auth.user?.id,
+    currentTeamId: stores.auth.team?.id,
+    ...overrides,
+    location,
+    stores,
+    t,
+  };
+}
@@ -1,102 +0,0 @@
-import { observer } from "mobx-react";
-import React, { createContext, useContext, ReactNode } from "react";
-import { useTranslation } from "react-i18next";
-import { useLocation } from "react-router";
-import useStores from "~/hooks/useStores";
-import { ActionContext as ActionContextType } from "~/types";
-
-export const ActionContext = createContext<ActionContextType | undefined>(
-  undefined
-);
-
-type ActionContextProviderProps = {
-  children: ReactNode;
-  value?: Partial<ActionContextType>;
-};
-
-/**
- * Provider that allows overriding the action context at different levels
- * of the React component tree.
- *
- * @example
- * ```tsx
- * // Override context for a command bar
- * <ActionContextProvider value={{ isCommandBar: true }}>
- *   <CommandBar />
- * </ActionContextProvider>
- *
- * // Nested overrides
- * <ActionContextProvider value={{ activeCollectionId: "collection-1" }}>
- *   <CollectionView />
- *   <ActionContextProvider value={{ activeDocumentId: "doc-1" }}>
- *     <DocumentView />
- *   </ActionContextProvider>
- * </ActionContextProvider>
- * ```
- */
-export const ActionContextProvider = observer(function ActionContextProvider_({
-  children,
-  value = {},
-}: ActionContextProviderProps) {
-  const parentContext = useContext(ActionContext);
-  const stores = useStores();
-  const { t } = useTranslation();
-  const location = useLocation();
-
-  // Create the base context if we don't have a parent context
-  const baseContext: ActionContextType = parentContext ?? {
-    isMenu: false,
-    isCommandBar: false,
-    isButton: false,
-    activeCollectionId: stores.ui.activeCollectionId ?? undefined,
-    activeDocumentId: stores.ui.activeDocumentId ?? undefined,
-    currentUserId: stores.auth.user?.id,
-    currentTeamId: stores.auth.team?.id,
-    location,
-    stores,
-    t,
-  };
-
-  // Merge the parent context with the provided overrides
-  const contextValue: ActionContextType = {
-    ...baseContext,
-    ...value,
-  };
-
-  return (
-    <ActionContext.Provider value={contextValue}>
-      {children}
-    </ActionContext.Provider>
-  );
-});
-
-/**
- * Hook to get the current action context, an object that is passed to all
- * action definitions.
- *
- * This hook respects the ActionContextProvider hierarchy, merging values from:
- * 1. Default system context (stores, location, translation)
- * 2. Parent ActionContextProvider values (if any)
- * 3. Local overrides parameter (highest priority)
- *
- * @param overrides Optional overrides of the action context. These will be
- *                 merged with any provider context and take highest priority.
- * @returns The current action context with all overrides applied.
- */
-export default function useActionContext(
-  overrides?: Partial<ActionContextType>
-): ActionContextType {
-  const contextValue = useContext(ActionContext);
-
-  // If we have a context value from a provider, use it as the base
-  if (contextValue) {
-    return {
-      ...contextValue,
-      ...overrides,
-    };
-  }
-
-  throw new Error(
-    "useActionContext must be used within an ActionContextProvider"
-  );
-}
@@ -11,14 +11,10 @@ export default function useDictionary() {

  return useMemo(
    () => ({
-      addColumnAfter: t("Insert after"),
-      addColumnBefore: t("Insert before"),
-      moveRowUp: t("Move up"),
-      moveRowDown: t("Move down"),
-      moveColumnLeft: t("Move left"),
-      moveColumnRight: t("Move right"),
-      addRowAfter: t("Insert after"),
-      addRowBefore: t("Insert before"),
+      addColumnAfter: t("Add column after"),
+      addColumnBefore: t("Add column before"),
+      addRowAfter: t("Add row after"),
+      addRowBefore: t("Add row before"),
      alignCenter: t("Align center"),
      alignLeft: t("Align left"),
      alignRight: t("Align right"),
@@ -39,7 +35,7 @@ export default function useDictionary() {
      deleteRow: t("Delete"),
      deleteTable: t("Delete table"),
      deleteAttachment: t("Delete file"),
-      dimensions: `${t("Width")} × ${t("Height")}`,
+      dimensions: t("Width x Height"),
      download: t("Download"),
      downloadAttachment: t("Download file"),
      replaceAttachment: t("Replace file"),
@@ -5,7 +5,6 @@ import { isDocumentUrl, isInternalUrl } from "@shared/utils/urls";
 import { sharedModelPath } from "~/utils/routeHelpers";
 import { isHash } from "~/utils/urls";
 import useStores from "./useStores";
-import { isFirefox } from "@shared/utils/browser";

 type Params = {
  /** The share ID of the document being viewed, if any */
@@ -79,12 +78,6 @@ export default function useEditorClickHandlers({ shareId }: Params) {
          window.open(navigateTo, "_blank");
        }
      } else {
-        // Middle-click events in Firefox are not prevented in the same way as other browsers
-        // so we need to explicitly return here to prevent two tabs from being opened when
-        // middle-clicking a link (#10083).
-        if (event?.button === 1 && isFirefox()) {
-          return;
-        }
        window.open(href, "_blank");
      }
    },
@@ -1,76 +0,0 @@
-import { isNumber } from "lodash";
-import { useRef } from "react";
-
-type Props = {
-  onSwipeRight: () => void;
-  onSwipeLeft: () => void;
-  onSwipeUp: () => void;
-  onSwipeDown: () => void;
-};
-
-export default function useSwipe({
-  onSwipeRight,
-  onSwipeLeft,
-  onSwipeUp,
-  onSwipeDown,
-}: Props) {
-  const touchXStart = useRef<number>();
-  const touchXEnd = useRef<number>();
-  const touchYStart = useRef<number>();
-  const touchYEnd = useRef<number>();
-
-  const resetTouchPoints = () => {
-    touchXStart.current = undefined;
-    touchXEnd.current = undefined;
-    touchYStart.current = undefined;
-    touchYEnd.current = undefined;
-  };
-
-  const onTouchStart = (e: React.TouchEvent<HTMLImageElement>) => {
-    touchXStart.current = e.changedTouches[0].screenX;
-    touchYStart.current = e.changedTouches[0].screenY;
-  };
-
-  const onTouchMove = (e: React.TouchEvent<HTMLImageElement>) => {
-    if (isNumber(touchXStart.current) && isNumber(touchYStart.current)) {
-      touchXEnd.current = e.changedTouches[0].screenX;
-      touchYEnd.current = e.changedTouches[0].screenY;
-      const dx = touchXEnd.current - touchXStart.current;
-      const dy = touchYEnd.current - touchYStart.current;
-
-      const swipeRight = dx > 0 && Math.abs(dy) < Math.abs(dx);
-      if (swipeRight) {
-        resetTouchPoints();
-        return onSwipeRight();
-      }
-
-      const swipeLeft = dx < 0 && Math.abs(dy) < Math.abs(dx);
-      if (swipeLeft) {
-        resetTouchPoints();
-        return onSwipeLeft();
-      }
-
-      const swipeDown = dy > 0 && Math.abs(dy) > Math.abs(dx);
-      if (swipeDown) {
-        resetTouchPoints();
-        return onSwipeDown();
-      }
-
-      const swipeUp = dy < 0 && Math.abs(dy) > Math.abs(dx);
-      if (swipeUp) {
-        resetTouchPoints();
-        return onSwipeUp();
-      }
-    }
-  };
-
-  const onTouchCancel = () => {
-    resetTouchPoints();
-  };
-
-  return {
-    onTouchStart,
-    onTouchMove,
-    onTouchCancel,
-  };
-}
@@ -25,7 +25,6 @@ import Logger from "./utils/Logger";
 import { PluginManager } from "./utils/PluginManager";
 import history from "./utils/history";
 import { initSentry } from "./utils/sentry";
-import { ActionContextProvider } from "./hooks/useActionContext";

 // Load plugins as soon as possible
 void PluginManager.loadPlugins();
@@ -54,27 +53,25 @@ if (element) {
        <Provider {...stores}>
          <Analytics>
            <Theme>
-              <Router history={history}>
-                <ErrorBoundary showTitle>
-                  <KBarProvider actions={[]} options={commandBarOptions}>
-                    <LazyPolyfill>
-                      <LazyMotion features={loadFeatures}>
-                        <ActionContextProvider>
-                          <PageScroll>
-                            <PageTheme />
-                            <ScrollToTop>
-                              <Routes />
-                            </ScrollToTop>
-                            <Toasts />
-                            <Dialogs />
-                            <Desktop />
-                          </PageScroll>
-                        </ActionContextProvider>
-                      </LazyMotion>
-                    </LazyPolyfill>
-                  </KBarProvider>
-                </ErrorBoundary>
-              </Router>
+              <ErrorBoundary showTitle>
+                <KBarProvider actions={[]} options={commandBarOptions}>
+                  <LazyPolyfill>
+                    <LazyMotion features={loadFeatures}>
+                      <Router history={history}>
+                        <PageScroll>
+                          <PageTheme />
+                          <ScrollToTop>
+                            <Routes />
+                          </ScrollToTop>
+                          <Toasts />
+                          <Dialogs />
+                          <Desktop />
+                        </PageScroll>
+                      </Router>
+                    </LazyMotion>
+                  </LazyPolyfill>
+                </KBarProvider>
+              </ErrorBoundary>
            </Theme>
          </Analytics>
        </Provider>
@@ -36,7 +36,7 @@ import {
  createDocument,
  exportCollection,
 } from "~/actions/definitions/collections";
-import { ActionContextProvider } from "~/hooks/useActionContext";
+import useActionContext from "~/hooks/useActionContext";
 import usePolicy from "~/hooks/usePolicy";
 import useRequest from "~/hooks/useRequest";
 import useStores from "~/hooks/useStores";
@@ -130,6 +130,11 @@ function CollectionMenu({
  );

  const can = usePolicy(collection);
+  const context = useActionContext({
+    isContextMenu: true,
+    activeCollectionId: collection.id,
+  });
+
  const sortAlphabetical = collection.sort.field === "title";
  const sortDir = collection.sort.direction;

@@ -223,7 +228,7 @@ function CollectionMenu({
  const rootAction = useMenuAction(actions);

  return (
-    <ActionContextProvider value={{ activeCollectionId: collection.id }}>
+    <>
      <VisuallyHidden.Root>
        <label>
          {t("Import document")}
@@ -239,6 +244,7 @@ function CollectionMenu({
      </VisuallyHidden.Root>
      <DropdownMenu
        action={rootAction}
+        context={context}
        align={align}
        onOpen={onOpen}
        onClose={onClose}
@@ -249,7 +255,7 @@ function CollectionMenu({
          onPointerEnter={handlePointerEnter}
        />
      </DropdownMenu>
-    </ActionContextProvider>
+    </>
  );
 }

@@ -10,7 +10,7 @@ import Document from "~/models/Document";
 import { DropdownMenu } from "~/components/Menu/DropdownMenu";
 import { OverflowMenuButton } from "~/components/Menu/OverflowMenuButton";
 import Switch from "~/components/Switch";
-import { ActionContextProvider } from "~/hooks/useActionContext";
+import useActionContext from "~/hooks/useActionContext";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useMobile from "~/hooks/useMobile";
 import usePolicy from "~/hooks/usePolicy";
@@ -132,6 +132,13 @@ function DocumentMenu({
    onSelectTemplate,
  });

+  const context = useActionContext({
+    isContextMenu: true,
+    activeDocumentId: document.id,
+    activeCollectionId:
+      !isShared && document.collectionId ? document.collectionId : undefined,
+  });
+
  const toggleSwitches = React.useMemo<React.ReactNode>(() => {
    if (!can.update || !(showDisplayOptions || showToggleEmbeds)) {
      return;
@@ -196,29 +203,20 @@ function DocumentMenu({
  ]);

  return (
-    <ActionContextProvider
-      value={{
-        activeDocumentId: document.id,
-        activeCollectionId:
-          !isShared && document.collectionId
-            ? document.collectionId
-            : undefined,
-      }}
+    <DropdownMenu
+      action={rootAction}
+      context={context}
+      align={align}
+      onOpen={onOpen}
+      onClose={onClose}
+      ariaLabel={t("Document options")}
+      append={toggleSwitches}
    >
-      <DropdownMenu
-        action={rootAction}
-        align={align}
-        onOpen={onOpen}
-        onClose={onClose}
-        ariaLabel={t("Document options")}
-        append={toggleSwitches}
-      >
-        <OverflowMenuButton
-          neutral={neutral}
-          onPointerEnter={handlePointerEnter}
-        />
-      </DropdownMenu>
-    </ActionContextProvider>
+      <OverflowMenuButton
+        neutral={neutral}
+        onPointerEnter={handlePointerEnter}
+      />
+    </DropdownMenu>
  );
 }

@@ -20,7 +20,7 @@ const NotificationMenu: React.FC = () => {

  return (
    <DropdownMenu action={rootAction} ariaLabel={t("Notifications")}>
-      <Button aria-label={t("Notifications")}>
+      <Button>
        <MoreIcon />
      </Button>
    </DropdownMenu>
@@ -8,9 +8,9 @@ import {
  copyLinkToRevision,
  restoreRevision,
 } from "~/actions/definitions/revisions";
+import useActionContext from "~/hooks/useActionContext";
 import { useMemo } from "react";
 import { useMenuAction } from "~/hooks/useMenuAction";
-import { ActionContextProvider } from "~/hooks/useActionContext";

 type Props = {
  document: Document;
@@ -19,6 +19,11 @@ type Props = {

 function RevisionMenu({ document }: Props) {
  const { t } = useTranslation();
+  const context = useActionContext({
+    isContextMenu: true,
+    activeDocumentId: document.id,
+  });
+
  const actions = useMemo(
    () => [restoreRevision, ActionV2Separator, copyLinkToRevision],
    []
@@ -27,15 +32,14 @@ function RevisionMenu({ document }: Props) {
  const rootAction = useMenuAction(actions);

  return (
-    <ActionContextProvider value={{ activeDocumentId: document.id }}>
-      <DropdownMenu
-        action={rootAction}
-        align="end"
-        ariaLabel={t("Revision options")}
-      >
-        <OverflowMenuButton />
-      </DropdownMenu>
-    </ActionContextProvider>
+    <DropdownMenu
+      action={rootAction}
+      context={context}
+      align="end"
+      ariaLabel={t("Revision options")}
+    >
+      <OverflowMenuButton />
+    </DropdownMenu>
  );
 }

@@ -21,7 +21,7 @@ type Props = {

 const TeamMenu: React.FC = ({ children }: Props) => {
  const { t } = useTranslation();
-  const context = useActionContext({ isMenu: true });
+  const context = useActionContext({ isContextMenu: true });

  // NOTE: it's useful to memoize on the team id and session because the action
  // menu is not cached at all.
@@ -2,7 +2,6 @@ import { computed, observable } from "mobx";
 import GroupMembership from "./GroupMembership";
 import Model from "./base/Model";
 import Field from "./decorators/Field";
-import { GroupPermission } from "@shared/types";

 class Group extends Model {
  static modelName = "Group";
@@ -26,18 +25,6 @@ class Group extends Model {
    return users.inGroup(this.id);
  }

-  @computed
-  get admins() {
-    const { groupUsers } = this.store.rootStore;
-    return groupUsers.orderedData
-      .filter(
-        (groupUser) =>
-          groupUser.groupId === this.id &&
-          groupUser.permission === GroupPermission.Admin
-      )
-      .map((groupUser) => groupUser.user);
-  }
-
  /**
   * Returns the direct memberships that this group has to documents. Documents that the current
   * user already has access to through a collection, archived, and trashed documents are not included.
@@ -8,6 +8,7 @@ import { AvatarSize } from "~/components/Avatar";
 import Facepile from "~/components/Facepile";
 import Fade from "~/components/Fade";
 import NudeButton from "~/components/NudeButton";
+import useActionContext from "~/hooks/useActionContext";
 import useMobile from "~/hooks/useMobile";
 import useStores from "~/hooks/useStores";

@@ -23,6 +24,7 @@ const MembershipPreview = ({ collection, limit = 8 }: Props) => {
  const { t } = useTranslation();
  const { memberships, groupMemberships, users } = useStores();
  const collectionUsers = users.inCollection(collection.id);
+  const context = useActionContext();
  const isMobile = useMobile();

  useEffect(() => {
@@ -70,6 +72,7 @@ const MembershipPreview = ({ collection, limit = 8 }: Props) => {

  return (
    <NudeButton
+      context={context}
      tooltip={{
        content:
          usersCount > 0
@@ -24,6 +24,7 @@ import Text from "~/components/Text";
 import Time from "~/components/Time";
 import Tooltip from "~/components/Tooltip";
 import { resolveCommentFactory } from "~/actions/definitions/comments";
+import useActionContext from "~/hooks/useActionContext";
 import useBoolean from "~/hooks/useBoolean";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import CommentMenu from "~/menus/CommentMenu";
@@ -311,12 +312,14 @@ const ResolveButton = ({
  comment: Comment;
  onUpdate: (attrs: { resolved: boolean }) => void;
 }) => {
+  const context = useActionContext();
  const { t } = useTranslation();

  return (
    <Tooltip content={t("Mark as resolved")} placement="top">
      <Action
        as={NudeButton}
+        context={context}
        action={resolveCommentFactory({
          comment,
          onResolve: () => onUpdate({ resolved: true }),
@@ -1,5 +1,6 @@
 import { AnimatePresence } from "framer-motion";
 import { observer } from "mobx-react";
+import { ArrowIcon } from "outline-icons";
 import { useRef, useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useRouteMatch } from "react-router-dom";
@@ -23,7 +24,6 @@ import CommentForm from "./CommentForm";
 import CommentSortMenu from "./CommentSortMenu";
 import CommentThread from "./CommentThread";
 import Sidebar from "./SidebarLayout";
-import { ArrowDownIcon } from "~/components/Icons/ArrowIcon";

 function Comments() {
  const { ui, comments, documents } = useStores();
@@ -230,6 +230,10 @@ const JumpToRecent = styled(ButtonSmall)`
  }
 `;

+const ArrowDownIcon = styled(ArrowIcon)`
+  transform: rotate(90deg);
+`;
+
 const NewCommentForm = styled(CommentForm)<{ dir?: "ltr" | "rtl" }>`
  padding: 12px;
  padding-right: ${(props) => (props.dir !== "rtl" ? "18px" : "12px")};
@@ -11,12 +11,12 @@ import Revision from "~/models/Revision";
 import { openDocumentInsights } from "~/actions/definitions/documents";
 import DocumentMeta from "~/components/DocumentMeta";
 import Fade from "~/components/Fade";
+import useActionContext from "~/hooks/useActionContext";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import { useLocationSidebarContext } from "~/hooks/useLocationSidebarContext";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
 import { documentPath } from "~/utils/routeHelpers";
-import NudeButton from "~/components/NudeButton";

 type Props = {
  /* The document to display meta data for */
@@ -36,6 +36,9 @@ function TitleDocumentMeta({ to, document, revision, ...rest }: Props) {
  const onlyYou = totalViewers === 1 && documentViews[0].userId;
  const viewsLoadedOnMount = useRef(totalViewers > 0);
  const can = usePolicy(document);
+  const actionContext = useActionContext({
+    activeDocumentId: document.id,
+  });

  const Wrapper = viewsLoadedOnMount.current ? Fragment : Fade;

@@ -67,7 +70,9 @@ function TitleDocumentMeta({ to, document, revision, ...rest }: Props) {
      !document.isTemplate ? (
        <Wrapper>
          &nbsp;•&nbsp;
-          <InsightsButton action={openDocumentInsights}>
+          <InsightsButton
+            onClick={() => openDocumentInsights.perform(actionContext)}
+          >
            {t("Viewed by")}{" "}
            {onlyYou
              ? t("only you")
@@ -86,7 +91,7 @@ const CommentLink = styled(Link)`
  align-items: center;
 `;

-const InsightsButton = styled(NudeButton)`
+const InsightsButton = styled.button`
  background: none;
  border: none;
  padding: 0;
@@ -23,7 +23,6 @@ import { useDocumentContext } from "~/components/DocumentContext";
 import { PopoverButton } from "~/components/IconPicker/components/PopoverButton";
 import useBoolean from "~/hooks/useBoolean";
 import usePolicy from "~/hooks/usePolicy";
-import { useTranslation } from "react-i18next";

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

@@ -71,7 +70,6 @@ const DocumentTitle = React.forwardRef(function _DocumentTitle(
  }: Props,
  externalRef: React.RefObject<RefHandle>
 ) {
-  const { t } = useTranslation();
  const ref = React.useRef<RefHandle>(null);
  const [iconPickerIsOpen, handleOpen, setIconPickerClosed] = useBoolean();
  const { editor } = useDocumentContext();
@@ -251,7 +249,6 @@ const DocumentTitle = React.forwardRef(function _DocumentTitle(
      autoFocus={!title}
      maxLength={DocumentValidation.maxTitleLength}
      readOnly={readOnly}
-      aria-label={t("Document title")}
      dir="auto"
      ref={mergeRefs([ref, externalRef])}
    >
@@ -23,6 +23,7 @@ import Tooltip from "~/components/Tooltip";
 import { publishDocument } from "~/actions/definitions/documents";
 import { navigateToTemplateSettings } from "~/actions/definitions/navigation";
 import { restoreRevision } from "~/actions/definitions/revisions";
+import useActionContext from "~/hooks/useActionContext";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useEditingFocus from "~/hooks/useEditingFocus";
@@ -108,6 +109,10 @@ function DocumentHeader({
    }
  }, [ui, isShare]);

+  const context = useActionContext({
+    activeDocumentId: document?.id,
+  });
+
  const can = usePolicy(document);
  const { isDeleted, isTemplate } = document;
  const isTemplateEditable = can.update && isTemplate;
@@ -129,7 +134,6 @@ function DocumentHeader({
      placement="bottom"
    >
      <Button
-        aria-label={t("Show contents")}
        onClick={handleToggle}
        icon={<TableOfContentsIcon />}
        borderOnHover
@@ -274,6 +278,7 @@ function DocumentHeader({
                  placement="bottom"
                >
                  <Button
+                    context={context}
                    action={isTemplate ? navigateToTemplateSettings : undefined}
                    onClick={isTemplate ? undefined : handleSave}
                    disabled={savingIsDisabled}
@@ -302,7 +307,12 @@ function DocumentHeader({
            {revision && revision.createdAt !== document.updatedAt && (
              <Action>
                <Tooltip content={t("Restore version")} placement="bottom">
-                  <Button action={restoreRevision} neutral hideOnActionDisabled>
+                  <Button
+                    action={restoreRevision}
+                    context={context}
+                    neutral
+                    hideOnActionDisabled
+                  >
                    {t("Restore")}
                  </Button>
                </Tooltip>
@@ -312,6 +322,7 @@ function DocumentHeader({
              <Action>
                <Button
                  action={publishDocument}
+                  context={context}
                  disabled={publishingIsDisabled}
                  hideOnActionDisabled
                  hideIcon
@@ -23,11 +23,7 @@ function KeyboardShortcutsButton() {

  return (
    <Tooltip content={t("Keyboard shortcuts")} shortcut="?">
-      <Button
-        onClick={handleOpenKeyboardShortcuts}
-        $hidden={isEditingFocus}
-        aria-label={t("Keyboard shortcuts")}
-      >
+      <Button onClick={handleOpenKeyboardShortcuts} $hidden={isEditingFocus}>
        <KeyboardIcon />
      </Button>
    </Tooltip>
@@ -6,10 +6,12 @@ import Empty from "~/components/Empty";
 import Heading from "~/components/Heading";
 import Scene from "~/components/Scene";
 import { navigateToHome } from "~/actions/definitions/navigation";
+import useActionContext from "~/hooks/useActionContext";

 const Error403 = () => {
  const { t } = useTranslation();
  const history = useHistory();
+  const context = useActionContext();

  return (
    <Scene title={t("No access to this doc")}>
@@ -22,7 +24,7 @@ const Error403 = () => {
          {t("Please request access from the document owner.")}
        </Empty>
        <Flex gap={8}>
-          <Button action={navigateToHome} hideIcon>
+          <Button action={navigateToHome} context={context} hideIcon>
            {t("Home")}
          </Button>
          <Button onClick={history.goBack} neutral>
@@ -8,9 +8,11 @@ import {
  navigateToHome,
  navigateToSearch,
 } from "~/actions/definitions/navigation";
+import useActionContext from "~/hooks/useActionContext";

 const Error404 = () => {
  const { t } = useTranslation();
+  const context = useActionContext();

  return (
    <Scene title={t("Not found")}>
@@ -23,10 +25,10 @@ const Error404 = () => {
          </Trans>
        </Empty>
        <Flex gap={8}>
-          <Button action={navigateToHome} neutral hideIcon>
+          <Button action={navigateToHome} context={context} neutral hideIcon>
            {t("Home")}
          </Button>
-          <Button action={navigateToSearch} neutral>
+          <Button action={navigateToSearch} context={context} neutral>
            {t("Search")}…
          </Button>
        </Flex>
@@ -6,9 +6,11 @@ import Empty from "~/components/Empty";
 import Heading from "~/components/Heading";
 import PageTitle from "~/components/PageTitle";
 import { navigateToHome } from "~/actions/definitions/navigation";
+import useActionContext from "~/hooks/useActionContext";

 const ErrorUnknown = () => {
  const { t } = useTranslation();
+  const context = useActionContext();

  return (
    <CenteredContent>
@@ -22,7 +24,7 @@ const ErrorUnknown = () => {
          </Trans>
        </Empty>
        <Flex gap={8}>
-          <Button action={navigateToHome} neutral hideIcon>
+          <Button action={navigateToHome} context={context} neutral hideIcon>
            {t("Home")}
          </Button>
        </Flex>
@@ -33,7 +33,7 @@ const WorkspaceSetup = ({ onBack }: { onBack?: () => void }) => {
            "Setup your workspace by providing a name and details for admin login. You can change these later."
          )}
        </Content>
-        <Inputs column gap={12}>
+        <Flex column gap={12} style={{ width: "100%" }}>
          <Input
            name="teamName"
            type="text"
@@ -57,7 +57,7 @@ const WorkspaceSetup = ({ onBack }: { onBack?: () => void }) => {
            required
            flex
          />
-        </Inputs>
+        </Flex>
        <ButtonLarge type="submit" fullwidth>
          {t("Continue")} →
        </ButtonLarge>
@@ -66,11 +66,6 @@ const WorkspaceSetup = ({ onBack }: { onBack?: () => void }) => {
  );
 };

-const Inputs = styled(Flex)`
-  width: 100%;
-  text-align: left;
-`;
-
 const StyledHeading = styled(Heading)`
  margin: 0;
 `;
@@ -11,6 +11,7 @@ import Scene from "~/components/Scene";
 import Text from "~/components/Text";
 import { createApiKey } from "~/actions/definitions/apiKeys";
 import env from "~/env";
+import useActionContext from "~/hooks/useActionContext";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import usePolicy from "~/hooks/usePolicy";
@@ -24,6 +25,7 @@ function APIAndApps() {
  const { t } = useTranslation();
  const { apiKeys, oauthAuthentications } = useStores();
  const can = usePolicy(team);
+  const context = useActionContext();
  const appName = env.APP_NAME;

  return (
@@ -38,6 +40,7 @@ function APIAndApps() {
                type="submit"
                value={`${t("New API key")}…`}
                action={createApiKey}
+                context={context}
              />
            </Action>
          )}
@@ -9,6 +9,7 @@ import PaginatedList from "~/components/PaginatedList";
 import Scene from "~/components/Scene";
 import Text from "~/components/Text";
 import { createApiKey } from "~/actions/definitions/apiKeys";
+import useActionContext from "~/hooks/useActionContext";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
@@ -19,6 +20,7 @@ function ApiKeys() {
  const { t } = useTranslation();
  const { apiKeys } = useStores();
  const can = usePolicy(team);
+  const context = useActionContext();

  return (
    <Scene
@@ -32,6 +34,7 @@ function ApiKeys() {
                type="submit"
                value={`${t("New API key")}…`}
                action={createApiKey}
+                context={context}
              />
            </Action>
          )}
@@ -161,7 +161,6 @@ const Application = observer(function Application({ oauthClient }: Props) {
            name="avatarUrl"
            render={({ field }) => (
              <ImageInput
-                alt={t("Application icon")}
                onSuccess={(url) => field.onChange(url)}
                onError={(err) => setError("avatarUrl", { message: err })}
                model={{
@@ -9,6 +9,7 @@ import PaginatedList from "~/components/PaginatedList";
 import Scene from "~/components/Scene";
 import Text from "~/components/Text";
 import { createOAuthClient } from "~/actions/definitions/oauthClients";
+import useActionContext from "~/hooks/useActionContext";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
@@ -19,6 +20,7 @@ function Applications() {
  const { t } = useTranslation();
  const { oauthClients } = useStores();
  const can = usePolicy(team);
+  const context = useActionContext();

  return (
    <Scene
@@ -32,6 +34,7 @@ function Applications() {
                type="submit"
                value={`${t("New App")}…`}
                action={createOAuthClient}
+                context={context}
              />
            </Action>
          )}
@@ -193,7 +193,6 @@ function Details() {
            )}
          >
            <ImageInput
-              alt={t("Workspace logo")}
              onSuccess={handleAvatarChange}
              onError={handleAvatarError}
              model={team}
@@ -16,6 +16,7 @@ import Scene from "~/components/Scene";
 import Text from "~/components/Text";
 import { inviteUser } from "~/actions/definitions/users";
 import env from "~/env";
+import useActionContext from "~/hooks/useActionContext";
 import useCurrentTeam from "~/hooks/useCurrentTeam";
 import usePolicy from "~/hooks/usePolicy";
 import useQuery from "~/hooks/useQuery";
@@ -31,6 +32,7 @@ function Members() {
  const location = useLocation();
  const history = useHistory();
  const team = useCurrentTeam();
+  const context = useActionContext();
  const { users } = useStores();
  const { t } = useTranslation();
  const params = useQuery();
@@ -126,6 +128,7 @@ function Members() {
                data-event-category="invite"
                data-event-action="peoplePage"
                action={inviteUser}
+                context={context}
                icon={<PlusIcon />}
              >
                {t("Invite people")}…
@@ -72,7 +72,6 @@ const Profile = () => {
          description={t("Choose a photo or image to represent yourself.")}
        >
          <ImageInput
-            alt={t("Profile picture")}
            onSuccess={handleAvatarChange}
            onError={handleAvatarError}
            model={user}
@@ -430,7 +430,7 @@ const GroupMemberListItem = observer(function ({
    () =>
      [
        {
-          label: t("Group admin"),
+          label: t("Manage"),
          value: GroupPermission.Admin,
        },
        {
@@ -59,7 +59,7 @@ export function GroupsTable(props: Props) {
                <Title onClick={() => handleViewMembers(group)}>
                  {group.name}
                </Title>
-                <Text type="tertiary" size="small" weight="normal">
+                <Text type="tertiary" size="small">
                  <Trans
                    defaults="{{ count }} member"
                    values={{ count: group.memberCount }}
@@ -97,30 +97,6 @@ export function GroupsTable(props: Props) {
          width: "1fr",
          sortable: false,
        },
-        {
-          type: "data",
-          id: "admins",
-          header: t("Admins"),
-          accessor: (group) => `${group.memberCount} admins`,
-          component: (group) => {
-            const users = group.admins.slice(0, MAX_AVATAR_DISPLAY);
-
-            if (users.length === 0) {
-              return null;
-            }
-
-            return (
-              <GroupMembers
-                onClick={() => handleViewMembers(group)}
-                width={users.length * AvatarSize.Large}
-              >
-                <Facepile users={users} />
-              </GroupMembers>
-            );
-          },
-          width: "1fr",
-          sortable: false,
-        },
        {
          type: "data",
          id: "createdAt",
@@ -10,10 +10,9 @@ import ImageUpload, { Props as ImageUploadProps } from "./ImageUpload";

 type Props = ImageUploadProps & {
  model: IAvatar;
-  alt: string;
 };

-export default function ImageInput({ model, onSuccess, alt, ...rest }: Props) {
+export default function ImageInput({ model, onSuccess, ...rest }: Props) {
  const { t } = useTranslation();

  return (
@@ -28,7 +27,6 @@ export default function ImageInput({ model, onSuccess, alt, ...rest }: Props) {
            model={model}
            size={AvatarSize.Upload}
            variant={AvatarVariant.Square}
-            alt={alt}
          />
          <Flex auto align="center" justify="center" className="upload">
            <EditIcon />
@@ -222,8 +222,6 @@ function SharedScene() {
    );
  }

-  const hasSidebar = !!share.tree?.children.length;
-
  return (
    <>
      <Helmet>
@@ -240,10 +238,7 @@ function SharedScene() {
      <TeamContext.Provider value={team}>
        <ThemeProvider theme={theme}>
          <DocumentContextProvider>
-            <Layout
-              title={pageTitle}
-              sidebar={hasSidebar ? <Sidebar share={share} /> : null}
-            >
+            <Layout title={pageTitle} sidebar={<Sidebar share={share} />}>
              {model instanceof Document ? (
                <DocumentScene
                  document={model}
@@ -8,19 +8,24 @@ import PaginatedDocumentList from "~/components/PaginatedDocumentList";
 import Scene from "~/components/Scene";
 import Subheading from "~/components/Subheading";
 import { permanentlyDeleteDocumentsInTrash } from "~/actions/definitions/documents";
+import useActionContext from "~/hooks/useActionContext";
 import useStores from "~/hooks/useStores";

 function Trash() {
  const { t } = useTranslation();
  const { documents } = useStores();
-
+  const context = useActionContext();
  return (
    <Scene
      icon={<TrashIcon />}
      title={t("Trash")}
      actions={
        documents.deleted.length > 0 && (
-          <Button neutral action={permanentlyDeleteDocumentsInTrash}>
+          <Button
+            neutral
+            action={permanentlyDeleteDocumentsInTrash}
+            context={context}
+          >
            {t("Empty trash")}
          </Button>
        )
@@ -242,8 +242,8 @@ export default class AuthStore extends Store<Team> {
        // Update the user's timezone if it has changed
        const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
        if (data.user.timezone !== timezone) {
-          const user = this.rootStore.users.get(data.user.id);
-          void user?.save({ timezone });
+          const user = this.rootStore.users.get(data.user.id)!;
+          void user.save({ timezone });
        }
      });
    } catch (err) {
@@ -92,7 +92,7 @@ export type MenuItem =
  | MenuGroup;

 export type ActionContext = {
-  isMenu: boolean;
+  isContextMenu: boolean;
  isCommandBar: boolean;
  isButton: boolean;
  sidebarContext?: SidebarContextType;
@@ -3,7 +3,7 @@ export default {
  // TypeScript files
  "**/*.[tj]s?(x)": [
    (f) => `prettier --write ${f.join(" ")}`,
-    (f) => (f.length > 20 ? `yarn lint --fix` : `oxlint ${f.join(" ")} --fix --type-aware`),
+    (f) => (f.length > 20 ? `yarn lint --fix` : `oxlint ${f.join(" ")} --fix`),
    () => `yarn build:i18n`,
    () => "git add shared/i18n/locales/en_US/translation.json",
  ],
@@ -13,7 +13,7 @@
    "dev": "NODE_ENV=development yarn concurrently -n api,collaboration  -c \"blue,magenta\" \"node --inspect=0.0.0.0 build/server/index.js --services=cron,collaboration,websockets,admin,web,worker\"",
    "dev:backend": "NODE_ENV=development nodemon --exec \"yarn build:server && yarn dev\" -e js,ts,tsx --ignore *.test.ts --ignore data/ --ignore build/ --ignore app/ --ignore shared/editor --ignore server/migrations",
    "dev:watch": "NODE_ENV=development yarn concurrently -n backend,frontend \"yarn dev:backend\" \"yarn vite:dev\"",
-    "lint": "oxlint --type-aware app server shared plugins",
+    "lint": "oxlint app server shared plugins",
    "lint:changed": "git diff --name-only --diff-filter=ACMRTUXB | grep -E '\\.(js|jsx|ts|tsx)$' | xargs -r oxlint",
    "format": "prettier --write .",
    "format:check": "prettier --check .",
@@ -84,7 +84,7 @@
    "@hocuspocus/server": "1.1.2",
    "@joplin/turndown-plugin-gfm": "^1.0.49",
    "@juggle/resize-observer": "^3.4.0",
-    "@linear/sdk": "^58.1.0",
+    "@linear/sdk": "^39.2.1",
    "@node-oauth/oauth2-server": "^5.2.0",
    "@notionhq/client": "^2.3.0",
    "@octokit/auth-app": "^6.1.4",
@@ -203,7 +203,7 @@
    "prosemirror-model": "^1.25.2",
    "prosemirror-schema-list": "^1.5.1",
    "prosemirror-state": "^1.4.3",
-    "prosemirror-tables": "^1.8.1",
+    "prosemirror-tables": "^1.7.1",
    "prosemirror-transform": "1.10.0",
    "prosemirror-view": "^1.40.1",
    "proxy-from-env": "^1.1.0",
@@ -280,6 +280,7 @@
    "@babel/preset-typescript": "^7.27.1",
    "@faker-js/faker": "^8.4.1",
    "@relative-ci/agent": "^4.3.1",
+    "@testing-library/react": "^12.0.0",
    "@types/addressparser": "^1.0.3",
    "@types/body-scroll-lock": "^3.1.2",
    "@types/crypto-js": "^4.2.2",
@@ -359,8 +360,7 @@
    "jest-fetch-mock": "^3.0.3",
    "lint-staged": "^13.3.0",
    "nodemon": "^3.1.10",
-    "oxlint": "1.11.2",
-    "oxlint-tsgolint": "^0.1.6",
+    "oxlint": "^1.7.0",
    "postinstall-postinstall": "^2.1.0",
    "prettier": "^3.6.2",
    "react-refresh": "^0.17.0",
@@ -15,6 +15,7 @@ import Input from "~/components/Input";
 import Text from "~/components/Text";
 import useStores from "~/hooks/useStores";
 import { disconnectAnalyticsIntegrationFactory } from "~/actions/definitions/integrations";
+import useActionContext from "~/hooks/useActionContext";
 import Flex from "~/components/Flex";
 import styled from "styled-components";

@@ -25,6 +26,7 @@ type FormData = {
 function GoogleAnalytics() {
  const { integrations } = useStores();
  const { t } = useTranslation();
+  const context = useActionContext();

  const integration = find(integrations.orderedData, {
    type: IntegrationType.Analytics,
@@ -106,6 +108,7 @@ function GoogleAnalytics() {

          <Button
            action={disconnectAnalyticsIntegrationFactory(integration)}
+            context={context}
            disabled={formState.isSubmitting}
            neutral
            hideIcon
@@ -11,7 +11,6 @@ import { Linear } from "../linear";
 import UploadLinearWorkspaceLogoTask from "../tasks/UploadLinearWorkspaceLogoTask";
 import * as T from "./schema";
 import { LinearUtils } from "plugins/linear/shared/LinearUtils";
-import { addSeconds } from "date-fns";

 const router = new Router();

@@ -53,10 +52,6 @@ router.get(
          userId: user.id,
          teamId: user.teamId,
          token: oauth.access_token,
-          refreshToken: oauth.refresh_token,
-          expiresAt: oauth.expires_in
-            ? addSeconds(Date.now(), oauth.expires_in)
-            : undefined,
          scopes: oauth.scope.split(" "),
        },
        { transaction }
@@ -12,13 +12,9 @@ import User from "@server/models/User";
 import { UnfurlIssueOrPR, UnfurlSignature } from "@server/types";
 import { LinearUtils } from "../shared/LinearUtils";
 import env from "./env";
-import { Minute } from "@shared/utils/time";

 const AccessTokenResponseSchema = z.object({
  access_token: z.string(),
-  // Linear is in the process of switching to short-lived refresh tokens. Some apps
-  // may not return a refresh token before April 2026, hence it's optional here.
-  refresh_token: z.string().optional(),
  token_type: z.string(),
  expires_in: z.number(),
  scope: z.string(),
@@ -55,33 +51,6 @@ export class Linear {
    return AccessTokenResponseSchema.parse(await res.json());
  }

-  static async refreshToken(refreshToken: string) {
-    const headers = {
-      "Content-Type": "application/x-www-form-urlencoded",
-      Accept: "application/json",
-    };
-
-    const body = new URLSearchParams();
-    body.set("refresh_token", refreshToken);
-    body.set("client_id", env.LINEAR_CLIENT_ID!);
-    body.set("client_secret", env.LINEAR_CLIENT_SECRET!);
-    body.set("grant_type", "refresh_token");
-
-    const res = await fetch(LinearUtils.tokenUrl, {
-      method: "POST",
-      headers,
-      body,
-    });
-
-    if (res.status !== 200) {
-      throw new Error(
-        `Error while refreshing access token from Linear; status: ${res.status}`
-      );
-    }
-
-    return AccessTokenResponseSchema.parse(await res.json());
-  }
-
  static async revokeAccess(accessToken: string) {
    const headers = {
      Authorization: `Bearer ${accessToken}`,
@@ -124,12 +93,9 @@ export class Linear {
    }

    try {
-      const accessToken = await integration.authentication.refreshTokenIfNeeded(
-        async (refreshToken: string) => Linear.refreshToken(refreshToken),
-        5 * Minute.ms
-      );
-
-      const client = new LinearClient({ accessToken });
+      const client = new LinearClient({
+        accessToken: integration.authentication.token,
+      });
      const issue = await client.issue(resource.id);

      if (!issue) {
@@ -227,7 +193,7 @@ export class Linear {
   * Parses a given URL and returns resource identifiers for Linear specific URLs
   *
   * @param url URL to parse
-   * @returns An object containing resource identifiers - `workspaceKey`, `type`, `id` and `name`.
+   * @returns {object} Containing resource identifiers - `workspaceKey`, `type`, `id` and `name`.
   */
  private static parseUrl(url: string) {
    const { hostname, pathname } = new URL(url);
@@ -15,6 +15,7 @@ import Text from "~/components/Text";
 import useStores from "~/hooks/useStores";
 import Icon from "./Icon";
 import { disconnectAnalyticsIntegrationFactory } from "~/actions/definitions/integrations";
+import useActionContext from "~/hooks/useActionContext";
 import Flex from "~/components/Flex";
 import styled from "styled-components";

@@ -26,6 +27,7 @@ type FormData = {
 function Matomo() {
  const { integrations } = useStores();
  const { t } = useTranslation();
+  const context = useActionContext();

  const integration = find(integrations.orderedData, {
    type: IntegrationType.Analytics,
@@ -127,6 +129,7 @@ function Matomo() {

          <Button
            action={disconnectAnalyticsIntegrationFactory(integration)}
+            context={context}
            disabled={formState.isSubmitting}
            neutral
            hideIcon
@@ -28,7 +28,7 @@ const router = new Router();
 router.post(
  "files.create",
  rateLimiter(RateLimiterStrategy.TenPerMinute),
-  auth(),
+  auth({ allowMultipart: true }),
  validate(T.FilesCreateSchema),
  multipart({
    maximumFileSize: Math.max(
@@ -16,6 +16,7 @@ import useStores from "~/hooks/useStores";
 import Icon from "./Icon";
 import Flex from "~/components/Flex";
 import { disconnectAnalyticsIntegrationFactory } from "~/actions/definitions/integrations";
+import useActionContext from "~/hooks/useActionContext";
 import styled from "styled-components";

 type FormData = {
@@ -27,6 +28,7 @@ type FormData = {
 function Umami() {
  const { integrations } = useStores();
  const { t } = useTranslation();
+  const context = useActionContext();

  const integration = find(integrations.orderedData, {
    type: IntegrationType.Analytics,
@@ -147,6 +149,7 @@ function Umami() {

          <Button
            action={disconnectAnalyticsIntegrationFactory(integration)}
+            context={context}
            disabled={formState.isSubmitting}
            neutral
            hideIcon
--- a/Show More
+++ b/Show More