From 43d31d8bb44644b0d78d8a7f543da790b30e1eea Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Mon, 21 Jul 2025 10:49:02 -0300
Subject: [PATCH] fix: Fixed issues with embedded linked items in Super editor
 (#2918)

* Fixed items being embedded twice when linking them in a Super note
* Fixed Remove button not working for embedded linked items in Super editor
---
 .../Components/LinkedItems/LinkedItemBubble.tsx    |  8 +++++---
 .../ItemBubblePlugin/Nodes/BubbleComponent.tsx     | 14 +++++---------
 .../ItemSelectionItemComponent.tsx                 |  8 +-------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/packages/web/src/javascripts/Components/LinkedItems/LinkedItemBubble.tsx b/packages/web/src/javascripts/Components/LinkedItems/LinkedItemBubble.tsx
index 8c0a7f729..84a8dade3 100644
--- a/packages/web/src/javascripts/Components/LinkedItems/LinkedItemBubble.tsx
+++ b/packages/web/src/javascripts/Components/LinkedItems/LinkedItemBubble.tsx
@@ -56,8 +56,10 @@ const LinkedItemBubble = ({
     setShowUnlinkButton(true)
   }
 
-  const onBlur = () => {
-    setShowUnlinkButton(false)
+  const onBlur: React.FocusEventHandler<HTMLButtonElement | HTMLAnchorElement> = (event) => {
+    if (!event.currentTarget.contains(event.relatedTarget)) {
+      setShowUnlinkButton(false)
+    }
     setWasClicked(false)
   }
 
@@ -131,7 +133,7 @@ const LinkedItemBubble = ({
           <button
             ref={(el) => (unlinkButtonRef.current = el as HTMLElement)}
             role="button"
-            className="-mr-1 ml-2 inline-flex cursor-pointer border-0 bg-transparent p-0 h-[1.15em] align-middle"
+            className="-mr-1 ml-2 inline-flex h-[1.15em] cursor-pointer border-0 bg-transparent p-0 align-middle"
             onClick={onUnlinkClick}
           >
             <Icon type="close" className="text-neutral hover:text-info" size="small" />
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleComponent.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleComponent.tsx
index f310b38f7..099f2711c 100644
--- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleComponent.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemBubblePlugin/Nodes/BubbleComponent.tsx
@@ -30,15 +30,11 @@ export function BubbleComponent({ itemUuid, node }: BubbleComponentProps) {
     [toggleAppPane, linkingController],
   )
 
-  const unlinkPressed = useCallback(
-    async (itemToUnlink: LinkableItem) => {
-      linkingController.unlinkItemFromSelectedItem(itemToUnlink).catch(console.error)
-      editor.update(() => {
-        node.remove()
-      })
-    },
-    [linkingController, node, editor],
-  )
+  const unlinkPressed = useCallback(async () => {
+    editor.update(() => {
+      node.remove()
+    })
+  }, [linkingController, node, editor])
 
   if (!item) {
     return <div>Unable to find item {itemUuid}</div>
diff --git a/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionItemComponent.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionItemComponent.tsx
index a7653cea4..f16b70353 100644
--- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionItemComponent.tsx
+++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionItemComponent.tsx
@@ -32,13 +32,7 @@ export function ItemSelectionItemComponent({ index, isSelected, onClick, onMouse
       onClick={onClick}
     >
       {option.item && <LinkedItemMeta item={option.item} searchQuery={searchQuery} />}
-      {!option.item && (
-        <LinkedItemSearchResultsAddTagOption
-          searchQuery={searchQuery}
-          onClickCallback={onClick}
-          isFocused={isSelected}
-        />
-      )}
+      {!option.item && <LinkedItemSearchResultsAddTagOption searchQuery={searchQuery} isFocused={isSelected} />}
     </li>
   )
 }