From 573b1956e44bedd42c2c997ed50398d592222153 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2023 19:06:58 +0400 Subject: [PATCH] Work for #6933: fix separator showing when there is no action bar (#6974) --- .../blocks/sd-paneldynamic.scss | 4 + .../etalons/paneldynamic-without-buttons.png | Bin 0 -> 13160 bytes .../tests/defaultV2/paneldynamic.ts | 107 ++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 visualRegressionTests/tests/defaultV2/etalons/paneldynamic-without-buttons.png diff --git a/src/defaultV2-theme/blocks/sd-paneldynamic.scss b/src/defaultV2-theme/blocks/sd-paneldynamic.scss index 5fdae4b742..c4b3df8bf7 100644 --- a/src/defaultV2-theme/blocks/sd-paneldynamic.scss +++ b/src/defaultV2-theme/blocks/sd-paneldynamic.scss @@ -40,6 +40,10 @@ border: none; } +.sd-paneldynamic__separator:only-child { + display: none; +} + .sd-paneldynamic__panel-wrapper { padding-bottom: calc(1 * var(--sd-base-padding)); } diff --git a/visualRegressionTests/tests/defaultV2/etalons/paneldynamic-without-buttons.png b/visualRegressionTests/tests/defaultV2/etalons/paneldynamic-without-buttons.png new file mode 100644 index 0000000000000000000000000000000000000000..bff58b936457bbb3b10eb5653801ca49b04f3f23 GIT binary patch literal 13160 zcmeHubx>SSlt<-I+VxxBHy$ob#P?yPJ^r3X&L437&#LAPi|KF=Y_wVLAwe z#QNkB@QbX@)HMji%qA@+qUw&c-HK^H_BmkVa_>B~oktQG^@F?=8buvS_H&}QEAc5c zGQ(EX4znD?t|2zeC376BhIDroQvO6`=~Tl-j{}b8M|G@+Oq@HMu`23QJ<%13Vy}G>3cpCn@HfTw;H36rltl8fo z=W4Rw>0mP8K8@3=&;7bHEsy1!vcti>pBeIKD7k{@M?r-@Y*z=8kvX{pMLam~hgrv2 zeyUt%NSUp|lO41ck>c*G#K>r+pOwRw(5D9vjDskwRz!|7j{5BBR|%@OCfitjhbFJc zK%@rW{T*OaG2}(ntdJSP=@OssNM}YPxieQuRZCnADOZh=#{7KS!&+OdyQnvN#mR#{ zzaS&u-%ah{{g^i0o;So));zk|hW1>#h(-D^Vf^Ss`QE02%HhwC-wMJ<_%2b!9qCX| zO7f5%@ffGqCrx#8Dvyk|$fmZe=p-6chQ_I(nAl5fO`*o{r<>RY-*1Q5TfrWu{!S)2lM#*q?xX^q_CumqsIO{_we7%#hIJOBvc6u z3$3g4dHsrxU7%S+C4W`vmz*yN8xN`G*A_;pWty3P)y&&5wK!XO)+!S}HVon($MNIB*|+p%u0LdZwxMuiDREWgZ$_2ttk0 zkH(D5F37QVAAHB?)YWmK1O7r)M}YDvJ2wWlBex!D>c$fD+_`#q6x1&TUIjbYDwCcsD=!_+xLSo`V>g`GI`C@QMksdHTN6k@9q%G-r3n!`p3{X@J1O)Miyf zYaC*@Xgs*zk4ci1?nHh%cdqxlzLw%JjIIZ{YS)vvC$}K~iRVX)kHiZF0qVcGkSKAm zR~^-t4`p^|rzCIMvI}(CUVPWg^1?NdODbOdgd-G zi4ScUgFw~VHQyb3)g?yJ~` zkF>WYA3_k!lnJMmF1UansbN#|6q-0vSNq!0*X#R*4}Nb8{UAE_ZWlhd5D1no!Iv#0D)3fFchFcF5e+|T!o{N>sV$Ud`fl=)B_Lx1* zMMt+ME3O{@DT=Emetu8SjnrK@D>1NU#4s|GMS5n;l#9;y=`o2u*;HLk-Vh4X57F(j z(BZZ^@gvRdVBmRa=c*x)2_jLBlbnqvUlUZh_1(@VdMWVE;n3)4dKYvjrNQ11Bwhk5 zt?KMZJsZY`QMhCeRnkfn_KMk&1N!g-2rCca-?WicZse`+JX-SI9$&ti!4Pq{${z!h z4^$tYwP)TsI|EBA)WXcCG?bte4s-w;EUrhz^8iaF4Rdf(&SsNal}pb z51dCCGVHZpRx@a}AFe7!!&3dnU1sd}c-z3Q(KfPj340{&S+T-@@SP&LVvz^9i-aj@ zcic1CzbrraJ42d`tHdLG^kD>b3?dwil^%I9j@0&Z_Ux3wuL8qXOGexQTn_G3Wk^MG zk+-(Y4=SL9yrMXFud^()L+<_V`5nBJH)&#G(qhQinK{-E;A{{_jO=LoU&kS)T$a zNL4sh!pwz5>2)T?qm=}cS|_X~mFMA%pQtmP$>{ASWsd7U&rIt{d-!rXSCmoKhpuJc zC+e&pD&arn*9rS_oFX^p4JVzM3a?Q3OTPvEmgFkko|Bhjs)b3a+vcPn>p$H(KLevM z6rOXaR2LZUjGHn{Jv5R3_T5=$5;4_vT6r8A+EBABGM#O(idNia*V+$ zxpg?y2<+{Bj+SO9D#;OLtKHR@LZ#w(OI|ReE4f$L^(Kur z*c=kaleM)kc`bD7L#hfcJnFo0OAwluc9%L$4o(Dh9j>>D9D_UN+x>P929~(@HXt|BMe-zot!$=V%QYC| z&nFIav!AgIa&BiQ49P)xQV)V8;c(gI(5m7Xd7(-8dwu*rL>mTPh`pw$wH;6MMPa6vuST4pD=9!}<|?-PIVYHCy7K?c$v!sVpn z!8(!cAOU0_!N%A>;AYd40ME4P+0IgImJ97BZygkade#WE-(Epo25*nFHJGWDp;)HQ z1J1iOKOkGfXVF0o+NbRL7JJkv;R8u5PU0IqE$Lnv*TaxNdX!s!w;cc2FE19@e-zhu&N>zdtSK!iy1fpfac> zi+ynrQcg=t`_1HpLZV@;CN4K+YLhrsR9~OOgC}!ywmAr9Tew^)GB8wcOkXL#Llo8( z(mjHox=>KGmTU3rm8r5m$xHU-tcz*O3piEU&88K)*;-738)K$Q_r}x#L-Vh0tq@gA zJ7PjaR+2ab(!chlpQdp~{%YmbC0y_-bF$d%8~y&0d}5nNLn~h+TB> zA0ASH1)cpH*N9cziGy z61#<#UEYKe@?_>7NT81+wUtUz=V1+yaKJ8SkEK_IyV*E;f7Gi^rC87mC{(vxvS++jXm0Ljx!FOGV+e z?Q;eil0nO$`tyUF^gpNfhrf6!|jsp<*7`sletm}Jq*VCxA4&Z>{^*eWA-$J z6w50vHk@uURO_X4j;P1=7HNrtCN)4K-}e^jwyi>33_U zyBY8Wc?%C<$SE!tREPz>@X-^{ZFpGvaGk?*7{;D<8ovHT+Bo2)bLA=0V-Mqb*4MGj z2%bZRMLi;crzC=#!vn8%?;r*G*E6U+bXKw7j?Ho!awa-fI9nsY_zpt%GO0AG}Mx$ip z{a#&xcYE91!an*1twcB#d+HIlhym$+P3%O`HAWNj`strj;)iA2R!@|n;CN|XvZ+(F zv>Uh`4{mcj^StY0E(5N#hs8>_w^ctosiUQyqg-4*L)Lw*3Ze7|g=CyiVr5la=*Nqc#6NU-O%Rc+^p-UEe52JZjap6zBe+>S6=X}RK@lSVb02pO%v=`c)jjoG_UXJJ}7dsyY+Z!WhMK; z=E`dLqYKO19gzXv3p%fQ{|$;mDu-V8vSA+6=+;cAi}R^|U5!7PphnPZ`KM&NfRH6@?iVf@NRlbEt$!fH};PdUlC%Yq%BozS+clC zpA`9iT|bDMTs~KIY!arr1PC>?ZjJ1Q-`Bs9Z$6#+Y1WzXHJ`@?oaC^J8t=DP*ma}u zntXp+hh?m7b3_9dfyKO1-*|PCu&4Fcrs|WCl)%#RHG6XN6>qYaC#PlAzVwpK(F)ez zqpD9xDM>!RY+$xB!W~Mz-nN^QxekzKfruVVkb?>Ti8eQC&SU=Mvr@QeNvNg2F}hWFjJahJ!tLi2B+7bUanE>nZDIq}_prL8wzC zp=|B)mr^msKV@#~3UeEqreBZx>U@yq>EPr}`=FhjoeChKIW1Z5>c4M|Kov|q=$ugl zcmJ{w+TlyKxImY~D}*DQl(v-&*VZFD-8WQwz&AQ_gnA zi=R;CG^ax;q=#{Gy$I2$a zF7$5W*d?_GsJ-R2Z=c;pUQ9)dT3cl-W-A!7QKFHUoFB>@vY$x>-|X>m-}qf~Oc3d{ zaRY+9UiiC`ORrI6vI=&javML~$k54~sR_H)bG2bG1*9E_kpr*z6<46v3O|cMzndRX zg!^%-tfx2d%ajD~*$CFAmab#4&ZP2ehoLXZ-;u7_-F>#$nl5Guc+V^{9nD(}R8V; za9Xyu!jXP*Mqio@UY}3X%eeYu?6|^J1Dt~3`Et{oyKxTF3%~f$OvS_Wm~CO@NApTc zlrQ4vbTymnvWB!Mm_o16NH-6xLQCT>kHOOOm}pKMk*`+p!*1y~4L-x>hlD9m0~yw3 z+TLfXvYG4|pOVnl-wP<9g{boP^sb(=aG*MKm3eQT{u+H$F$@1B$&($9!B=gMIjza< z#EKDh1+7j{_~yHb!H}OixYlSzJGf8~ne0WQd%_pbUmmpDDV-kFRp~cqtYhVo#~wyY zxyqo`1ns>-A7ECX$P5}4x_KZuZD8K9;N~WZ^@dBHj15Eq5Whx+I>AJh$RrkB@1wk8 zeF+=c$8oi_-jMOimo-O2Y@FLOZ344|wAUXw3a%(4)Xt$CKl=|GJgn)o+QT^FR*-|; z#!5bp@%~QH&ow_}>^Indj>*JGnZOQ~7Buv4pPdy(!biR7;p;$swzrmgYtFUTaKh`{ z&Ew0R@FJ#-6&-l7Dl%g&QhiWwVF{8cgD>elC@d&!h?Vr})ja>j-Y?~>+-!?;Iyc$1 z)js7B!l1$DNXY(B2x+-VbhOB`)}iw)tx>{(HTVwxWFRLtrnVGEH81@=Dn;AYi;wb?%%-z?9x&I|-kH zcT21KxBjm6wA}K`RTHP8NSk@%$vP5S4-+zR{HqwNn|7|+oRbvv#tUqLTh?c{mRvI@ z^F3F4>{39jUF6DI^qP@_P`V0vwmGxZmR?>2uubs)@afBw8gSi?Jy!O3VF`WY8qM5RYR|ulo|O zr?#^06mv+M4@DZ|sMyYbBLq`@El8^T6hS|gDgP=5%VR}T6ELWSK7qs7QH|JDHu;trKq3$Ju z`T1RlB8+rJ{x0X$=gbUZ`Zk3QThF;9PUxigzuBKv=c`HEcnO{yYQ z=GRb4Eo(gu#lBw0UiS3N?08(Wk}?|Di{fgI;Rhy|uER4kaQq+>Y^3A*jlU2q|9tU< zT8`|(pcjvwN#r9UiboJceHUpB0qV&gJ<~0C#A~7P2C8uM{5;D^aW!ATSM<#Vq2S-9 zqZQj3bV8($wDSP%nR96#a9{Bj$_u~vQ^`5f?*&L!;p!^t%bB|~)hilx6S;&Tv>xK+ zcuo@(93?#GXE-`PE5~N{H01VZ0-aJZ8ret+ob^L1oW6%#$S)-u0|&Qo3^k8zeY8p#p8UpH0CHDErOL7?r*xL|)x)ua8+Lj=qY zrr=qnu@HC74ZX?Xf>^O zfPiJ@@0F2VT#hT4m~*({k{f0kTcB7pM>w$Sy%~#I^Nunsp{xvDKVM&5{&DWAI)4Xw z^`8>Uxk3hAeNi7L_G1o0t)>cSL?Lt@lGncuDYTl@oR@Q2<{W3z759JiI9skhL)IPD%iNLZ>B}s%U8zqQW_zl-%m}J&K8%UR zF%<3r8yI?e&#FgN&>;QHZxWm+!{{}6A9w=$LBtD7rr1iQAnhvatRnMAvh<L@=jGPcrX@%8X=yjbsL!zr9~~xn9}m21(wL6`prXdH@9bSm3sz?f zqEaukT4BkhK-1Jdvf>m{7ISN7!$qWYXQ=5|WJ2*{d78r=)o;8haYEGdUm=$3$1o@o z1Y0pl3Kn$F88k0_=yIHuFB>~m?W|Y#U%!eskWiB*w6S4nZup8WNR!}|X0ejAmk?{A z*SF-g?y$Gy^43i;$HI{pK=|XZysv~D-5X88JGwI`J}!Kq+khTQ7au(~E-@W0 z6MD!aS!PJf(LC2rE82pCFzs`o~A9PuKofgb_5`hi>x>8xj;d5 zSGIqq_-}r4p|b{=h{y4hXz;Ux0lqyJe*SR4Y?2}O$2uIAyI9To@c>2tOolon@j0$M zX>4qyz(SRXB9VXo5a0nHNG!D?+uOHdc6Q9l_ZQI3 zrOrDHO;o1NZBxdgJiGY+pe?AWi3fi7;h8-+-vjZ0W zlS>TfAOt)J7-)E8B&5?wEK})C%o70O7wzrs=$M$XGTDG3jO^{BuP;y8eXrc_ty{;< z3Yge=lG}a%b$1l0`M=s&V-OAO>9H(eFx7Zim2syec{=DTHZzp*4s|$QOEt zQ&e||MCL;gVG688Z$KNs{7RV;4og6BO3d4FhduxbfTZF*l5H{Ml6ZJ{uL14F-iSPZ zDE8)spbP~T8KCGxBw*TyNZpadfTdVnw>AHCM-uV0wX}dNEiC~*4Sf9?D`fvpu^|fx zaPTP5|Me4Y*KIst#!};Mpnen7_GcPK@;x5hI$t*+zT;zMKHn>DA0MBr?CcmRimwux zz;sONz;u8sNKr`1%4Rk7omR7T`03p|Hw7G!*;IzZ53xHSYIw3gj!v&@axIIY} za6e%WxFl282~K%pr6=Edxlbp9S>fEkdM5x$&04b6*Y0ItV!=EBb$*idWUHdZyMdq@ zzoKJB2Qql;xT7>UqhrehG@>askEj=%?4sudF3Ab>6=S@n`J1kH?2dNqZYVn^qNrX( z9BEzpTub=YJqFB+!{>2G0r&wRPvGl?k*9(F?)(GrSZe8Pg-jRi)SM@BIdq3R3+h~+UpMCheyve$+#UJiubbRiyHJYa9RNv;l>OD2 z!%Y_SDK4|`XPlJkBavyYf^@6S2dd%APK&=vjqmXToLKSB5D^m66j*mY7pBs+Oo)5b z8;bLm=p9guNrVqJV$(8pJ%2n!U}3SFC4?f@&01R%UTrm zCAQt<82IHE?w{jg%VEvynB6MEkTck9$82ZN+p8_x3l-rJ&v7m!}-poMdU9ATP z{10vdmZE6O2B-^gA#`+f79i?wAUt6jELP)>e&Zs(y?MNmZ`}T+mVbYZLC|6W!K+@Z ziTLt`3!bDd(fNR0Q^|qYym7MSOE*_Ztr?#kxV@s*DbL#wC2T!>xtx=QMVKv#0xQHm z55NZqAt1cN@!7u!?ch9IpsE>l0+DBO5IV+? z947|OqL&6>*s2w*4_SK!Tg_&kLoiNsal__zgq9?kb8AYsr)ONREh4XPP;Rmp@zWyw zg6ngr{-bt0hlL4_D~t8#v3B(-W$=lX5K-rosI{q(iNn-<)GKG7myj#c837Ey8J;pX zoxS06-CoG-PZLOKYkOBj^_N6yRPW<8EMBGc0X=7lMY}7VdjHaSw}!oi3x=umT(voS zoYPjK%82m9nuGm@hdOh-_yKYxGcW?%q?6RBovfz}U?21h2$!6oEpLnZD^nB{@VU&iDJ9|xbj-M3#QI^l0h z9dnA60y}3vIh&ESADQ(-AdE2&Qb=u#mW6I120J`0&q@DyRW*Blb>Oo&pA&U-E--B%&{30e3m)DY33)+&eWBdss24gw%skTlb^c&!*SBldo68N6 zDC`NWJWs5#Enis009A{cre@FfWO;4$WVyKt@O_NpFX1I<16=e3nQ6SBx3hn$Bp|tt zfW(ewIiT0F!Onl3OQ^r)_ZUCF8&PgVO5cO9b>&lcVlVF1_piL_a#+n3o|#kNyUpsF z>2;gl^XEUq3C2U8s@wG}9^erEYDd}5TRx~`Bbk5STHzr58eU_G!{6k|l%g?F0+2%y z5t2sGFR`^Ngx_M52jvWR6>K8ewjI z0W+`E+d+nk6vB5fxbPEcZVgg>n_8{%w@d!vz{l#&2Q5p%_|;2DYgFg{0^5`5IORD9B5*CIq|08{IsS*?DYB-WNBj*NNFUSu zVv(4b0Ty5Z1_AhMxi`-}ajalr5#hxRD-swyl9?njb0}JY)w=pGJ+Br(j;bp&eNMxAzL00v!%rY>V1} z8o}7OxNJs1Itot&l==Mmvu*_7cpp#${iBT4JB@nPN0nHqgPn*xV|Ro_wVu(Rm9Wv_ zvqqL-OeYMd}4CF*&2&|>)og3*!3>WAASz|t&LbE&Kj85W-wBqinu$%9LIx{J(aThJ(jWqc% zI}P(R_dDo{QrnUGTTa|%zpRpy=u<#u$4Y?W7Z*P;RRR}4Vp3V)tqN*2<05B_>jbki z9C|DG4h*f0D@fCUhZa2|@iSy~s^{GAZFf2=KoM!#-)Bjf0xoyNYcge|&i`I=vfZU$ z3&G>)*qgp9|BNxM6IidTD?`!Ej>LHO?yW+g3YB*Z>X7KR-x1y`o3>X;&jmVexS||H zUQ$I%3*Fv$G6Sjj3UCBk28NZ7xDgWgBqVFfgg`|Dloq-KBZ+F~PY3rlmy9T#dfm?! zW$I3x9lj3gza=mQDjr!I-~v<>2hs>nca$&#t=46X;Ink7rBl+_KL7M%?(UY8b<0GK z1j}V0FNVI@_n5e(J07$#SL{Z*xVYHZ;uG$c9XxEGzX~WFL90!Bp+XB4jNe@&J+z*l z{&RdhG%?W~5XtF#{M&cHj_&hF_wekMXqt^z3Q!FI&vXAA>MGWs9mF3=WcOhR*1ysC zecB*zU_k2QV^_XDHV=e-X?WwKXAR>L^Uu*q2u;N1Wra+xFZ@<&pDAp4Z3Y(@+(z+F zwBi#F9z+4Vo$U!1cPX*yJ_Y{;0=Q7c$p8tm_AMB~sNedn6UeZ(n8A-80fmxbx)mnI zU~?NN7rmkF2*YcGU?Dt!%ksNN8q|^pNFJ}Ex_R!?yDlA&ya(6zlJ@}8aubHzmO--+)|U0*WmUn z^CfCJ>=dZ$(qZKp4jE7^K%84qt)>(Z=)u9=>G@^>Zq*`ko^+6BeeQZAEtyZ?2gCGl z--JGV`(~J){=v{NU5M-_%X`>!i)RUSeu#{`(lI?)Yg#rUB`c#N`4 zQ!uN<$HKhIwfggR@f+7;I=|~a(>Z&lD;={#uQ>J-V+!c^HQXx3~na_wcM&d0JXq>RWTM;{+VO%>QRYc9rjYRV(eaKy=tKGsYwzyvvUN$(QUdTG@W_FFQ&o(BOmDa902S)% z>%&=r`DiH(fPwMIqpECV@1z^41cB@wWoRd>7#mOj%$4tX$0gQjD28Jtv21hG83(M5Xfm1_^%64ix|h< z2a6KM-G`j&gS(HHV|Uko-{iC;LyH7*FH)8PfzC=lD(C`IfdP-}E5!_AZ zEBK$5yJ%I-RgHO(&7qYMehs){{^jhVh#WR literal 0 HcmV?d00001 diff --git a/visualRegressionTests/tests/defaultV2/paneldynamic.ts b/visualRegressionTests/tests/defaultV2/paneldynamic.ts index cc9dbc6b45..508e6a7407 100644 --- a/visualRegressionTests/tests/defaultV2/paneldynamic.ts +++ b/visualRegressionTests/tests/defaultV2/paneldynamic.ts @@ -289,3 +289,110 @@ frameworks.forEach(framework => { }); }); }); + +frameworks.forEach(framework => { + const json = { + "logoPosition": "right", + "pages": [ + { + "name": "page1", + "elements": [ + { + type: "paneldynamic", + name: "relatives", + title: "Panel Dynamic", + templateTitle: "Information about: {panel.relativeType}", + templateElements: [ + { + name: "relativeType", + type: "dropdown", + title: "Relative", + choices: [ + "father", + "mother", + "brother", + "sister", + "son", + "daughter" + ], + isRequired: true + }, + { + name: "isalive", + type: "radiogroup", + title: "Alive?", + startWithNewLine: false, + isRequired: true, + colCount: 0, + choices: ["Yes", "No"] + }, + { + name: "liveage", + type: "dropdown", + title: "Age", + isRequired: true, + startWithNewLine: false, + visibleIf: "{panel.isalive} = 'Yes'", + choicesMin: 1, + choicesMax: 115 + }, + { + name: "deceasedage", + type: "dropdown", + title: "Deceased Age", + isRequired: true, + startWithNewLine: false, + visibleIf: "{panel.isalive} = 'No'", + choices: [ + { + value: -1, + text: "Unknown" + } + ], + choicesMin: 1, + choicesMax: 115 + }, + { + name: "causeofdeathknown", + type: "radiogroup", + title: "Cause of Death Known?", + isRequired: true, + colCount: 0, + startWithNewLine: false, + visibleIf: "{panel.isalive} = 'No'", + choices: ["Yes", "No"] + }, + { + name: "causeofdeath", + type: "text", + title: "Cause of Death", + isRequired: true, + startWithNewLine: false, + visibleIf: + "{panel.isalive} = 'No' and {panel.causeofdeathknown} = 'Yes'" + } + ], + panelCount: 1, + maxPanelCount: 1, + minPanelCount: 1 + } + ] + } + ] + }; + fixture`${framework} ${title} ${theme}` + .page`${url_test}${theme}/${framework}`.beforeEach(async t => { + await explicitErrorHandler(); + await applyTheme(theme); + await initSurvey(framework, json); + }); + test("Paneldynamic without buttons", async (t)=>{ + await wrapVisualTest(t, async (t, comparer) => { + await t.resizeWindow(1280, 900); + await ClientFunction(() => { + document.body.focus(); + })(); + await takeElementScreenshot("paneldynamic-without-buttons", Selector(".sd-question--paneldynamic"), t, comparer); + }); + }); +});