@ministryofjustice/frontend 7.0.0 → 8.0.0-beta.1

package/moj/all.bundle.mjs

@@ -341,7 +341,7 @@ function createAll(Component, config, scopeOrOptions) {
  *
  * {@link https://github.com/ministryofjustice/moj-frontend/releases}
  */
-const version = '7.0.0';
+const version = '8.0.0-beta.1';
 
 class AddAnother extends Component {
   /**
@@ -1311,8 +1311,8 @@ class DatePicker extends ConfigurableComponent {
   }
   setExcludedDays() {
     if (this.config.excludedDays) {
-      // lowercase and arrange dayLabels to put indexOf sunday == 0 for comparison
-      // with getDay() function
+      /* lowercase and arrange dayLabels to put indexOf sunday == 0 for comparison
+         with getDay() function */
       const weekDays = this.dayLabels.map(item => item.toLowerCase());
       if (this.config.weekStartDay === 'monday') {
         weekDays.unshift(weekDays.pop());
@@ -1338,8 +1338,6 @@ class DatePicker extends ConfigurableComponent {
    * @returns {boolean}
    */
   isExcludedDate(date) {
-    // This comparison does not work correctly - it will exclude the mindate itself
-    // see: https://github.com/ministryofjustice/moj-frontend/issues/923
     if (this.minDate && this.minDate > date) {
       return true;
     }
@@ -1861,15 +1859,23 @@ class PdsHeader extends Component {
     this.$tabOpenClass = 'probation-common-header__toggle-open';
     const $userToggle = this.$root.querySelector('.probation-common-header__user-menu-toggle');
     const $userMenu = this.$root.querySelector('#probation-common-header-user-menu');
-    if (!$userToggle || !$userMenu || !($userToggle instanceof HTMLElement) || !($userMenu instanceof HTMLElement)) {
+    const $servicesToggle = this.$root.querySelector('.probation-common-header__services-menu-toggle');
+    const $servicesMenu = this.$root.querySelector('#probation-common-header-services-menu');
+    if (!$userToggle || !$userMenu || !$servicesToggle || !$servicesMenu || !($userToggle instanceof HTMLElement) || !($userMenu instanceof HTMLElement) || !($servicesToggle instanceof HTMLElement) || !($servicesMenu instanceof HTMLElement)) {
       return 0;
     }
     this.hideFallbackLinks();
     $userToggle.removeAttribute('hidden');
-    this.closeTabs([[$userToggle, $userMenu]]);
+    $servicesToggle.removeAttribute('hidden');
+    this.closeTabs([[$userToggle, $userMenu], [$servicesToggle, $servicesMenu]]);
     $userToggle.addEventListener('click', _event => {
+      this.closeTabs([[$servicesToggle, $servicesMenu]]);
       this.toggleMenu($userToggle, $userMenu);
     });
+    $servicesToggle.addEventListener('click', _event => {
+      this.closeTabs([[$userToggle, $userMenu]]);
+      this.toggleMenu($servicesToggle, $servicesMenu);
+    });
   }
 
   /**
@@ -1905,7 +1911,9 @@ class PdsHeader extends Component {
   }
   hideFallbackLinks() {
     const $userLink = this.$root.querySelector('.probation-common-header__user-menu-link');
+    const $servicesLink = this.$root.querySelector('.probation-common-header__services-menu-link');
     if ($userLink) $userLink.setAttribute('hidden', 'hidden');
+    if ($servicesLink) $servicesLink.setAttribute('hidden', 'hidden');
   }
 
   /**