refactor(core/form/inputs): wrap delete in try/catch to finalize ref …

…assignment It could potentially error, and then we must not set the deleted ref.
sanity-io · May 30, 2023 · cd3eb90 · cd3eb90
1 parent 20fb696
commit cd3eb90
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/packages/sanity/src/core/form/inputs/PortableText/object/BlockObject.tsx b/packages/sanity/src/core/form/inputs/PortableText/object/BlockObject.tsx
@@ -116,8 +116,13 @@ export function BlockObject(props: BlockObjectProps) {
     if (isDeleting.current) {
       return
     }
-    PortableTextEditor.delete(editor, selfSelection, {mode: 'blocks'})
-    isDeleting.current = true
+    try {
+      PortableTextEditor.delete(editor, selfSelection, {mode: 'blocks'})
+    } catch (err) {
+      console.error(err)
+    } finally {
+      isDeleting.current = true
+    }
   }, [editor, selfSelection])
 
   // Focus the editor if this object is removed because it was deleted.

diff --git a/packages/sanity/src/core/form/inputs/PortableText/object/InlineObjectToolbarPopover.tsx b/packages/sanity/src/core/form/inputs/PortableText/object/InlineObjectToolbarPopover.tsx
@@ -59,9 +59,14 @@ export function InlineObjectToolbarPopover(props: InlineObjectToolbarPopoverProp
       }
       event.preventDefault()
       event.stopPropagation()
-      onDelete(event)
-      if (deleteButtonRef.current) {
-        deleteButtonRef.current.disabled = true
+      try {
+        onDelete(event)
+      } catch (err) {
+        console.error(err)
+      } finally {
+        if (deleteButtonRef.current) {
+          deleteButtonRef.current.disabled = true
+        }
       }
     },
     [onDelete]