@comicrelief/component-library 5.8.7 → 6.1.1

package/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,30 @@
-Type: patch
+### PR Titles
+#### To pass testing pipeline, these need to follow Conventional Commits spec:
+https://www.conventionalcommits.org/en/v1.0.0/
+e.g.
+`feat: create NewForm component`
+or
+`fix: update broken link in NewForm component`
 
-Fixes #
 
-## Changes proposed in this PR
+### PR description
+#### What is it doing?
+Tell us what it is doing from a technical perspective.
 
-- Briefly describe the changes in this PR
-- Do you have some test asserting this behavior?
+#### Why is this required?
+Tell us why this is required from a business/product perspective.
+
+#### link to Jira ticket:
+Add a link to the Jira ticket.
+
+
+### Quick Checklist:
+- [ ] My PR title follows the Conventional Commit spec.
+
+- [ ] I have filled out the PR description as per the template above.
+
+- [ ] I have added tests to cover new or changed behaviour.
+
+- [ ] I have updated any relevant documentation.
+
+### Important! - lastly, make sure to squash merge...

package/dist/components/Atoms/Logo/Logo.js

@@ -21,8 +21,6 @@ var _srLogo = _interopRequireDefault(require("./assets/sr-logo.svg"));
 
 var _srGameonLogo = _interopRequireDefault(require("./assets/sr-gameon-logo.svg"));
 
-var _bigNightLogo = _interopRequireDefault(require("./assets/big-night-logo.png"));
-
 var Image = _styledComponents.default.img.withConfig({
   displayName: "Logo__Image",
   componentId: "sc-18yiye8-0"
@@ -54,9 +52,6 @@ var themeSwitcher = function themeSwitcher(theme) {
     case 'Sport Relief Gameon':
       return _srGameonLogo.default;
 
-    case 'Big Night In':
-      return _bigNightLogo.default;
-
     default:
       return _crLogo.default;
   }

package/dist/components/Atoms/Select/Select.js

@@ -23,7 +23,7 @@ var _dropDownDarkPurple = _interopRequireDefault(require("./assets/drop-down-dar
 
 var _spacing = _interopRequireDefault(require("../../../theme/shared/spacing"));
 
-var _excluded = ["errorMsg", "description", "label", "options", "hideLabel", "defaultValue", "onChange", "greyDescription", "className"];
+var _excluded = ["errorMsg", "description", "label", "options", "hideLabel", "defaultValue", "onChange", "greyDescription", "className", "optional"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -68,6 +68,7 @@ var Select = /*#__PURE__*/_react.default.forwardRef(function (_ref8, ref) {
       _onChange = _ref8.onChange,
       greyDescription = _ref8.greyDescription,
       className = _ref8.className,
+      optional = _ref8.optional,
       rest = (0, _objectWithoutProperties2.default)(_ref8, _excluded);
 
   var _useState = (0, _react.useState)(''),
@@ -79,7 +80,8 @@ var Select = /*#__PURE__*/_react.default.forwardRef(function (_ref8, ref) {
     label: label,
     hideLabel: hideLabel,
     errorMsg: errorMsg,
-    className: className
+    className: className,
+    optional: optional
   }, /*#__PURE__*/_react.default.createElement(StyledSelect, Object.assign({
     onChange: function onChange(e) {
       setValue(e.currentTarget.value);
@@ -91,6 +93,7 @@ var Select = /*#__PURE__*/_react.default.forwardRef(function (_ref8, ref) {
   }, rest, {
     error: errorMsg,
     defaultValue: defaultValue,
+    required: optional === false,
     hasValue: !!value,
     greyDescription: greyDescription,
     ref: ref
@@ -117,7 +120,8 @@ Select.defaultProps = {
   /** If true, the 'description' option, which is initially selected but disabled, will be grey
    *   - like a text input's placeholder */
   greyDescription: false,
-  className: ''
+  className: '',
+  optional: false
 };
 var _default = Select;
 exports.default = _default;

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

@@ -78,6 +78,7 @@ exports[`renders correctly 1`] = `
     className="c3"
     defaultValue=""
     onChange={[Function]}
+    required={true}
   >
     <option
       disabled={true}

package/dist/components/Molecules/Logos/Logos.js

@@ -33,26 +33,6 @@ var Logos = function Logos(_ref) {
     })));
   }
 
-  if (campaign === 'Big Night In') {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("a", {
-      href: "/",
-      title: "Go to Comic Relief homepage"
-    }, /*#__PURE__*/_react.default.createElement(_Logo.default, {
-      rotate: true,
-      sizeSm: "50px",
-      sizeMd: "60px",
-      campaign: "Comic Relief"
-    })), /*#__PURE__*/_react.default.createElement("a", {
-      href: "/big-night-in",
-      title: "Big night in homepage"
-    }, /*#__PURE__*/_react.default.createElement(_Logo.default, {
-      rotate: false,
-      sizeSm: "100px",
-      sizeMd: "200px",
-      campaign: "Big Night In"
-    })));
-  }
-
   if (campaign === 'Sport Relief') {
     return /*#__PURE__*/_react.default.createElement("a", {
       href: "/sportrelief",
@@ -67,7 +47,7 @@ var Logos = function Logos(_ref) {
     href: "/",
     title: "Go to Comic Relief homepage"
   }, /*#__PURE__*/_react.default.createElement(_Logo.default, {
-    rotate: true,
+    rotate: false,
     campaign: "Comic Relief"
   }));
 };

package/dist/components/Organisms/EmailSignUp/__snapshots__/EmailSignUp.test.js.snap

@@ -231,6 +231,7 @@ exports[`renders ESU School correctly 1`] = `
         defaultValue=""
         onChange={[Function]}
         placeholder="Please choose an option"
+        required={true}
         value=""
       >
         <option

package/dist/index.js

@@ -101,7 +101,7 @@ Object.defineProperty(exports, "Button", {
     return _Button.default;
   }
 });
-Object.defineProperty(exports, "Radio", {
+Object.defineProperty(exports, "RadioButton", {
   enumerable: true,
   get: function get() {
     return _RadioButton.default;

package/package.json

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

package/src/components/Atoms/Logo/Logo.js

@@ -7,7 +7,6 @@ import spacing from '../../../theme/shared/spacing';
 import crLogo from './assets/cr-logo.svg';
 import srLogo from './assets/sr-logo.svg';
 import srLogoGameOn from './assets/sr-gameon-logo.svg';
-import bigNiht from './assets/big-night-logo.png';
 
 const Image = styled.img`
   object-fit: cover;
@@ -37,8 +36,6 @@ const themeSwitcher = theme => {
       return srLogo;
     case 'Sport Relief Gameon':
       return srLogoGameOn;
-    case 'Big Night In':
-      return bigNiht;
     default:
       return crLogo;
   }

package/src/components/Atoms/Select/Select.js

@@ -49,6 +49,7 @@ const Select = React.forwardRef(
       onChange,
       greyDescription,
       className,
+      optional,
       ...rest
     },
     ref
@@ -56,7 +57,13 @@ const Select = React.forwardRef(
     const [value, setValue] = useState('');
 
     return (
-      <Label label={label} hideLabel={hideLabel} errorMsg={errorMsg} className={className}>
+      <Label
+        label={label}
+        hideLabel={hideLabel}
+        errorMsg={errorMsg}
+        className={className}
+        optional={optional}
+      >
         <StyledSelect
           onChange={e => {
             setValue(e.currentTarget.value);
@@ -67,6 +74,7 @@ const Select = React.forwardRef(
           {...rest}
           error={errorMsg}
           defaultValue={defaultValue}
+          required={optional === false}
           hasValue={!!value}
           greyDescription={greyDescription}
           ref={ref}
@@ -102,7 +110,8 @@ Select.propTypes = {
   greyDescription: PropTypes.bool,
   // className is needed so that styled(`Select`) will work
   // (as `rest` is not spread on the outermost component)
-  className: PropTypes.string
+  className: PropTypes.string,
+  optional: PropTypes.bool
 };
 
 Select.defaultProps = {
@@ -112,7 +121,8 @@ Select.defaultProps = {
   /** If true, the 'description' option, which is initially selected but disabled, will be grey
    *   - like a text input's placeholder */
   greyDescription: false,
-  className: ''
+  className: '',
+  optional: false
 };
 
 export default Select;

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

@@ -78,6 +78,7 @@ exports[`renders correctly 1`] = `
     className="c3"
     defaultValue=""
     onChange={[Function]}
+    required={true}
   >
     <option
       disabled={true}

package/src/components/Molecules/Logos/Logos.js

@@ -17,24 +17,6 @@ const Logos = ({ campaign }) => {
     );
   }
 
-  if (campaign === 'Big Night In') {
-    return (
-      <>
-        <a href="/" title="Go to Comic Relief homepage">
-          <Logo rotate sizeSm="50px" sizeMd="60px" campaign="Comic Relief" />
-        </a>
-        <a href="/big-night-in" title="Big night in homepage">
-          <Logo
-            rotate={false}
-            sizeSm="100px"
-            sizeMd="200px"
-            campaign="Big Night In"
-          />
-        </a>
-      </>
-    );
-  }
-
   if (campaign === 'Sport Relief') {
     return (
       <a href="/sportrelief" title="Sport Relief in homepage">
@@ -45,7 +27,7 @@ const Logos = ({ campaign }) => {
 
   return (
     <a href="/" title="Go to Comic Relief homepage">
-      <Logo rotate campaign="Comic Relief" />
+      <Logo rotate={false} campaign="Comic Relief" />
     </a>
   );
 };

package/src/components/Organisms/EmailSignUp/__snapshots__/EmailSignUp.test.js.snap

@@ -231,6 +231,7 @@ exports[`renders ESU School correctly 1`] = `
         defaultValue=""
         onChange={[Function]}
         placeholder="Please choose an option"
+        required={true}
         value=""
       >
         <option

package/src/index.js

@@ -18,7 +18,7 @@ export { default as Logo } from './components/Atoms/Logo/Logo';
 export { default as Picture } from './components/Atoms/Picture/Picture';
 export { default as Link } from './components/Atoms/Link/Link';
 export { default as Button } from './components/Atoms/Button/Button';
-export { default as Radio } from './components/Atoms/RadioButton/RadioButton';
+export { default as RadioButton } from './components/Atoms/RadioButton/RadioButton';
 export { default as Checkbox } from './components/Atoms/Checkbox/Checkbox';
 export { default as Input } from './components/Atoms/Input/Input';
 export { default as Select } from './components/Atoms/Select/Select';