feat: Full toolbar is now shown in Super notes on non-mobile screens instead of floating formatting toolbar. It can be focused or toggled using Ctrl/Cmd+Shift+K (#2576)

2023-10-11 17:34:54 +05:30
parent ec4c7c2c62
commit dac6ec22f2
16 changed files with 334 additions and 767 deletions
--- a/packages/icons/src/Icons/ic-indent.svg
+++ b/packages/icons/src/Icons/ic-indent.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+	<path fill="currentColor" d="M2 3.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5zm.646 2.146a.5.5 0 0 1 .708 0l2 2a.5.5 0 0 1 0 .708l-2 2a.5.5 0 0 1-.708-.708L4.293 8L2.646 6.354a.5.5 0 0 1 0-.708zM7 6.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5zm0 3a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5zm-5 3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5z" />
+</svg>
--- a/packages/icons/src/Icons/ic-outdent.svg
+++ b/packages/icons/src/Icons/ic-outdent.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+	<path fill="currentColor" d="M2 3.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5zm10.646 2.146a.5.5 0 0 1 .708.708L11.707 8l1.647 1.646a.5.5 0 0 1-.708.708l-2-2a.5.5 0 0 1 0-.708l2-2zM2 6.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5zm0 3a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5zm0 3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5z" />
+</svg>
--- a/packages/icons/src/Icons/index.ts
+++ b/packages/icons/src/Icons/index.ts
@@ -104,6 +104,7 @@ import HistoryLockedIllustration from './il-history-locked.svg'
 import IconsSpriteStylekit from './icons-sprite-stylekit.svg'
 import IlNotesIcon from './il-notes.svg'
 import ImageIcon from './ic-image.svg'
+import IndentIcon from './ic-indent.svg'
 import InfoIcon from './ic-info.svg'
 import ItalicIcon from './ic-italic.svg'
 import KeyboardCloseIcon from './ic-keyboard-close.svg'
@@ -137,6 +138,7 @@ import NoPreviewIllustration from './il-no-preview.svg'
 import NotesFilledIcon from './ic-notes-filled.svg'
 import NotesIcon from './ic-notes.svg'
 import OpenInIcon from './ic-open-in.svg'
+import OutdentIcon from './ic-outdent.svg'
 import PasswordIcon from './ic-textbox-password.svg'
 import PencilFilledIcon from './ic-pencil-filled.svg'
 import PencilIcon from './ic-pencil.svg'
@@ -188,8 +190,8 @@ import SubtractIcon from './ic-subtract.svg'
 import SuperscriptIcon from './ic-superscript.svg'
 import SyncIcon from './ic-sync.svg'
 import TasksIcon from './ic-tasks.svg'
-import TextIcon from './ic-text.svg'
 import TextCircleIcon from './ic-text-circle.svg'
+import TextIcon from './ic-text.svg'
 import TextParagraphLongIcon from './ic-text-paragraph-long.svg'
 import ThemesFilledIcon from './ic-themes-filled.svg'
 import ThemesIcon from './ic-themes.svg'
@@ -221,6 +223,7 @@ export {
  AddBoldIcon,
  AddIcon,
  AddTextIcon,
+  AegisIcon,
  ArchiveIcon,
  ArrowDownCheckmarkIcon,
  ArrowDownIcon,
@@ -274,6 +277,7 @@ export {
  EmailFilledIcon,
  EmailIcon,
  EnterIcon,
+  EvernoteIcon,
  EyeFilledIcon,
  EyeIcon,
  EyeOffFilledIcon,
@@ -304,6 +308,7 @@ export {
  FullscreenExitIcon,
  FullscreenIcon,
  GiftOutlineIcon,
+  GoogleKeepIcon,
  GroupIcon,
  HashtagFilledIcon,
  HashtagIcon,
@@ -316,6 +321,7 @@ export {
  IconsSpriteStylekit,
  IlNotesIcon,
  ImageIcon,
+  IndentIcon,
  InfoIcon,
  ItalicIcon,
  KeyboardCloseIcon,
@@ -349,6 +355,7 @@ export {
  NotesFilledIcon,
  NotesIcon,
  OpenInIcon,
+  OutdentIcon,
  PasswordIcon,
  PencilFilledIcon,
  PencilIcon,
@@ -364,6 +371,8 @@ export {
  ProtectedIllustration,
  RedoIcon,
  ReorderIcon,
+  ReplaceAllIcon,
+  ReplaceIcon,
  RestoreIcon,
  RichTextIcon,
  SafeIcon,
@@ -382,6 +391,7 @@ export {
  ShortcutButtonIcon,
  SignInIcon,
  SignOutIcon,
+  SimplenoteIcon,
  SNLogoAltIcon,
  SNLogoFull,
  SNLogoIcon,
@@ -397,8 +407,8 @@ export {
  SuperscriptIcon,
  SyncIcon,
  TasksIcon,
-  TextIcon,
  TextCircleIcon,
+  TextIcon,
  TextParagraphLongIcon,
  ThemesFilledIcon,
  ThemesIcon,
@@ -420,10 +430,4 @@ export {
  ViewIcon,
  WarningIcon,
  WindowIcon,
-  EvernoteIcon,
-  GoogleKeepIcon,
-  SimplenoteIcon,
-  AegisIcon,
-  ReplaceIcon,
-  ReplaceAllIcon,
 }
--- a/packages/icons/src/Lexical/indent.svg
+++ b/packages/icons/src/Lexical/indent.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="bi bi-text-indent-left"><path d="M2 3.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5zm.646 2.146a.5.5 0 0 1 .708 0l2 2a.5.5 0 0 1 0 .708l-2 2a.5.5 0 0 1-.708-.708L4.293 8 2.646 6.354a.5.5 0 0 1 0-.708zM7 6.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5zm0 3a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5zm-5 3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5z"/></svg>
--- a/packages/icons/src/Lexical/outdent.svg
+++ b/packages/icons/src/Lexical/outdent.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="bi bi-text-indent-right"><path d="M2 3.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5zm10.646 2.146a.5.5 0 0 1 .708.708L11.707 8l1.647 1.646a.5.5 0 0 1-.708.708l-2-2a.5.5 0 0 1 0-.708l2-2zM2 6.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5zm0 3a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5zm0 3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5z"/></svg>
--- a/packages/ui-services/src/Keyboard/KeyboardCommands.ts
+++ b/packages/ui-services/src/Keyboard/KeyboardCommands.ts
@@ -27,6 +27,7 @@ export const STAR_NOTE_COMMAND = createKeyboardCommand('STAR_NOTE_COMMAND')
 export const PIN_NOTE_COMMAND = createKeyboardCommand('PIN_NOTE_COMMAND')

 export const SUPER_TOGGLE_SEARCH = createKeyboardCommand('SUPER_TOGGLE_SEARCH')
+export const SUPER_TOGGLE_TOOLBAR = createKeyboardCommand('SUPER_TOGGLE_TOOLBAR')
 export const SUPER_SEARCH_TOGGLE_CASE_SENSITIVE = createKeyboardCommand('SUPER_SEARCH_TOGGLE_CASE_SENSITIVE')
 export const SUPER_SEARCH_TOGGLE_REPLACE_MODE = createKeyboardCommand('SUPER_SEARCH_TOGGLE_REPLACE_MODE')
 export const SUPER_SEARCH_NEXT_RESULT = createKeyboardCommand('SUPER_SEARCH_NEXT_RESULT')
--- a/packages/ui-services/src/Keyboard/getKeyboardShortcuts.ts
+++ b/packages/ui-services/src/Keyboard/getKeyboardShortcuts.ts
@@ -30,6 +30,7 @@ import {
  SUPER_SEARCH_PREVIOUS_RESULT,
  SUPER_SEARCH_TOGGLE_REPLACE_MODE,
  CHANGE_EDITOR_WIDTH_COMMAND,
+  SUPER_TOGGLE_TOOLBAR,
 } from './KeyboardCommands'
 import { KeyboardKey } from './KeyboardKey'
 import { KeyboardModifier } from './KeyboardModifier'
@@ -147,6 +148,11 @@ export function getKeyboardShortcuts(platform: Platform, _environment: Environme
      modifiers: [primaryModifier, KeyboardModifier.Shift],
      preventDefault: true,
    },
+    {
+      command: SUPER_TOGGLE_TOOLBAR,
+      key: 'k',
+      modifiers: [primaryModifier, KeyboardModifier.Shift],
+    },
    {
      command: SUPER_TOGGLE_SEARCH,
      key: 'f',
--- a/packages/web/src/javascripts/Components/Icon/IconNameToSvgMapping.tsx
+++ b/packages/web/src/javascripts/Components/Icon/IconNameToSvgMapping.tsx
@@ -42,8 +42,8 @@ export const IconNameToSvgMapping = {
  'fullscreen-exit': icons.FullscreenExitIcon,
  'hashtag-off': icons.HashtagOffIcon,
  'keyboard-close': icons.KeyboardCloseIcon,
-  'link-off': icons.LinkOffIcon,
  'line-width': icons.LineWidthIcon,
+  'link-off': icons.LinkOffIcon,
  'list-bulleted': icons.ListBulleted,
  'list-numbered': icons.ListNumbered,
  'lock-filled': icons.LockFilledIcon,
@@ -99,17 +99,19 @@ export const IconNameToSvgMapping = {
  hashtag: icons.HashtagIcon,
  help: icons.HelpIcon,
  history: icons.HistoryIcon,
+  image: icons.ImageIcon,
+  indent: icons.IndentIcon,
  info: icons.InfoIcon,
  italic: icons.ItalicIcon,
  keyboard: icons.KeyboardIcon,
  link: icons.LinkIcon,
  listed: icons.ListedIcon,
  lock: icons.LockIcon,
-  image: icons.ImageIcon,
  markdown: icons.MarkdownIcon,
  merge: icons.MergeIcon,
  more: icons.MoreIcon,
  notes: icons.NotesIcon,
+  outdent: icons.OutdentIcon,
  paragraph: icons.TextParagraphLongIcon,
  password: icons.PasswordIcon,
  pencil: icons.PencilIcon,
--- a/packages/web/src/javascripts/Components/SuperEditor/BlocksEditor.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/BlocksEditor.tsx
@@ -19,7 +19,6 @@ import AutoEmbedPlugin from './Plugins/AutoEmbedPlugin'
 import CollapsiblePlugin from './Plugins/CollapsiblePlugin'
 import DraggableBlockPlugin from './Plugins/DraggableBlockPlugin'
 import CodeHighlightPlugin from './Plugins/CodeHighlightPlugin'
-import FloatingTextFormatToolbarPlugin from './Plugins/ToolbarPlugins/FloatingTextFormatToolbarPlugin'
 import { TabIndentationPlugin } from './Plugins/TabIndentationPlugin'
 import { handleEditorChange } from './Utils'
 import { SuperEditorContentId } from './Constants'
@@ -110,7 +109,6 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
      <RemoveBrokenTablesPlugin />
      {!readonly && floatingAnchorElem && (
        <>
-          <FloatingTextFormatToolbarPlugin anchorElem={floatingAnchorElem} />
          <DraggableBlockPlugin anchorElem={floatingAnchorElem} />
          <TableActionMenuPlugin anchorElem={floatingAnchorElem} cellMerge />
        </>
--- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/IndentOutdent.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/IndentOutdent.tsx
@@ -4,13 +4,13 @@ export function GetIndentOutdentBlocks(editor: LexicalEditor) {
  return [
    {
      name: 'Indent',
-      iconName: 'arrow-right',
+      iconName: 'indent',
      keywords: ['indent'],
      onSelect: () => editor.dispatchCommand(INDENT_CONTENT_COMMAND, undefined),
    },
    {
      name: 'Outdent',
-      iconName: 'arrow-left',
+      iconName: 'outdent',
      keywords: ['outdent'],
      onSelect: () => editor.dispatchCommand(OUTDENT_CONTENT_COMMAND, undefined),
    },
--- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugin/ToolbarLinkEditor.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugin/ToolbarLinkEditor.tsx
@@ -1,12 +1,11 @@
 import Icon from '@/Components/Icon/Icon'
-import { CloseIcon, CheckIcon, PencilFilledIcon, TrashFilledIcon } from '@standardnotes/icons'
 import { KeyboardKey } from '@standardnotes/ui-services'
-import { IconComponent } from '../../Lexical/Theme/IconComponent'
 import { sanitizeUrl } from '../../Lexical/Utils/sanitizeUrl'
 import { TOGGLE_LINK_COMMAND } from '@lexical/link'
 import { useCallback, useState, useRef, useEffect } from 'react'
 import { GridSelection, LexicalEditor, NodeSelection, RangeSelection } from 'lexical'
 import { classNames } from '@standardnotes/snjs'
+import StyledTooltip from '@/Components/StyledTooltip/StyledTooltip'

 type Props = {
  linkUrl: string
@@ -65,29 +64,27 @@ const LinkEditor = ({ linkUrl, isEditMode, setEditMode, editor, lastSelection, i
        }}
        className="flex-grow rounded-sm bg-contrast p-1 text-text sm:min-w-[40ch]"
      />
-      <button
-        className="flex rounded-lg p-3 hover:bg-contrast hover:text-text disabled:cursor-not-allowed"
-        onClick={() => {
-          setEditMode(false)
-          editor.focus()
-        }}
-        aria-label="Cancel editing link"
-        onMouseDown={(event) => event.preventDefault()}
-      >
-        <IconComponent size={15}>
-          <CloseIcon />
-        </IconComponent>
-      </button>
-      <button
-        className="flex rounded-lg p-3 hover:bg-contrast hover:text-text disabled:cursor-not-allowed"
-        onClick={handleLinkSubmission}
-        aria-label="Save link"
-        onMouseDown={(event) => event.preventDefault()}
-      >
-        <IconComponent size={15}>
-          <CheckIcon />
-        </IconComponent>
-      </button>
+      <StyledTooltip showOnMobile showOnHover label="Cancel editing">
+        <button
+          className="flex select-none items-center justify-center rounded p-2 enabled:hover:bg-default disabled:opacity-50 md:border md:border-transparent enabled:hover:md:translucent-ui:border-[--popover-border-color]"
+          onClick={() => {
+            setEditMode(false)
+            editor.focus()
+          }}
+          onMouseDown={(event) => event.preventDefault()}
+        >
+          <Icon type="close" size="medium" />
+        </button>
+      </StyledTooltip>
+      <StyledTooltip showOnMobile showOnHover label="Save link">
+        <button
+          className="flex select-none items-center justify-center rounded p-2 enabled:hover:bg-default disabled:opacity-50 md:border md:border-transparent enabled:hover:md:translucent-ui:border-[--popover-border-color]"
+          onClick={handleLinkSubmission}
+          onMouseDown={(event) => event.preventDefault()}
+        >
+          <Icon type="check" size="medium" />
+        </button>
+      </StyledTooltip>
    </div>
  ) : (
    <div className="flex items-center gap-1">
@@ -105,31 +102,29 @@ const LinkEditor = ({ linkUrl, isEditMode, setEditMode, editor, lastSelection, i
      </a>
      {!isAutoLink && (
        <>
-          <button
-            className="flex rounded-lg p-3 hover:bg-contrast hover:text-text disabled:cursor-not-allowed"
-            onClick={() => {
-              setEditedLinkUrl(linkUrl)
-              setEditMode(true)
-            }}
-            aria-label="Edit link"
-            onMouseDown={(event) => event.preventDefault()}
-          >
-            <IconComponent size={15}>
-              <PencilFilledIcon />
-            </IconComponent>
-          </button>
-          <button
-            className="flex rounded-lg p-3 hover:bg-contrast hover:text-text disabled:cursor-not-allowed"
-            onClick={() => {
-              editor.dispatchCommand(TOGGLE_LINK_COMMAND, null)
-            }}
-            aria-label="Remove link"
-            onMouseDown={(event) => event.preventDefault()}
-          >
-            <IconComponent size={15}>
-              <TrashFilledIcon />
-            </IconComponent>
-          </button>
+          <StyledTooltip showOnMobile showOnHover label="Edit link">
+            <button
+              className="flex select-none items-center justify-center rounded p-2 enabled:hover:bg-default disabled:opacity-50 md:border md:border-transparent enabled:hover:md:translucent-ui:border-[--popover-border-color]"
+              onClick={() => {
+                setEditedLinkUrl(linkUrl)
+                setEditMode(true)
+              }}
+              onMouseDown={(event) => event.preventDefault()}
+            >
+              <Icon type="pencil-filled" size="medium" />
+            </button>
+          </StyledTooltip>
+          <StyledTooltip showOnMobile showOnHover label="Remove link">
+            <button
+              className="flex select-none items-center justify-center rounded p-2 enabled:hover:bg-default disabled:opacity-50 md:border md:border-transparent enabled:hover:md:translucent-ui:border-[--popover-border-color]"
+              onClick={() => {
+                editor.dispatchCommand(TOGGLE_LINK_COMMAND, null)
+              }}
+              onMouseDown={(event) => event.preventDefault()}
+            >
+              <Icon type="trash-filled" size="medium" />
+            </button>
+          </StyledTooltip>
        </>
      )}
    </div>
--- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugin/ToolbarLinkTextEditor.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugin/ToolbarLinkTextEditor.tsx
@@ -1,17 +1,18 @@
 import Icon from '@/Components/Icon/Icon'
-import { CloseIcon, CheckIcon, PencilFilledIcon } from '@standardnotes/icons'
 import { KeyboardKey } from '@standardnotes/ui-services'
-import { IconComponent } from '../../Lexical/Theme/IconComponent'
 import { $isRangeSelection, $isTextNode, GridSelection, LexicalEditor, NodeSelection, RangeSelection } from 'lexical'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { VisuallyHidden } from '@ariakit/react'
 import { getSelectedNode } from '../../Lexical/Utils/getSelectedNode'
 import { $isLinkNode } from '@lexical/link'
+import StyledTooltip from '@/Components/StyledTooltip/StyledTooltip'

 type Props = {
  linkText: string
  editor: LexicalEditor
  lastSelection: RangeSelection | GridSelection | NodeSelection | null
+  isEditMode: boolean
+  setEditMode: (isEditMode: boolean) => void
 }

 export const $isLinkTextNode = (node: ReturnType<typeof getSelectedNode>, selection: RangeSelection) => {
@@ -19,9 +20,8 @@ export const $isLinkTextNode = (node: ReturnType<typeof getSelectedNode>, select
  return $isLinkNode(parent) && $isTextNode(node) && selection.anchor.getNode() === selection.focus.getNode()
 }

-const LinkTextEditor = ({ linkText, editor, lastSelection }: Props) => {
+const LinkTextEditor = ({ linkText, editor, isEditMode, setEditMode, lastSelection }: Props) => {
  const [editedLinkText, setEditedLinkText] = useState(() => linkText)
-  const [isEditMode, setEditMode] = useState(false)
  const editModeContainer = useRef<HTMLDivElement>(null)

  useEffect(() => {
@@ -72,50 +72,47 @@ const LinkTextEditor = ({ linkText, editor, lastSelection }: Props) => {
        }}
        className="flex-grow rounded-sm bg-contrast p-1 text-text sm:min-w-[20ch]"
      />
-      <button
-        className="flex rounded-lg p-3 hover:bg-contrast hover:text-text disabled:cursor-not-allowed"
-        onClick={() => {
-          setEditMode(false)
-          editor.focus()
-        }}
-        aria-label="Cancel editing link"
-        onMouseDown={(event) => event.preventDefault()}
-      >
-        <IconComponent size={15}>
-          <CloseIcon />
-        </IconComponent>
-      </button>
-      <button
-        className="flex rounded-lg p-3 hover:bg-contrast hover:text-text disabled:cursor-not-allowed"
-        onClick={handleLinkTextSubmission}
-        aria-label="Save link"
-        onMouseDown={(event) => event.preventDefault()}
-      >
-        <IconComponent size={15}>
-          <CheckIcon />
-        </IconComponent>
-      </button>
+      <StyledTooltip showOnMobile showOnHover label="Cancel editing">
+        <button
+          className="flex select-none items-center justify-center rounded p-2 enabled:hover:bg-default disabled:opacity-50 md:border md:border-transparent enabled:hover:md:translucent-ui:border-[--popover-border-color]"
+          onClick={() => {
+            setEditMode(false)
+            editor.focus()
+          }}
+          onMouseDown={(event) => event.preventDefault()}
+        >
+          <Icon type="close" size="medium" />
+        </button>
+      </StyledTooltip>
+      <StyledTooltip showOnMobile showOnHover label="Save link text">
+        <button
+          className="flex select-none items-center justify-center rounded p-2 enabled:hover:bg-default disabled:opacity-50 md:border md:border-transparent enabled:hover:md:translucent-ui:border-[--popover-border-color]"
+          onClick={handleLinkTextSubmission}
+          onMouseDown={(event) => event.preventDefault()}
+        >
+          <Icon type="check" size="medium" />
+        </button>
+      </StyledTooltip>
    </div>
  ) : (
    <div className="flex items-center gap-1">
      <Icon type="plain-text" className="ml-1 mr-1 flex-shrink-0" />
-      <div className="flex-grow max-w-[35ch] overflow-hidden text-ellipsis whitespace-nowrap">
+      <div className="flex-grow overflow-hidden text-ellipsis whitespace-nowrap">
        <VisuallyHidden>Link text:</VisuallyHidden>
        {linkText}
      </div>
-      <button
-        className="flex rounded-lg p-3 hover:bg-contrast hover:text-text disabled:cursor-not-allowed ml-auto"
-        onClick={() => {
-          setEditedLinkText(linkText)
-          setEditMode(true)
-        }}
-        aria-label="Edit link"
-        onMouseDown={(event) => event.preventDefault()}
-      >
-        <IconComponent size={15}>
-          <PencilFilledIcon />
-        </IconComponent>
-      </button>
+      <StyledTooltip showOnMobile showOnHover label="Edit link text">
+        <button
+          className="flex select-none items-center justify-center rounded p-2 enabled:hover:bg-default disabled:opacity-50 md:border md:border-transparent enabled:hover:md:translucent-ui:border-[--popover-border-color]"
+          onClick={() => {
+            setEditedLinkText(linkText)
+            setEditMode(true)
+          }}
+          onMouseDown={(event) => event.preventDefault()}
+        >
+          <Icon type="pencil-filled" size="medium" />
+        </button>
+      </StyledTooltip>
    </div>
  )
 }
--- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugins/MobileToolbarPlugin.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugins/MobileToolbarPlugin.tsx
@@ -18,8 +18,8 @@ import {
  UNDO_COMMAND,
 } from 'lexical'
 import { mergeRegister } from '@lexical/utils'
-import { $isLinkNode, $isAutoLinkNode, TOGGLE_LINK_COMMAND } from '@lexical/link'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { $isLinkNode, TOGGLE_LINK_COMMAND } from '@lexical/link'
+import { ComponentPropsWithoutRef, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { GetAlignmentBlocks } from '../Blocks/Alignment'
 import { GetBulletedListBlock } from '../Blocks/BulletedList'
 import { GetChecklistBlock } from '../Blocks/Checklist'
@@ -37,25 +37,65 @@ import { GetQuoteBlock } from '../Blocks/Quote'
 import { GetTableBlock } from '../Blocks/Table'
 import { MutuallyExclusiveMediaQueryBreakpoints, useMediaQuery } from '@/Hooks/useMediaQuery'
 import { classNames } from '@standardnotes/snjs'
-import { SUPER_TOGGLE_SEARCH } from '@standardnotes/ui-services'
+import { SUPER_TOGGLE_SEARCH, SUPER_TOGGLE_TOOLBAR } from '@standardnotes/ui-services'
 import { useApplication } from '@/Components/ApplicationProvider'
 import { GetRemoteImageBlock } from '../Blocks/RemoteImage'
 import { InsertRemoteImageDialog } from '../RemoteImagePlugin/RemoteImagePlugin'
-import LinkEditor from '../LinkEditor/LinkEditor'
+import LinkEditor from './ToolbarLinkEditor'
 import { FOCUSABLE_BUT_NOT_TABBABLE } from '@/Constants/Constants'
 import { useSelectedTextFormatInfo } from './useSelectedTextFormatInfo'
 import StyledTooltip from '@/Components/StyledTooltip/StyledTooltip'
+import LinkTextEditor, { $isLinkTextNode } from './ToolbarLinkTextEditor'
+import { Toolbar, ToolbarItem, useToolbarStore } from '@ariakit/react'

-const MobileToolbarPlugin = () => {
+interface ToolbarButtonProps extends ComponentPropsWithoutRef<'button'> {
+  name: string
+  active?: boolean
+  iconName: string
+  onSelect: () => void
+}
+
+const ToolbarButton = ({ name, active, iconName, onSelect, disabled, ...props }: ToolbarButtonProps) => {
+  const [editor] = useLexicalComposerContext()
+
+  return (
+    <StyledTooltip showOnMobile showOnHover label={name}>
+      <ToolbarItem
+        className="flex select-none items-center justify-center rounded p-0.5 focus:shadow-none focus:outline-none enabled:hover:bg-default enabled:focus-visible:bg-default disabled:opacity-50 md:border md:border-transparent enabled:hover:md:translucent-ui:border-[--popover-border-color]"
+        onMouseDown={(event) => {
+          event.preventDefault()
+          onSelect()
+        }}
+        onContextMenu={(event) => {
+          editor.focus()
+          event.preventDefault()
+        }}
+        disabled={disabled}
+        {...props}
+      >
+        <div
+          className={classNames(
+            'flex items-center justify-center rounded p-2 transition-colors duration-75',
+            active && 'bg-info text-info-contrast',
+          )}
+        >
+          <Icon type={iconName} size="medium" className="!text-current [&>path]:!text-current" />
+        </div>
+      </ToolbarItem>
+    </StyledTooltip>
+  )
+}
+
+const ToolbarPlugin = () => {
  const application = useApplication()
  const [editor] = useLexicalComposerContext()
  const [modal, showModal] = useModal()

  const [isInEditor, setIsInEditor] = useState(false)
-  const [isInLinkEditor, setIsInLinkEditor] = useState(false)
  const [isInToolbar, setIsInToolbar] = useState(false)
  const isMobile = useMediaQuery(MutuallyExclusiveMediaQueryBreakpoints.sm)

+  const containerRef = useRef<HTMLDivElement>(null)
  const toolbarRef = useRef<HTMLDivElement>(null)
  const linkEditorRef = useRef<HTMLDivElement>(null)
  const backspaceButtonRef = useRef<HTMLButtonElement>(null)
@@ -77,9 +117,19 @@ const MobileToolbarPlugin = () => {
    }
  }, [editor])

-  const { isBold, isItalic, isUnderline, isSubscript, isSuperscript, isStrikethrough, blockType, isHighlighted } =
-    useSelectedTextFormatInfo()
-  const [isSelectionLink, setIsSelectionLink] = useState(false)
+  const {
+    isBold,
+    isItalic,
+    isUnderline,
+    isSubscript,
+    isSuperscript,
+    isStrikethrough,
+    blockType,
+    isHighlighted,
+    isLink,
+    isLinkText,
+    isAutoLink,
+  } = useSelectedTextFormatInfo()

  const [canUndo, setCanUndo] = useState(false)
  const [canRedo, setCanRedo] = useState(false)
@@ -193,7 +243,7 @@ const MobileToolbarPlugin = () => {
            insertLink()
          })
        },
-        active: isSelectionLink,
+        active: isLink,
      },
      {
        name: 'Search',
@@ -205,6 +255,7 @@ const MobileToolbarPlugin = () => {
      GetParagraphBlock(editor),
      ...GetHeadingsBlocks(editor),
      ...GetIndentOutdentBlocks(editor),
+      ...GetAlignmentBlocks(editor),
      GetTableBlock(() =>
        showModal('Insert Table', (onClose) => <InsertTableDialog activeEditor={editor} onClose={onClose} />),
      ),
@@ -218,7 +269,6 @@ const MobileToolbarPlugin = () => {
      GetCodeBlock(editor),
      GetDividerBlock(editor),
      ...GetDatetimeBlocks(editor),
-      ...GetAlignmentBlocks(editor),
      ...[GetPasswordBlock(editor)],
      GetCollapsibleBlock(editor),
      ...GetEmbedsBlocks(editor),
@@ -233,7 +283,7 @@ const MobileToolbarPlugin = () => {
      isBold,
      isHighlighted,
      isItalic,
-      isSelectionLink,
+      isLink,
      isStrikethrough,
      isSubscript,
      isSuperscript,
@@ -243,41 +293,14 @@ const MobileToolbarPlugin = () => {
  )

  useEffect(() => {
+    const container = containerRef.current
    const rootElement = editor.getRootElement()

    if (!rootElement) {
      return
    }

-    const handleFocus = () => setIsInEditor(true)
-    const handleBlur = (event: FocusEvent) => {
-      const elementToBeFocused = event.relatedTarget as Node
-      const toolbarContainsElementToFocus = toolbarRef.current && toolbarRef.current.contains(elementToBeFocused)
-      const linkEditorContainsElementToFocus =
-        linkEditorRef.current &&
-        (linkEditorRef.current.contains(elementToBeFocused) || elementToBeFocused === linkEditorRef.current)
-      const willFocusBackspaceButton = backspaceButtonRef.current && elementToBeFocused === backspaceButtonRef.current
-      if (toolbarContainsElementToFocus || linkEditorContainsElementToFocus || willFocusBackspaceButton) {
-        return
-      }
-      setIsInEditor(false)
-    }
-
-    rootElement.addEventListener('focus', handleFocus)
-    rootElement.addEventListener('blur', handleBlur)
-
-    return () => {
-      rootElement.removeEventListener('focus', handleFocus)
-      rootElement.removeEventListener('blur', handleBlur)
-    }
-  }, [editor])
-
-  useEffect(() => {
-    const toolbar = toolbarRef.current
-    const linkEditor = linkEditorRef.current
-
    const handleToolbarFocus = () => setIsInToolbar(true)
-    const handleLinkEditorFocus = () => setIsInLinkEditor(true)
    const handleToolbarBlur = (event: FocusEvent) => {
      const elementToBeFocused = event.relatedTarget as Node
      if (elementToBeFocused === backspaceButtonRef.current) {
@@ -285,34 +308,42 @@ const MobileToolbarPlugin = () => {
      }
      setIsInToolbar(false)
    }
-    const handleLinkEditorBlur = (event: FocusEvent) => {
+
+    const handleRootFocus = () => setIsInEditor(true)
+    const handleRootBlur = (event: FocusEvent) => {
      const elementToBeFocused = event.relatedTarget as Node
-      if (elementToBeFocused === backspaceButtonRef.current) {
+
+      const containerContainsElementToFocus = container?.contains(elementToBeFocused)
+
+      const willFocusBackspaceButton = backspaceButtonRef.current && elementToBeFocused === backspaceButtonRef.current
+
+      if (containerContainsElementToFocus || willFocusBackspaceButton) {
        return
      }
-      setIsInLinkEditor(false)
+
+      setIsInEditor(false)
    }

-    if (toolbar) {
-      toolbar.addEventListener('focus', handleToolbarFocus)
-      toolbar.addEventListener('blur', handleToolbarBlur)
-    }
+    rootElement.addEventListener('focus', handleRootFocus)
+    rootElement.addEventListener('blur', handleRootBlur)

-    if (linkEditor) {
-      linkEditor.addEventListener('focus', handleLinkEditorFocus)
-      linkEditor.addEventListener('blur', handleLinkEditorBlur)
+    if (container) {
+      container.addEventListener('focus', handleToolbarFocus)
+      container.addEventListener('blur', handleToolbarBlur)
    }

    return () => {
-      toolbar?.removeEventListener('focus', handleToolbarFocus)
-      toolbar?.removeEventListener('blur', handleToolbarBlur)
-      linkEditor?.removeEventListener('focus', handleLinkEditorFocus)
-      linkEditor?.removeEventListener('blur', handleLinkEditorBlur)
+      rootElement.removeEventListener('focus', handleRootFocus)
+      rootElement.removeEventListener('blur', handleRootBlur)
+      container?.removeEventListener('focus', handleToolbarFocus)
+      container?.removeEventListener('blur', handleToolbarBlur)
    }
-  }, [])
-  const [isSelectionAutoLink, setIsSelectionAutoLink] = useState(false)
+  }, [editor])
+
  const [linkUrl, setLinkUrl] = useState('')
+  const [linkText, setLinkText] = useState('')
  const [isLinkEditMode, setIsLinkEditMode] = useState(false)
+  const [isLinkTextEditMode, setIsLinkTextEditMode] = useState(false)
  const [lastSelection, setLastSelection] = useState<RangeSelection | GridSelection | NodeSelection | null>(null)

  const updateEditorSelection = useCallback(() => {
@@ -329,18 +360,6 @@ const MobileToolbarPlugin = () => {
      const node = getSelectedNode(selection)
      const parent = node.getParent()

-      if ($isLinkNode(parent) || $isLinkNode(node)) {
-        setIsSelectionLink(true)
-      } else {
-        setIsSelectionLink(false)
-      }
-
-      if ($isAutoLinkNode(parent) || $isAutoLinkNode(node)) {
-        setIsSelectionAutoLink(true)
-      } else {
-        setIsSelectionAutoLink(false)
-      }
-
      if ($isLinkNode(parent)) {
        setLinkUrl(parent.getURL())
      } else if ($isLinkNode(node)) {
@@ -348,6 +367,11 @@ const MobileToolbarPlugin = () => {
      } else {
        setLinkUrl('')
      }
+      if ($isLinkTextNode(node, selection)) {
+        setLinkText(node.getTextContent())
+      } else {
+        setLinkText('')
+      }

      if (
        selection !== null &&
@@ -380,76 +404,147 @@ const MobileToolbarPlugin = () => {
    )
  }, [editor, updateEditorSelection])

-  const isFocusInEditorOrToolbar = isInEditor || isInToolbar || isInLinkEditor
+  useEffect(() => {
+    const container = containerRef.current
+    const rootElement = editor.getRootElement()
+
+    if (!container || !rootElement) {
+      return
+    }
+
+    const resizeObserver = new ResizeObserver(() => {
+      if (isMobile) {
+        return
+      }
+
+      const containerHeight = container.offsetHeight
+
+      rootElement.style.paddingBottom = containerHeight ? `${containerHeight + 16 * 2}px` : ''
+    })
+
+    resizeObserver.observe(container)
+
+    return () => {
+      resizeObserver.disconnect()
+    }
+  }, [editor, isMobile])
+
+  const isFocusInEditorOrToolbar = isInEditor || isInToolbar
+  const [isToolbarVisible, setIsToolbarVisible] = useState(true)
+  const canShowToolbar = isMobile ? isFocusInEditorOrToolbar : isToolbarVisible
+
+  const toolbarStore = useToolbarStore()
+
+  useEffect(() => {
+    return application.keyboardService.addCommandHandler({
+      command: SUPER_TOGGLE_TOOLBAR,
+      onKeyDown: (event) => {
+        if (isMobile) {
+          return
+        }
+
+        event.preventDefault()
+
+        const isFocusInContainer = containerRef.current?.contains(document.activeElement)
+
+        if (!isToolbarVisible) {
+          setIsToolbarVisible(true)
+          toolbarStore.move(toolbarStore.first())
+          return
+        }
+
+        if (isFocusInContainer) {
+          setIsToolbarVisible(false)
+          editor.focus()
+        } else {
+          toolbarStore.move(toolbarStore.first())
+        }
+      },
+    })
+  }, [application.keyboardService, editor, isMobile, isToolbarVisible, toolbarStore])

  return (
    <>
      {modal}
      <div
-        className={classNames('bg-contrast', !isMobile || !isFocusInEditorOrToolbar ? 'hidden' : '')}
-        id="super-mobile-toolbar"
-      >
-        {isSelectionLink && (
-          <div
-            className="border-t border-border px-2 focus:shadow-none focus:outline-none"
-            ref={linkEditorRef}
-            tabIndex={FOCUSABLE_BUT_NOT_TABBABLE}
-          >
-            <LinkEditor
-              linkUrl={linkUrl}
-              isEditMode={isLinkEditMode}
-              setEditMode={setIsLinkEditMode}
-              isAutoLink={isSelectionAutoLink}
-              editor={editor}
-              lastSelection={lastSelection}
-            />
-          </div>
+        className={classNames(
+          'bg-contrast',
+          'md:absolute md:bottom-4 md:left-1/2 md:max-w-[60%] md:-translate-x-1/2 md:rounded-lg md:border md:border-border md:px-2 md:py-1 md:translucent-ui:border-[--popover-border-color] md:translucent-ui:bg-[--popover-background-color] md:translucent-ui:[backdrop-filter:var(--popover-backdrop-filter)]',
+          !canShowToolbar ? 'hidden' : '',
        )}
-        <div className="flex w-full flex-shrink-0 border-t border-border bg-contrast">
-          <div
-            tabIndex={-1}
+        id="super-mobile-toolbar"
+        ref={containerRef}
+      >
+        {isLinkText && !isAutoLink && (
+          <>
+            <div className="border-t border-border px-1 py-1 md:border-0 md:px-0 md:py-0">
+              <LinkTextEditor
+                linkText={linkText}
+                editor={editor}
+                lastSelection={lastSelection}
+                isEditMode={isLinkTextEditMode}
+                setEditMode={setIsLinkTextEditMode}
+              />
+            </div>
+            <div
+              role="presentation"
+              className="my-1 hidden h-px bg-border translucent-ui:bg-[--popover-border-color] md:block"
+            />
+          </>
+        )}
+        {isLink && (
+          <>
+            <div
+              className="border-t border-border px-1 py-1 focus:shadow-none focus:outline-none md:border-0 md:px-0 md:py-0"
+              ref={linkEditorRef}
+              tabIndex={FOCUSABLE_BUT_NOT_TABBABLE}
+            >
+              <LinkEditor
+                linkUrl={linkUrl}
+                isEditMode={isLinkEditMode}
+                setEditMode={setIsLinkEditMode}
+                isAutoLink={isAutoLink}
+                editor={editor}
+                lastSelection={lastSelection}
+              />
+            </div>
+            <div
+              role="presentation"
+              className="my-1 hidden h-px bg-border translucent-ui:bg-[--popover-border-color] md:block"
+            />
+          </>
+        )}
+        <div className="flex w-full flex-shrink-0 border-t border-border md:border-0">
+          <Toolbar
            className="flex items-center gap-1 overflow-x-auto pl-1 [&::-webkit-scrollbar]:h-0"
            ref={toolbarRef}
+            store={toolbarStore}
          >
            {items.map((item) => {
              return (
-                <StyledTooltip showOnMobile showOnHover label={item.name} key={item.name}>
-                  <button
-                    className="flex select-none items-center justify-center rounded p-0.5 hover:bg-default disabled:opacity-50"
-                    aria-label={item.name}
-                    onMouseDown={(event) => {
-                      event.preventDefault()
-                      item.onSelect()
-                    }}
-                    onContextMenu={(event) => {
-                      editor.focus()
-                      event.preventDefault()
-                    }}
-                    disabled={item.disabled}
-                  >
-                    <div
-                      className={classNames(
-                        'flex items-center justify-center rounded p-2 transition-colors duration-75',
-                        item.active && 'bg-info text-info-contrast',
-                      )}
-                    >
-                      <Icon type={item.iconName} size="medium" className="!text-current [&>path]:!text-current" />
-                    </div>
-                  </button>
-                </StyledTooltip>
+                <ToolbarButton
+                  name={item.name}
+                  iconName={item.iconName}
+                  active={item.active}
+                  disabled={item.disabled}
+                  onSelect={item.onSelect}
+                  key={item.name}
+                />
              )
            })}
-          </div>
-          <button
-            className="flex flex-shrink-0 items-center justify-center rounded border-l border-border px-3 py-3"
-            aria-label="Dismiss keyboard"
-          >
-            <Icon type="keyboard-close" size="medium" />
-          </button>
+          </Toolbar>
+          {isMobile && (
+            <button
+              className="flex flex-shrink-0 items-center justify-center rounded border-l border-border px-3 py-3"
+              aria-label="Dismiss keyboard"
+            >
+              <Icon type="keyboard-close" size="medium" />
+            </button>
+          )}
        </div>
      </div>
    </>
  )
 }

-export default MobileToolbarPlugin
+export default ToolbarPlugin
--- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugins/useSelectedTextFormatInfo.ts
+++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugins/useSelectedTextFormatInfo.ts
@@ -14,7 +14,7 @@ import { $isHeadingNode } from '@lexical/rich-text'
 import { $isListNode, ListNode } from '@lexical/list'
 import { useCallback, useEffect, useState } from 'react'
 import { getSelectedNode } from '../../Lexical/Utils/getSelectedNode'
-import { $isLinkTextNode } from '../LinkEditor/LinkTextEditor'
+import { $isLinkTextNode } from './ToolbarLinkTextEditor'

 const blockTypeToBlockName = {
  bullet: 'Bulleted List',
--- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugins/FloatingTextFormatToolbarPlugin.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ToolbarPlugins/FloatingTextFormatToolbarPlugin.tsx
@@ -1,535 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { $isLinkNode, TOGGLE_LINK_COMMAND } from '@lexical/link'
-import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'
-import { mergeRegister } from '@lexical/utils'
-import {
-  $getSelection,
-  $isRangeSelection,
-  FORMAT_TEXT_COMMAND,
-  LexicalEditor,
-  SELECTION_CHANGE_COMMAND,
-  COMMAND_PRIORITY_LOW,
-  RangeSelection,
-  GridSelection,
-  NodeSelection,
-  KEY_MODIFIER_COMMAND,
-  COMMAND_PRIORITY_NORMAL,
-  createCommand,
-} from 'lexical'
-import { INSERT_UNORDERED_LIST_COMMAND, REMOVE_LIST_COMMAND, INSERT_ORDERED_LIST_COMMAND } from '@lexical/list'
-import { ComponentPropsWithoutRef, useCallback, useEffect, useRef, useState } from 'react'
-import { createPortal } from 'react-dom'
-import { getSelectedNode } from '../../Lexical/Utils/getSelectedNode'
-import {
-  BoldIcon,
-  ItalicIcon,
-  UnderlineIcon,
-  StrikethroughIcon,
-  CodeIcon,
-  LinkIcon,
-  SuperscriptIcon,
-  SubscriptIcon,
-  ListBulleted,
-  ListNumbered,
-  DrawIcon,
-} from '@standardnotes/icons'
-import { IconComponent } from '../../Lexical/Theme/IconComponent'
-import { classNames } from '@standardnotes/snjs'
-import { getDOMRangeRect } from '../../Lexical/Utils/getDOMRangeRect'
-import { getPositionedPopoverStyles } from '@/Components/Popover/GetPositionedPopoverStyles'
-import { getAdjustedStylesForNonPortalPopover } from '@/Components/Popover/Utils/getAdjustedStylesForNonPortal'
-import LinkEditor from '../LinkEditor/LinkEditor'
-import LinkTextEditor, { $isLinkTextNode } from '../LinkEditor/LinkTextEditor'
-import { URL_REGEX } from '@/Constants/Constants'
-import { useSelectedTextFormatInfo } from './useSelectedTextFormatInfo'
-import { MutuallyExclusiveMediaQueryBreakpoints, useMediaQuery } from '@/Hooks/useMediaQuery'
-import StyledTooltip from '@/Components/StyledTooltip/StyledTooltip'
-
-const IconSize = 15
-
-const TOGGLE_LINK_AND_EDIT_COMMAND = createCommand<string | null>('TOGGLE_LINK_AND_EDIT_COMMAND')
-
-const ToolbarButton = ({ active, ...props }: { active?: boolean } & ComponentPropsWithoutRef<'button'>) => {
-  return (
-    <button
-      className={classNames(
-        'flex rounded-lg p-3 hover:bg-default hover:text-text disabled:cursor-not-allowed',
-        active && 'bg-info text-info-contrast',
-      )}
-      {...props}
-    >
-      {props.children}
-    </button>
-  )
-}
-
-function TextFormatFloatingToolbar({
-  editor,
-  anchorElem,
-  isText,
-  isLink,
-  isLinkText,
-  isAutoLink,
-  isBold,
-  isItalic,
-  isUnderline,
-  isCode,
-  isStrikethrough,
-  isSubscript,
-  isSuperscript,
-  isBulletedList,
-  isNumberedList,
-  isHighlighted,
-}: {
-  editor: LexicalEditor
-  anchorElem: HTMLElement
-  isText: boolean
-  isBold: boolean
-  isCode: boolean
-  isItalic: boolean
-  isLink: boolean
-  isLinkText: boolean
-  isAutoLink: boolean
-  isStrikethrough: boolean
-  isSubscript: boolean
-  isSuperscript: boolean
-  isUnderline: boolean
-  isBulletedList: boolean
-  isNumberedList: boolean
-  isHighlighted: boolean
-}) {
-  const toolbarRef = useRef<HTMLDivElement | null>(null)
-
-  const [linkUrl, setLinkUrl] = useState('')
-  const [linkText, setLinkText] = useState('')
-  const [isLinkEditMode, setIsLinkEditMode] = useState(false)
-  const [lastSelection, setLastSelection] = useState<RangeSelection | GridSelection | NodeSelection | null>(null)
-
-  useEffect(() => {
-    return editor.registerCommand(
-      TOGGLE_LINK_AND_EDIT_COMMAND,
-      (payload) => {
-        if (payload === null) {
-          return editor.dispatchCommand(TOGGLE_LINK_COMMAND, null)
-        } else if (typeof payload === 'string') {
-          const dispatched = editor.dispatchCommand(TOGGLE_LINK_COMMAND, payload)
-          setLinkUrl(payload)
-          setIsLinkEditMode(true)
-          return dispatched
-        }
-        return false
-      },
-      COMMAND_PRIORITY_LOW,
-    )
-  }, [editor])
-
-  const insertLink = useCallback(() => {
-    if (!isLink) {
-      editor.update(() => {
-        editor.dispatchCommand(TOGGLE_LINK_AND_EDIT_COMMAND, '')
-      })
-    } else {
-      editor.dispatchCommand(TOGGLE_LINK_AND_EDIT_COMMAND, null)
-    }
-  }, [editor, isLink])
-
-  const formatBulletList = useCallback(() => {
-    if (!isBulletedList) {
-      editor.dispatchCommand(INSERT_UNORDERED_LIST_COMMAND, undefined)
-    } else {
-      editor.dispatchCommand(REMOVE_LIST_COMMAND, undefined)
-    }
-  }, [editor, isBulletedList])
-
-  const formatNumberedList = useCallback(() => {
-    if (!isNumberedList) {
-      editor.dispatchCommand(INSERT_ORDERED_LIST_COMMAND, undefined)
-    } else {
-      editor.dispatchCommand(REMOVE_LIST_COMMAND, undefined)
-    }
-  }, [editor, isNumberedList])
-
-  const updateToolbar = useCallback(() => {
-    const selection = $getSelection()
-    if ($isRangeSelection(selection)) {
-      const node = getSelectedNode(selection)
-      const parent = node.getParent()
-      if ($isLinkNode(parent)) {
-        setLinkUrl(parent.getURL())
-      } else if ($isLinkNode(node)) {
-        setLinkUrl(node.getURL())
-      } else {
-        setLinkUrl('')
-      }
-      if ($isLinkTextNode(node, selection)) {
-        setLinkText(node.getTextContent())
-      } else {
-        setLinkText('')
-      }
-    }
-
-    const toolbarElement = toolbarRef.current
-
-    if (!toolbarElement) {
-      return
-    }
-
-    const nativeSelection = window.getSelection()
-    const activeElement = document.activeElement
-    const rootElement = editor.getRootElement()
-
-    if (
-      selection !== null &&
-      nativeSelection !== null &&
-      rootElement !== null &&
-      rootElement.contains(nativeSelection.anchorNode)
-    ) {
-      setLastSelection(selection)
-
-      const rangeRect = getDOMRangeRect(nativeSelection, rootElement)
-      const toolbarRect = toolbarElement.getBoundingClientRect()
-      const rootElementRect = rootElement.getBoundingClientRect()
-
-      const calculatedStyles = getPositionedPopoverStyles({
-        align: 'start',
-        side: 'top',
-        anchorRect: rangeRect,
-        popoverRect: toolbarRect,
-        documentRect: rootElementRect,
-        offset: 12,
-        maxHeightFunction: () => 'none',
-      })
-      if (calculatedStyles) {
-        toolbarElement.style.setProperty('--offset', calculatedStyles['--offset'])
-      }
-
-      if (calculatedStyles) {
-        Object.assign(toolbarElement.style, calculatedStyles)
-        const adjustedStyles = getAdjustedStylesForNonPortalPopover(toolbarElement, calculatedStyles, rootElement)
-        toolbarElement.style.setProperty('--translate-x', adjustedStyles['--translate-x'])
-        toolbarElement.style.setProperty('--translate-y', adjustedStyles['--translate-y'])
-      }
-    } else if (!activeElement || activeElement.id !== 'link-input') {
-      setLastSelection(null)
-      setIsLinkEditMode(false)
-      setLinkUrl('')
-    }
-
-    return true
-  }, [editor])
-
-  useEffect(() => {
-    const scrollerElem = editor.getRootElement()
-
-    const update = () => {
-      editor.getEditorState().read(() => {
-        updateToolbar()
-      })
-    }
-
-    window.addEventListener('resize', update)
-    if (scrollerElem) {
-      scrollerElem.addEventListener('scroll', update)
-    }
-
-    return () => {
-      window.removeEventListener('resize', update)
-      if (scrollerElem) {
-        scrollerElem.removeEventListener('scroll', update)
-      }
-    }
-  }, [editor, anchorElem, updateToolbar])
-
-  useEffect(() => {
-    editor.getEditorState().read(() => {
-      updateToolbar()
-    })
-    return mergeRegister(
-      editor.registerUpdateListener(({ editorState }) => {
-        editorState.read(() => {
-          updateToolbar()
-        })
-      }),
-
-      editor.registerCommand(
-        SELECTION_CHANGE_COMMAND,
-        () => {
-          updateToolbar()
-          return false
-        },
-        COMMAND_PRIORITY_LOW,
-      ),
-    )
-  }, [editor, updateToolbar])
-
-  useEffect(() => {
-    return editor.registerCommand(
-      KEY_MODIFIER_COMMAND,
-      (payload) => {
-        const event: KeyboardEvent = payload
-        const { code, ctrlKey, metaKey } = event
-
-        if (code === 'KeyK' && (ctrlKey || metaKey)) {
-          event.preventDefault()
-          if ('readText' in navigator.clipboard) {
-            navigator.clipboard
-              .readText()
-              .then((text) => {
-                if (URL_REGEX.test(text)) {
-                  editor.dispatchCommand(TOGGLE_LINK_COMMAND, text)
-                } else {
-                  throw new Error('Not a valid URL')
-                }
-              })
-              .catch((error) => {
-                console.error(error)
-                editor.dispatchCommand(TOGGLE_LINK_AND_EDIT_COMMAND, '')
-                setIsLinkEditMode(true)
-              })
-          } else {
-            editor.dispatchCommand(TOGGLE_LINK_AND_EDIT_COMMAND, '')
-            setIsLinkEditMode(true)
-          }
-          return true
-        }
-        return false
-      },
-      COMMAND_PRIORITY_NORMAL,
-    )
-  }, [editor])
-
-  useEffect(() => {
-    editor.getEditorState().read(() => updateToolbar())
-  }, [editor, isLink, isText, updateToolbar])
-
-  if (!editor.isEditable()) {
-    return null
-  }
-
-  return (
-    <div
-      ref={toolbarRef}
-      className="absolute left-0 top-0 rounded-lg border border-border bg-contrast px-2 py-1 shadow-sm shadow-contrast translucent-ui:border-[--popover-border-color] translucent-ui:bg-[--popover-background-color] translucent-ui:[backdrop-filter:var(--popover-backdrop-filter)]"
-    >
-      {isLinkText && !isAutoLink && (
-        <>
-          <LinkTextEditor linkText={linkText} editor={editor} lastSelection={lastSelection} />
-          <div
-            role="presentation"
-            className="mb-1.5 mt-0.5 h-px bg-border translucent-ui:bg-[--popover-border-color]"
-          />
-        </>
-      )}
-      {isLink && (
-        <LinkEditor
-          linkUrl={linkUrl}
-          isEditMode={isLinkEditMode}
-          setEditMode={setIsLinkEditMode}
-          isAutoLink={isAutoLink}
-          editor={editor}
-          lastSelection={lastSelection}
-        />
-      )}
-      {isText && isLink && (
-        <div role="presentation" className="mb-1.5 mt-0.5 h-px bg-border translucent-ui:bg-[--popover-border-color]" />
-      )}
-      {isText && (
-        <div className="flex gap-1">
-          <StyledTooltip label="Bold">
-            <ToolbarButton
-              active={isBold}
-              onClick={() => {
-                editor.dispatchCommand(FORMAT_TEXT_COMMAND, 'bold')
-              }}
-              aria-label="Format text as bold"
-            >
-              <IconComponent size={IconSize}>
-                <BoldIcon />
-              </IconComponent>
-            </ToolbarButton>
-          </StyledTooltip>
-          <StyledTooltip label="Italicize">
-            <ToolbarButton
-              onClick={() => {
-                editor.dispatchCommand(FORMAT_TEXT_COMMAND, 'italic')
-              }}
-              active={isItalic}
-              aria-label="Format text as italics"
-            >
-              <IconComponent size={IconSize}>
-                <ItalicIcon />
-              </IconComponent>
-            </ToolbarButton>
-          </StyledTooltip>
-          <StyledTooltip label="Underline">
-            <ToolbarButton
-              onClick={() => {
-                editor.dispatchCommand(FORMAT_TEXT_COMMAND, 'underline')
-              }}
-              active={isUnderline}
-              aria-label="Format text to underlined"
-            >
-              <IconComponent size={IconSize + 1}>
-                <UnderlineIcon />
-              </IconComponent>
-            </ToolbarButton>
-          </StyledTooltip>
-          <StyledTooltip label="Strikethrough">
-            <ToolbarButton
-              onClick={() => {
-                editor.dispatchCommand(FORMAT_TEXT_COMMAND, 'strikethrough')
-              }}
-              active={isStrikethrough}
-              aria-label="Format text with a strikethrough"
-            >
-              <IconComponent size={IconSize}>
-                <StrikethroughIcon />
-              </IconComponent>
-            </ToolbarButton>
-          </StyledTooltip>
-          <StyledTooltip label="Subscript">
-            <ToolbarButton
-              onClick={() => {
-                editor.dispatchCommand(FORMAT_TEXT_COMMAND, 'subscript')
-              }}
-              active={isSubscript}
-              title="Subscript"
-              aria-label="Format Subscript"
-            >
-              <IconComponent paddingTop={4} size={IconSize - 2}>
-                <SubscriptIcon />
-              </IconComponent>
-            </ToolbarButton>
-          </StyledTooltip>
-          <StyledTooltip label="Superscript">
-            <ToolbarButton
-              onClick={() => {
-                editor.dispatchCommand(FORMAT_TEXT_COMMAND, 'superscript')
-              }}
-              active={isSuperscript}
-              title="Superscript"
-              aria-label="Format Superscript"
-            >
-              <IconComponent paddingTop={1} size={IconSize - 2}>
-                <SuperscriptIcon />
-              </IconComponent>
-            </ToolbarButton>
-          </StyledTooltip>
-          <StyledTooltip label="Code">
-            <ToolbarButton
-              onClick={() => {
-                editor.dispatchCommand(FORMAT_TEXT_COMMAND, 'code')
-              }}
-              active={isCode}
-              aria-label="Insert code block"
-            >
-              <IconComponent size={IconSize}>
-                <CodeIcon />
-              </IconComponent>
-            </ToolbarButton>
-          </StyledTooltip>
-          <StyledTooltip label="Highlight">
-            <ToolbarButton
-              onClick={() => {
-                editor.dispatchCommand(FORMAT_TEXT_COMMAND, 'highlight')
-              }}
-              active={isHighlighted}
-              aria-label="Highlight text"
-            >
-              <IconComponent size={IconSize}>
-                <DrawIcon />
-              </IconComponent>
-            </ToolbarButton>
-          </StyledTooltip>
-          <StyledTooltip label="Insert link">
-            <ToolbarButton onClick={insertLink} active={isLink} aria-label="Insert link">
-              <IconComponent size={IconSize}>
-                <LinkIcon />
-              </IconComponent>
-            </ToolbarButton>
-          </StyledTooltip>
-          <StyledTooltip label="Insert bulleted list">
-            <ToolbarButton onClick={formatBulletList} active={isBulletedList} aria-label="Insert bulleted list">
-              <IconComponent size={IconSize}>
-                <ListBulleted />
-              </IconComponent>
-            </ToolbarButton>
-          </StyledTooltip>
-          <StyledTooltip label="Insert numbered list">
-            <ToolbarButton onClick={formatNumberedList} active={isNumberedList} aria-label="Insert numbered list">
-              <IconComponent size={IconSize}>
-                <ListNumbered />
-              </IconComponent>
-            </ToolbarButton>
-          </StyledTooltip>
-        </div>
-      )}
-    </div>
-  )
-}
-
-function useFloatingTextFormatToolbar(editor: LexicalEditor, anchorElem: HTMLElement): JSX.Element | null {
-  const {
-    isText,
-    isLink,
-    isLinkText,
-    isAutoLink,
-    isBold,
-    isItalic,
-    isStrikethrough,
-    isSubscript,
-    isSuperscript,
-    isUnderline,
-    isCode,
-    isHighlighted,
-    blockType,
-  } = useSelectedTextFormatInfo()
-
-  const isMobile = useMediaQuery(MutuallyExclusiveMediaQueryBreakpoints.sm)
-
-  if (isMobile) {
-    return null
-  }
-
-  if (!isText && !isLink) {
-    return null
-  }
-
-  return createPortal(
-    <TextFormatFloatingToolbar
-      editor={editor}
-      anchorElem={anchorElem}
-      isText={isText}
-      isLink={isLink}
-      isLinkText={isLinkText}
-      isAutoLink={isAutoLink}
-      isBold={isBold}
-      isItalic={isItalic}
-      isStrikethrough={isStrikethrough}
-      isSubscript={isSubscript}
-      isSuperscript={isSuperscript}
-      isUnderline={isUnderline}
-      isCode={isCode}
-      isHighlighted={isHighlighted}
-      isBulletedList={blockType === 'bullet'}
-      isNumberedList={blockType === 'number'}
-    />,
-    anchorElem,
-  )
-}
-
-export default function FloatingTextFormatToolbarPlugin({
-  anchorElem = document.body,
-}: {
-  anchorElem?: HTMLElement
-}): JSX.Element | null {
-  const [editor] = useLexicalComposerContext()
-  return useFloatingTextFormatToolbar(editor, anchorElem)
-}
--- a/packages/web/src/javascripts/Components/SuperEditor/SuperEditor.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/SuperEditor.tsx
@@ -44,7 +44,7 @@ import ReadonlyPlugin from './Plugins/ReadonlyPlugin/ReadonlyPlugin'
 import { SuperSearchContextProvider } from './Plugins/SearchPlugin/Context'
 import { SearchPlugin } from './Plugins/SearchPlugin/SearchPlugin'
 import ModalOverlay from '@/Components/Modal/ModalOverlay'
-import MobileToolbarPlugin from './Plugins/ToolbarPlugins/MobileToolbarPlugin'
+import ToolbarPlugin from './Plugins/ToolbarPlugin/ToolbarPlugin'
 import CodeOptionsPlugin from './Plugins/CodeOptionsPlugin/CodeOptions'
 import RemoteImagePlugin from './Plugins/RemoteImagePlugin/RemoteImagePlugin'
 import NotEntitledBanner from '../ComponentView/NotEntitledBanner'
@@ -250,7 +250,7 @@ export const SuperEditor: FunctionComponent<Props> = ({
                <SuperSearchContextProvider>
                  <SearchPlugin />
                </SuperSearchContextProvider>
-                <MobileToolbarPlugin />
+                <ToolbarPlugin />
                <CodeOptionsPlugin />
                <RemoteImagePlugin />
              </BlocksEditor>
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="bi bi-text-indent-left"><path d="M2 3.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5zm.646 2.146a.5.5 0 0 1 .708 0l2 2a.5.5 0 0 1 0 .708l-2 2a.5.5 0 0 1-.708-.708L4.293 8 2.646 6.354a.5.5 0 0 1 0-.708zM7 6.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5zm0 3a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5zm-5 3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5z"/></svg>`