@financial-times/n-myft-ui 40.1.7 → 40.1.9

package/.toolkitstate/ci.json

@@ -1,6 +1,6 @@
 {
   "branch": "",
   "repo": "n-myft-ui",
-  "version": "7ba95d10eb1521c993da7451cc661022e0c8e5b2",
-  "tag": "v40.1.7"
+  "version": "fdae808ef9fa7d46d7eb3eeb192a1a988b0ae065",
+  "tag": "v40.1.9"
 }

package/components/jsx/preferences-modal/preferences-modal.jsx

@@ -45,7 +45,7 @@ export default function InstantAlertsPreferencesModal({ flags, conceptId, visibl
 				</span>
 
 				<p data-component-id="myft-preferences-modal-list" className="n-myft-ui__preferences-modal__text"></p>
-				<a className="n-myft-ui__preferences-modal__text" href="/myft/alerts" data-trackable="pop-up-box|contact-preference" data-trackable-context-concept_id={conceptId}>Manage your delivery channels here</a>
+				<a className="n-myft-ui__preferences-modal__text" href="/myaccount/contact-preferences" data-trackable="pop-up-box|contact-preference" data-trackable-context-concept_id={conceptId}>Manage your delivery channels here</a>
 				<span className="n-myft-ui__preferences-modal-error" data-component-id="myft-preference-modal-error"></span>
 				<button className="n-myft-ui__preferences-modal__remove-button" data-component-id="myft-preference-modal-remove" data-trackable="pop-up-box|remove-from-myFT" data-trackable-context-concept_id={conceptId}>Remove from myFT</button>
 			</div>

package/dist/preferences-modal/preferences-modal.js

@@ -70,7 +70,7 @@ function InstantAlertsPreferencesModal(_ref) {
 			_react2.default.createElement('p', { 'data-component-id': 'myft-preferences-modal-list', className: 'n-myft-ui__preferences-modal__text' }),
 			_react2.default.createElement(
 				'a',
-				{ className: 'n-myft-ui__preferences-modal__text', href: '/myft/alerts', 'data-trackable': 'pop-up-box|contact-preference', 'data-trackable-context-concept_id': conceptId },
+				{ className: 'n-myft-ui__preferences-modal__text', href: '/myaccount/contact-preferences', 'data-trackable': 'pop-up-box|contact-preference', 'data-trackable-context-concept_id': conceptId },
 				'Manage your delivery channels here'
 			),
 			_react2.default.createElement('span', { className: 'n-myft-ui__preferences-modal-error', 'data-component-id': 'myft-preference-modal-error' }),

package/myft/ui/lists.js

@@ -89,7 +89,9 @@ async function openSaveArticleToList (contentId, options = {}) {
 
 	function addCloseButtonDataTrackable () {
 		const closeBtn = document.querySelector('.o-overlay__close');
-		closeBtn.setAttribute('data-trackable', 'close-button');
+		if (closeBtn) {
+			closeBtn.setAttribute('data-trackable', 'close-button');
+		}
 	}
 
 	function outsideClickHandler (e) {
@@ -100,9 +102,6 @@ async function openSaveArticleToList (contentId, options = {}) {
 		const isTargetInsideOverlay = overlayContainer.contains(e.target) && !e.target.classList.contains('o-overlay__close');
 		if(createListOverlay.visible && (!overlayContent || !isTargetInsideOverlay)) {
 			createListOverlay.close();
-			// When we close the list overlay we want to return the focuse to the trigger element
-			// This is for better accessibility and it will allow keyboard users to continue from where they left off when they opened the overlay
-			returnFocusToRefocusElement();
 		}
 	}
 
@@ -121,6 +120,14 @@ async function openSaveArticleToList (contentId, options = {}) {
 		refreshListElement();
 		showListElement();
 		restoreFormHandler();
+		focusOverlayCloseButton();
+	}
+
+	function focusOverlayCloseButton () {
+		const closeBtn = document.querySelector('.o-overlay__close');
+		if (closeBtn) {
+			closeBtn.focus();
+		}
 	}
 
 	function openFormHandler () {
@@ -154,25 +161,17 @@ async function openSaveArticleToList (contentId, options = {}) {
 
 		document.body.addEventListener('click', outsideClickHandler);
 
-		const closeBtn = document.querySelector('.o-overlay__close');
-		if(closeBtn){
-			// whenever we close the overlay we want to return the focuse to the trigger element
-			closeBtn.addEventListener('click', returnFocusToRefocusElement);
-		}
-
 	});
 
 	createListOverlay.wrapper.addEventListener('oOverlay.destroy', () => {
+		// Restore focus regardless of close path (close button, outside click, Escape key).
+		returnFocusToRefocusElement();
+
 		window.removeEventListener('scroll', scrollHandler);
 
 		window.removeEventListener('oViewport.resize', resizeHandler);
 
 		document.body.removeEventListener('click', outsideClickHandler);
-
-		const closeBtn = document.querySelector('.o-overlay__close');
-		if (closeBtn) {
-			closeBtn.removeEventListener('click', returnFocusToRefocusElement);
-		}
 	});
 
 	addCloseButtonDataTrackable();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/n-myft-ui",
-  "version": "40.1.7",
+  "version": "40.1.9",
   "description": "Client side component for interaction with myft",
   "main": "server.js",
   "scripts": {