@ons/design-system 46.1.0 → 46.1.3

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 ONS Digital
+Copyright (c) 2018 Crown Copyright (Office for National Statistics)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/components/message-list/_message-list.scss

@@ -12,7 +12,7 @@
   }
 
   &__subject {
-    margin: 0;
+    margin: 0 0 0.2rem;
   }
 
   &__metadata {

package/components/tabs/_tabs.scss

@@ -33,9 +33,10 @@
   color: $color-text;
   display: inline-block;
   height: 2.5rem;
+  line-height: 2.3rem;
   margin: 0 0.1rem 0 0;
   overflow: visible;
-  padding: 0.5rem 1rem;
+  padding: 0 1rem;
   position: relative;
   text-decoration: underline;
 

package/components/timeout-modal/timeout-modal.js

@@ -8,6 +8,9 @@ export default class TimeoutModal {
     this.initialExpiryTime = initialExpiryTime;
     this.continueButton = context.querySelector('.ons-js-modal-btn');
     this.modalVisibleInMilliseconds = context.getAttribute('data-show-modal-time') * 1000;
+    this.expiryTime = '';
+    this.expiryTimeInMilliseconds = 0;
+    this.shouldRestartCheck = false;
 
     // Create modal instance
     this.modal = new Modal(this.context);
@@ -27,7 +30,8 @@ export default class TimeoutModal {
   startTimeout() {
     clearTimeout(this.showModalTimeout);
     if (this.initialExpiryTime) {
-      this.expiryTimeInMilliseconds = this.timeout.convertTimeToMilliSeconds(this.initialExpiryTime);
+      this.expiryTime = this.timeout.expiryTime;
+      this.expiryTimeInMilliseconds = this.timeout.convertTimeToMilliSeconds(this.expiryTime);
     } else {
       // For demo purposes
       this.expiryTimeInMilliseconds = 60000;
@@ -39,18 +43,39 @@ export default class TimeoutModal {
   }
 
   async openModalAndStartCountdown() {
-    const modalWillOpen = await this.timeout.hasExpiryTimeResetInAnotherTab();
+    const modalWillOpen = await this.hasExpiryTimeResetInAnotherTab();
     if (modalWillOpen && !this.modal.isDialogOpen()) {
       this.modal.openDialog();
       this.timeout.startUiCountdown();
+
+      this.shouldRestartCheck = setInterval(async () => {
+        await this.hasExpiryTimeResetInAnotherTab();
+      }, 20000);
     }
   }
 
-  closeModalAndRestartTimeout() {
+  async hasExpiryTimeResetInAnotherTab() {
+    const checkExpiryTime = await this.timeout.getExpiryTime();
+    if (checkExpiryTime.substring(0, 19) != this.timeout.expiryTime.substring(0, 19)) {
+      // Substring is required as endpoint can at random return milliseconds with expiry time
+      this.expiryTime = checkExpiryTime;
+      this.expiryTimeInMilliseconds = this.timeout.convertTimeToMilliSeconds(checkExpiryTime);
+      this.closeModalAndRestartTimeout(this.expiryTimeInMilliseconds);
+    } else {
+      return true;
+    }
+  }
+
+  async closeModalAndRestartTimeout(time) {
+    clearInterval(this.shouldRestartCheck);
+
+    if (typeof timeInMilliSeconds !== 'string') {
+      time = false;
+    }
     if (this.modal.isDialogOpen()) {
       this.modal.closeDialog();
     }
-    this.timeout.restartTimeout();
+    await this.timeout.restartTimeout(time);
     this.startTimeout();
   }