Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 29 insertions, 26 deletions

diff --git a/app/assets/javascripts/content_editor/components/toolbar_link_button.vue b/app/assets/javascripts/content_editor/components/toolbar_link_button.vue
index ff525e52873..4fb1e8ce16f 100644
--- a/app/assets/javascripts/content_editor/components/toolbar_link_button.vue
+++ b/app/assets/javascripts/content_editor/components/toolbar_link_button.vue
@@ -89,31 +89,34 @@ export default {
 </script>
 <template>
   <editor-state-observer @transaction="updateLinkState">
-    <gl-dropdown
-      v-gl-tooltip
-      :aria-label="__('Insert link')"
-      :title="__('Insert link')"
-      :toggle-class="{ active: isActive }"
-      size="small"
-      category="tertiary"
-      icon="link"
-      @show="selectLink()"
-    >
-      <gl-dropdown-form class="gl-px-3!">
-        <gl-form-input-group v-model="linkHref" :placeholder="__('Link URL')">
-          <template #append>
-            <gl-button variant="confirm" @click="updateLink">{{ __('Apply') }}</gl-button>
-          </template>
-        </gl-form-input-group>
-      </gl-dropdown-form>
-      <gl-dropdown-divider />
-      <gl-dropdown-item v-if="isActive" @click="removeLink">
-        {{ __('Remove link') }}
-      </gl-dropdown-item>
-      <gl-dropdown-item v-else @click="openFileUpload">
-        {{ __('Upload file') }}
-      </gl-dropdown-item>
-
+    <span class="gl-display-inline-flex">
+      <gl-dropdown
+        v-gl-tooltip
+        :title="__('Insert link')"
+        :text="__('Insert link')"
+        :toggle-class="{ active: isActive }"
+        size="small"
+        category="tertiary"
+        icon="link"
+        text-sr-only
+        lazy
+        @show="selectLink()"
+      >
+        <gl-dropdown-form class="gl-px-3!">
+          <gl-form-input-group v-model="linkHref" :placeholder="__('Link URL')">
+            <template #append>
+              <gl-button variant="confirm" @click="updateLink">{{ __('Apply') }}</gl-button>
+            </template>
+          </gl-form-input-group>
+        </gl-dropdown-form>
+        <gl-dropdown-divider />
+        <gl-dropdown-item v-if="isActive" @click="removeLink">
+          {{ __('Remove link') }}
+        </gl-dropdown-item>
+        <gl-dropdown-item v-else @click="openFileUpload">
+          {{ __('Upload file') }}
+        </gl-dropdown-item>
+      </gl-dropdown>
       <input
         ref="fileSelector"
         type="file"
@@ -121,6 +124,6 @@ export default {
         class="gl-display-none"
         @change="onFileSelect"
       />
-    </gl-dropdown>
+    </span>
   </editor-state-observer>
 </template>