[4.x] Popovers now stop click propagation (#7844)

Popovers now stop click propagation. Fixes #7840.
statamic · Apr 5, 2023 · fd0900f · fd0900f
1 parent c13fbc1
commit fd0900f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/resources/js/components/Popover.vue b/resources/js/components/Popover.vue
@@ -1,6 +1,7 @@
 <template>
     <div :class="{'popover-open': isOpen}" @mouseleave="leave">
-        <div @click="toggle" ref="trigger" aria-haspopup="true" :aria-expanded="isOpen" v-if="$scopedSlots.default">
+
+        <div @click.stop="toggle" ref="trigger" aria-haspopup="true" :aria-expanded="isOpen" v-if="$scopedSlots.default">
             <slot name="trigger"></slot>
         </div>
 

diff --git a/resources/js/components/assets/Browser/Browser.vue b/resources/js/components/assets/Browser/Browser.vue
@@ -213,9 +213,16 @@
                                          </dropdown-list>
                                     </div>
                                     <!-- Assets -->
-                                    <button class="asset-tile outline-none group relative" v-for="(asset, index) in assets" :key="asset.id" :class="{ 'selected': isSelected(asset.id) }">
+                                    <button
+                                        class="asset-tile outline-none group relative"
+                                        v-for="(asset, index) in assets"
+                                        :key="asset.id"
+                                        :class="{ 'selected': isSelected(asset.id) }"
+                                        @click="toggleSelection(asset.id, index, $event)"
+                                        @dblclick="$emit('edit-asset', asset)"
+                                    >
                                         <div class="asset-thumb-container">
-                                            <div class="asset-thumb" @click="toggleSelection(asset.id, index, $event)" @dblclick="$emit('edit-asset', asset)">
+                                            <div class="asset-thumb">
                                                 <img v-if="asset.is_image" :src="asset.thumbnail" loading="lazy" :class="{'p-4 h-full w-full': asset.extension === 'svg'}" />
                                                 <file-icon
                                                     v-else