Trigger spa:request:end and spa:navigation:end when navigation is abo…

…rted.
signalizejs · Jul 14, 2024 · 5091a8c · 5091a8c
1 parent 7ab7cc0
commit 5091a8c
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/packages/signalizejs/src/modules/spa.js b/packages/signalizejs/src/modules/spa.js
@@ -87,8 +87,17 @@ export default async ({ params, resolve, root }, config) => {
 			error: null
 		};
 
+		let navigationRequestIsRunning = false;
+
 		if (abortNavigationRequestController !== undefined) {
 			abortNavigationRequestController.abort();
+
+			if (navigationRequestIsRunning) {
+				navigationRequestIsRunning = false;
+				dispatch('spa:request:end', { ...dispatchEventData, navigationResponse: null });
+			}
+
+			dispatch('spa:navigation:end', dispatchEventData);
 		}
 
 		abortNavigationRequestController = new AbortController();
@@ -119,12 +128,14 @@ export default async ({ params, resolve, root }, config) => {
 			} else {
 				dispatch('spa:request:start', { ...dispatchEventData });
 
+				navigationRequestIsRunning = true;
 				navigationResponse = await ajax(urlString, {
 					signal: abortNavigationRequestController.signal,
 					headers: {
 						Accept: 'text/html, application/xhtml+xml'
 					}
 				});
+				navigationRequestIsRunning = false;
 				abortNavigationRequestController = undefined;
 				const requestIsWithoutErroor = navigationResponse.error === null;