Skip to content

Commit a8cd8c2

Browse files
authored
[6.x] Fix nested Bard toolbar focus issues (#14396)
1 parent 280eda0 commit a8cd8c2

5 files changed

Lines changed: 9 additions & 6 deletions

File tree

resources/js/components/fieldtypes/bard/BardButtonsSettingFieldtype.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
:key="button.name"
77
v-tooltip="button.text"
88
:class="{ active: enabled(button.name) }"
9+
@mousedown.prevent
910
@click="toggleButton(button.name)"
1011
>
1112
<ui-icon :name="button.svg" v-if="button.svg" />

resources/js/components/fieldtypes/bard/Image.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<div
1515
class="flex flex-wrap items-center justify-center gap-2 border-t px-2 py-2 text-center text-2xs text-white @container/toolbar dark:border-gray-900 dark:text-gray-300"
1616
>
17-
<Button v-if="!src" size="sm" icon="folder-photos" :text="__('Choose Image')" @click="openSelector" />
17+
<Button v-if="!src" size="sm" icon="folder-photos" :text="__('Choose Image')" @mousedown.prevent @click="openSelector" />
1818

19-
<Button v-if="src" size="sm" icon="edit" :text="__('Edit Image')" @click="edit" />
20-
<Button v-if="src" size="sm" icon="rename" :text="__('Override Alt')" :class="{ active: showingAltEdit }" @click="toggleAltEditor" />
21-
<Button v-if="src" size="sm" icon="replace" :text="__('Replace')" @click="openSelector" />
22-
<Button v-if="src" size="sm" icon="trash" :text="__('Remove')" @click="deleteNode" />
19+
<Button v-if="src" size="sm" icon="edit" :text="__('Edit Image')" @mousedown.prevent @click="edit" />
20+
<Button v-if="src" size="sm" icon="rename" :text="__('Override Alt')" :class="{ active: showingAltEdit }" @mousedown.prevent @click="toggleAltEditor" />
21+
<Button v-if="src" size="sm" icon="replace" :text="__('Replace')" @mousedown.prevent @click="openSelector" />
22+
<Button v-if="src" size="sm" icon="trash" :text="__('Remove')" @mousedown.prevent @click="deleteNode" />
2323
</div>
2424

2525
<div

resources/js/components/fieldtypes/bard/LinkToolbarButton.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
size="sm"
1515
:aria-label="button.text"
1616
v-tooltip="button.text"
17+
@mousedown.prevent
1718
>
1819
<ui-icon :name="button.svg" v-if="button.svg" class="size-4" />
1920
<div class="flex items-center" v-html="button.html" v-if="button.html" />

resources/js/components/fieldtypes/bard/Set.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
<Dropdown>
5353
<template #trigger>
54-
<Button icon="dots" variant="ghost" size="xs" :aria-label="__('Open dropdown menu')" />
54+
<Button icon="dots" variant="ghost" size="xs" :aria-label="__('Open dropdown menu')" @mousedown.prevent />
5555
</template>
5656
<DropdownMenu>
5757
<DropdownItem

resources/js/components/fieldtypes/bard/ToolbarButton.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
size="sm"
77
:aria-label="button.text"
88
v-tooltip="button.text"
9+
@mousedown.prevent
910
@click="button.command(editor, button.args)"
1011
>
1112
<ui-icon :name="button.svg" v-if="button.svg" class="size-3.5! " :class="{ 'group-hover:text-white text-yellow-300!': active && variant === 'floating' }" />

0 commit comments

Comments
 (0)