@comicrelief/component-library 5.6.0 → 5.6.1

package/dist/components/Atoms/Link/Link.js

@@ -44,7 +44,9 @@ var Link = function Link(_ref) {
   if (target === null) {
     // Use our helper function to determine the raw domains to compare
     var currentDomain = (0, _internalLinkHelper.getDomain)(document.location.host);
-    var linkDomain = (0, _internalLinkHelper.getDomain)(href);
+    var linkDomain = (0, _internalLinkHelper.getDomain)(href); // Additional check for applications that need more control
+
+    var isWhiteListOverridden = rest.overrideWhiteList === true;
     /**
      * If the link has no domain supplied (likely '/' or '#')
      * OR has the same domain as the current page, don't open
@@ -53,7 +55,7 @@ var Link = function Link(_ref) {
 
     var isExternalLink = linkDomain !== '' && currentDomain !== linkDomain;
     var isWhiteListed = (0, _whiteListed.default)(href);
-    window = isExternalLink && !isWhiteListed ? '_blank' : '_self';
+    window = isExternalLink && (isWhiteListOverridden || !isWhiteListed) ? '_blank' : '_self';
   } else {
     window = target === 'blank' ? '_blank' : '_self';
   }

package/dist/components/Organisms/Footer/Footer.js

@@ -42,9 +42,9 @@ var Footer = function Footer(_ref) {
     sizeMd: "72px",
     rotate: false,
     campaign: campaign
-  }))), /*#__PURE__*/_react.default.createElement(_Nav.default, {
+  }))), /*#__PURE__*/_react.default.createElement(_Nav.default, Object.assign({
     navItems: navItems
-  }), /*#__PURE__*/_react.default.createElement(_Footer.FooterCopyright, null, /*#__PURE__*/_react.default.createElement(_Text.default, {
+  }, rest)), /*#__PURE__*/_react.default.createElement(_Footer.FooterCopyright, null, /*#__PURE__*/_react.default.createElement(_Text.default, {
     tag: "p",
     color: "grey"
   }, footerCopy)))));
@@ -53,7 +53,8 @@ var Footer = function Footer(_ref) {
 Footer.defaultProps = {
   navItems: {},
   footerCopy: '',
-  campaign: 'Comic Relief'
+  campaign: 'Comic Relief',
+  overrideWhiteList: false
 };
 var _default = Footer;
 exports.default = _default;

package/dist/components/Organisms/Footer/Footer.md

@@ -4,5 +4,12 @@
 import data from './data/data';
 import footerCopy from './data/footerCopy';
 
-<Footer navItems={data} footerCopy={footerCopy.copy} campaign="Comic Relief" />;
+<>
+    <p>Standard footer</p>
+    <Footer navItems={data} footerCopy={footerCopy.copy} campaign="Comic Relief"  />
+
+    <p>Overrides whitelist functionality for external usage</p>
+    <Footer navItems={data} footerCopy={footerCopy.copy} campaign="Comic Relief" overrideWhiteList />
+</>
+
 ```

package/dist/components/Organisms/Footer/Nav/Nav.js

@@ -11,6 +11,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/es
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _Text = _interopRequireDefault(require("../../../Atoms/Text/Text"));
@@ -23,12 +25,15 @@ var _internalLinkHelper = require("../../../../utils/internalLinkHelper");
 
 var _Nav = require("./Nav.style");
 
+var _excluded = ["navItems"];
+
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var FooterNav = function FooterNav(_ref) {
-  var navItems = _ref.navItems;
+  var navItems = _ref.navItems,
+      rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var menuGroups = navItems.menuGroups;
 
   var _useState = (0, _react.useState)(false),
@@ -96,14 +101,14 @@ var FooterNav = function FooterNav(_ref) {
     }, !isSmallBreakpoint ? /*#__PURE__*/_react.default.createElement(_Text.default, {
       color: "white",
       weight: "bold"
-    }, group.title) : /*#__PURE__*/_react.default.createElement(_Nav.NavLink, {
+    }, group.title) : /*#__PURE__*/_react.default.createElement(_Nav.NavLink, Object.assign({
       href: "#",
       inline: true,
       "aria-expanded": !!isSubMenuOpen[group.id],
       "aria-haspopup": "true",
       role: "button",
       onClick: toggleSubMenu(group.id)
-    }, /*#__PURE__*/_react.default.createElement(_Text.default, {
+    }, rest), /*#__PURE__*/_react.default.createElement(_Text.default, {
       color: "white"
     }, group.title)), group.links && group.links.length > 0 && /*#__PURE__*/_react.default.createElement(_Nav.SubNavMenu, {
       role: "list",
@@ -117,11 +122,11 @@ var FooterNav = function FooterNav(_ref) {
       return /*#__PURE__*/_react.default.createElement(_Nav.SubNavItem, {
         key: thisUrl,
         column: group.links.length % 2 === 0 && group.links.length > 2
-      }, /*#__PURE__*/_react.default.createElement(_Nav.SubNavLink, {
+      }, /*#__PURE__*/_react.default.createElement(_Nav.SubNavLink, Object.assign({
         href: thisUrl,
         inline: true,
         role: "menuitem"
-      }, /*#__PURE__*/_react.default.createElement(_Text.default, {
+      }, rest), /*#__PURE__*/_react.default.createElement(_Text.default, {
         color: "white"
       }, child.title)));
     })));

package/package.json

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

package/src/components/Atoms/Link/Link.js

@@ -28,15 +28,18 @@ const Link = ({
     const currentDomain = getDomain(document.location.host);
     const linkDomain = getDomain(href);
 
+    // Additional check for applications that need more control
+    const isWhiteListOverridden = rest.overrideWhiteList === true;
+
     /**
      * If the link has no domain supplied (likely '/' or '#')
      * OR has the same domain as the current page, don't open
      * in a new tab
      */
     const isExternalLink = linkDomain !== '' && (currentDomain !== linkDomain);
-
     const isWhiteListed = whiteListed(href);
-    window = isExternalLink && !isWhiteListed ? '_blank' : '_self';
+
+    window = isExternalLink && (isWhiteListOverridden || !isWhiteListed) ? '_blank' : '_self';
   } else {
     window = target === 'blank' ? '_blank' : '_self';
   }

package/src/components/Organisms/Footer/Footer.js

@@ -31,7 +31,7 @@ const Footer = ({
               <Logo sizeSm="48px" sizeMd="72px" rotate={false} campaign={campaign} />
             </Brand>
           </FooterBranding>
-          <FooterNav navItems={navItems} />
+          <FooterNav navItems={navItems} {...rest} />
           <FooterCopyright>
             <Text tag="p" color="grey">
               {footerCopy}
@@ -46,13 +46,15 @@ const Footer = ({
 Footer.propTypes = {
   navItems: PropTypes.objectOf(PropTypes.shape),
   footerCopy: PropTypes.string,
-  campaign: PropTypes.string
+  campaign: PropTypes.string,
+  overrideWhiteList: PropTypes.bool
 };
 
 Footer.defaultProps = {
   navItems: {},
   footerCopy: '',
-  campaign: 'Comic Relief'
+  campaign: 'Comic Relief',
+  overrideWhiteList: false
 };
 
 export default Footer;

package/src/components/Organisms/Footer/Footer.md

@@ -4,5 +4,12 @@
 import data from './data/data';
 import footerCopy from './data/footerCopy';
 
-<Footer navItems={data} footerCopy={footerCopy.copy} campaign="Comic Relief" />;
+<>
+    <p>Standard footer</p>
+    <Footer navItems={data} footerCopy={footerCopy.copy} campaign="Comic Relief"  />
+
+    <p>Overrides whitelist functionality for external usage</p>
+    <Footer navItems={data} footerCopy={footerCopy.copy} campaign="Comic Relief" overrideWhiteList />
+</>
+
 ```

package/src/components/Organisms/Footer/Nav/Nav.js

@@ -16,7 +16,7 @@ import {
   SubNavLink
 } from './Nav.style';
 
-const FooterNav = ({ navItems }) => {
+const FooterNav = ({ navItems, ...rest }) => {
   const { menuGroups } = navItems;
   const [isExpandable] = useState(false);
   const [isSubMenuOpen, setIsSubMenuOpen] = useState({});
@@ -78,6 +78,7 @@ const FooterNav = ({ navItems }) => {
                 aria-haspopup="true"
                 role="button"
                 onClick={toggleSubMenu(group.id)}
+                {...rest}
               >
                 <Text color="white">{group.title}</Text>
               </NavLink>
@@ -103,7 +104,7 @@ const FooterNav = ({ navItems }) => {
                         group.links.length % 2 === 0 && group.links.length > 2
                       }
                     >
-                      <SubNavLink href={thisUrl} inline role="menuitem">
+                      <SubNavLink href={thisUrl} inline role="menuitem" {...rest}>
                         <Text color="white">{child.title}</Text>
                       </SubNavLink>
                     </SubNavItem>