supernav-test 2.2.27 → 2.2.28

package/dist/components/lsac-supernavbar/components/Topnav.js

@@ -11,6 +11,12 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactRedux = require("react-redux");
 
+var _hamburgerIcon = require("../static/images/hamburger-icon.svg");
+
+var _closeHamburgerIcon = require("../static/images/close-hamburger-icon.svg");
+
+var _iconUser = require("../static/images/icon-user.svg");
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _SidebarActions = require("../actions/SidebarActions");
@@ -29,10 +35,6 @@ 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; }
 
-// import Hamburger from '../static/images/hamburger-icon.svg';
-// import CloseHamburger from '../static/images/close-hamburger-icon.svg'
-// import SaamaLogo from '../static/images/saama_logo.svg';
-// import UserIcon from '../static/images/icon-user.svg';
 // icon imports
 require('../stylesheets/topnav.scss');
 
@@ -94,8 +96,12 @@ function TopNav(props) {
   var showHamburger = function showHamburger() {
     var menuIcon;
 
-    if (isLogoClickable) {// menuIcon = isMinimal || expanded ? <span className="close-hamburger-icon"><CloseHamburger /></span> : <Hamburger />
-    } else {// menuIcon= <Hamburger />
+    if (isLogoClickable) {
+      menuIcon = isMinimal || expanded ? /*#__PURE__*/_react.default.createElement("span", {
+        className: "close-hamburger-icon"
+      }, /*#__PURE__*/_react.default.createElement(_closeHamburgerIcon.ReactComponent, null)) : /*#__PURE__*/_react.default.createElement(_hamburgerIcon.ReactComponent, null);
+    } else {
+      menuIcon = /*#__PURE__*/_react.default.createElement(_hamburgerIcon.ReactComponent, null);
     }
 
     return menuIcon;
@@ -123,11 +129,21 @@ function TopNav(props) {
       clickable: isLogoClickable
     }),
     onClick: handleToggleClick
-  }), /*#__PURE__*/_react.default.createElement("span", {
+  }, /*#__PURE__*/_react.default.createElement("img", {
+    src: "saama_logo.svg",
+    alt: "saama",
+    width: "107.36px;",
+    height: "38px;"
+  })), /*#__PURE__*/_react.default.createElement("span", {
     className: "LSAC-logo"
   }, "Life Science ", /*#__PURE__*/_react.default.createElement("br", null), "Analytics Cloud"), !!applicationTitle ? /*#__PURE__*/_react.default.createElement("span", {
     className: "app-name"
-  }, applicationTitle) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null));
+  }, applicationTitle) : /*#__PURE__*/_react.default.createElement("img", {
+    src: "saama_logo.svg",
+    alt: "saama",
+    width: "107.36px;",
+    height: "38px;"
+  }));
 
   var content = topnavDisplayMode === _UtilityConstants.TopnavDisplayModes.MINIMAL ? /*#__PURE__*/_react.default.createElement("div", {
     className: "top-nav-minimal header-logo",
@@ -149,7 +165,7 @@ function TopNav(props) {
     id: "dropdown-basic"
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "account-name"
-  }, accountName)), /*#__PURE__*/_react.default.createElement("div", {
+  }, accountName), /*#__PURE__*/_react.default.createElement(_iconUser.ReactComponent, null)), /*#__PURE__*/_react.default.createElement("div", {
     className: "user-dropdown-contents"
   }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, /*#__PURE__*/_react.default.createElement("span", null, userName), /*#__PURE__*/_react.default.createElement("span", {
     className: "switch-account-link-wrapper"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supernav-test",
-  "version": "2.2.27",
+  "version": "2.2.28",
   "private": false,
   "dependencies": {
     "@testing-library/jest-dom": "5.14.1",
@@ -21,7 +21,9 @@
     "supernav-test": "^2.2.18",
     "typescript": "4.4.3",
     "web-vitals": "1.1.2",
-    "webpack-dev-server": "3.11.1"
+    "webpack-dev-server": "3.11.1",
+    "react": "17.0.2",
+    "react-dom": "17.0.2"
   },
   "peerDependencies": {
     "react": "17.0.2",