@comicrelief/component-library 8.89.1 → 8.90.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs.js +879 -829
- package/dist/index.es.js +4924 -4862
- package/package.json +1 -1
- package/src/components/Atoms/Icons/ArrowExample.jsx +8 -5
- package/src/components/Atoms/Icons/AtSign.js +4 -4
- package/src/components/Atoms/Icons/GiftAidLogo.js +13 -7
- package/src/components/Atoms/Icons/IconsExample.jsx +3 -1
- package/src/components/Atoms/Icons/Internal.js +4 -4
- package/src/components/Atoms/Icons/Post.js +4 -4
- package/src/components/Atoms/Link/Link.test.js +0 -2
- package/src/components/Molecules/Accordion/AccordionExample.jsx +11 -9
- package/src/components/Molecules/ArticleTeaser/ArticleTeaser.js +1 -1
- package/src/components/Molecules/ArticleTeaser/ArticleTeaser.test.js +0 -2
- package/src/components/Molecules/Banner/Banner.js +2 -2
- package/src/components/Molecules/Banner/__snapshots__/Banner.test.js.snap +0 -1
- package/src/components/Molecules/Box/Box.js +1 -1
- package/src/components/Molecules/Box/__snapshots__/Box.test.js.snap +0 -1
- package/src/components/Molecules/CardDs/__snapshots__/CardDs.test.js.snap +0 -4
- package/src/components/Molecules/LogoLinked/LogoLinked.js +4 -4
- package/src/components/Molecules/LogoLinked/LogoLinked.style.js +2 -2
- package/src/components/Molecules/Lookup/Lookup.js +0 -2
- package/src/components/Molecules/PopUp/PopUpGiftAid/PopUpGiftAid.js +36 -7
- package/src/components/Molecules/PopUp/PopUpGiftAid/PopUpGiftAidExample.jsx +34 -33
- package/src/components/Molecules/PopUp/PopUpGiftAid/__snapshots__/PopUpGiftAid.test.js.snap +48 -36
- package/src/components/Molecules/PopUp/PopUpSecurePayment/PopUpSecurePayment.js +19 -3
- package/src/components/Molecules/PopUp/PopUpSecurePayment/PopUpSecurePaymentExample.jsx +23 -37
- package/src/components/Molecules/PopUp/PopUpShared.style.js +47 -1
- package/src/components/Molecules/SearchResult/SearchResult.js +4 -4
- package/src/components/Molecules/SearchResult/__snapshots__/SearchResult.test.js.snap +0 -8
- package/src/components/Organisms/Donate/Donate.js +1 -1
- package/src/components/Organisms/Donate/Form/Form.js +2 -2
- package/src/components/Organisms/Donate/MoneyBuy/MoneyBuy.js +1 -1
- package/src/components/Organisms/Donate/__snapshots__/Donate.test.js.snap +0 -7
- package/src/components/Organisms/DonateBanner/Form/Form.js +2 -2
- package/src/components/Organisms/DonateBanner/MoneyBuy/MoneyBuy.js +1 -1
- package/src/components/Organisms/DonateBanner/__snapshots__/DonateBanner.test.js.snap +0 -7
- package/src/components/Organisms/DynamicGallery/_DynamicGalleryColumn.js +1 -1
- package/src/components/Organisms/DynamicGallery/__snapshots__/DynamicGallery.test.js.snap +0 -3
- package/src/components/Organisms/Footer/Footer.js +2 -2
- package/src/components/Organisms/Footer/FooterExample.jsx +3 -3
- package/src/components/Organisms/Footer/Nav/Nav.js +3 -3
- package/src/components/Organisms/Footer/__snapshots__/Footer.test.js.snap +0 -49
- package/src/components/Organisms/Header/Burger/BurgerMenu.js +1 -1
- package/src/components/Organisms/Header/Header.js +1 -1
- package/src/components/Organisms/Header/HeaderNav/HeaderNav.js +3 -3
- package/src/components/Organisms/Header/Nav/Nav.js +2 -2
- package/src/components/Organisms/Header2025/Burger/BurgerMenu.js +1 -1
- package/src/components/Organisms/Header2025/Header2025.js +2 -2
- package/src/components/Organisms/Header2025/Header2025Example.jsx +2 -2
- package/src/components/Organisms/Header2025/HeaderNav2025/HeaderNav2025.js +2 -2
- package/src/components/Organisms/Header2025/HeaderNav2025/HeaderNavItem2025.js +4 -4
- package/src/components/Organisms/Header2025/HeaderNav2025/MoreNav.js +2 -2
- package/src/components/Organisms/MarketingPreferencesDS/_OptInCheckbox.js +1 -1
- package/src/components/Organisms/Membership/Form/Form.js +3 -3
- package/src/components/Organisms/Membership/Membership.test.js +0 -9
- package/src/components/Organisms/Membership/MoneyBox/MoneyBox.js +1 -1
|
@@ -24,7 +24,7 @@ const Footer = ({
|
|
|
24
24
|
|
|
25
25
|
return (
|
|
26
26
|
<div>
|
|
27
|
-
<FooterWrapper navItems {...rest}>
|
|
27
|
+
<FooterWrapper $navItems {...rest}>
|
|
28
28
|
<InnerWrapper>
|
|
29
29
|
{additionalLegalLine
|
|
30
30
|
&& <FooterLegalLine tag="p" color="grey">{additionalLegalLine}</FooterLegalLine>
|
|
@@ -38,7 +38,7 @@ const Footer = ({
|
|
|
38
38
|
<Logo sizeSm="48px" sizeMd="48px" sizeLg="72px" rotate={false} campaign={campaign} />
|
|
39
39
|
</Brand>
|
|
40
40
|
</FooterBranding>
|
|
41
|
-
<FooterNav navItems={navItems} overrideallowList={overrideallowList} {...rest} />
|
|
41
|
+
<FooterNav navItems={navItems} $overrideallowList={overrideallowList} {...rest} />
|
|
42
42
|
|
|
43
43
|
{ showFundraisingRegulatorLogo && <FundraisingRegulatorLogo /> }
|
|
44
44
|
|
|
@@ -7,9 +7,9 @@ export function FooterExample1() {
|
|
|
7
7
|
return (
|
|
8
8
|
<>
|
|
9
9
|
<h3>Standard footer</h3>
|
|
10
|
-
<Footer navItems={data} footerCopy={footerCopy.copy} campaign="Comic Relief"
|
|
10
|
+
<Footer navItems={data} footerCopy={footerCopy.copy} campaign="Comic Relief" />
|
|
11
11
|
</>
|
|
12
|
-
)
|
|
12
|
+
);
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
export function FooterExample2() {
|
|
@@ -23,7 +23,7 @@ export function FooterExample2() {
|
|
|
23
23
|
overrideallowList
|
|
24
24
|
/>
|
|
25
25
|
</>
|
|
26
|
-
)
|
|
26
|
+
);
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
export function FooterExample3() {
|
|
@@ -63,7 +63,7 @@ const FooterNav = ({ navItems = {}, ...rest }) => {
|
|
|
63
63
|
<NavItem
|
|
64
64
|
role="none"
|
|
65
65
|
key={`${group.id}-${group.title}`}
|
|
66
|
-
index={index}
|
|
66
|
+
$index={index}
|
|
67
67
|
$isSubMenuOpen={!!isSubMenuOpen[group.id]}
|
|
68
68
|
>
|
|
69
69
|
{!isSmallBreakpoint ? (
|
|
@@ -73,7 +73,7 @@ const FooterNav = ({ navItems = {}, ...rest }) => {
|
|
|
73
73
|
) : (
|
|
74
74
|
<NavLink
|
|
75
75
|
href="#"
|
|
76
|
-
inline
|
|
76
|
+
$inline
|
|
77
77
|
aria-expanded={!!isSubMenuOpen[group.id]}
|
|
78
78
|
aria-haspopup="true"
|
|
79
79
|
role="button"
|
|
@@ -104,7 +104,7 @@ const FooterNav = ({ navItems = {}, ...rest }) => {
|
|
|
104
104
|
group.links.length % 2 === 0 && group.links.length > 2
|
|
105
105
|
}
|
|
106
106
|
>
|
|
107
|
-
<SubNavLink href={thisUrl} inline role="menuitem" {...rest}>
|
|
107
|
+
<SubNavLink href={thisUrl} $inline role="menuitem" {...rest}>
|
|
108
108
|
<Text color="white" size="s">{child.title}</Text>
|
|
109
109
|
</SubNavLink>
|
|
110
110
|
</SubNavItem>
|
|
@@ -584,7 +584,6 @@ exports[`renders correctly 1`] = `
|
|
|
584
584
|
<div>
|
|
585
585
|
<footer
|
|
586
586
|
className="c0"
|
|
587
|
-
navItems={true}
|
|
588
587
|
role="banner"
|
|
589
588
|
>
|
|
590
589
|
<div
|
|
@@ -714,7 +713,6 @@ exports[`renders correctly 1`] = `
|
|
|
714
713
|
>
|
|
715
714
|
<li
|
|
716
715
|
className="c15"
|
|
717
|
-
index={0}
|
|
718
716
|
role="none"
|
|
719
717
|
>
|
|
720
718
|
<span
|
|
@@ -733,8 +731,6 @@ exports[`renders correctly 1`] = `
|
|
|
733
731
|
<a
|
|
734
732
|
className="c8 c19 c20"
|
|
735
733
|
href="https://www.comicrelief.com/#"
|
|
736
|
-
inline={true}
|
|
737
|
-
overrideallowList={false}
|
|
738
734
|
role="menuitem"
|
|
739
735
|
target="_self"
|
|
740
736
|
type="standard"
|
|
@@ -752,8 +748,6 @@ exports[`renders correctly 1`] = `
|
|
|
752
748
|
<a
|
|
753
749
|
className="c8 c19 c20"
|
|
754
750
|
href="https://www.comicrelief.com/update-your-preferences"
|
|
755
|
-
inline={true}
|
|
756
|
-
overrideallowList={false}
|
|
757
751
|
role="menuitem"
|
|
758
752
|
target="_self"
|
|
759
753
|
type="standard"
|
|
@@ -769,7 +763,6 @@ exports[`renders correctly 1`] = `
|
|
|
769
763
|
</li>
|
|
770
764
|
<li
|
|
771
765
|
className="c15"
|
|
772
|
-
index={1}
|
|
773
766
|
role="none"
|
|
774
767
|
>
|
|
775
768
|
<span
|
|
@@ -788,8 +781,6 @@ exports[`renders correctly 1`] = `
|
|
|
788
781
|
<a
|
|
789
782
|
className="c8 c19 c20"
|
|
790
783
|
href="/contact-us"
|
|
791
|
-
inline={true}
|
|
792
|
-
overrideallowList={false}
|
|
793
784
|
role="menuitem"
|
|
794
785
|
target="_self"
|
|
795
786
|
type="standard"
|
|
@@ -807,8 +798,6 @@ exports[`renders correctly 1`] = `
|
|
|
807
798
|
<a
|
|
808
799
|
className="c8 c19 c20"
|
|
809
800
|
href="https://giftaid.comicrelief.com/update"
|
|
810
|
-
inline={true}
|
|
811
|
-
overrideallowList={false}
|
|
812
801
|
role="menuitem"
|
|
813
802
|
target="_self"
|
|
814
803
|
type="standard"
|
|
@@ -826,8 +815,6 @@ exports[`renders correctly 1`] = `
|
|
|
826
815
|
<a
|
|
827
816
|
className="c8 c19 c20"
|
|
828
817
|
href="https://www.comicrelief.com/frequently-asked-questions"
|
|
829
|
-
inline={true}
|
|
830
|
-
overrideallowList={false}
|
|
831
818
|
role="menuitem"
|
|
832
819
|
target="_self"
|
|
833
820
|
type="standard"
|
|
@@ -845,8 +832,6 @@ exports[`renders correctly 1`] = `
|
|
|
845
832
|
<a
|
|
846
833
|
className="c8 c19 c20"
|
|
847
834
|
href="https://www.comicrelief.com/red-nose-days-frequently-asked-questions"
|
|
848
|
-
inline={true}
|
|
849
|
-
overrideallowList={false}
|
|
850
835
|
role="menuitem"
|
|
851
836
|
target="_self"
|
|
852
837
|
type="standard"
|
|
@@ -862,7 +847,6 @@ exports[`renders correctly 1`] = `
|
|
|
862
847
|
</li>
|
|
863
848
|
<li
|
|
864
849
|
className="c15"
|
|
865
|
-
index={2}
|
|
866
850
|
role="none"
|
|
867
851
|
>
|
|
868
852
|
<span
|
|
@@ -881,8 +865,6 @@ exports[`renders correctly 1`] = `
|
|
|
881
865
|
<a
|
|
882
866
|
className="c8 c19 c20"
|
|
883
867
|
href="https://www.comicrelief.com/about-comic-relief"
|
|
884
|
-
inline={true}
|
|
885
|
-
overrideallowList={false}
|
|
886
868
|
role="menuitem"
|
|
887
869
|
target="_self"
|
|
888
870
|
type="standard"
|
|
@@ -900,8 +882,6 @@ exports[`renders correctly 1`] = `
|
|
|
900
882
|
<a
|
|
901
883
|
className="c8 c19 c20"
|
|
902
884
|
href="https://www.comicrelief.com/about-comic-relief/history"
|
|
903
|
-
inline={true}
|
|
904
|
-
overrideallowList={false}
|
|
905
885
|
role="menuitem"
|
|
906
886
|
target="_self"
|
|
907
887
|
type="standard"
|
|
@@ -919,8 +899,6 @@ exports[`renders correctly 1`] = `
|
|
|
919
899
|
<a
|
|
920
900
|
className="c8 c19 c20"
|
|
921
901
|
href="https://www.comicrelief.com/about-comic-relief/finances"
|
|
922
|
-
inline={true}
|
|
923
|
-
overrideallowList={false}
|
|
924
902
|
role="menuitem"
|
|
925
903
|
target="_self"
|
|
926
904
|
type="standard"
|
|
@@ -938,8 +916,6 @@ exports[`renders correctly 1`] = `
|
|
|
938
916
|
<a
|
|
939
917
|
className="c8 c19 c20"
|
|
940
918
|
href="https://www.comicrelief.com/working-with-us"
|
|
941
|
-
inline={true}
|
|
942
|
-
overrideallowList={false}
|
|
943
919
|
role="menuitem"
|
|
944
920
|
target="_self"
|
|
945
921
|
type="standard"
|
|
@@ -957,8 +933,6 @@ exports[`renders correctly 1`] = `
|
|
|
957
933
|
<a
|
|
958
934
|
className="c8 c19 c20"
|
|
959
935
|
href="https://www.comicrelief.com/about-comic-relief/meet-the-team"
|
|
960
|
-
inline={true}
|
|
961
|
-
overrideallowList={false}
|
|
962
936
|
role="menuitem"
|
|
963
937
|
target="_self"
|
|
964
938
|
type="standard"
|
|
@@ -976,8 +950,6 @@ exports[`renders correctly 1`] = `
|
|
|
976
950
|
<a
|
|
977
951
|
className="c8 c19 c20"
|
|
978
952
|
href="https://www.sportrelief.com/"
|
|
979
|
-
inline={true}
|
|
980
|
-
overrideallowList={false}
|
|
981
953
|
role="menuitem"
|
|
982
954
|
target="_self"
|
|
983
955
|
type="standard"
|
|
@@ -993,7 +965,6 @@ exports[`renders correctly 1`] = `
|
|
|
993
965
|
</li>
|
|
994
966
|
<li
|
|
995
967
|
className="c15"
|
|
996
|
-
index={3}
|
|
997
968
|
role="none"
|
|
998
969
|
>
|
|
999
970
|
<span
|
|
@@ -1012,8 +983,6 @@ exports[`renders correctly 1`] = `
|
|
|
1012
983
|
<a
|
|
1013
984
|
className="c8 c19 c20"
|
|
1014
985
|
href="https://www.comicrelief.com/careers"
|
|
1015
|
-
inline={true}
|
|
1016
|
-
overrideallowList={false}
|
|
1017
986
|
role="menuitem"
|
|
1018
987
|
target="_self"
|
|
1019
988
|
type="standard"
|
|
@@ -1031,8 +1000,6 @@ exports[`renders correctly 1`] = `
|
|
|
1031
1000
|
<a
|
|
1032
1001
|
className="c8 c19 c20"
|
|
1033
1002
|
href="https://app.beapplied.com/org/comic-relief"
|
|
1034
|
-
inline={true}
|
|
1035
|
-
overrideallowList={false}
|
|
1036
1003
|
role="menuitem"
|
|
1037
1004
|
target="_self"
|
|
1038
1005
|
type="standard"
|
|
@@ -1048,7 +1015,6 @@ exports[`renders correctly 1`] = `
|
|
|
1048
1015
|
</li>
|
|
1049
1016
|
<li
|
|
1050
1017
|
className="c15"
|
|
1051
|
-
index={4}
|
|
1052
1018
|
role="none"
|
|
1053
1019
|
>
|
|
1054
1020
|
<span
|
|
@@ -1067,8 +1033,6 @@ exports[`renders correctly 1`] = `
|
|
|
1067
1033
|
<a
|
|
1068
1034
|
className="c8 c19 c20"
|
|
1069
1035
|
href="https://www.comicrelief.com/news"
|
|
1070
|
-
inline={true}
|
|
1071
|
-
overrideallowList={false}
|
|
1072
1036
|
role="menuitem"
|
|
1073
1037
|
target="_self"
|
|
1074
1038
|
type="standard"
|
|
@@ -1086,8 +1050,6 @@ exports[`renders correctly 1`] = `
|
|
|
1086
1050
|
<a
|
|
1087
1051
|
className="c8 c19 c20"
|
|
1088
1052
|
href="https://www.comicrelief.com/press-releases"
|
|
1089
|
-
inline={true}
|
|
1090
|
-
overrideallowList={false}
|
|
1091
1053
|
role="menuitem"
|
|
1092
1054
|
target="_self"
|
|
1093
1055
|
type="standard"
|
|
@@ -1103,7 +1065,6 @@ exports[`renders correctly 1`] = `
|
|
|
1103
1065
|
</li>
|
|
1104
1066
|
<li
|
|
1105
1067
|
className="c15"
|
|
1106
|
-
index={5}
|
|
1107
1068
|
role="none"
|
|
1108
1069
|
>
|
|
1109
1070
|
<span
|
|
@@ -1122,8 +1083,6 @@ exports[`renders correctly 1`] = `
|
|
|
1122
1083
|
<a
|
|
1123
1084
|
className="c8 c19 c20"
|
|
1124
1085
|
href="/homepage"
|
|
1125
|
-
inline={true}
|
|
1126
|
-
overrideallowList={false}
|
|
1127
1086
|
role="menuitem"
|
|
1128
1087
|
target="_self"
|
|
1129
1088
|
type="standard"
|
|
@@ -1141,8 +1100,6 @@ exports[`renders correctly 1`] = `
|
|
|
1141
1100
|
<a
|
|
1142
1101
|
className="c8 c19 c20"
|
|
1143
1102
|
href="/this-is-a-test"
|
|
1144
|
-
inline={true}
|
|
1145
|
-
overrideallowList={false}
|
|
1146
1103
|
role="menuitem"
|
|
1147
1104
|
target="_self"
|
|
1148
1105
|
type="standard"
|
|
@@ -1160,8 +1117,6 @@ exports[`renders correctly 1`] = `
|
|
|
1160
1117
|
<a
|
|
1161
1118
|
className="c8 c19 c20"
|
|
1162
1119
|
href="https://www.yahoo.com"
|
|
1163
|
-
inline={true}
|
|
1164
|
-
overrideallowList={false}
|
|
1165
1120
|
role="menuitem"
|
|
1166
1121
|
target="_blank"
|
|
1167
1122
|
type="standard"
|
|
@@ -1184,8 +1139,6 @@ exports[`renders correctly 1`] = `
|
|
|
1184
1139
|
<a
|
|
1185
1140
|
className="c8 c19 c20"
|
|
1186
1141
|
href="https://www.sportrelief.com"
|
|
1187
|
-
inline={true}
|
|
1188
|
-
overrideallowList={false}
|
|
1189
1142
|
role="menuitem"
|
|
1190
1143
|
target="_self"
|
|
1191
1144
|
type="standard"
|
|
@@ -1203,8 +1156,6 @@ exports[`renders correctly 1`] = `
|
|
|
1203
1156
|
<a
|
|
1204
1157
|
className="c8 c19 c20"
|
|
1205
1158
|
href="https://bing.com"
|
|
1206
|
-
inline={true}
|
|
1207
|
-
overrideallowList={false}
|
|
1208
1159
|
role="menuitem"
|
|
1209
1160
|
target="_blank"
|
|
1210
1161
|
type="standard"
|
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
const Header = ({
|
|
11
11
|
navItems = {}, metaIcons, campaign = 'Comic Relief', logoUrl = '/', ...rest
|
|
12
12
|
}) => (
|
|
13
|
-
<HeaderWrapper navItems {...rest}>
|
|
13
|
+
<HeaderWrapper $navItems {...rest}>
|
|
14
14
|
<InnerWrapper>
|
|
15
15
|
<Brand>
|
|
16
16
|
<LogoLinked url={logoUrl} campaign={campaign} />
|
|
@@ -108,7 +108,7 @@ const HeaderNav = ({
|
|
|
108
108
|
<NavItem
|
|
109
109
|
role="none"
|
|
110
110
|
key={`${thisID}-item`}
|
|
111
|
-
index={index}
|
|
111
|
+
$index={index}
|
|
112
112
|
$isSubMenuOpen={!!isSubMenuOpen[thisID]}
|
|
113
113
|
>
|
|
114
114
|
{isNotDesktop ? (
|
|
@@ -172,7 +172,7 @@ const HeaderNav = ({
|
|
|
172
172
|
// Otherwise, render out as usual:
|
|
173
173
|
return (
|
|
174
174
|
<SubNavItem key={thisSubUrl}>
|
|
175
|
-
<SubNavLink href={thisSubUrl} inline role="menuitem">
|
|
175
|
+
<SubNavLink href={thisSubUrl} $inline role="menuitem">
|
|
176
176
|
<Text>{child.title}</Text>
|
|
177
177
|
</SubNavLink>
|
|
178
178
|
</SubNavItem>
|
|
@@ -188,7 +188,7 @@ const HeaderNav = ({
|
|
|
188
188
|
|
|
189
189
|
{/* These are only shown on the non-desktop view; the desktop nav renders
|
|
190
190
|
these in the parent Header component to suit the design layout */}
|
|
191
|
-
<NavMetaIcons isHeader data-testid="meta-icons--mobile">
|
|
191
|
+
<NavMetaIcons $isHeader data-testid="meta-icons--mobile">
|
|
192
192
|
{metaIcons}
|
|
193
193
|
</NavMetaIcons>
|
|
194
194
|
<DonateButtonWrapperBottom data-testid="donate-button--mobile">
|
|
@@ -86,7 +86,7 @@ const MainNav = ({ navItems = {} }) => {
|
|
|
86
86
|
<NavItem
|
|
87
87
|
role="none"
|
|
88
88
|
key={group.id}
|
|
89
|
-
index={index}
|
|
89
|
+
$index={index}
|
|
90
90
|
$isSubMenuOpen={!!isSubMenuOpen[group.id]}
|
|
91
91
|
>
|
|
92
92
|
{isMobile ? (
|
|
@@ -157,7 +157,7 @@ const MainNav = ({ navItems = {} }) => {
|
|
|
157
157
|
}
|
|
158
158
|
return (
|
|
159
159
|
<SubNavItem key={thisSubUrl}>
|
|
160
|
-
<SubNavLink href={thisSubUrl} inline role="menuitem">
|
|
160
|
+
<SubNavLink href={thisSubUrl} $inline role="menuitem">
|
|
161
161
|
<Text>{child.title}</Text>
|
|
162
162
|
</SubNavLink>
|
|
163
163
|
</SubNavItem>
|
|
@@ -12,7 +12,7 @@ const Header2025 = ({
|
|
|
12
12
|
navItems = {}, metaIcons = undefined, campaign = 'Comic Relief', donateButton = null,
|
|
13
13
|
characterLimit = 60, showBoxShadow = false, ...rest
|
|
14
14
|
}) => (
|
|
15
|
-
<Header2025Wrapper navItems $showBoxShadow={showBoxShadow} {...rest}>
|
|
15
|
+
<Header2025Wrapper $navItems $showBoxShadow={showBoxShadow} {...rest}>
|
|
16
16
|
<InnerWrapper>
|
|
17
17
|
<Brand>
|
|
18
18
|
<LogoLinked
|
|
@@ -31,7 +31,7 @@ const Header2025 = ({
|
|
|
31
31
|
/>
|
|
32
32
|
<ButtonsAndIcons>
|
|
33
33
|
{ metaIcons && (
|
|
34
|
-
<Header2025MetaIcons isHeader data-testid="meta-icons--desktop">{metaIcons}</Header2025MetaIcons>
|
|
34
|
+
<Header2025MetaIcons $isHeader data-testid="meta-icons--desktop">{metaIcons}</Header2025MetaIcons>
|
|
35
35
|
)}
|
|
36
36
|
<DonateButtonWrapperTop data-testid="donate-button--desktop">{donateButton}</DonateButtonWrapperTop>
|
|
37
37
|
</ButtonsAndIcons>
|
|
@@ -115,7 +115,7 @@ export default function Header2025Example() {
|
|
|
115
115
|
navItems={data}
|
|
116
116
|
rotate="true"
|
|
117
117
|
donateButton={donateButton}
|
|
118
|
-
metaIcons={
|
|
118
|
+
metaIcons={(
|
|
119
119
|
<div>
|
|
120
120
|
<Icon
|
|
121
121
|
icon={searchIcon}
|
|
@@ -129,7 +129,7 @@ export default function Header2025Example() {
|
|
|
129
129
|
id="search"
|
|
130
130
|
/>
|
|
131
131
|
</div>
|
|
132
|
-
}
|
|
132
|
+
)}
|
|
133
133
|
/>
|
|
134
134
|
</ExampleContainer>
|
|
135
135
|
|
|
@@ -138,7 +138,7 @@ const HeaderNav2025 = ({
|
|
|
138
138
|
<HeaderNavItem2025
|
|
139
139
|
thisID={thisID}
|
|
140
140
|
key={`${thisID}--item`}
|
|
141
|
-
index={index}
|
|
141
|
+
$index={index}
|
|
142
142
|
hasSubMenu={hasSubMenu}
|
|
143
143
|
openedSubMenu={openedSubMenu}
|
|
144
144
|
toggleSubMenu={toggleSubMenu}
|
|
@@ -172,7 +172,7 @@ const HeaderNav2025 = ({
|
|
|
172
172
|
{/* These are only shown on the non-desktop view; the desktop nav renders
|
|
173
173
|
these in the parent Header component to suit the design layout */}
|
|
174
174
|
{metaIcons && (
|
|
175
|
-
<NavMetaIcons isHeader data-testid="meta-icons--mobile">
|
|
175
|
+
<NavMetaIcons $isHeader data-testid="meta-icons--mobile">
|
|
176
176
|
{metaIcons}
|
|
177
177
|
</NavMetaIcons>
|
|
178
178
|
)}
|
|
@@ -18,13 +18,13 @@ const HeaderNavItem2025 = (
|
|
|
18
18
|
<NavItem
|
|
19
19
|
role="none"
|
|
20
20
|
key={`${index}-${thisID}--item`}
|
|
21
|
-
index={index}
|
|
21
|
+
$index={index}
|
|
22
22
|
$isSubMenuOpen={!!openedSubMenu}
|
|
23
23
|
>
|
|
24
24
|
{isNotDesktop ? (
|
|
25
25
|
<NavLink
|
|
26
26
|
href={hasPopUp ? '#' : thisUrl}
|
|
27
|
-
inline
|
|
27
|
+
$inline
|
|
28
28
|
rel={relNoopener}
|
|
29
29
|
aria-expanded={!!openedSubMenu[thisID]}
|
|
30
30
|
aria-haspopup={hasPopUp}
|
|
@@ -44,7 +44,7 @@ const HeaderNavItem2025 = (
|
|
|
44
44
|
<StyledText>
|
|
45
45
|
<DesktopNavLink
|
|
46
46
|
href={thisUrl}
|
|
47
|
-
inline
|
|
47
|
+
$inline
|
|
48
48
|
rel={relNoopener}
|
|
49
49
|
aria-haspopup={hasPopUp}
|
|
50
50
|
key={`${index}-${thisID}`}
|
|
@@ -82,7 +82,7 @@ const HeaderNavItem2025 = (
|
|
|
82
82
|
// Otherwise, render out as usual:
|
|
83
83
|
return (
|
|
84
84
|
<SubNavItem key={`${index}-${thisSubUrl}`}>
|
|
85
|
-
<SubNavLink href={thisSubUrl} inline role="menuitem">
|
|
85
|
+
<SubNavLink href={thisSubUrl} $inline role="menuitem">
|
|
86
86
|
<Text size="s">{child.title}</Text>
|
|
87
87
|
</SubNavLink>
|
|
88
88
|
</SubNavItem>
|
|
@@ -69,7 +69,7 @@ const MoreNav = ({
|
|
|
69
69
|
or a 'button' to show the submenu: */}
|
|
70
70
|
<MoreNavNestedLink
|
|
71
71
|
href={hasPopUp ? '#' : thisUrl}
|
|
72
|
-
inline
|
|
72
|
+
$inline
|
|
73
73
|
rel={relNoopener}
|
|
74
74
|
aria-haspopup={hasPopUp}
|
|
75
75
|
role={hasPopUp ? 'button' : 'link'}
|
|
@@ -102,7 +102,7 @@ const MoreNav = ({
|
|
|
102
102
|
<MoreNavSubItem key={thisSubUrl}>
|
|
103
103
|
<MoreSubNavLink
|
|
104
104
|
href={thisSubUrl}
|
|
105
|
-
inline
|
|
105
|
+
$inline
|
|
106
106
|
role="menuitem"
|
|
107
107
|
// Allows us to avoid using the 'display:none'
|
|
108
108
|
// approach so we can animate properly:
|
|
@@ -48,7 +48,7 @@ const OptInCheckbox = ({
|
|
|
48
48
|
|
|
49
49
|
return (
|
|
50
50
|
<CheckContainer>
|
|
51
|
-
<CheckLabel htmlFor={`${name}-yes`} userSelection={userSelection}>
|
|
51
|
+
<CheckLabel htmlFor={`${name}-yes`} $userSelection={userSelection}>
|
|
52
52
|
<AssociatedFieldsName className={`icon-${name}`}>
|
|
53
53
|
{ AssociatedFields[name].label }
|
|
54
54
|
</AssociatedFieldsName>
|
|
@@ -125,9 +125,9 @@ const Signup = ({
|
|
|
125
125
|
const MoneyBoxes = regularGiving.moneybuys.map(
|
|
126
126
|
({ value, description }, index) => (
|
|
127
127
|
<MoneyBox
|
|
128
|
-
isSelected={index === 1 && isSelected}
|
|
129
|
-
boxBorderColor={boxBorderColor}
|
|
130
|
-
isInputMatchBox={value}
|
|
128
|
+
$isSelected={index === 1 && isSelected}
|
|
129
|
+
$boxBorderColor={boxBorderColor}
|
|
130
|
+
$isInputMatchBox={value}
|
|
131
131
|
amount={value}
|
|
132
132
|
description={`£${value}`}
|
|
133
133
|
setOtherAmount={() => selectMoneyBuy(description, value)}
|
|
@@ -584,11 +584,8 @@ it('renders correctly', () => {
|
|
|
584
584
|
<input
|
|
585
585
|
aria-label="£5"
|
|
586
586
|
aria-required={false}
|
|
587
|
-
boxBorderColor=""
|
|
588
587
|
className="c20"
|
|
589
588
|
id="mship-1--moneyBuy-box1"
|
|
590
|
-
isInputMatchBox="5"
|
|
591
|
-
isSelected={false}
|
|
592
589
|
name="mship-1--moneyBuy1"
|
|
593
590
|
onClick={[Function]}
|
|
594
591
|
placeholder=""
|
|
@@ -620,11 +617,8 @@ it('renders correctly', () => {
|
|
|
620
617
|
<input
|
|
621
618
|
aria-label="£10"
|
|
622
619
|
aria-required={false}
|
|
623
|
-
boxBorderColor=""
|
|
624
620
|
className="c20"
|
|
625
621
|
id="mship-1--moneyBuy-box2"
|
|
626
|
-
isInputMatchBox="10"
|
|
627
|
-
isSelected={true}
|
|
628
622
|
name="mship-1--moneyBuy2"
|
|
629
623
|
onClick={[Function]}
|
|
630
624
|
placeholder=""
|
|
@@ -656,11 +650,8 @@ it('renders correctly', () => {
|
|
|
656
650
|
<input
|
|
657
651
|
aria-label="£20"
|
|
658
652
|
aria-required={false}
|
|
659
|
-
boxBorderColor=""
|
|
660
653
|
className="c20"
|
|
661
654
|
id="mship-1--moneyBuy-box3"
|
|
662
|
-
isInputMatchBox="20"
|
|
663
|
-
isSelected={false}
|
|
664
655
|
name="mship-1--moneyBuy3"
|
|
665
656
|
onClick={[Function]}
|
|
666
657
|
placeholder=""
|
|
@@ -13,7 +13,7 @@ const MoneyBox = styled(Input)`
|
|
|
13
13
|
letter-spacing: -2px;
|
|
14
14
|
height: auto;
|
|
15
15
|
|
|
16
|
-
${({ boxBorderColor, isInputMatchBox, isSelected }) => (boxBorderColor === isInputMatchBox || isSelected)
|
|
16
|
+
${({ $boxBorderColor, $isInputMatchBox, $isSelected }) => ($boxBorderColor === $isInputMatchBox || $isSelected)
|
|
17
17
|
&& css`
|
|
18
18
|
border-color: ${({ theme }) => theme.color('red')};
|
|
19
19
|
background-color: ${({ theme }) => theme.color('red')};
|