From 3a8eeedf6aa778c4a24e8d164a3c6f426f58e82a Mon Sep 17 00:00:00 2001 From: Mathew May Date: Wed, 12 Apr 2023 11:24:23 +0800 Subject: [PATCH] MDL-75274 theme_boost: Aria so dropdowns with search focus better --- theme/boost/amd/build/aria.min.js | Bin 8819 -> 8956 bytes theme/boost/amd/build/aria.min.js.map | Bin 24998 -> 25311 bytes theme/boost/amd/src/aria.js | 8 +++++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/theme/boost/amd/build/aria.min.js b/theme/boost/amd/build/aria.min.js index 0343554206ca139bf980916e4704c07dc6036373..7b83af0d3e15359093248a7919e5fe8fffe77caa 100644 GIT binary patch delta 142 zcmezD^2c?>)h15QZ+S=$rCtCxDYav{aG}GQxZ!ObrX|I zGV}9nm5Ngni;^=Y-)A}F0N1akR-BQUR^pbQTw1IF7uD2B%P-AK@dX;}S(2Korj}Ql QlVfXZ3sRmutpu|e$Eu>^?)8w4A~21F6!oEfLKONfL7Uf8}fXU^k0-}&Z# z^hMyiF9T2CZPAIA*7N1eLD|a}D`magQo7JdpZdzr!S1Vfmey0{)ZJ9Nyj94LFW=hB zq;}Jr%ePkU^yr)CuO0u=@<*V-$+OmL7oI!ld22bZ;qq(x$JSS`bar*sU3ZR;k9X!P z+3fMN*50@4=Z|lBKb))LrbH0~NC*WgIU~Y=;EE_MOp0lM>5$lx09#U&Bw!XDvy~)c zP}5`#VOOL9(rCWLpagf@F%DC}rcsZLBEkc;DMbPxxh8xH5hr`{A#`H4tr~QE+QLO^ zJ0Qgd#d>7U$0!m`^-DTbaS(+IxFKha=O+IyxFd4PtWzv+Oe!i0p(wewSb=|3+z}ao zKFJxabB?$z*`P`mITJLLmmv|MeDS1e$~ckb6F4TJq3Sdx1irYB0Hes;M^2LQ3ePnd zWvme+cO=)u4uONGV0&JQLo&(Zqz;AK13CRDeB+H|9X;Qtl7P|1ZGwQKteM?}{y5xQ zJ(8SqMj+rOE|_|$MhfN!38|)P7zNSu98p$f4QawUIR7}v+OfAS+wg3Mk`b{rz}T( z#%4h7*@U*G1I;DKlDVssmZ~hS&K|kCU}6mMhapP@;6B7ZlL~kzB7>3 z?UCNO9W><3qB*UII5?mlHn^(I*bc%yT+B;qB7NBJ8s*8<%iE(?hcd?>M6Lv?wZ1F1 zb1GrC>?+Au}W|^Om{x_LI{Ncydp8l9MTiuG7~q(ZQZ)h)RP}uIpV5v$ zg^x_oktmDCzQg!uiVk5h9h7t-G${)|kSVzhHVcL>E_PrOoHbP}(6v$^xNFx7DJkaF znrXi$O7sL%H7>By4(hKK`y*6MooQPRrx4?dX-~5F(p8pKgmBQ`kfNVjy?)=0ddw2p zMjUR+vZBMWo39^OzZHl3v&K>e(F04*dDdpwk$w6}?C#Y~wt%!aq)T!HAMu42BWs-8 zQ2N{0?8TFPYBvtxo*s+uT(kjC1ovMA{4L&p;htk-Ow(NV>ET55vPJpCoh5Htf0*b9 z9OzFIH*S*zvo`ScHZy7^`fsKDo_O#)RR(GohqRjSEkPCc&_c zsBto1;Uq`fB^j!#t|EFsR2@@6=!&eu2D)tDU#!#VDPsI13HjJLLBuEIxE?DE--LS72X% tzq-`MFE&JwAp|vyrQ?}*T3_m-%sjvsTE<|~3xotU$?~$8*YBme{{jR?>VyCQ delta 2348 zcmcImOK)3M5SCF9^pQ5GNeNAh0upJJ98^2b6IF#dbFZBnH;Hd;=UzKa(md_>nZ$7u zTS9>a?7HEstL|7AWx)>sRtTv(mPkk}kSccUSTJ*r-PlryU_lnKeD0ZN>WQ0r6zE}qvK&(;@ z5d|l+E9vCWa_J5(n4pFfSqZqM6M4c0oT(p43a?m*6ogrMU)SiU6ou%7oYv=5)tQng zHmP7)GAOU4bIz7!Oe6>wwty3|bY5~}Qxd2Y*f9n^ze?r672^mniFC4z4a?`A=i_a+ z*3GS5LfeoTQIHVDQ~9aWjWY35li*;Iqf(a6V-r?z3hG(>-4FZ|;#`-{84Bj9XRe#k zPd)W(e5mJ8au=Hd0dtg&8=O=FZvXqb6=&kqRtQ2~merEmf7I-*VgdRT(hi4)v~eKC zELEg)yiff7bJzC2>$*Z+r+DPPZv9|`b0THt-Yb%caQI(TPrzy8A)$|5=Anq@+~cU( zJso9+HqiaqFJg#hA!Cqno*wxZ^!FR zR4SCXw$S=wAa=x&WOs0tp+Ly==CDRFlF{QWps1j3n`m5R7myLjbx@UI^)xXUD5>ug zBOi@vVR$3vgT9?8I;hVQ><~P}9n@(PG?kJ0yd0J)m>dY?m75%jZ=?1|9(A-$TELJU zX-n0VPXXZ$E)*rvPk)?ujbO5viYC-pY5n-eJHcH^PNUhD zWzl%UgpacQpeExy-B_qSGd&`my1WwhtuvoP^k~oGc{I2PC(;Z~p(v4O{c)rvgjVB! zgwsdTJi!amS8$Z;^%3#i-t}9=N;@=KCw83Kx3oL#rXZ>u(MPsTfmf6@i|OAiTXZoN zmRa?=clEB>XyMb=z%VHy8)2P=Bjj^-Ob4gy>V?-I$f%cuDyUxfg9$=bP1{?+qwK`Rmp za#H=|f7pMA=K<@YPOqB@+~W6#$J=On*iyaexht*bG&~I9uG&i%u9y<7)purzP$t+l zWtpro;&@V(GpRX4S}Q@vYamMmY}-uQn7ymr;Wg3g6}>j2Ro~j^dWEXD7T;;>D!h2_ z6>4T_4@cBzixa(Nn?v;=P8OniwscedzL@JJX6b3Qb6wKY0rlm>>Kpov8n1t~bmP3f zh_r0fi-*_M$4lKq`gKu~CH5QVr>Xh67@6MyZOW;j>Pt^9H|(a_c_kNA&+@(Qjx}Tx z^J~jbZfe=l%Pz}oKq69s*B>j0iQ>~XT)G%uEgqWX62_TQRMn@s=! diff --git a/theme/boost/amd/src/aria.js b/theme/boost/amd/src/aria.js index 1508bf988d8..ccfd393790b 100644 --- a/theme/boost/amd/src/aria.js +++ b/theme/boost/amd/src/aria.js @@ -75,10 +75,13 @@ const dropdownFix = () => { const menu = e.target.parentElement.querySelector('[role="menu"]'); let menuItems = false; let foundMenuItem = false; + let textInput = false; if (menu) { menuItems = menu.querySelectorAll('[role="menuitem"]'); + textInput = e.target.parentElement.querySelector('[data-action="search"]'); } + if (menuItems && menuItems.length > 0) { // Up key opens the menu at the end. if (trigger === 'ArrowUp') { @@ -95,7 +98,10 @@ const dropdownFix = () => { } } - if (foundMenuItem) { + if (textInput) { + shiftFocus(textInput); + } + if (foundMenuItem && textInput === null) { shiftFocus(foundMenuItem); } }; -- 2.43.0