From 35bd8622f735373d186abbcf71d496418bfa7064 Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Wed, 28 Oct 2020 15:11:57 +0100
Subject: [PATCH] MDL-69878 core_message: always show message drawer close icon

---
 message/amd/build/message_drawer.min.js       | Bin 4798 -> 4838 bytes
 message/amd/build/message_drawer.min.js.map   | Bin 23567 -> 23850 bytes
 message/amd/src/message_drawer.js             |   6 +++++-
 message/templates/message_drawer.mustache     |   4 ++--
 ...ssage_drawer_view_contacts_header.mustache |   2 +-
 ...e_drawer_view_conversation_header.mustache |   2 +-
 ...ssage_drawer_view_overview_header.mustache |   2 +-
 ...message_drawer_view_search_header.mustache |   2 +-
 ...ssage_drawer_view_settings_header.mustache |   2 +-
 theme/boost/scss/moodle/drawer.scss           |   8 --------
 theme/boost/style/moodle.css                  |   5 -----
 theme/classic/style/moodle.css                |   5 -----
 12 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/message/amd/build/message_drawer.min.js b/message/amd/build/message_drawer.min.js
index bcb430f8a01977feef7872f9a525674dec4d4b6c..e5ea5a0c5c2447a4d83c476c0a0f98a152f29f14 100644
GIT binary patch
delta 54
zcmdm|`b>4h0bbEmy|m1{6paEsXCMDy*LbJUkPv^r&98W^nI`Yz<zjOQatwD3nw-X`
KyIECWCKCV?WD)rQ

delta 60
zcmaE+x=(e(0bZ>{jRHLnS4S7upm=A0zYs@HKi42ly|m1{6b+@!yn@matFp}E%%q%D
QrOj7)t(i9a3e02z0DU+Vp#T5?

diff --git a/message/amd/build/message_drawer.min.js.map b/message/amd/build/message_drawer.min.js.map
index fad71131eaada256868441b66873d897800c29c5..4c16845b5d146f8a93eac75812967838ee4bff26 100644
GIT binary patch
delta 131
zcmeC*!MJJ{<Ayp}rVQ7~54aR3b1C!iWjX0MJ32e+xH~#}=DKb^BRh+g9n2|ro_tVF
zX7X%dlgW(o{>&~J?vpc=joJKMbX*++H!oD)$jqJ<<N?%dv^i2;gNZ34Y;&{be3i+Y
if^{}0_#I`PobJy*d5V+D<Uap|$qt?@n^i+zu>%0yR4YjU

delta 133
zcmZ3ri?M$P<Ayp}rabq_6NN=5i^|DM=%hM2<~i#)J33}L0ZC^^9d}1ZPcxUzyJcsw
zG8wu|{-<or;pU>_>gefMGTB>IWpk`bH#56=pa)QO>E`$98ca;4p_?VO=BrHh^;hOo
l&&(?*EwL)gEY3{INu4YhAiDXD-(J?q^?~f0-9sO<0|4LoD`x-z

diff --git a/message/amd/src/message_drawer.js b/message/amd/src/message_drawer.js
index c36f8b03a9b..03a4866cc19 100644
--- a/message/amd/src/message_drawer.js
+++ b/message/amd/src/message_drawer.js
@@ -254,7 +254,7 @@ function(
         });
 
         $(SELECTORS.JUMPTO).focus(function() {
-            var firstInput = $(SELECTORS.HEADER_CONTAINER).find('input:visible');
+            var firstInput = root.find(SELECTORS.CLOSE_BUTTON);
             if (firstInput.length) {
                 firstInput.focus();
             } else {
@@ -298,6 +298,10 @@ function(
 
         var closebutton = root.find(SELECTORS.CLOSE_BUTTON);
         closebutton.on(CustomEvents.events.activate, function() {
+            var button = $(SELECTORS.DRAWER).attr('data-origin');
+            if (button) {
+                $('#' + button).focus();
+            }
             PubSub.publish(Events.TOGGLE_VISIBILITY);
         });
 
diff --git a/message/templates/message_drawer.mustache b/message/templates/message_drawer.mustache
index 215cf15d922..c29d841aa78 100644
--- a/message/templates/message_drawer.mustache
+++ b/message/templates/message_drawer.mustache
@@ -36,8 +36,8 @@
 {{< core/drawer}}
     {{$drawercontent}}
         <div id="message-drawer-{{uniqid}}" class="message-app" data-region="message-drawer" role="region">
-            <div class="closewidget bg-light border-bottom text-right">
-                <a class="text-dark" data-action="closedrawer" href="#">
+            <div class="closewidget text-right pr-2">
+                <a class="text-dark btn-link" data-action="closedrawer" href="#">
                      {{#pix}} i/window_close, core, {{#str}} closebuttontitle {{/str}} {{/pix}}
                 </a>
             </div>
diff --git a/message/templates/message_drawer_view_contacts_header.mustache b/message/templates/message_drawer_view_contacts_header.mustache
index cef660d585e..ff09a4b124f 100644
--- a/message/templates/message_drawer_view_contacts_header.mustache
+++ b/message/templates/message_drawer_view_contacts_header.mustache
@@ -34,7 +34,7 @@
     {}
 
 }}
-<div class="hidden border-bottom px-2 py-3" aria-hidden="true" data-region="view-contacts">
+<div class="hidden border-bottom p-1 px-sm-2" aria-hidden="true" data-region="view-contacts">
     <div class="d-flex align-items-center">
         {{#isdrawer}}
         <div class="align-self-stretch">
diff --git a/message/templates/message_drawer_view_conversation_header.mustache b/message/templates/message_drawer_view_conversation_header.mustache
index 8a2d00173f0..4b38ef3b816 100644
--- a/message/templates/message_drawer_view_conversation_header.mustache
+++ b/message/templates/message_drawer_view_conversation_header.mustache
@@ -35,7 +35,7 @@
 }}
 
 <div
-    class="hidden bg-white position-relative border-bottom p-1 p-sm-2"
+    class="hidden bg-white position-relative border-bottom p-1 px-sm-2"
     aria-hidden="true"
     data-region="view-conversation"
 >
diff --git a/message/templates/message_drawer_view_overview_header.mustache b/message/templates/message_drawer_view_overview_header.mustache
index 07c801c34d3..b633815480d 100644
--- a/message/templates/message_drawer_view_overview_header.mustache
+++ b/message/templates/message_drawer_view_overview_header.mustache
@@ -33,7 +33,7 @@
     {}
 
 }}
-<div class="border-bottom  p-1 px-sm-2 py-sm-3" aria-hidden="false" {{^isdrawer}}data-in-panel="true"{{/isdrawer}} data-region="view-overview">
+<div class="border-bottom p-1 px-sm-2" aria-hidden="false" {{^isdrawer}}data-in-panel="true"{{/isdrawer}} data-region="view-overview">
     <div class="d-flex align-items-center">
         <div class="input-group simplesearchform">
             <input
diff --git a/message/templates/message_drawer_view_search_header.mustache b/message/templates/message_drawer_view_search_header.mustache
index 296110b34f1..8a270f88050 100644
--- a/message/templates/message_drawer_view_search_header.mustache
+++ b/message/templates/message_drawer_view_search_header.mustache
@@ -34,7 +34,7 @@
 
 }}
 
-<div class="hidden border-bottom px-2 py-3 view-search" {{^isdrawer}}data-in-panel="true"{{/isdrawer}} aria-hidden="true" data-region="view-search">
+<div class="hidden border-bottom p-1 px-sm-2 view-search" {{^isdrawer}}data-in-panel="true"{{/isdrawer}} aria-hidden="true" data-region="view-search">
     <div class="d-flex align-items-center">
         <a
             class="mr-2 align-self-stretch d-flex align-items-center"
diff --git a/message/templates/message_drawer_view_settings_header.mustache b/message/templates/message_drawer_view_settings_header.mustache
index a9f717e36f6..60f1eb4e8c6 100644
--- a/message/templates/message_drawer_view_settings_header.mustache
+++ b/message/templates/message_drawer_view_settings_header.mustache
@@ -34,7 +34,7 @@
 
 }}
 
-<div class="hidden border-bottom px-2 py-3" aria-hidden="true" data-region="view-settings">
+<div class="hidden border-bottom p-1 px-sm-2 pb-sm-3" aria-hidden="true" data-region="view-settings">
     <div class="d-flex align-items-center">
         {{#isdrawer}}
         <div class="align-self-stretch" >
diff --git a/theme/boost/scss/moodle/drawer.scss b/theme/boost/scss/moodle/drawer.scss
index d20a0494cd9..de68d0002d5 100644
--- a/theme/boost/scss/moodle/drawer.scss
+++ b/theme/boost/scss/moodle/drawer.scss
@@ -124,10 +124,6 @@ $right-drawer-width: 320px;
         opacity: 1;
     }
 
-    .closewidget {
-        display: none;
-    }
-
     &.hidden {
         display: block;
         right: $right-drawer-width * -1;
@@ -147,10 +143,6 @@ $right-drawer-width: 320px;
             height: 100%;
             z-index: $zindex-fixed;
         }
-        .closewidget {
-            display: block;
-            padding: 0 0.2rem;
-        }
     }
     body.drawer-open-left,
     body.drawer-open-right {
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 59f212a7711..bc4391e427d 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -14170,8 +14170,6 @@ body.drawer-ease {
     padding: 0;
     visibility: visible;
     opacity: 1; }
-  [data-region=right-hand-drawer] .closewidget {
-    display: none; }
   [data-region=right-hand-drawer].hidden {
     display: block;
     right: -320px;
@@ -14187,9 +14185,6 @@ body.drawer-ease {
     top: 0;
     height: 100%;
     z-index: 1030; }
-  [data-region=right-hand-drawer] .closewidget {
-    display: block;
-    padding: 0 0.2rem; }
   body.drawer-open-left,
   body.drawer-open-right {
     overflow: hidden; } }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index cf7cc900ff4..c470b5816fa 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -14385,8 +14385,6 @@ body.drawer-ease {
     padding: 0;
     visibility: visible;
     opacity: 1; }
-  [data-region=right-hand-drawer] .closewidget {
-    display: none; }
   [data-region=right-hand-drawer].hidden {
     display: block;
     right: -320px;
@@ -14402,9 +14400,6 @@ body.drawer-ease {
     top: 0;
     height: 100%;
     z-index: 1030; }
-  [data-region=right-hand-drawer] .closewidget {
-    display: block;
-    padding: 0 0.2rem; }
   body.drawer-open-left,
   body.drawer-open-right {
     overflow: hidden; } }
-- 
2.17.1