From e75bf41538f74b49445930ab2cb3d75d43f4b8b9 Mon Sep 17 00:00:00 2001
From: Shamim Rezaie <shamim@moodle.com>
Date: Sun, 16 Jun 2019 19:46:04 +1000
Subject: [PATCH] MDL-63198 forms: click on scrollbar should not close the
 suggestions box

---
 lib/amd/build/form-autocomplete.min.js        | Bin 11153 -> 11222 bytes
 lib/amd/build/form-autocomplete.min.js.map    | Bin 74986 -> 75363 bytes
 lib/amd/src/form-autocomplete.js              |   7 +++++--
 .../form_autocomplete_suggestions.mustache    |   2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/amd/build/form-autocomplete.min.js b/lib/amd/build/form-autocomplete.min.js
index c6a2fc1fc6a713f0b05e8ed981a99b5affa6f00d..549a653ebc18445dff6d160bfa8d5c41b6b360c9 100644
GIT binary patch
delta 61
zcmbOjel2_hrwmhO@#KRXl9Pl5<ut3)_0sZ_ON%u$Yg2QIQx!7PG!)bHGK)3RHPzH6
RAK;Lhyib68v$0GZKLCW06W#y-

delta 54
zcmcZ>J~4a)r;KJ|NlB50Qf7*hrlM`S9)hQ)mZ+hmtfZZ+mzh^kTH=|qxm+fm9{}CN
B5Xt}m

diff --git a/lib/amd/build/form-autocomplete.min.js.map b/lib/amd/build/form-autocomplete.min.js.map
index c37d9a4743c41cc2baa58028aaa5ede8f5ea838d..db0aeafd1eb9af9a0ef8cd558119b14a439bea7d 100644
GIT binary patch
delta 1574
zcmZ`(O>7%Q6xKw65JXZ?lFAB1*)+i<@uvPw;;2aJ?Ci!~J0XdG;{3J2UjJ?F*p7da
z*a)b^fm@Myf~pswAW_m2m65oW9=L!i#F0aLN+l$!h;jmn3p39}Nd>(;?aX}hz3+W*
z-v0JO`{CX8uRrf-Gb_zcJC0_h1uFX})m52Mx+VhCWR22<_{=D~IxL@=FtdtS21MA_
zcw}~UPApm%OjQnw8yaPPzB{MNI@K0=pt=CD96QFIBrhXJi(3^*a}0=Uwx6OH2V0jH
zD9s{hPekT!4*Lhl;JzXNdy0=M-&aJ+Iz~6&*Qf`!^zojkNJ*)PDAG3>06H*1T=1iQ
zh9sIt`pvd}(=TezW4ekeFH%|+42<qJZ_R)7Om7V<KFMMiEU&}IA-T7P#UUam>|x0&
zgA(h7JIgP_vr8kVrVwxmt+OdJ;0^ymD)3UoPV7J<mXQpeFA9l1IZSD|fj&k4)vQ&O
z8oV8`wlx@Z2j}2n#M<ZZiBoKjR}gDXWzr8<vbN{B0O15vZLkqNM;dT7>h7r{JcANi
zIoxnRIzSBgJL<JWgue@dkTE$*>5}-&DQgg186ne9TAA&up(HF4^Z77eU~>$PRys$#
zA|p+S;Cl*L6#8QlCp#AlksY`a8*7`HgG;etxED)zIna5u!M6*Gs|#Iw$f%391gGI(
z^>(M-rPKth2Bo#r7SFLo2H#{^hOf5@pR8F<Rgh_4Kr~v?A+TwKM{6Gt6E3e?xg$5$
zXC`(%ExNi#*;hsV+k!l&*qN7!2Y~I+WK-e&s6yAqsJDjh*)e*UQ#^k<i85Sj4hwK&
z^k{X&OyYoq%dowXAT{`T<1}%?uNy<84xO8Wq|qGPyhi$4*w)ip6_h+ZugA$6aPPv_
zgiA*WA#vhSc$NGNCGg?WsOB>nAFnxKmbSbP*^6)WdV*pIu~SjG#^u))C;WLaM5Z9H
zHA3=G-1@#R6Odz+#ssS-+c?N%*#P+8{Hw=<FQug?F3x@SW;p&k;i{Q2PG+EB#JlR)
zotPL^o$E9l9XYhzfZNGIa3%f!K}c{T`C|7rqFV1HI}b&}0{8zH97?@LiqJ?o=(L{~
zsEWtQR2&W)=EmX3D2)?;jw!`~t7&w9@3D<#c$gaQt^|ZBX;IIP;)Yk!mf#axc(JVD
z%$LwRLtxnxAnY!JG+LM!=V1ixz`N;TQfPjWzR*Udo5Xyl0hbRYBE!zzzVUb=DV0;1
zxLJ_WMWa@c%(PU^rlg8dF6Q%zcv&(ll94x!99(~|5AGba!?%au@ZT~xKa@cFvKwwa
z=)d|?J9z;fefOM8vfHJlaxoE4<m*r2NhQxpq2rA3$3ZWA_EpELJn`rdYS8kj?Np(9
f)~t-0g;K5hcs(Xrt#G|G1aG|G*}VDS{P}+Xjy>LE

delta 1440
zcmZuxUuc_E6z7&o)!KH_tkjLtFD~@Y^7T*t^$#-JdvCsc`I41s(j-gUwPsD4rcKiP
z`C^jFwg<rnA4GZ(@lAYC@MTI62Ey1tQ9;HY_auWkk*fIMgChR>&dFd^_j0)Rp5OVM
z-#Pc(d++Pc!>>9&datYXLD%7eGt5<;bHlGn&XZ{5Y)~~gzliHyfy=x=h+7<-J`rhe
zEtf~A8s}BNPf$?XSl%To#&U=0AScvw52z?XO{}O(obLqC+e9lXt#^Y%OsNP2l!b1k
zs)(Squ99t7=NfN{gJnDXWjx*=#YoQ4l3Lvp0=r{^O@khKmaVjQLLYXV$Ochxo>Er*
zD8WP)$<5Z}(p!(&s-gd~%oEE&cOO_8Y*hpO1fptWx+3B3q7BYOPQt4%IQqN<*r7_D
zVirD$-eF~UV|j|r!}aAshZ76n=g{bCl=Emq;(8ek%GOL#h2NJ)SOe^_f~~2egE~Hk
zoSI8`U@<WON^Ssd#hzeua3}Vh1-8XK{dEFoDR-OP1uO9(mV!onjz!?(_y9}5mvIO4
z!B6o8Ta{8%F+{Gn$vr(YBr=1k^>$bk-cBf1*tJB2?LqhX@s8O5+zJfB--&KWp5N+i
zQcJ0L-3-H(<nz#-?Cq%$lYvbS`(Pw_{esUeYKYzQh?0Mo6cmmqc0X*#riGH*5@U@D
zF}H6wM!M9p;JhZv<e(;Mya;^dQ<jB4SFnGM)%l5%x1Fu(6%9WQSOIhIiYYlG@%HH=
zG&N^&MJw?7>R4Zu#7vR(%6+)Gda}1pJD-Mvq9r(7y*OyW5}YSciiR^6!a~FGeMqm_
zSsh+m8)l8x`)ltoYqPjMXvs;gZ%j-Zlq!N@UO`DD*#J(Vre~$~ssc!*z4$WRUw_5s
z4y)k@0~b?kmdvKu2XiCByzs?_gYCeN8=oC_8V|*&P79QiQwDtg(r^848i{t_QkYer
zZ{1G)jH+&Io@TS~!)B_dPM4IxS8FujYDR%(`dC+vI=cz?H;3VBI`{~bBXg{4mrxma
zGd&EqpB{ix#{EB}&I<5rW}5r(`|vMWGNhkoe~uE<>}N%Tp8htqdPdL}z-MV!$C;2W
zS%U4YQ&-9%?8p`tQx+}?s^E_!xrb&D$A-&)p^k!zH1Cf9Q7|!SJbxBR=tq%zXVnzv
zaXhGthzd_;kF$JB$zJGSuGZz;<$b2YANLfvd7~f7-(Cx(OtUgJnoEz4EA}%=u2`y>
zT0T?A6wS#au8|SNF*bT?RB<X*Gi7Eb323CpC-a$N*4zfyrDwqS{wcWo&CtQ6&Q|HW
HUl#rWORKa1

diff --git a/lib/amd/src/form-autocomplete.js b/lib/amd/src/form-autocomplete.js
index 9e412a343c2..b91dd0ba169 100644
--- a/lib/amd/src/form-autocomplete.js
+++ b/lib/amd/src/form-autocomplete.js
@@ -719,10 +719,13 @@ function($, log, str, templates, notification, LoadingIcon) {
                 // Get the current element with focus.
                 var focusElement = $(document.activeElement);
 
-                // Only close the menu if the input hasn't regained focus, and if the element still exists.
+                // Only close the menu if the input hasn't regained focus and if the element still exists,
+                // and regain focus if the scrollbar is clicked.
                 // Due to the half a second delay, it is possible that the input element no longer exist
                 // by the time this code is being executed.
-                if (focusElement.attr('id') != inputElement.attr('id') && $('#' + state.inputId).length) {
+                if (focusElement.is(document.getElementById(state.suggestionsId))) {
+                    inputElement.focus(); // Probably the scrollbar is clicked. Regain focus.
+                } else if (!focusElement.is(inputElement) && $(document.getElementById(state.inputId)).length) {
                     if (options.tags) {
                         pendingPromise.then(function() {
                             return createItem(options, state, originalSelect);
diff --git a/lib/templates/form_autocomplete_suggestions.mustache b/lib/templates/form_autocomplete_suggestions.mustache
index 83866adb742..a7cc56a4fd4 100644
--- a/lib/templates/form_autocomplete_suggestions.mustache
+++ b/lib/templates/form_autocomplete_suggestions.mustache
@@ -35,7 +35,7 @@
         { "label": "Another item label with <strong>tags</strong>", "value": "4" }
     ]}
 }}
-<ul class="form-autocomplete-suggestions" id="{{suggestionsId}}" role="listbox" aria-hidden="true">
+<ul class="form-autocomplete-suggestions" id="{{suggestionsId}}" role="listbox" aria-hidden="true" tabindex="-1">
     {{#options}}
         <li role="option" data-value="{{value}}">{{{label}}}</li>
     {{/options}}
-- 
2.17.1