supernav-test 2.2.30 → 2.2.34

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

@@ -23,7 +23,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; }
 
-// import IconRight from '../static/images/sidebar-icons/rightIcon.svg';
+// import {ReactComponent as IconRight} from '../static/images/sidebar-icons/rightIcon.svg';
 var styles = require('../stylesheets/sidebar-main-link.scss');
 
 function SidebarMainLink(props) {

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

@@ -11,11 +11,7 @@ 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 _saama_logo = _interopRequireDefault(require("../static/images/saama_logo.svg"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
@@ -35,6 +31,9 @@ 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 {ReactComponent as Hamburger} from '../static/images/hamburger-icon.svg';
+// import {ReactComponent as CloseHamburger} from '../static/images/close-hamburger-icon.svg'
+// import {ReactComponent as UserIcon} from '../static/images/icon-user.svg';
 // icon imports
 require('../stylesheets/topnav.scss');
 
@@ -96,12 +95,8 @@ function TopNav(props) {
   var showHamburger = function showHamburger() {
     var menuIcon;
 
-    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);
+    if (isLogoClickable) {// menuIcon = isMinimal || expanded ? <span className="close-hamburger-icon"><CloseHamburger /></span> : <Hamburger />
+    } else {// menuIcon= <Hamburger />
     }
 
     return menuIcon;
@@ -129,11 +124,13 @@ function TopNav(props) {
       clickable: isLogoClickable
     }),
     onClick: handleToggleClick
-  }, "null"), /*#__PURE__*/_react.default.createElement("span", {
+  }, /*#__PURE__*/_react.default.createElement("img", {
+    src: _saama_logo.default
+  })), /*#__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) : null);
+  }, applicationTitle) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null));
 
   var content = topnavDisplayMode === _UtilityConstants.TopnavDisplayModes.MINIMAL ? /*#__PURE__*/_react.default.createElement("div", {
     className: "top-nav-minimal header-logo",
@@ -155,7 +152,7 @@ function TopNav(props) {
     id: "dropdown-basic"
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "account-name"
-  }, accountName), /*#__PURE__*/_react.default.createElement(_iconUser.ReactComponent, null)), /*#__PURE__*/_react.default.createElement("div", {
+  }, accountName)), /*#__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/dist/components/lsac-supernavbar/static/images/saama_logo.svg

@@ -6,10 +6,10 @@ viewBox="0 0 23961 8481"
  xmlns:xlink="http://www.w3.org/1999/xlink">
  <defs>
   <style type="text/css">
-   <![CDATA[
+
     .fil0 {fill:#1E96DE}
     .fil1 {fill:#333333}
-   ]]>
+
   </style>
  </defs>
  <g id="Layer_x0020_1">

package/dist/components/lsac-supernavbar/stylesheets/topnav.scss

@@ -213,6 +213,7 @@ $bodyText: $gray80;
     left: 4px;
     margin: 0px;
     width: auto;
+    height: 15px;
   }
   .close-hamburger-icon svg{
     top: 4px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supernav-test",
-  "version": "2.2.30",
+  "version": "2.2.34",
   "private": false,
   "dependencies": {
     "@testing-library/jest-dom": "5.14.1",
@@ -81,7 +81,7 @@
     "build-dev": "webpack --mode development",
     "build-prod": "webpack --mode production",
     "tsc-build": "npx tsc",
-    "publish:npm": "set NODE_ENV=production && rm -rf dist && mkdir dist && npx babel --extensions .tsx,.jsx,.ts,.js src --out-dir dist --copy-files"
+    "publish:npm": "set NODE_ENV=production && rm -rf dist && mkdir dist && npx babel --extensions .tsx,.jsx,.ts,.js src --out-dir dist --copy-files && npx tsc"
   },
   "eslintConfig": {
     "extends": [