@comicrelief/component-library 8.44.3 → 8.44.4

package/src/components/Atoms/Input/input.test.js

@@ -147,7 +147,6 @@ it('renders correctly', () => {
     >
       <span
         className="c1 c2"
-        color="inherit"
         dangerouslySetInnerHTML={
           Object {
             "__html": "Label",
@@ -327,7 +326,6 @@ it('renders with responsive max widths correctly', () => {
     >
       <span
         className="c1 c2"
-        color="inherit"
         dangerouslySetInnerHTML={
           Object {
             "__html": "Responsive Width Input",

package/src/components/Atoms/RadioButton/RadioButton.test.js

@@ -122,8 +122,6 @@ it('renders correctly', () => {
         <span />
         <span
           className="c2"
-          color="inherit"
-          size="s"
         >
           Male
         </span>
@@ -237,8 +235,6 @@ it('renders correctly', () => {
         <span />
         <span
           className="c2"
-          color="inherit"
-          size="s"
         >
           Female
         </span>

package/src/components/Atoms/Select/__snapshots__/Select.test.js.snap

@@ -111,7 +111,6 @@ exports[`renders correctly 1`] = `
 >
   <span
     className="c1 c2"
-    color="inherit"
     dangerouslySetInnerHTML={
       Object {
         "__html": "Label",

package/src/components/Atoms/Text/Text.js

@@ -19,19 +19,19 @@ export const BaseText = styled.span`
       // all tags will use the new standardised styles set in fontHelper), but, in order to ensure
       // things don't break/look bad accidentally, it'll require intentional, in-situ prop removal.
 
-      ${({ size }) => (size && `font-size: ${theme.fontSize(size)}`)};
-      ${({ size }) => (size && 'line-height: normal')};
+      ${({ $size }) => ($size && `font-size: ${theme.fontSize($size)}`)};
+      ${({ $size }) => ($size && 'line-height: normal')};
 
-      ${({ family }) => (family && `font-family: ${theme.fontFamilies(family)}`)};
-      ${({ weight }) => (weight && `font-weight: ${weight}`)};
-      ${({ height }) => (height && `line-height: ${height}`)};
-      ${({ uppercase }) => (uppercase && 'text-transform: uppercase')};
+      ${({ $family }) => ($family && `font-family: ${theme.fontFamilies($family)}`)};
+      ${({ $weight }) => ($weight && `font-weight: ${$weight}`)};
+      ${({ $height }) => ($height && `line-height: ${$height}`)};
+      ${({ $uppercase }) => ($uppercase && 'text-transform: uppercase')};
 
-      color: ${({ color }) => (color ? theme.color(color) : 'inherit')};
+      color: ${({ $color }) => ($color ? theme.color($color) : 'inherit')};
 
-      ${({ textAlign }) => textAlign && `text-align: ${textAlign}`};
+      ${({ $textAlign }) => $textAlign && `text-align: ${$textAlign}`};
 
-      ${({ size }) => (size === 'super' && css`
+      ${({ $size }) => ($size === 'super' && css`
         font-size: ${theme.fontSize('xxl')};
         line-height: 3rem;
 
@@ -48,9 +48,9 @@ export const BaseText = styled.span`
         }
       `)};
 
-      ${({ mobileColor }) => mobileColor && css`
+      ${({ $mobileColor }) => $mobileColor && css`
         @media (max-width: ${breakpointValues2026.L - 1}px) {
-          color: ${theme.color(mobileColor)};
+          color: ${theme.color($mobileColor)};
         }
       `};
       
@@ -82,14 +82,14 @@ const Text = ({
   <BaseText
     {...rest}
     as={tag}
-    color={color}
-    size={size}
-    uppercase={uppercase}
-    height={height}
-    weight={weight}
-    family={family}
-    mobileColor={mobileColor}
-    textAlign={textAlign}
+    $color={color}
+    $size={size}
+    $uppercase={uppercase}
+    $height={height}
+    $weight={weight}
+    $family={family}
+    $mobileColor={mobileColor}
+    $textAlign={textAlign}
   >
     {children}
   </BaseText>

package/src/components/Atoms/Text/Text.md

@@ -8,7 +8,7 @@ import fontConfig from  '../../../theme/crTheme/fontConfig';
     // To be phased out: tags to use the prescribed family always
     family="Anton"
   >
-    <span style={{ width: "55px", display: "inline-block" }}>H1 </span>
+    <span style={{ width: "55px"}}>H1 </span>
   </Text>
   <Text style={{ textTransform: "none" }} tag="span" size="s">
     <b>family:</b> {fontConfig['h1'].family} -  
@@ -25,7 +25,7 @@ import fontConfig from  '../../../theme/crTheme/fontConfig';
     mobileColor="green"
     family="Anton"
   >
-    <span style={{ width: "55px", display: "inline-block" }}>H2 </span>
+    <span style={{ width: "55px"}}>H2 </span>
   </Text>
   <Text style={{ textTransform: "none" }} tag="span" size="s">
     <b>family:</b> {fontConfig['h2'].family} - 
@@ -41,7 +41,7 @@ import fontConfig from  '../../../theme/crTheme/fontConfig';
     mobileColor="red"
     family="Montserrat"
   >
-    <span style={{ width: "55px", display: "inline-block" }}>H3 </span>
+    <span style={{ width: "55px"}}>H3 </span>
   </Text>
   <Text style={{ textTransform: "none" }} tag="span" size="s">
     <b>family:</b> {fontConfig['h3'].family} -  
@@ -58,7 +58,7 @@ import fontConfig from  '../../../theme/crTheme/fontConfig';
     weight="normal"
     // To be phased out: text to always be rendered as typed
     uppercase>
-    <span style={{ width: "55px", display: "inline-block" }}>H4 </span>
+    <span style={{ width: "55px"}}>H4 </span>
   </Text>
   <Text style={{ textTransform: "none" }} tag="span" size="s">
     <b>family:</b> {fontConfig['span'].family} -  
@@ -70,8 +70,8 @@ import fontConfig from  '../../../theme/crTheme/fontConfig';
 
 
 
-  <Text tag="p" size="m" style={{ marginTop: "2rem"}}>
-    <span style={{ width: "55px", display: "inline-block" }}>Body</span>
+  <Text tag="p" size="m" style={{ marginTop: "2rem"}} height="100px" weight="500">
+    <span style={{ width: "55px"}}>P (body)</span>
   </Text>
   <Text style={{ textTransform: "none" }} tag="span" size="s">
     <b>family:</b> {fontConfig['p'].family} -  
@@ -91,7 +91,7 @@ import fontConfig from  '../../../theme/crTheme/fontConfig';
     uppercase
     // To be phased-out
     weight="normal">
-    <span style={{ width: "55px", display: "inline-block" }}>H5 </span>
+    <span style={{ width: "55px"}}>H5 </span>
   </Text>
   <Text style={{ textTransform: "none" }} tag="span" size="s">
     <b>family:</b> {fontConfig['h5'].family} -  
@@ -105,7 +105,7 @@ import fontConfig from  '../../../theme/crTheme/fontConfig';
     family="Anton" 
     uppercase
     weight="normal">
-    <span style={{ width: "55px", display: "inline-block" }}>H6</span>
+    <span style={{ width: "55px"}}>H6</span>
   </Text>
   <Text style={{ textTransform: "none" }} tag="span" size="s">
     <b>family:</b> {fontConfig['h6'].family}

package/src/components/Atoms/Text/__snapshots__/Text.test.js.snap

@@ -38,7 +38,6 @@ exports[`renders heavy heading correctly 1`] = `
 
 <h3
   className="c0"
-  color="inherit"
 >
   Heading 3 heavy
 </h3>
@@ -82,8 +81,6 @@ exports[`renders high heading correctly 1`] = `
 
 <h3
   className="c0"
-  color="inherit"
-  height="5"
 >
   Heading 3 high
 </h3>
@@ -128,8 +125,6 @@ exports[`renders large heading correctly 1`] = `
 
 <h3
   className="c0"
-  color="inherit"
-  size="l"
 >
   Heading 3 large
 </h3>
@@ -175,8 +170,6 @@ exports[`renders xl paragraph with Anton font correctly 1`] = `
 
 <p
   className="c0"
-  color="inherit"
-  size="xl"
 >
   My paragraph xl and font Anton
 </p>
@@ -222,8 +215,6 @@ exports[`renders xl yellow paragraph correctly 1`] = `
 
 <p
   className="c0"
-  color="yellow"
-  size="xl"
 >
   My paragraph xl and yellow
 </p>

package/src/components/Atoms/TextArea/TextArea.test.js

@@ -132,7 +132,6 @@ it('renders correctly', () => {
     >
       <span
         className="c1 c2"
-        color="inherit"
         dangerouslySetInnerHTML={
           Object {
             "__html": "Label",

package/src/components/Atoms/TextInputWithDropdown/__snapshots__/TextInputWithDropdown.test.js.snap

@@ -140,7 +140,6 @@ exports[`renders correctly with no value and no options 1`] = `
   >
     <span
       className="c2 c3"
-      color="inherit"
       dangerouslySetInnerHTML={
         Object {
           "__html": "Search for bikes",
@@ -314,7 +313,6 @@ exports[`renders correctly with value and no options 1`] = `
   >
     <span
       className="c2 c3"
-      color="inherit"
       dangerouslySetInnerHTML={
         Object {
           "__html": "Search for bikes",
@@ -527,7 +525,6 @@ exports[`renders correctly with value and options 1`] = `
   >
     <span
       className="c2 c3"
-      color="inherit"
       dangerouslySetInnerHTML={
         Object {
           "__html": "Search for bikes",
@@ -577,7 +574,6 @@ exports[`renders correctly with value and options 1`] = `
       >
         <span
           className="c2"
-          color="inherit"
         >
           Canyon
         </span>
@@ -593,7 +589,6 @@ exports[`renders correctly with value and options 1`] = `
       >
         <span
           className="c2"
-          color="inherit"
         >
           Cannondale
         </span>
@@ -609,7 +604,6 @@ exports[`renders correctly with value and options 1`] = `
       >
         <span
           className="c2"
-          color="inherit"
         >
           Condor
         </span>
@@ -625,7 +619,6 @@ exports[`renders correctly with value and options 1`] = `
       >
         <span
           className="c2"
-          color="inherit"
         >
           Cube
         </span>

package/src/components/Molecules/Accordion/__snapshots__/Accordion.test.js.snap

@@ -175,8 +175,6 @@ exports[`renders correctly 1`] = `
   >
     <h2
       className="c2"
-      color="inherit"
-      size="l"
     >
       I am the title
     </h2>
@@ -203,8 +201,6 @@ exports[`renders correctly 1`] = `
   >
     <p
       className="c6"
-      color="inherit"
-      size="s"
     >
       Name, surname, email and billing address We need these to process your payment, create a receipt and send it to you. Establishment information We use this information to understand which institutions (e.g. schools, companies) raise money for us. Your details will be kept safe and never shared with other organisations; see our Privacy Policy for more information
     </p>

package/src/components/Molecules/ArticleTeaser/ArticleTeaser.test.js

@@ -294,16 +294,11 @@ it('renders article teaser correctly', () => {
         >
           <span
             className="c8 c9"
-            color="inherit"
-            size="xs"
           >
              01 July 2019
           </span>
           <h3
             className="c10 c11"
-            color="inherit"
-            height="2rem"
-            size="xl"
           >
             News article
           </h3>
@@ -576,16 +571,11 @@ it('renders press realese correctly', () => {
         >
           <span
             className="c8 c9"
-            color="inherit"
-            size="xs"
           >
              01 July 2019
           </span>
           <h3
             className="c10 c11"
-            color="inherit"
-            height="2rem"
-            size="xl"
           >
             Press Release
           </h3>

package/src/components/Molecules/Banner/__snapshots__/Banner.test.js.snap

@@ -69,8 +69,6 @@ exports[`renders correctly 1`] = `
   >
     <p
       className="c2"
-      color="white"
-      size="s"
     >
       Mental health issues affect 1 in 4 of us in the UK. Join now and with your help we can provide vital support for people like Jordan. You know what to do.
     </p>

package/src/components/Molecules/Descriptor/Descriptor.test.js

@@ -249,8 +249,6 @@ it('renders article teaser correctly', () => {
         >
           <span
             className="c3 c4"
-            color="grey_dark"
-            size="s"
           >
             15/06/2020
           </span>
@@ -276,9 +274,6 @@ it('renders article teaser correctly', () => {
         </div>
         <h3
           className="c7 c8"
-          color="inherit"
-          height="2rem"
-          size="xl"
         >
           Title
         </h3>
@@ -287,29 +282,21 @@ it('renders article teaser correctly', () => {
         >
           <span
             className="c10 c11"
-            color="grey_dark"
-            size="xs"
           >
             tag1
           </span>
           <span
             className="c10 c11"
-            color="grey_dark"
-            size="xs"
           >
             tag2
           </span>
           <span
             className="c10 c11"
-            color="grey_dark"
-            size="xs"
           >
             tag3
           </span>
           <span
             className="c10 c11"
-            color="grey_dark"
-            size="xs"
           >
             tag4
           </span>

package/src/components/Molecules/InfoBanner/__snapshots__/InfoBanner.test.js.snap

@@ -140,15 +140,11 @@ exports[`renders correctly 1`] = `
   >
     <h3
       className="c2"
-      color="inherit"
-      size="md"
     >
       Project Name
     </h3>
     <p
       className="c3"
-      color="inherit"
-      size="s"
     >
       Hello There
     </p>
@@ -158,15 +154,11 @@ exports[`renders correctly 1`] = `
   >
     <h3
       className="c2"
-      color="inherit"
-      size="md"
     >
       End Date
     </h3>
     <p
       className="c3"
-      color="inherit"
-      size="s"
     >
       1st June 2020
     </p>
@@ -176,15 +168,11 @@ exports[`renders correctly 1`] = `
   >
     <h3
       className="c2"
-      color="inherit"
-      size="md"
     >
       Funding theme
     </h3>
     <p
       className="c3"
-      color="inherit"
-      size="s"
     >
       <a
         className="c4"
@@ -202,15 +190,11 @@ exports[`renders correctly 1`] = `
   >
     <h3
       className="c2"
-      color="inherit"
-      size="md"
     >
       Amount Awarded
     </h3>
     <p
       className="c3"
-      color="inherit"
-      size="s"
     >
       £2,000,000
     </p>
@@ -220,15 +204,11 @@ exports[`renders correctly 1`] = `
   >
     <h3
       className="c2"
-      color="inherit"
-      size="md"
     >
       Start Date
     </h3>
     <p
       className="c3"
-      color="inherit"
-      size="s"
     >
       1st June 2010
     </p>
@@ -238,15 +218,11 @@ exports[`renders correctly 1`] = `
   >
     <h3
       className="c2"
-      color="inherit"
-      size="md"
     >
       Beneficiary Country
     </h3>
     <p
       className="c3"
-      color="inherit"
-      size="s"
     >
       Uk
     </p>

package/src/components/Molecules/PartnerLink/PartnerLink.test.js

@@ -175,8 +175,6 @@ it('renders correctly', () => {
       </div>
       <span
         className="c4 c5 c6"
-        color="white"
-        size="xxs"
       >
         Find out more
       </span>

package/src/components/Molecules/Promo/__snapshots__/Promo.test.js.snap

@@ -301,15 +301,11 @@ exports[`renders Promo correctly 1`] = `
       >
         <h1
           className="c7"
-          color="white"
-          size="super"
         >
           Curabitur pretium tincidunt lacus
         </h1>
         <p
           className="c8"
-          color="white"
-          size="s"
         >
           Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo, est eros bibendum elit, nec luctus magna sollicitudin.
         </p>
@@ -642,15 +638,11 @@ exports[`renders Promo correctly end position 1`] = `
       >
         <h1
           className="c7"
-          color="white"
-          size="super"
         >
           Curabitur pretium tincidunt lacus
         </h1>
         <p
           className="c8"
-          color="white"
-          size="s"
         >
           Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo, est eros bibendum elit, nec luctus magna sollicitudin.
         </p>

package/src/components/Molecules/SchoolLookup/__snapshots__/SchoolLookup.test.js.snap

@@ -140,7 +140,6 @@ exports[`renders correctly 1`] = `
   >
     <span
       className="c2 c3"
-      color="inherit"
       dangerouslySetInnerHTML={
         Object {
           "__html": "Enter the name or postcode of your school or nursery",

package/src/components/Molecules/SearchInput/SearchInput.test.js

@@ -190,7 +190,6 @@ it('renders correctly', () => {
             >
               <span
                 className="c6 c7"
-                color="inherit"
                 dangerouslySetInnerHTML={
                   Object {
                     "__html": "Search",

package/src/components/Molecules/SearchResult/__snapshots__/SearchResult.test.js.snap

@@ -206,15 +206,11 @@ exports[`renders correctly in minimalist form 1`] = `
     >
       <span
         className="c7"
-        color="inherit"
-        size="xs"
       >
          
       </span>
       <h3
         className="c8 c9"
-        color="inherit"
-        size="xl"
       >
         News article
       </h3>
@@ -466,22 +462,16 @@ exports[`renders correctly with copy 1`] = `
     >
       <span
         className="c7"
-        color="inherit"
-        size="xs"
       >
          
       </span>
       <h3
         className="c8 c9"
-        color="inherit"
-        size="xl"
       >
         News article
       </h3>
       <p
         className="c10"
-        color="inherit"
-        size="m"
       >
         News article copy
       </p>
@@ -696,15 +686,11 @@ exports[`renders correctly with date 1`] = `
     >
       <span
         className="c7"
-        color="inherit"
-        size="xs"
       >
          01 July 2019
       </span>
       <h3
         className="c8 c9"
-        color="inherit"
-        size="xl"
       >
         News article
       </h3>
@@ -920,15 +906,11 @@ exports[`renders correctly with date and type 1`] = `
     >
       <span
         className="c7"
-        color="inherit"
-        size="xs"
       >
          article | 01 July 2019
       </span>
       <h3
         className="c8 c9"
-        color="inherit"
-        size="xl"
       >
         News article
       </h3>

package/src/components/Molecules/SingleMessage/__snapshots__/SingleMessage.test.js.snap

@@ -190,8 +190,6 @@ exports[`renders Single Message with 100% vertical height image correctly 1`] =
   >
     <p
       className="c6"
-      color="white"
-      size="xxl"
     >
       “The creativity that goes into helping people have a better life is extraordinary.”
     </p>
@@ -469,15 +467,11 @@ exports[`renders Single Message with Image correctly 1`] = `
   >
     <h1
       className="c6"
-      color="white"
-      size="xxl"
     >
       title
     </h1>
     <p
       className="c7"
-      color="white"
-      size="s"
     >
       description
     </p>
@@ -733,8 +727,6 @@ exports[`renders Single Message with double image correctly 1`] = `
   >
     <p
       className="c6"
-      color="black"
-      size="xxl"
     >
       “The creativity that goes into helping people have a better life is extraordinary.”
     </p>
@@ -1035,15 +1027,11 @@ exports[`renders Single Message with full width correctly 1`] = `
   >
     <h1
       className="c6"
-      color="white"
-      size="xxl"
     >
       title
     </h1>
     <p
       className="c7"
-      color="white"
-      size="s"
     >
       description
     </p>
@@ -1343,8 +1331,6 @@ exports[`renders Single Message with no Image correctly 1`] = `
   >
     <p
       className="c2"
-      color="white"
-      size="xxl"
     >
       “The creativity that goes into helping people have a better life is extraordinary.”
     </p>