luna-one 3.1.512 → 3.1.514

package/dist/luna/components/MobileNav/MobileNav.js

@@ -108,7 +108,8 @@ var MobileNav = function MobileNav(props) {
       handleSearchSubmit = _useContext.handleSearchSubmit,
       searchField = _useContext.searchField,
       closeHamburger = _useContext.closeHamburger,
-      isBottomBarActive = _useContext.isBottomBarActive;
+      isBottomBarActive = _useContext.isBottomBarActive,
+      sectorFlyoutData = _useContext.sectorFlyoutData;
 
   var _useState = (0, _react.useState)(null),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -236,7 +237,7 @@ var MobileNav = function MobileNav(props) {
     userProfile: userProfile,
     logout: logout,
     authLabels: authLabels
-  })), !disableLogin && /*#__PURE__*/_react["default"].createElement("section", {
+  })), (sectorFlyoutData === null || sectorFlyoutData === void 0 ? void 0 : sectorFlyoutData.authenticated) && /*#__PURE__*/_react["default"].createElement("section", {
     className: "ter-mobile-mega-menu ".concat(isOpen !== null ? "ter-mobile-mega-menu--inactive" : ""),
     onClick: function onClick() {
       return handleSectorFlyoutDeployed();
@@ -252,7 +253,7 @@ var MobileNav = function MobileNav(props) {
     className: "ter-mobile-menu__caret ter-mobile-menu__caret--down",
     src: _downCaretDarkBlue["default"],
     alt: "caret icon"
-  }))), /*#__PURE__*/_react["default"].createElement(MobileDashboardMenu, {
+  }))), (sectorFlyoutData === null || sectorFlyoutData === void 0 ? void 0 : sectorFlyoutData.authenticated) && /*#__PURE__*/_react["default"].createElement(MobileDashboardMenu, {
     text: myDashboardLabel,
     links: waffleMenu === null || waffleMenu === void 0 ? void 0 : waffleMenu.links,
     cta: waffleMenu === null || waffleMenu === void 0 ? void 0 : waffleMenu.cta,

package/dist/luna/components/WaffleMenu/WaffleMenu.scss

@@ -11,6 +11,7 @@
     }    
     &__selector {
         &__button {
+            cursor: pointer;
             padding: 10px 4px 4px 4px;
             border-bottom: 3px solid transparent;
             &--active, &:hover {

package/dist/luna/other-organisms/NavBar/NavBar.js

@@ -114,7 +114,8 @@ var NavBarContext = /*#__PURE__*/(0, _react.createContext)({
   setMouse: function setMouse() {},
   closeAllDropDowns: function closeAllDropDowns() {},
   checkScroll: function checkScroll() {},
-  closeHamburger: function closeHamburger() {}
+  closeHamburger: function closeHamburger() {},
+  sectorFlyoutData: null
 });
 exports.NavBarContext = NavBarContext;
 
@@ -494,7 +495,8 @@ var NavBar = function NavBar(props) {
       desktopSearchDeployed: desktopSearchDeployed,
       setDesktopSearchDeployed: setDesktopSearchDeployed,
       isWaffleMenuDeployed: isWaffleMenuDeployed,
-      setWaffleMenuDeployed: setWaffleMenuDeployed
+      setWaffleMenuDeployed: setWaffleMenuDeployed,
+      sectorFlyoutData: sectorFlyoutData
     }
   }, /*#__PURE__*/_react["default"].createElement("nav", {
     className: "ter-navbar ter-navbar".concat(isHidden && ((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.scrollY) > 100 && !desktopSearchDeployed ? "--is-hidden" : "--is-showing"),
@@ -528,11 +530,11 @@ var NavBar = function NavBar(props) {
     globalSearch: globalSearch,
     setGlobalSearch: setGlobalSearch,
     waffleMenu: true
-  }, /*#__PURE__*/_react["default"].createElement(_WaffleMenu["default"], {
+  }, (sectorFlyoutData === null || sectorFlyoutData === void 0 ? void 0 : sectorFlyoutData.authenticated) && /*#__PURE__*/_react["default"].createElement(_WaffleMenu["default"], {
     links: waffleMenu === null || waffleMenu === void 0 ? void 0 : waffleMenu.links,
     cta: waffleMenu === null || waffleMenu === void 0 ? void 0 : waffleMenu.cta,
     Link: Link
-  }), !disableLogin && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("button", {
+  }), (sectorFlyoutData === null || sectorFlyoutData === void 0 ? void 0 : sectorFlyoutData.authenticated) && /*#__PURE__*/_react["default"].createElement("button", {
     type: "button",
     className: "ter-utility-nav__my-account",
     onClick: function onClick() {
@@ -543,7 +545,7 @@ var NavBar = function NavBar(props) {
     width: "20",
     height: "20",
     alt: ""
-  })))), /*#__PURE__*/_react["default"].createElement("div", {
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "luna-layout__navigation-padding ".concat(menuBarTheme ? "luna-layout__navigation-padding--".concat(menuBarTheme) : "")
   }, !disableMenus && /*#__PURE__*/_react["default"].createElement("div", {
     className: "ter-navbar__wrapper \n            ".concat(menuBarTheme ? "ter-navbar__wrapper--".concat(menuBarTheme) : "", "\n            ").concat(displayIcons ? "ter-navbar__wrapper--with-icons" : "", "\n            ").concat(displayIcons && menuBarTheme ? "ter-navbar__wrapper--with-icons--".concat(menuBarTheme) : "", "\n          ")

package/dist/luna/other-organisms/NavBar/NavBar.scss

@@ -576,6 +576,7 @@
     @media screen and (max-width: $breakpoint-sm) {
       display: none;
     }
+    cursor: pointer;
     align-items: center;
     margin: 0 25px;
     padding: 7px 4px 7px 4px;

package/dist/luna/other-organisms/SubNav/{SubNavSiblingsMenu.js → SiblingsMenu.js}

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard3 = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 
 Object.defineProperty(exports, "__esModule", {
@@ -9,9 +11,11 @@ exports["default"] = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
+
 var _interopRequireWildcard2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/interopRequireWildcard"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard3(require("react"));
 
 var _useMouse2 = _interopRequireDefault(require("../../utils/hooks/useMouse"));
 
@@ -25,7 +29,7 @@ var _caratUp = _interopRequireDefault(require("../../../application/assets/image
 
 var _close = _interopRequireDefault(require("../../../application/assets/images/close.svg"));
 
-var _lodash = _interopRequireDefault(require("lodash"));
+var _lodash = require("lodash");
 
 var _component = _interopRequireDefault(require("@loadable/component"));
 
@@ -39,8 +43,8 @@ var LunaLink = (0, _component["default"])(function () {
   }
 });
 
-var SubNavSiblingsMenu = function SubNavSiblingsMenu(_ref) {
-  var _window;
+var SiblingsMenu = function SiblingsMenu(_ref) {
+  var _window, _window$location, _window2;
 
   var title = _ref.title,
       _ref$siblings = _ref.siblings,
@@ -48,7 +52,6 @@ var SubNavSiblingsMenu = function SubNavSiblingsMenu(_ref) {
       isOpen = _ref.isOpen,
       width = _ref.width,
       closeSiblingsWithEnter = _ref.closeSiblingsWithEnter,
-      path = _ref.path,
       _onClick = _ref.onClick,
       onClose = _ref.onClose,
       Link = _ref.Link;
@@ -56,32 +59,47 @@ var SubNavSiblingsMenu = function SubNavSiblingsMenu(_ref) {
   var _useMouse = (0, _useMouse2["default"])(),
       mouse = _useMouse.mouse;
 
+  var path = (_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname;
+
+  var _useState = (0, _react.useState)([]),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+      orderedSiblings = _useState2[0],
+      setOrderedSiblings = _useState2[1];
+
+  (0, _react.useEffect)(function () {
+    var equals = function equals(arr) {
+      return (0, _lodash.orderBy)(siblings === null || siblings === void 0 ? void 0 : siblings.filter(function (d) {
+        return arr.map(function (str) {
+          var _d$pageName, _d$pageName$toLowerCa;
+
+          return (d === null || d === void 0 ? void 0 : (_d$pageName = d.pageName) === null || _d$pageName === void 0 ? void 0 : (_d$pageName$toLowerCa = _d$pageName.toLowerCase()) === null || _d$pageName$toLowerCa === void 0 ? void 0 : _d$pageName$toLowerCa.indexOf(str)) === 0;
+        }).reduce(function (a, b) {
+          return a && b;
+        });
+      }), ['pageName']);
+    };
+
+    var notEquals = function notEquals(arr) {
+      return (0, _lodash.orderBy)(siblings === null || siblings === void 0 ? void 0 : siblings.filter(function (d) {
+        return arr.map(function (str) {
+          var _d$pageName2, _d$pageName2$toLowerC;
+
+          return (d === null || d === void 0 ? void 0 : (_d$pageName2 = d.pageName) === null || _d$pageName2 === void 0 ? void 0 : (_d$pageName2$toLowerC = _d$pageName2.toLowerCase()) === null || _d$pageName2$toLowerC === void 0 ? void 0 : _d$pageName2$toLowerC.indexOf(str)) !== 0;
+        }).reduce(function (a, b) {
+          return a && b;
+        });
+      }), ['pageName']);
+    };
+
+    setOrderedSiblings([].concat((0, _toConsumableArray2["default"])(equals(['overview'])), (0, _toConsumableArray2["default"])(notEquals(['overview', 'contact'])), (0, _toConsumableArray2["default"])(equals(['contact']))));
+  }, [siblings]);
+
   if ((siblings === null || siblings === void 0 ? void 0 : siblings.length) <= 1) {
     return /*#__PURE__*/_react["default"].createElement("p", {
       className: "ter-sub-nav__breadcrumbs__text ter-sub-nav__breadcrumbs__text--last"
     }, title);
-  } // REORDER SIBLINGS MENU
-
-
-  var siblingsOverview = siblings === null || siblings === void 0 ? void 0 : siblings.filter(function (d) {
-    var _d$pageName, _d$pageName$toLowerCa;
-
-    return (d === null || d === void 0 ? void 0 : (_d$pageName = d.pageName) === null || _d$pageName === void 0 ? void 0 : (_d$pageName$toLowerCa = _d$pageName.toLowerCase()) === null || _d$pageName$toLowerCa === void 0 ? void 0 : _d$pageName$toLowerCa.indexOf('overview')) === 0;
-  });
-  var siblingsContact = siblings === null || siblings === void 0 ? void 0 : siblings.filter(function (d) {
-    var _d$pageName2, _d$pageName2$toLowerC;
-
-    return (d === null || d === void 0 ? void 0 : (_d$pageName2 = d.pageName) === null || _d$pageName2 === void 0 ? void 0 : (_d$pageName2$toLowerC = _d$pageName2.toLowerCase()) === null || _d$pageName2$toLowerC === void 0 ? void 0 : _d$pageName2$toLowerC.indexOf('contact')) === 0;
-  });
-  var siblingsSubset = siblings === null || siblings === void 0 ? void 0 : siblings.filter(function (d) {
-    var _d$pageName3, _d$pageName3$toLowerC, _d$pageName4, _d$pageName4$toLowerC;
-
-    return (d === null || d === void 0 ? void 0 : (_d$pageName3 = d.pageName) === null || _d$pageName3 === void 0 ? void 0 : (_d$pageName3$toLowerC = _d$pageName3.toLowerCase()) === null || _d$pageName3$toLowerC === void 0 ? void 0 : _d$pageName3$toLowerC.indexOf('overview')) !== 0 && (d === null || d === void 0 ? void 0 : (_d$pageName4 = d.pageName) === null || _d$pageName4 === void 0 ? void 0 : (_d$pageName4$toLowerC = _d$pageName4.toLowerCase()) === null || _d$pageName4$toLowerC === void 0 ? void 0 : _d$pageName4$toLowerC.indexOf('contact')) !== 0;
-  });
-
-  var siblingsSubsetOrdered = _lodash["default"].orderBy(siblingsSubset, ['pageName']);
+  }
 
-  var siblingsOrdered = [].concat((0, _toConsumableArray2["default"])(siblingsOverview), (0, _toConsumableArray2["default"])(siblingsSubsetOrdered), (0, _toConsumableArray2["default"])(siblingsContact));
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       position: "relative",
@@ -117,7 +135,7 @@ var SubNavSiblingsMenu = function SubNavSiblingsMenu(_ref) {
       flexDirection: "column",
       flexWrap: "wrap",
       position: width > 600 ? "absolute" : "fixed",
-      top: width > 600 ? "46px" : ((_window = window) === null || _window === void 0 ? void 0 : _window.scrollY) > 0 ? "48px" : "108px",
+      top: width > 600 ? "46px" : ((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.scrollY) > 0 ? "48px" : "108px",
       left: width < 600 && "0px",
       width: width > 600 ? "280px" : "100vw"
     }
@@ -153,8 +171,8 @@ var SubNavSiblingsMenu = function SubNavSiblingsMenu(_ref) {
     }
   })), /*#__PURE__*/_react["default"].createElement("ul", {
     className: "ter-sub-nav__siblings__list"
-  }, siblingsOrdered && (siblingsOrdered === null || siblingsOrdered === void 0 ? void 0 : siblingsOrdered.map(function (sibling, i) {
-    var active = sibling.slug.includes(path);
+  }, orderedSiblings && (orderedSiblings === null || orderedSiblings === void 0 ? void 0 : orderedSiblings.map(function (sibling, i) {
+    var active = sibling.slug === path;
     return sibling.slug && !active ? /*#__PURE__*/_react["default"].createElement("li", {
       key: "sibling-item-".concat(i),
       className: "ter-sub-nav__siblings__list__list-item"
@@ -177,5 +195,5 @@ var SubNavSiblingsMenu = function SubNavSiblingsMenu(_ref) {
   })))));
 };
 
-var _default = SubNavSiblingsMenu;
+var _default = SiblingsMenu;
 exports["default"] = _default;

package/dist/luna/other-organisms/SubNav/SubNav.js

@@ -29,9 +29,9 @@ var _ellipses = _interopRequireDefault(require("../../../application/assets/imag
 
 var _close = _interopRequireDefault(require("../../../application/assets/images/close.svg"));
 
-var SubNavSiblingsMenu = (0, _component["default"])(function () {
+var SiblingsMenu = (0, _component["default"])(function () {
   return Promise.resolve().then(function () {
-    return (0, _interopRequireWildcard2["default"])(require('./SubNavSiblingsMenu'));
+    return (0, _interopRequireWildcard2["default"])(require('./SiblingsMenu'));
   });
 });
 var LunaLink = (0, _component["default"])(function () {
@@ -45,7 +45,7 @@ var LunaLink = (0, _component["default"])(function () {
 });
 
 var SubNav = function SubNav(_ref) {
-  var _window, _window$location, _breadcrumbs, _breadcrumbs2;
+  var _breadcrumbs, _breadcrumbs2;
 
   var _ref$breadcrumbs = _ref.breadcrumbs,
       breadcrumbs = _ref$breadcrumbs === void 0 ? [] : _ref$breadcrumbs,
@@ -57,8 +57,6 @@ var SubNav = function SubNav(_ref) {
   var _useMouse = (0, _useMouse2["default"])(),
       mouse = _useMouse.mouse;
 
-  var path = (_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.replace(/(\/(.*?)\/)/, "");
-
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
       openBreadcrumbs = _useState2[0],
@@ -91,9 +89,9 @@ var SubNav = function SubNav(_ref) {
     var width = 0;
 
     if (typeof window !== "undefined") {
-      var _window2 = window,
-          innerWidth = _window2.innerWidth,
-          innerHeight = _window2.innerHeight;
+      var _window = window,
+          innerWidth = _window.innerWidth,
+          innerHeight = _window.innerHeight;
       width = innerWidth;
       height = innerHeight;
     }
@@ -171,13 +169,12 @@ var SubNav = function SubNav(_ref) {
   }, breadcrumbs && (breadcrumbs === null || breadcrumbs === void 0 ? void 0 : breadcrumbs.length) <= 3 && width > 600 ? breadcrumbs === null || breadcrumbs === void 0 ? void 0 : breadcrumbs.map(function (breadcrumb, i) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
       key: "breadcrumb-".concat(i)
-    }, (breadcrumbs === null || breadcrumbs === void 0 ? void 0 : breadcrumbs.length) === i + 1 ? /*#__PURE__*/_react["default"].createElement(SubNavSiblingsMenu, {
+    }, (breadcrumbs === null || breadcrumbs === void 0 ? void 0 : breadcrumbs.length) === i + 1 ? /*#__PURE__*/_react["default"].createElement(SiblingsMenu, {
       title: breadcrumb.title,
       siblings: siblings,
       isOpen: openSiblings,
       width: width,
       closeSiblingsWithEnter: closeSiblingsWithEnter,
-      path: path,
       Link: Link,
       onClose: function onClose() {
         setOpenSiblings(false);
@@ -253,13 +250,12 @@ var SubNav = function SubNav(_ref) {
     "aria-controls": "sub-nav-siblings",
     role: "button",
     id: (0, _formatID["default"])("".concat((_breadcrumbs = breadcrumbs[(breadcrumbs === null || breadcrumbs === void 0 ? void 0 : breadcrumbs.length) - 1]) === null || _breadcrumbs === void 0 ? void 0 : _breadcrumbs.title, "-subnav-breadcumb"))
-  }, /*#__PURE__*/_react["default"].createElement(SubNavSiblingsMenu, {
+  }, /*#__PURE__*/_react["default"].createElement(SiblingsMenu, {
     title: (_breadcrumbs2 = breadcrumbs[(breadcrumbs === null || breadcrumbs === void 0 ? void 0 : breadcrumbs.length) - 1]) === null || _breadcrumbs2 === void 0 ? void 0 : _breadcrumbs2.title,
     siblings: siblings,
     isOpen: openSiblings,
     width: width,
     closeSiblingsWithEnter: closeSiblingsWithEnter,
-    path: path,
     Link: Link,
     onClose: function onClose() {
       setOpenSiblings(false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "luna-one",
-  "version": "3.1.512",
+  "version": "3.1.514",
   "peerDependencies": {
     "react": "^17.0.2",
     "react-dom": "^17.0.2",