From fbe79fe5f2c7b977e4fac0883d9cb8ca7cef8ba6 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 10 Dec 2025 11:34:05 +0000
Subject: [PATCH 1/4] Update icon references

---
 resources/js/components/fieldtypes/bard/LinkToolbar.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/fieldtypes/bard/LinkToolbar.vue b/resources/js/components/fieldtypes/bard/LinkToolbar.vue
index fe51de4cdff..7153fbda83f 100644
--- a/resources/js/components/fieldtypes/bard/LinkToolbar.vue
+++ b/resources/js/components/fieldtypes/bard/LinkToolbar.vue
@@ -68,8 +68,8 @@
                                 :aria-label="`${__('Browse')}...`"
                                 @click="openSelector"
                             >
-                                <ui-icon v-show="linkType === 'asset'" name="folder-image" class="size-4" />
-                                <ui-icon v-show="linkType !== 'asset'" name="folder-generic" class="size-4" />
+                                <Icon v-show="linkType === 'asset'" name="folder-photos" class="size-4" />
+                                <Icon v-show="linkType !== 'asset'" name="folder" class="size-4" />
                             </button>
                         </div>
                     </div>

From 599d78a4234423407896957b693bcbf769474cb4 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 10 Dec 2025 11:59:18 +0000
Subject: [PATCH 2/4] Prevent popover closing when clicking combobox items

The Combobox options are rendered in their own portal, which triggers the Popover's "focus-outside" event.

We need to cancel the popover event when the user clicks a combobox option.
---
 resources/js/components/ui/Popover.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/js/components/ui/Popover.vue b/resources/js/components/ui/Popover.vue
index a42acc465f3..42dfe159427 100644
--- a/resources/js/components/ui/Popover.vue
+++ b/resources/js/components/ui/Popover.vue
@@ -47,6 +47,13 @@ function updateOpen(value) {
     emit('update:open', value);
     open.value = value;
 }
+
+function focusOutside(event) {
+	if (event.target.hasAttribute('data-ui-combobox-item')) {
+		event.stopPropagation();
+		event.preventDefault();
+	}
+}
 </script>
 
 <template>
@@ -61,6 +68,7 @@ function updateOpen(value) {
                 :align
                 :sideOffset="offset"
                 :side
+                @focus-outside="focusOutside"
             >
                 <slot v-bind="slotProps" />
                 <PopoverClose as-child>

From 9136c6122035a37f75ccb223801258cdbd09921e Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 10 Dec 2025 12:01:45 +0000
Subject: [PATCH 3/4] Avoid needing to "click" a ref to open relationship
 selector

---
 resources/js/components/fieldtypes/bard/LinkToolbar.vue     | 2 +-
 .../fieldtypes/relationship/RelationshipFieldtype.vue       | 2 +-
 .../js/components/inputs/relationship/RelationshipInput.vue | 6 +++++-
 resources/js/components/structures/PageSelector.vue         | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/fieldtypes/bard/LinkToolbar.vue b/resources/js/components/fieldtypes/bard/LinkToolbar.vue
index 7153fbda83f..a4d71521a99 100644
--- a/resources/js/components/fieldtypes/bard/LinkToolbar.vue
+++ b/resources/js/components/fieldtypes/bard/LinkToolbar.vue
@@ -413,7 +413,7 @@ export default {
         },
 
         openEntrySelector() {
-            this.$refs.relationshipInput.$refs.existing.click();
+            this.$refs.relationshipInput.openSelector();
         },
 
         openAssetSelector() {
diff --git a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
index 05ed36843c2..843eb55c4ac 100644
--- a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
+++ b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
@@ -160,7 +160,7 @@ export default {
         },
 
         linkExistingItem() {
-            this.$refs.input.$refs.existing.$el.click();
+            this.$refs.input.openSelector();
         },
 
         unlinkAll() {
diff --git a/resources/js/components/inputs/relationship/RelationshipInput.vue b/resources/js/components/inputs/relationship/RelationshipInput.vue
index ad097200862..167b03f4a7d 100644
--- a/resources/js/components/inputs/relationship/RelationshipInput.vue
+++ b/resources/js/components/inputs/relationship/RelationshipInput.vue
@@ -68,7 +68,7 @@
                         icon="link"
                         :size="buttonSize"
                         :text="linkLabel"
-                        @click.prevent="isSelecting = true"
+                        @click.prevent="openSelector"
                     />
                 </div>
             </div>
@@ -285,6 +285,10 @@ export default {
             this.update([...this.value.slice(0, index), ...this.value.slice(index + 1)]);
         },
 
+	    openSelector() {
+			this.isSelecting = true;
+	    },
+
         selectionsUpdated(selections) {
             this.getDataForSelections(selections).then(() => {
                 this.update(selections);
diff --git a/resources/js/components/structures/PageSelector.vue b/resources/js/components/structures/PageSelector.vue
index e80fa5036d9..89cafb7b6b7 100644
--- a/resources/js/components/structures/PageSelector.vue
+++ b/resources/js/components/structures/PageSelector.vue
@@ -86,7 +86,7 @@ export default {
 
     methods: {
         linkExistingItem() {
-            this.$refs.input.$refs.existing.$el.click();
+            this.$refs.input.openSelector();
         },
 
         itemDataUpdated(data) {

From 0ea501c2e9b2792d31d526cd2c7feec3aafbcab2 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 11 Dec 2025 10:29:04 +0000
Subject: [PATCH 4/4] Use a prop instead, like we did in v5

---
 .../js/components/fieldtypes/bard/LinkToolbarButton.vue    | 2 +-
 resources/js/components/ui/Popover.vue                     | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue b/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue
index a9c74a5683a..4b9e6026c45 100644
--- a/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue
+++ b/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue
@@ -1,5 +1,5 @@
 <template>
-    <Popover ref="popover" class="!size-min" :inset="true" v-model:open="showingToolbar">
+    <Popover ref="popover" class="!size-min" :inset="true" :close-on-outside-click="false" v-model:open="showingToolbar">
         <template #trigger>
             <Button
                 class="px-2!"
diff --git a/resources/js/components/ui/Popover.vue b/resources/js/components/ui/Popover.vue
index 42dfe159427..14361a4623d 100644
--- a/resources/js/components/ui/Popover.vue
+++ b/resources/js/components/ui/Popover.vue
@@ -16,6 +16,7 @@ const props = defineProps({
     offset: { type: Number, default: 5 },
     side: { type: String, default: 'bottom' },
     open: { type: Boolean, default: false },
+	closeOnOutsideClick: { type: Boolean, default: true },
 });
 
 const popoverContentClasses = cva({
@@ -48,8 +49,8 @@ function updateOpen(value) {
     open.value = value;
 }
 
-function focusOutside(event) {
-	if (event.target.hasAttribute('data-ui-combobox-item')) {
+function interactOutside(event) {
+	if (!props.closeOnOutsideClick) {
 		event.stopPropagation();
 		event.preventDefault();
 	}
@@ -68,7 +69,7 @@ function focusOutside(event) {
                 :align
                 :sideOffset="offset"
                 :side
-                @focus-outside="focusOutside"
+                @interact-outside="interactOutside"
             >
                 <slot v-bind="slotProps" />
                 <PopoverClose as-child>