From 6cd2346d46064596bb9058efed9fef4c739dbbf4 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom@getoutline.com>
Date: Wed, 10 Dec 2025 19:43:19 -0500
Subject: [PATCH] fix: Media editor crashes page (#10852)

closes #10851
---
 app/editor/components/MediaLinkEditor.tsx  | 14 +++++++++-----
 app/editor/components/SelectionToolbar.tsx |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/editor/components/MediaLinkEditor.tsx b/app/editor/components/MediaLinkEditor.tsx
index 8605261181..75965fe52a 100644
--- a/app/editor/components/MediaLinkEditor.tsx
+++ b/app/editor/components/MediaLinkEditor.tsx
@@ -12,7 +12,7 @@ import ToolbarButton from "./ToolbarButton";
 import useOnClickOutside from "~/hooks/useOnClickOutside";
 
 type Props = {
-  node: Node;
+  node?: Node;
   view: EditorView;
   dictionary: Dictionary;
   autoFocus?: boolean;
@@ -31,14 +31,14 @@ export function MediaLinkEditor({
   onEscape,
   onClickOutside,
 }: Props) {
-  const url = (node.attrs.href ?? node.attrs.src) as string;
+  const url = (node?.attrs.href ?? node?.attrs.src) as string;
   const [localUrl, setLocalUrl] = useState(url);
   const wrapperRef = useRef<HTMLDivElement>(null);
 
   // If we're attempting to edit an image, autofocus the input
   // Not doing for embed type because it made the editor scroll to top
   // unexpectedly–leaving that out for now
-  const isEditingImgUrl = node.type.name === "image";
+  const isEditingImgUrl = node?.type.name === "image";
 
   const moveSelectionToEnd = useCallback(() => {
     const { state, dispatch } = view;
@@ -65,9 +65,9 @@ export function MediaLinkEditor({
 
   const update = useCallback(() => {
     const { state } = view;
-    const hrefType = node.type.name === "image" ? "src" : "href";
+    const hrefType = node?.type.name === "image" ? "src" : "href";
     const tr = state.tr.setNodeMarkup(state.selection.from, undefined, {
-      ...node.attrs,
+      ...node?.attrs,
       [hrefType]: localUrl,
     });
 
@@ -102,6 +102,10 @@ export function MediaLinkEditor({
     [update, moveSelectionToEnd]
   );
 
+  if (!node) {
+    return null;
+  }
+
   return (
     <Wrapper ref={wrapperRef}>
       <Input
diff --git a/app/editor/components/SelectionToolbar.tsx b/app/editor/components/SelectionToolbar.tsx
index 2f50a6a3e9..4c2ac8be1a 100644
--- a/app/editor/components/SelectionToolbar.tsx
+++ b/app/editor/components/SelectionToolbar.tsx
@@ -286,7 +286,9 @@ export function SelectionToolbar(props: Props) {
       ) : activeToolbar === Toolbar.Media ? (
         <MediaLinkEditor
           key={`embed-${selection.from}`}
-          node={(selection as NodeSelection).node}
+          node={
+            "node" in selection ? (selection as NodeSelection).node : undefined
+          }
           view={view}
           dictionary={dictionary}
           onLinkUpdate={() => setActiveToolbar(null)}