luna-one 3.1.416 → 3.1.419

package/dist/application/components/NavBarHandler/NavBarHandler.js

@@ -31,7 +31,9 @@ var NavBarHandler = function NavBarHandler(_ref) {
       searchComponent = _ref.searchComponent,
       searchDeployed = _ref.searchDeployed,
       setSearchDeployed = _ref.setSearchDeployed,
-      navigate = _ref.navigate;
+      navigate = _ref.navigate,
+      globalSearch = _ref.globalSearch,
+      setGlobalSearch = _ref.setGlobalSearch;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -118,7 +120,9 @@ var NavBarHandler = function NavBarHandler(_ref) {
     menuBarTheme: data === null || data === void 0 ? void 0 : data.menuBarTheme,
     topNavTheme: data === null || data === void 0 ? void 0 : data.topNavTheme,
     navigate: navigate,
-    authLabels: data === null || data === void 0 ? void 0 : data.authLabels
+    authLabels: data === null || data === void 0 ? void 0 : data.authLabels,
+    setGlobalSearch: setGlobalSearch,
+    globalSearch: globalSearch
   });
 };
 

package/dist/luna/components/NavBarTop/NavBarTop.js

@@ -74,7 +74,11 @@ var NavBarTop = function NavBarTop(props) {
       searchDeployed = props.searchDeployed,
       setSearchDeployed = props.setSearchDeployed,
       displaySectorName = props.displaySectorName,
-      theme = props.theme;
+      theme = props.theme,
+      setDesktopSearchDeployed = props.setDesktopSearchDeployed,
+      desktopSearchDeployed = props.desktopSearchDeployed,
+      globalSearch = props.globalSearch,
+      setGlobalSearch = props.setGlobalSearch;
   var inputFocus = (0, _utilizeFocus.utilizeFocus)();
 
   var _useContext = (0, _react.useContext)(_NavBar.NavBarContext),
@@ -87,14 +91,10 @@ var NavBarTop = function NavBarTop(props) {
       searchState = _useState2[0],
       setSearchState = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(searchDeployed),
-      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-      desktopSearchDeployed = _useState4[0],
-      setDesktopSearchDeployed = _useState4[1];
-
   var toggleDesktopSearch = function toggleDesktopSearch(isDesktop) {
     if (!desktopSearchDeployed) {
       setSearchDeployed(true);
+      setGlobalSearch(false);
       setDesktopSearchDeployed(true);
 
       if (!mouse) {
@@ -173,7 +173,7 @@ var NavBarTop = function NavBarTop(props) {
     }
   };
 
-  var logoElement = document.querySelector('.ter-navbar-top__logo');
+  var logoElement = document.querySelector(".ter-navbar-top__logo");
 
   var handleToggleWithKeyBoard = function handleToggleWithKeyBoard(event) {
     if (!mouse) {

package/dist/luna/featurettes/Accordion/AccordionItem.js

@@ -75,7 +75,8 @@ var AccordionItem = function AccordionItem(_ref) {
     className: "luna-accordion__item",
     style: {
       borderBottom: "1px solid ".concat(dividerColor)
-    }
+    },
+    "data-expanded": isExpanded
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "luna-accordion__item-header",
     onClick: function onClick() {

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

@@ -33,6 +33,8 @@ var _utilizeFocus = require("../../utils/utilizeFocus");
 
 var _rightCaretLightGray = _interopRequireDefault(require("../../images/right-caret-light-gray.svg"));
 
+var _searchHighlighted = _interopRequireDefault(require("../../images/search-highlighted.svg"));
+
 var LunaLink = (0, _component.default)(function () {
   return Promise.resolve().then(function () {
     return (0, _interopRequireWildcard2.default)(require("terra-one/dist/components/LunaLink/LunaLink"));
@@ -56,11 +58,6 @@ var Icon = (0, _component.default)(function () {
     return components.Icon;
   }
 });
-var FlyoutSearch = (0, _component.default)(function () {
-  return Promise.resolve().then(function () {
-    return (0, _interopRequireWildcard2.default)(require("./FlyoutSearch"));
-  });
-});
 var Fade = (0, _component.default)(function () {
   return Promise.resolve().then(function () {
     return (0, _interopRequireWildcard2.default)(require("react-awesome-reveal"));
@@ -80,7 +77,16 @@ var Flyout = function Flyout(_ref) {
       searchPlaceholder = _ref.searchPlaceholder,
       disableSearch = _ref.disableSearch,
       close = _ref.close,
-      searchSubmit = _ref.searchSubmit;
+      searchSubmit = _ref.searchSubmit,
+      searchDeployed = _ref.searchDeployed,
+      setSearchDeployed = _ref.setSearchDeployed,
+      setDesktopSearchDeployed = _ref.setDesktopSearchDeployed,
+      desktopSearchDeployed = _ref.desktopSearchDeployed,
+      languageSelectorDeployed = _ref.languageSelectorDeployed,
+      handleLanguageSelectorDeployed = _ref.handleLanguageSelectorDeployed,
+      closeHamburger = _ref.closeHamburger,
+      globalSearch = _ref.globalSearch,
+      setGlobalSearch = _ref.setGlobalSearch;
 
   var _useState = (0, _react.useState)(""),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -100,6 +106,13 @@ var Flyout = function Flyout(_ref) {
     searchSubmit(searchField);
   };
 
+  var openSearchComponent = function openSearchComponent() {
+    setDesktopSearchDeployed(true);
+    close();
+    closeHamburger();
+    setGlobalSearch(true);
+  };
+
   var generateFlyoutLinks = function generateFlyoutLinks(links) {
     return /*#__PURE__*/_react.default.createElement("ul", {
       className: "flyout-links__menu"
@@ -127,8 +140,8 @@ var Flyout = function Flyout(_ref) {
         className: "flyout-links__link-icon"
       }, /*#__PURE__*/_react.default.createElement("img", {
         style: {
-          height: "16px",
-          width: "26px"
+          height: "20px",
+          width: "20px"
         },
         id: _lodash.default.uniqueId("id-"),
         src: _externalArrowWhiteTheme.default,
@@ -187,13 +200,20 @@ var Flyout = function Flyout(_ref) {
     className: "ter-flyout__divider ter-flyout__divider-logo"
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "ter-flyout__links"
-  }, links && generateFlyoutLinks(links)), !disableSearch && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(FlyoutSearch, {
-    searchField: searchField,
-    placeholder: searchPlaceholder,
-    handleChange: handleSearchFieldChange,
-    reference: inputFocus.ref,
-    handleSubmit: handleSearchSubmit
-  }), /*#__PURE__*/_react.default.createElement("div", {
+  }, links && generateFlyoutLinks(links)), !disableSearch && /*#__PURE__*/_react.default.createElement("div", {
+    className: "ter-flyout__search"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "ter-flyout__search-icon",
+    onClick: function onClick() {
+      return openSearchComponent();
+    }
+  }, /*#__PURE__*/_react.default.createElement("p", {
+    className: "ter-flyout__search-text"
+  }, searchPlaceholder), /*#__PURE__*/_react.default.createElement("img", {
+    id: _lodash.default.uniqueId("id-"),
+    src: _searchHighlighted.default,
+    alt: "Search"
+  })), /*#__PURE__*/_react.default.createElement("div", {
     className: "ter-flyout__divider"
   })))));
 };

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

@@ -94,7 +94,7 @@
       &__menu {
         list-style-type: none;
         padding: 0 0 0 7px;
-        font-size: $body-font-size;
+        font-size: $subheading-size-mobile;
         display: inline-block;
         margin-top: 0;
         margin-bottom: 0;
@@ -151,46 +151,57 @@
           }
         }
       }
+
+      &__link:hover > .flyout-links__link-text:before {
+        border-bottom: 2px solid $trimble-gold;
+      }
     }
   }
 
   &__search {
-    height: 30px;
     display: flex;
-    flex-direction: row;
-    align-items: center;
-    border-bottom: 2px solid;
-    border-color: rgba(255, 255, 255, 0.5);
-    margin-top: 15px;
-    padding-bottom: 5px;
-
     @media screen and (max-width: $breakpoint-sm) {
-      border: none ;
+      border: none;
       height: 60px;
       margin: 0;
       padding: 0 0 0 7px;
     }
 
     &-icon {
-      height: 21px;
-      width: 21px;
-      margin-right: 10px;
+      justify-content: space-between;
+      width: 251px;
+      padding: 0 0 0 6px;
+      margin-top: 15px;
+      display: flex;
+
+      img {
+        margin-top: 3px;
+        height: 20px;
+        width: 20px;
+      }
+
+      @media screen and (max-width: $breakpoint-sm) {
+        width: 100%;
+      }
     }
 
-    &-input {
-      width: 100%;
-      font-size: $large-body-font-size;
+    &-text {
+      font-size: $subheading-size-mobile;
       color: $white;
+      line-height: 25px;
       background: transparent;
       border: none;
 
-      &:focus {
-        outline: none;
-      }
-
       &::placeholder {
         color: $white;
       }
+      @media screen and (max-width: $breakpoint-sm) {
+       padding-bottom: 25px;
+      }
+    }
+
+    &-text:hover {
+      border-bottom: 2px solid $trimble-gold;
     }
 
     &-btn {
@@ -202,8 +213,17 @@
 
       @media screen and (max-width: $breakpoint-sm) {
         display: block;
+
       }
     }
+
+    &-icon:hover > &-text {
+      border-bottom: 2px solid $trimble-gold;
+    }
+  }
+
+  &__search:hover > p:before {
+    border-bottom: 2px solid $trimble-gold;
   }
 
   &__divider {
@@ -222,4 +242,8 @@
       top: 60px;
     }
   }
+
+  &__search-icon {
+    cursor: pointer;
+  }
 }

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

@@ -33,42 +33,42 @@ var _logoIcon = _interopRequireDefault(require("../../images/logo-icon.svg"));
 
 var Login = (0, _component.default)(function () {
   return Promise.resolve().then(function () {
-    return (0, _interopRequireWildcard2.default)(require('../../components/Login/Login'));
+    return (0, _interopRequireWildcard2.default)(require("../../components/Login/Login"));
   });
 });
 var MegaMenu = (0, _component.default)(function () {
   return Promise.resolve().then(function () {
-    return (0, _interopRequireWildcard2.default)(require('../../components/MegaMenu/MegaMenu'));
+    return (0, _interopRequireWildcard2.default)(require("../../components/MegaMenu/MegaMenu"));
   });
 });
 var NavBarTop = (0, _component.default)(function () {
   return Promise.resolve().then(function () {
-    return (0, _interopRequireWildcard2.default)(require('../../components/NavBarTop/NavBarTop'));
+    return (0, _interopRequireWildcard2.default)(require("../../components/NavBarTop/NavBarTop"));
   });
 });
 var MobileNav = (0, _component.default)(function () {
   return Promise.resolve().then(function () {
-    return (0, _interopRequireWildcard2.default)(require('../../components/MobileNav/MobileNav'));
+    return (0, _interopRequireWildcard2.default)(require("../../components/MobileNav/MobileNav"));
   });
 });
 var NavMiniMenu = (0, _component.default)(function () {
   return Promise.resolve().then(function () {
-    return (0, _interopRequireWildcard2.default)(require('./NavMiniMenu'));
+    return (0, _interopRequireWildcard2.default)(require("./NavMiniMenu"));
   });
 });
 var SubNav = (0, _component.default)(function () {
   return Promise.resolve().then(function () {
-    return (0, _interopRequireWildcard2.default)(require('../SubNav/SubNav'));
+    return (0, _interopRequireWildcard2.default)(require("../SubNav/SubNav"));
   });
 });
 var Flyout = (0, _component.default)(function () {
   return Promise.resolve().then(function () {
-    return (0, _interopRequireWildcard2.default)(require('../Flyout/Flyout'));
+    return (0, _interopRequireWildcard2.default)(require("../Flyout/Flyout"));
   });
 });
 var NavOption = (0, _component.default)(function () {
   return Promise.resolve().then(function () {
-    return (0, _interopRequireWildcard2.default)(require('./NavOption'));
+    return (0, _interopRequireWildcard2.default)(require("./NavOption"));
   });
 });
 var Icon = (0, _component.default)(function () {
@@ -156,7 +156,9 @@ var NavBar = function NavBar(props) {
       topNavTheme = props.topNavTheme,
       menuBarTheme = props.menuBarTheme,
       navigate = props.navigate,
-      authLabels = props.authLabels;
+      authLabels = props.authLabels,
+      setGlobalSearch = props.setGlobalSearch,
+      globalSearch = props.globalSearch;
 
   var _useState = (0, _react.useState)(null),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -200,6 +202,11 @@ var NavBar = function NavBar(props) {
       pathname = _useState16[0],
       setPathname = _useState16[1];
 
+  var _useState17 = (0, _react.useState)(searchDeployed),
+      _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
+      desktopSearchDeployed = _useState18[0],
+      setDesktopSearchDeployed = _useState18[1];
+
   (0, _react.useEffect)(function () {
     if (window) {
       setPathname(window.location.pathname);
@@ -212,10 +219,10 @@ var NavBar = function NavBar(props) {
     _setLastPosition(data);
   };
 
-  var _useState17 = (0, _react.useState)(true),
-      _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
-      isBottomBarActive = _useState18[0],
-      setIsBottomBarActive = _useState18[1];
+  var _useState19 = (0, _react.useState)(true),
+      _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
+      isBottomBarActive = _useState20[0],
+      setIsBottomBarActive = _useState20[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);
 
@@ -349,8 +356,8 @@ var NavBar = function NavBar(props) {
       var _option$links2;
 
       var isCollapsed = (option === null || option === void 0 ? void 0 : (_option$links2 = option.links) === null || _option$links2 === void 0 ? void 0 : _option$links2.length) > 4 ? true : false;
-      var url = getUrl(option).split('/')[2];
-      var path = pathname && pathname.split('/')[2]; // to determine if active, check if nav url is in the first breadcrumb after the local of the pathname
+      var url = getUrl(option).split("/")[2];
+      var path = pathname && pathname.split("/")[2]; // to determine if active, check if nav url is in the first breadcrumb after the local of the pathname
 
       var active = path && (path === null || path === void 0 ? void 0 : path.includes(url));
       return /*#__PURE__*/_react.default.createElement(NavOption, {
@@ -477,7 +484,11 @@ var NavBar = function NavBar(props) {
     searchDeployed: searchDeployed,
     setSearchDeployed: setSearchDeployed,
     displaySectorName: displaySectorName,
-    theme: topNavTheme
+    theme: topNavTheme,
+    desktopSearchDeployed: desktopSearchDeployed,
+    setDesktopSearchDeployed: setDesktopSearchDeployed,
+    globalSearch: globalSearch,
+    setGlobalSearch: setGlobalSearch
   }, !disableLogin && /*#__PURE__*/_react.default.createElement(Login, {
     loginPage: loginPage,
     login: login,
@@ -545,7 +556,14 @@ var NavBar = function NavBar(props) {
     searchPlaceholder: sectorFlyoutData.searchPlaceholder,
     disableSearch: sectorFlyoutData.disableSearch,
     close: handleSectorFlyoutDeployed,
-    searchSubmit: searchFlyoutSubmit
+    searchSubmit: searchFlyoutSubmit,
+    searchDeployed: searchDeployed,
+    setSearchDeployed: setSearchDeployed,
+    desktopSearchDeployed: desktopSearchDeployed,
+    setDesktopSearchDeployed: setDesktopSearchDeployed,
+    closeHamburger: closeHamburger,
+    globalSearch: globalSearch,
+    setGlobalSearch: setGlobalSearch
   }));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "luna-one",
-  "version": "3.1.416",
+  "version": "3.1.419",
   "dependencies": {
     "@loadable/component": "^5.15.2",
     "@storybook/addon-knobs": "^6.3.1",

package/dist/luna/other-organisms/Flyout/FlyoutSearch.js

@@ -1,67 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-require("./Flyout.scss");
-
-var _lodash = _interopRequireDefault(require("lodash"));
-
-var _searchHighlighted = _interopRequireDefault(require("../../images/search-highlighted.svg"));
-
-var _rightCaretLightGray = _interopRequireDefault(require("../../images/right-caret-light-gray.svg"));
-
-var FlyoutSearch = function FlyoutSearch(_ref) {
-  var searchField = _ref.searchField,
-      placeholder = _ref.placeholder,
-      handleChange = _ref.handleChange,
-      reference = _ref.reference,
-      handleSubmit = _ref.handleSubmit;
-
-  var handleSearchSubmit = function handleSearchSubmit(e) {
-    e.preventDefault();
-
-    if (searchField.length === 0) {
-      return;
-    } else {
-      handleSubmit();
-    }
-  };
-
-  return /*#__PURE__*/_react.default.createElement("form", {
-    onSubmit: handleSearchSubmit,
-    className: "ter-flyout__search"
-  }, /*#__PURE__*/_react.default.createElement("figure", {
-    className: "ter-flyout__search-icon"
-  }, /*#__PURE__*/_react.default.createElement("img", {
-    id: _lodash.default.uniqueId("id-"),
-    src: _searchHighlighted.default,
-    alt: "Search"
-  })), /*#__PURE__*/_react.default.createElement("input", {
-    className: "ter-flyout__search-input",
-    type: "text",
-    name: "search",
-    "aria-label": "Search",
-    value: searchField,
-    onChange: handleChange,
-    placeholder: placeholder || "search",
-    ref: reference,
-    id: "flyout-search-input-field"
-  }), /*#__PURE__*/_react.default.createElement("button", {
-    className: "ter-flyout__search-btn",
-    onClick: handleSearchSubmit
-  }, /*#__PURE__*/_react.default.createElement("img", {
-    className: "ter-flyout__search-btn-caret",
-    src: _rightCaretLightGray.default,
-    alt: "caret icon"
-  })));
-};
-
-var _default = FlyoutSearch;
-exports.default = _default;