Merge branch '31492-banners-should-only-be-dismissable-by-clicking-x' into 'master'

Banners should only be dismissable by clicking x button

See merge request gitlab-org/gitlab!17642

app/assets/javascripts/flash.js

@@ -40,13 +40,17 @@ const createFlashEl = (message, type) => `
   <div class="flash-content flash-${type} rounded">
     <div class="flash-text">
       ${_.escape(message)}
-      ${spriteIcon('close', 'close-icon')}
+      <div class="close-icon-wrapper js-close-icon">
+        ${spriteIcon('close', 'close-icon')}
+      </div>
     </div>
   </div>
 `;
 
 const removeFlashClickListener = (flashEl, fadeTransition) => {
-  flashEl.addEventListener('click', () => hideFlash(flashEl, fadeTransition));
+  flashEl
+    .querySelector('.js-close-icon')
+    .addEventListener('click', () => hideFlash(flashEl, fadeTransition));
 };
 
 /*
@@ -78,7 +82,6 @@ const createFlash = function createFlash(
   flashContainer.innerHTML = createFlashEl(message, type);
 
   const flashEl = flashContainer.querySelector(`.flash-${type}`);
-  removeFlashClickListener(flashEl, fadeTransition);
 
   if (actionConfig) {
     flashEl.innerHTML += createAction(actionConfig);
@@ -90,6 +93,8 @@ const createFlash = function createFlash(
     }
   }
 
+  removeFlashClickListener(flashEl, fadeTransition);
+
   flashContainer.style.display = 'block';
 
   if (addBodyClass) document.body.classList.add('flash-shown');

app/assets/stylesheets/framework/flash.scss

 $notification-box-shadow-color: rgba(0, 0, 0, 0.25);
 
 .flash-container {
-  cursor: pointer;
   margin: 0;
   margin-bottom: $gl-padding;
   font-size: 14px;
@@ -19,12 +18,17 @@ $notification-box-shadow-color: rgba(0, 0, 0, 0.25);
     }
   }
 
-  .close-icon {
-    width: 16px;
-    height: 16px;
+  .close-icon-wrapper {
+    padding: ($gl-btn-padding + $gl-padding-4) $gl-padding $gl-btn-padding;
     position: absolute;
-    right: $gl-padding;
-    top: $gl-padding;
+    right: 0;
+    top: 0;
+    cursor: pointer;
+
+    .close-icon {
+      width: 16px;
+      height: 16px;
+    }
   }
 
   .flash-notice,

app/views/layouts/_flash.html.haml

@@ -5,4 +5,5 @@
     - if value
       %div{ class: "flash-content flash-#{key} rounded" }
         %span= value
-        = sprite_icon('close', size: 16, css_class: 'close-icon')
+        %div{ class: "close-icon-wrapper js-close-icon" }
+          = sprite_icon('close', size: 16, css_class: 'close-icon')

changelogs/unreleased/31492-banners-should-only-be-dismissable-by-clicking-x.yml

+---
+title: Banners should only be dismissable by clicking x button
+merge_request: 17642
+author:
+type: changed

spec/javascripts/flash_spec.js

@@ -176,7 +176,7 @@ describe('Flash', () => {
       it('removes element after clicking', () => {
         flash('test', 'alert', document, null, false, true);
 
-        document.querySelector('.flash-alert').click();
+        document.querySelector('.flash-alert .js-close-icon').click();
 
         expect(document.querySelector('.flash-alert')).toBeNull();
 
@@ -210,7 +210,13 @@ describe('Flash', () => {
 
   describe('removeFlashClickListener', () => {
     beforeEach(() => {
-      document.body.innerHTML += '<div class="flash-container"><div class="flash"></div></div>';
+      document.body.innerHTML += `
+        <div class="flash-container">
+          <div class="flash">
+            <div class="close-icon js-close-icon"></div>
+          </div>
+        </div>
+      `;
     });
 
     it('removes global flash on click', done => {
@@ -218,7 +224,7 @@ describe('Flash', () => {
 
       removeFlashClickListener(flashEl, false);
 
-      flashEl.click();
+      flashEl.querySelector('.js-close-icon').click();
 
       setTimeout(() => {
         expect(document.querySelector('.flash')).toBeNull();