@comicrelief/component-library 8.6.1 → 8.7.0

package/dist/components/Molecules/Accordion/Accordion.js

@@ -43,19 +43,21 @@ const Copy = _styledComponents.default.div.withConfig({
   return theme.allBreakpoints('M');
 }, (0, _spacing.default)('lg'), _ref4 => {
   let {
-    isOpen
+    isOpen,
+    contentBottomPadding
   } = _ref4;
-  return isOpen && (0, _styledComponents.css)(["height:auto;visibility:visible;transition:all 0.2s cubic-bezier(0.21,1.7,0.83,0.68) 0s;padding:0 ", " ", ";@media ", "{padding:0 ", " ", ";}"], (0, _spacing.default)('l'), (0, _spacing.default)('l'), _ref5 => {
+  return isOpen && (0, _styledComponents.css)(["height:auto;visibility:visible;transition:all 0.2s cubic-bezier(0.21,1.7,0.83,0.68) 0s;padding:0 ", " ", ";@media ", "{padding:0 ", " ", ";}"], (0, _spacing.default)('lg'), contentBottomPadding || (0, _spacing.default)('l'), _ref5 => {
     let {
       theme
     } = _ref5;
     return theme.allBreakpoints('M');
-  }, (0, _spacing.default)('lg'), (0, _spacing.default)('l'));
+  }, (0, _spacing.default)('lg'), contentBottomPadding || (0, _spacing.default)('l'));
 });
 const Accordion = _ref6 => {
   let {
     children,
     title,
+    contentBottomPadding,
     ...rest
   } = _ref6;
   const [isOpen, setIsOpen] = (0, _react.useState)(false);
@@ -65,12 +67,14 @@ const Accordion = _ref6 => {
   return /*#__PURE__*/_react.default.createElement(Container, rest, /*#__PURE__*/_react.default.createElement(Button, {
     onClick: handleOpen,
     "aria-expanded": isOpen ? 'true' : 'false',
-    ChevronKeyframes: ChevronKeyframes
+    ChevronKeyframes: ChevronKeyframes,
+    type: "button"
   }, title, /*#__PURE__*/_react.default.createElement(Icon, null, /*#__PURE__*/_react.default.createElement(_index.Chevron, {
     colour: "black",
     direction: isOpen ? 'up' : 'down'
   }))), /*#__PURE__*/_react.default.createElement(Copy, {
-    isOpen: isOpen
+    isOpen: isOpen,
+    contentBottomPadding: contentBottomPadding
   }, children));
 };
 var _default = exports.default = Accordion;

package/dist/components/Molecules/Accordion/Accordion.md

@@ -13,3 +13,18 @@ import Text from '../../Atoms/Text/Text';
  <Text tag="p">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</Text>
 </Accordion>
 ```
+
+```js
+import Text from '../../Atoms/Text/Text';
+
+<Accordion
+  contentBottomPadding="15px"
+  title={
+    <Text family="Anton" size="l" uppercase>
+      I am the title
+    </Text>
+  }
+  >
+ <Text tag="p">Customised bottom padding here!</Text>
+</Accordion>
+```

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

@@ -114,6 +114,7 @@ exports[`renders correctly 1`] = `
     aria-expanded="false"
     className="c1"
     onClick={[Function]}
+    type="button"
   >
     <h2
       className="c2"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comicrelief/component-library",
   "author": "Comic Relief Engineering Team",
-  "version": "8.6.1",
+  "version": "8.7.0",
   "main": "dist/index.js",
   "license": "ISC",
   "jest": {

package/playwright/components/molecules/accordian.spec.js

@@ -2,18 +2,17 @@ const { test, expect } = require('@playwright/test');
 
 test.describe('accordian component', () => {
   test('accordian', async ({ page, context }) => {
-
     await page.goto('/#accordion');
 
     // accordian elements should be visible
     await expect(page.locator('[data-testid="Accordion-example-1"]')).toBeVisible();
-    await expect(page.locator('[data-preview="Accordion"]')).toBeVisible();
+    await expect(page.locator('[data-testid="Accordion-example-1"] [data-preview="Accordion"]')).toBeVisible();
     // dropdown svg icon should be visible
-    await expect(page.locator('[data-preview="Accordion"] svg')).toBeVisible();
+    await expect(page.locator('[data-testid="Accordion-example-1"] [data-preview="Accordion"] svg')).toBeVisible();
 
     // clicking the accordian should show the paragraph
-    await page.locator('[data-preview="Accordion"] svg').click();
-    await expect(page.locator('[data-preview="Accordion"] p')).toBeVisible();
+    await page.locator('[data-testid="Accordion-example-1"] [data-preview="Accordion"] svg').click();
+    await expect(page.locator('[data-testid="Accordion-example-1"] [data-preview="Accordion"] p')).toBeVisible();
 
     await page.close();
   });

package/src/components/Molecules/Accordion/Accordion.js

@@ -60,20 +60,20 @@ const Copy = styled.div`
     padding: 0 ${spacing('lg')};
   }
 
-  ${({ isOpen }) => (isOpen && css`
+  ${({ isOpen, contentBottomPadding }) => (isOpen && css`
     height: auto;
     visibility: visible;
     transition: all 0.2s cubic-bezier(0.21, 1.7, 0.83, 0.68) 0s;
-    padding: 0 ${spacing('l')} ${spacing('l')};
+    padding: 0 ${spacing('lg')} ${contentBottomPadding || spacing('l')};
 
     @media ${({ theme }) => theme.allBreakpoints('M')} {
-      padding: 0 ${spacing('lg')} ${spacing('l')};
+      padding: 0 ${spacing('lg')} ${contentBottomPadding || spacing('l')};
     }
   `)}
 `;
 
 const Accordion = ({
-  children, title, ...rest
+  children, title, contentBottomPadding, ...rest
 }) => {
   const [isOpen, setIsOpen] = useState(false);
 
@@ -83,13 +83,13 @@ const Accordion = ({
 
   return (
     <Container {...rest}>
-      <Button onClick={handleOpen} aria-expanded={isOpen ? 'true' : 'false'} ChevronKeyframes={ChevronKeyframes}>
+      <Button onClick={handleOpen} aria-expanded={isOpen ? 'true' : 'false'} ChevronKeyframes={ChevronKeyframes} type="button">
         {title}
         <Icon>
           <Chevron colour="black" direction={isOpen ? 'up' : 'down'} />
         </Icon>
       </Button>
-      <Copy isOpen={isOpen}>
+      <Copy isOpen={isOpen} contentBottomPadding={contentBottomPadding}>
         {children}
       </Copy>
     </Container>
@@ -97,6 +97,7 @@ const Accordion = ({
 };
 
 Accordion.propTypes = {
+  contentBottomPadding: PropTypes.string,
   children: PropTypes.node.isRequired,
   title: PropTypes.oneOfType([
     PropTypes.string,

package/src/components/Molecules/Accordion/Accordion.md

@@ -13,3 +13,18 @@ import Text from '../../Atoms/Text/Text';
  <Text tag="p">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</Text>
 </Accordion>
 ```
+
+```js
+import Text from '../../Atoms/Text/Text';
+
+<Accordion
+  contentBottomPadding="15px"
+  title={
+    <Text family="Anton" size="l" uppercase>
+      I am the title
+    </Text>
+  }
+  >
+ <Text tag="p">Customised bottom padding here!</Text>
+</Accordion>
+```

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

@@ -114,6 +114,7 @@ exports[`renders correctly 1`] = `
     aria-expanded="false"
     className="c1"
     onClick={[Function]}
+    type="button"
   >
     <h2
       className="c2"