@nice-digital/global-nav 4.1.730-GN-169-Dropdown-open → 4.1.735-GN-169-Dropdown-open

package/README.md

@@ -436,10 +436,6 @@ var global_nav_config = {
 - Type: `String`, `Function`
 - Default: `null`
 
-Function parameters:
-
-- `query` (`String`) the query term used in the search
-
 Pass an `onDropdownClose` property to enable callback when dropdown is closed.
 Pass either a function, or the name of a function defined on `window`. E.g.:
 

package/lib/Header/Account/Account.js

@@ -165,7 +165,7 @@ function Account(props) {
     "aria-labelledby": "my-account-button",
     onKeyDown: handleKeyDown,
     ref: myAccountMenu
-  }, accountsData.links && Object.keys(accountsData.links).map(function (text, i) {
+  }, doesUseIdAM && accountsData.display_name && /*#__PURE__*/_react["default"].createElement("li", null, /*#__PURE__*/_react["default"].createElement("span", null, accountsData.display_name)), accountsData.links && Object.keys(accountsData.links).map(function (text, i) {
     return /*#__PURE__*/_react["default"].createElement("li", {
       key: i,
       role: "presentation"

package/lib/Header/Account/Account.module.scss

@@ -106,10 +106,14 @@
     margin: 0;
   }
 
+  span,
   a {
-    color: $nds-colour-link;
     display: block;
     padding: rem($nds-spacing-small $nds-spacing-medium);
+  }
+
+  a {
+    color: $nds-colour-link;
     text-decoration: none;
     white-space: nowrap;
 

package/lib/Header/Header.js

@@ -103,31 +103,29 @@ var Header = /*#__PURE__*/function (_Component) {
     }
   };
 
+  _proto.checkForFunctionOrFunctionName = function checkForFunctionOrFunctionName(funcParam) {
+    return typeof funcParam === "function" ? funcParam : window[funcParam];
+  };
+
   _proto.dropdownToggleHandler = function dropdownToggleHandler(idOfOpenDropdown) {
     // If we've got an onDropdownOpen or onDropdownClose prop call the onDropdownOpen or onDropdownClose callback based on idOfOpenDropdown.
     var _this$props = this.props,
         onDropdownOpen = _this$props.onDropdownOpen,
         onDropdownClose = _this$props.onDropdownClose;
 
-    if (onDropdownOpen) {
-      var onDropdownOpenCallback = typeof onDropdownOpen === "function" ? onDropdownOpen : window[onDropdownOpen];
-
-      if (idOfOpenDropdown !== null && typeof onDropdownOpenCallback === "function") {
-        onDropdownOpenCallback();
+    if (onDropdownOpen && idOfOpenDropdown !== null) {
+      if (typeof this.checkForFunctionOrFunctionName(onDropdownOpen) === "function") {
+        onDropdownOpen();
         return true;
       }
     }
 
-    if (onDropdownClose) {
-      var onDropdownCloseCallback = typeof onDropdownClose === "function" ? onDropdownClose : window[onDropdownClose];
-
-      if (idOfOpenDropdown == null && typeof onDropdownCloseCallback === "function") {
-        onDropdownCloseCallback();
+    if (onDropdownClose && idOfOpenDropdown == null) {
+      if (typeof this.checkForFunctionOrFunctionName(onDropdownClose) === "function") {
+        onDropdownClose();
         return true;
       }
     }
-
-    return false;
   };
 
   _proto.render = function render() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nice-digital/global-nav",
-  "version": "4.1.730-GN-169-Dropdown-open",
+  "version": "4.1.735-GN-169-Dropdown-open",
   "description": "Global header and footer components for NICE digital services",
   "main": "lib/index.js",
   "types": "./types.d.ts",

package/types.d.ts

@@ -72,6 +72,8 @@ declare module "@nice-digital/global-nav" {
 		skipLinkId?: string;
 		search?: false | SearchProps;
 		auth?: NiceAccountsProviderProps | IdamProviderProps | false;
+		onDropdownOpen?: string | OnDropdownOpenCallback;
+		onDropdownClose?: string | OnDropdownCloseCallback;
 		onNavigating?: string | OnNavigatingCallback;
 		additionalSubMenuItems?: Array<AdditionalSubMenuItem>;
 	};