luna-one 3.1.326 → 3.1.330

package/dist/luna/components/CTAButtons/CTAButtons.js

@@ -34,6 +34,7 @@ var CTAButtons = function CTAButtons(_ref) {
     className: "cta-buttons"
   }, buttons.map(function (button, index) {
     return (button === null || button === void 0 ? void 0 : button.url) && (button === null || button === void 0 ? void 0 : button.text) && /*#__PURE__*/_react.default.createElement(_terraOne.Button, {
+      key: "button-".concat(variant ? variant + "-" : '').concat(index),
       className: (index + 1) % 2 !== 0 ? buttonsVariants === null || buttonsVariants === void 0 ? void 0 : buttonsVariants.primary : buttonsVariants === null || buttonsVariants === void 0 ? void 0 : buttonsVariants.secondary,
       url: button.url
     }, button.text);

package/dist/luna/components/CtaWithHeader/CtaWithHeader.js

@@ -91,14 +91,16 @@ var CtaWithHeader = function CtaWithHeader(_ref) {
     var _buttonsVarians, _buttonsVarians2;
 
     return (button === null || button === void 0 ? void 0 : button.url) && (button === null || button === void 0 ? void 0 : button.text) && (textLinks ? /*#__PURE__*/_react.default.createElement("div", {
+      key: index,
       className: "text-link-container"
     }, /*#__PURE__*/_react.default.createElement("a", {
       className: (0, _checkForExternalLink.default)(button.url) ? "text-link-external" : "text-link",
       href: button.url
     }, button.text)) : /*#__PURE__*/_react.default.createElement(_terraOne.Button, {
+      key: index,
       className: (index + 1) % 2 !== 0 ? (_buttonsVarians = buttonsVarians) === null || _buttonsVarians === void 0 ? void 0 : _buttonsVarians.primary : (_buttonsVarians2 = buttonsVarians) === null || _buttonsVarians2 === void 0 ? void 0 : _buttonsVarians2.secondary,
       url: button.url
-    }, button.text));
+    }, button.text && button.text));
   })));
 };
 

package/dist/luna/components/MegaMenu/MegaMenu.js

@@ -46,12 +46,7 @@ var MegaMenu = function MegaMenu(props) {
       currentOpenMenu = props.currentOpenMenu,
       collapsed = props.collapsed,
       isOpen = props.isOpen,
-      Link = props.Link,
-      updateNavHeightStyles = props.updateNavHeightStyles,
-      navHeightStyles = props.navHeightStyles,
-      subNavHeightStyles = props.subNavHeightStyles,
-      maxActiveNavItems = props.maxActiveNavItems,
-      setMaxActiveNavItems = props.setMaxActiveNavItems;
+      Link = props.Link;
 
   var _useState = (0, _react.useState)(null),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -68,6 +63,26 @@ var MegaMenu = function MegaMenu(props) {
       hoveredFeature = _useState6[0],
       setHoveredFeature = _useState6[1];
 
+  var _useState7 = (0, _react.useState)(0),
+      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+      maxActiveNavItems = _useState8[0],
+      setMaxActiveNavItems = _useState8[1];
+
+  var _useState9 = (0, _react.useState)(null),
+      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+      navHeightStyles = _useState10[0],
+      setNavHeightStyles = _useState10[1];
+
+  var _useState11 = (0, _react.useState)(null),
+      _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+      subNavHeightStyles = _useState12[0],
+      setSubNavHeightStyles = _useState12[1];
+
+  (0, _react.useEffect)(function () {
+    updateNavHeightStyles();
+    updateSubNavHeightStyles();
+  }, [maxActiveNavItems]);
+
   var mouseLeave = function mouseLeave(source) {
     hideSubsection();
     unselectFeature();
@@ -91,6 +106,42 @@ var MegaMenu = function MegaMenu(props) {
     returnDeployedChildClass();
   };
 
+  var updateNavHeightStyles = function updateNavHeightStyles() {
+    var currentMinHeight,
+        currentHeight,
+        // extra margin within dropdown menu
+    internalMarginHeight = 52,
+        // extra space for nav parent title - e.g. "Products" or "Solutions"
+    navExtraSpace = 39,
+        // height of single nav menu item
+    singleItemHeight = 34; //update heights based on max nav items
+
+    currentMinHeight = maxActiveNavItems * singleItemHeight + navExtraSpace + internalMarginHeight;
+    currentHeight = maxActiveNavItems * singleItemHeight + navExtraSpace + internalMarginHeight;
+    setNavHeightStyles({
+      minHeight: currentMinHeight + "px",
+      height: currentHeight + "px"
+    });
+  };
+
+  var updateSubNavHeightStyles = function updateSubNavHeightStyles() {
+    var currentMinHeight,
+        currentHeight,
+        // extra margin within dropdown menu
+    internalMarginHeight = 32,
+        // height of single nav menu item
+    singleItemHeight = 34,
+        //extra space for sub-menus
+    subNavExtraSpace = 71; //update heights based on max nav items
+
+    currentMinHeight = maxActiveNavItems * singleItemHeight + internalMarginHeight + subNavExtraSpace;
+    currentHeight = maxActiveNavItems * singleItemHeight + internalMarginHeight + subNavExtraSpace;
+    setSubNavHeightStyles({
+      minHeight: currentMinHeight + "px",
+      height: currentHeight + "px"
+    });
+  };
+
   var hideSubsection = function hideSubsection() {
     setDeployedSubsection(null);
     setDeployedTertiary(null);

package/dist/luna/components/MegaMenu/menu-generators/FullSubMenu.js

@@ -9,6 +9,8 @@ exports.FullSubMenu = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
@@ -30,7 +32,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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 FullSubMenu = function FullSubMenu(props) {
-  var _React$createElement;
+  var _category$links, _React$createElement;
 
   var menuProps = props.menuProps;
   var category = menuProps.category,
@@ -38,10 +40,8 @@ var FullSubMenu = function FullSubMenu(props) {
       mouseOverSubsection = menuProps.mouseOverSubsection,
       mouseOverTertiary = menuProps.mouseOverTertiary,
       mouseOverWithKeysMegaMenu = menuProps.mouseOverWithKeysMegaMenu,
-      maxActiveNavItems = menuProps.maxActiveNavItems,
       setMaxActiveNavItems = menuProps.setMaxActiveNavItems,
-      megaMenuParentValue = menuProps.megaMenuParentValue,
-      fullSubMenuParentValue = menuProps.fullSubMenuParentValue;
+      megaMenuParentValue = menuProps.megaMenuParentValue;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -53,28 +53,21 @@ var FullSubMenu = function FullSubMenu(props) {
       subMenuClicked = _useState4[0],
       setSubMenuClicked = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(0),
-      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-      maxSubmenuItems = _useState6[0],
-      setMaxSubmenuItems = _useState6[1];
-
   var _useContext = (0, _react.useContext)(_NavBar.NavBarContext),
       mouse = _useContext.mouse;
 
   var isOpen = (0, _react.useMemo)(function () {
     return deployedSubsection === category.text;
   }, [deployedSubsection, category]);
+  var fullSubMenuParents = category === null || category === void 0 ? void 0 : (_category$links = category.links) === null || _category$links === void 0 ? void 0 : _category$links.length;
+  var fullSubMenuProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, menuProps), {}, {
+    fullSubMenuParents: fullSubMenuParents
+  });
 
-  var updateMaxActiveNavItems = function updateMaxActiveNavItems(currentLinks, megaMenuParentValue, e) {
+  var updateMaxActiveNavItems = function updateMaxActiveNavItems(currentLinks, megaMenuValue, e) {
     e.stopPropagation();
-    setMaxSubmenuItems(currentLinks.length);
-
-    if (currentLinks && currentLinks.length > megaMenuParentValue) {
-      // check parent
-      setMaxActiveNavItems(currentLinks.length);
-    } else {
-      setMaxActiveNavItems(megaMenuParentValue);
-    }
+    var highest = currentLinks > megaMenuValue ? currentLinks : megaMenuValue;
+    setMaxActiveNavItems(highest);
   };
 
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
@@ -89,10 +82,12 @@ var FullSubMenu = function FullSubMenu(props) {
       setIsMousedOver(false);
     },
     onClick: function onClick(e) {
+      var _category$links2;
+
       mouseOverSubsection(category.text);
       mouseOverTertiary(null);
       setSubMenuClicked(true);
-      updateMaxActiveNavItems(category.links, megaMenuParentValue, e);
+      updateMaxActiveNavItems(category === null || category === void 0 ? void 0 : (_category$links2 = category.links) === null || _category$links2 === void 0 ? void 0 : _category$links2.length, megaMenuParentValue, e);
     },
     onKeyDown: function onKeyDown(e) {
       return mouseOverWithKeysMegaMenu(e, category.text);
@@ -110,7 +105,7 @@ var FullSubMenu = function FullSubMenu(props) {
     "aria-label": isOpen ? "Expanded" : "Collapsed",
     className: "ter-mega-menu__left-title-caret"
   }))), /*#__PURE__*/_react.default.createElement(_SubMenu.default, {
-    menuProps: menuProps,
+    menuProps: fullSubMenuProps,
     isOpen: isOpen,
     links: category.links
   }));

package/dist/luna/components/MegaMenu/menu-generators/SubMenu.js

@@ -46,9 +46,9 @@ var SubMenu = function SubMenu(props) {
       hasFeatures = menuProps.hasFeatures,
       mouseLeave = menuProps.mouseLeave,
       subNavHeightStyles = menuProps.subNavHeightStyles,
-      maxActiveNavItems = menuProps.maxActiveNavItems,
       setMaxActiveNavItems = menuProps.setMaxActiveNavItems,
-      fullSubMenuParents = menuProps.fullSubMenuParents;
+      fullSubMenuParents = menuProps.fullSubMenuParents,
+      megaMenuParentValue = menuProps.megaMenuParentValue;
 
   var _useContext = (0, _react.useContext)(_NavBar.NavBarContext),
       mouse = _useContext.mouse,
@@ -64,11 +64,6 @@ var SubMenu = function SubMenu(props) {
       childOpen = _useState4[0],
       setChildOpen = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(0),
-      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-      maxSubmenuItems = _useState6[0],
-      setMaxSubmenuItems = _useState6[1];
-
   var subMouseLeave = function subMouseLeave() {
     setChildOpen(null);
   };
@@ -86,14 +81,10 @@ var SubMenu = function SubMenu(props) {
     }
   };
 
-  var updateMaxActiveNavItems = function updateMaxActiveNavItems(currentLinks, fullSubMenuParents, e) {
+  var updateMaxActiveNavItems = function updateMaxActiveNavItems(currentLinks, megaMenuCount, fullSubMenuParents, e) {
     e.stopPropagation();
-
-    if (currentLinks.length > maxActiveNavItems) {
-      setMaxActiveNavItems(currentLinks.length);
-    } else {
-      setMaxActiveNavItems(fullSubMenuParents);
-    }
+    var highest = currentLinks > megaMenuCount && currentLinks > fullSubMenuParents ? currentLinks : megaMenuCount > currentLinks && megaMenuCount > fullSubMenuParents ? megaMenuCount : fullSubMenuParents;
+    setMaxActiveNavItems(highest);
   };
 
   var generateTertiaryMenu = function generateTertiaryMenu(category) {
@@ -114,9 +105,11 @@ var SubMenu = function SubMenu(props) {
         setIsMousedOver(null);
       },
       onClick: function onClick(e) {
+        var _category$links;
+
         mouseOverSubsection(deployedSubsection);
         mouseOverTertiary(category.text);
-        updateMaxActiveNavItems(category.links, fullSubMenuParents, e);
+        updateMaxActiveNavItems(category === null || category === void 0 ? void 0 : (_category$links = category.links) === null || _category$links === void 0 ? void 0 : _category$links.length, megaMenuParentValue, fullSubMenuParents, e);
       },
       onKeyDown: function onKeyDown(e) {
         return navigateWithKeys(e, category.text);

package/dist/luna/components/Tabs/Tabs.scss

@@ -91,6 +91,9 @@
             }
             .nav-text {
               color: $dark-navy;
+              @media screen and (max-width: $breakpoint-sm) {
+                color: $white;
+              }
             }
           }
 

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

@@ -139,31 +139,16 @@ var NavBar = function NavBar(props) {
 
   var lastPositionRef = (0, _react.useRef)(lastPosition);
 
-  var _useState15 = (0, _react.useState)(0),
-      _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-      maxActiveNavItems = _useState16[0],
-      setMaxActiveNavItems = _useState16[1];
-
-  var _useState17 = (0, _react.useState)(null),
-      _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
-      navHeightStyles = _useState18[0],
-      setNavHeightStyles = _useState18[1];
-
-  var _useState19 = (0, _react.useState)(null),
-      _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
-      subNavHeightStyles = _useState20[0],
-      setSubNavHeightStyles = _useState20[1];
-
   var setLastPosition = function setLastPosition(data) {
     lastPositionRef.current = data;
 
     _setLastPosition(data);
   };
 
-  var _useState21 = (0, _react.useState)(true),
-      _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
-      isBottomBarActive = _useState22[0],
-      setIsBottomBarActive = _useState22[1];
+  var _useState15 = (0, _react.useState)(true),
+      _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
+      isBottomBarActive = _useState16[0],
+      setIsBottomBarActive = _useState16[1];
 
   var subNavDisplay = (subNavData === null || subNavData === void 0 ? void 0 : (_subNavData$breadcrum = subNavData.breadcrumbs) === null || _subNavData$breadcrum === void 0 ? void 0 : _subNavData$breadcrum.length) || (subNavData === null || subNavData === void 0 ? void 0 : (_subNavData$siblingPa = subNavData.siblingPages) === null || _subNavData$siblingPa === void 0 ? void 0 : _subNavData$siblingPa.length);
 
@@ -229,10 +214,6 @@ var NavBar = function NavBar(props) {
       }
     };
   }, []);
-  (0, _react.useEffect)(function () {
-    updateNavHeightStyles();
-    updateSubNavHeightStyles();
-  }, [maxActiveNavItems]);
 
   var closeAllDropDowns = function closeAllDropDowns() {
     setCurrentOpenMenu(null);
@@ -265,7 +246,6 @@ var NavBar = function NavBar(props) {
   var closeDropDown = function closeDropDown(menu) {
     if (currentOpenMenu === menu || !menu) {
       setCurrentOpenMenu(null);
-      setMaxActiveNavItems(0);
     }
   };
 
@@ -273,44 +253,6 @@ var NavBar = function NavBar(props) {
     e.stopPropagation();
   };
 
-  var updateNavHeightStyles = function updateNavHeightStyles() {
-    var currentMinHeight,
-        currentHeight,
-        // extra margin within dropdown menu
-    internalMarginHeight = 52,
-        // extra space for nav parent title - e.g. "Products" or "Solutions"
-    navExtraSpace = 39,
-        // height of single nav menu item
-    singleItemHeight = 34; //update heights based on max nav items
-
-    currentMinHeight = maxActiveNavItems * singleItemHeight + navExtraSpace + internalMarginHeight;
-    currentHeight = maxActiveNavItems * singleItemHeight + navExtraSpace + internalMarginHeight;
-    setNavHeightStyles({
-      minHeight: currentMinHeight + "px",
-      height: currentHeight + "px"
-    });
-  };
-
-  var updateSubNavHeightStyles = function updateSubNavHeightStyles() {
-    var currentMinHeight,
-        currentHeight,
-        // extra margin within dropdown menu
-    internalMarginHeight = 32,
-        // extra space for nav parent title - e.g. "Products" or "Solutions"
-    // navExtraSpace = 39,
-    // height of single nav menu item
-    singleItemHeight = 34,
-        //extra space for sub-menus
-    subNavExtraSpace = 71; //update heights based on max nav items
-
-    currentMinHeight = maxActiveNavItems * singleItemHeight + internalMarginHeight + subNavExtraSpace;
-    currentHeight = maxActiveNavItems * singleItemHeight + internalMarginHeight + subNavExtraSpace;
-    setSubNavHeightStyles({
-      minHeight: currentMinHeight + "px",
-      height: currentHeight + "px"
-    });
-  };
-
   var generateNavOptions = function generateNavOptions() {
     return navOptions.map(function (option) {
       if (option.type === "category") {
@@ -323,12 +265,7 @@ var NavBar = function NavBar(props) {
           content: option,
           Link: Link,
           collapsed: isCollapsed ? true : !isExpanded,
-          currentOpenMenu: currentOpenMenu,
-          updateNavHeightStyles: updateNavHeightStyles,
-          navHeightStyles: navHeightStyles,
-          subNavHeightStyles: subNavHeightStyles,
-          maxActiveNavItems: maxActiveNavItems,
-          setMaxActiveNavItems: setMaxActiveNavItems
+          currentOpenMenu: currentOpenMenu
         });
       } else if (option.type === "links") {
         return /*#__PURE__*/_react.default.createElement(_NavMiniMenu.default, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "luna-one",
-  "version": "3.1.326",
+  "version": "3.1.330",
   "dependencies": {
     "@storybook/addon-knobs": "^6.3.1",
     "@testing-library/jest-dom": "^5.11.9",
@@ -23,7 +23,7 @@
     "react-scroll": "^1.7.14",
     "react-slidedown": "^2.4.5",
     "smoothscroll-polyfill": "^0.4.4",
-    "terra-one": "^3.0.107"
+    "terra-one": "~3.0.108"
   },
   "peerDependencies": {
     "node-sass": "^4.12.0",