@citolab/qti-components 7.17.0 → 7.17.1

package/dist/{chunk-352OTVTY.js → chunk-ERONHL4R.js}

@@ -1,10 +1,10 @@
 import {
   QtiModalFeedback
-} from "./chunk-O4XIWHTF.js";
+} from "./chunk-3IHVFNP6.js";
 import {
   item_default,
   m
-} from "./chunk-W4SQRNWO.js";
+} from "./chunk-3PDF4K62.js";
 import {
   watch
 } from "./chunk-2ZEJ3RR5.js";
@@ -49,6 +49,7 @@ var TestNavigationMixin = (superClass) => {
       // Navigation state tracking
       this._activeController = null;
       this._loadResults = [];
+      this._navigationId = 0;
       // Simple loading progress tracking
       this._loadingState = {
         expectedItems: 0,
@@ -168,14 +169,18 @@ var TestNavigationMixin = (superClass) => {
     async _handleNavigationRequest({ detail }) {
       if (!detail?.id) return;
       this._cancelPreviousNavigation();
+      const navigationId = ++this._navigationId;
+      const controller = new AbortController();
       try {
         this._dispatchLoadingStarted(detail.type, detail.id);
-        this._activeController = new AbortController();
-        await this._executeNavigation(detail.type, detail.id);
+        this._activeController = controller;
+        await this._executeNavigation(detail.type, detail.id, navigationId, controller);
       } catch (error) {
         this._handleNavigationError(error, detail.type, detail.id);
       } finally {
-        this._activeController = null;
+        if (this._activeController === controller) {
+          this._activeController = null;
+        }
         this._dispatchLoadingEnded(detail.type, detail.id);
       }
     }
@@ -184,29 +189,30 @@ var TestNavigationMixin = (superClass) => {
         this._dispatchError(this._createNavigationError(error, type, id));
       }
     }
-    async _executeNavigation(type, id) {
+    async _executeNavigation(type, id, navigationId, controller) {
       if (type === "item") {
-        await this._navigateToItem(id);
+        await this._navigateToItem(id, navigationId, controller);
       } else {
-        await this._navigateToSection(id);
+        await this._navigateToSection(id, navigationId, controller);
       }
     }
     /**
      * Navigate to specific item with simple state tracking
      */
-    async _navigateToItem(itemId) {
+    async _navigateToItem(itemId, navigationId, controller) {
       const itemRef = this._findItemRef(itemId);
       this._updateSessionContext(itemRef, itemId);
       this._resetLoadingState();
       this._loadingState.expectedItems = 1;
-      await this._loadItems([itemId]);
-      await this._waitForLoadingComplete();
+      await this._loadItems([itemId], navigationId, controller);
+      await this._waitForLoadingComplete(navigationId, controller);
+      if (this._isStaleNavigation(navigationId, controller)) return;
       this._dispatchTestLoaded(this._loadResults);
     }
     /**
      * Navigate to section with simple state tracking
      */
-    async _navigateToSection(sectionId) {
+    async _navigateToSection(sectionId, navigationId, controller) {
       const sectionEl = this._findSection(sectionId);
       const navPartId = sectionEl?.closest("qti-test-part")?.identifier;
       this.sessionContext = {
@@ -218,8 +224,9 @@ var TestNavigationMixin = (superClass) => {
       const itemIds = this._getSectionItemIds(sectionId);
       this._resetLoadingState();
       this._loadingState.expectedItems = itemIds.length;
-      await this._loadItems(itemIds);
-      await this._waitForLoadingComplete();
+      await this._loadItems(itemIds, navigationId, controller);
+      await this._waitForLoadingComplete(navigationId, controller);
+      if (this._isStaleNavigation(navigationId, controller)) return;
       this._dispatchTestLoaded(this._loadResults);
     }
     // ===========================================
@@ -252,8 +259,9 @@ var TestNavigationMixin = (superClass) => {
     /**
      * Wait for loading to complete with simple polling
      */
-    async _waitForLoadingComplete() {
+    async _waitForLoadingComplete(navigationId, controller) {
       while (!this._loadingState.isComplete) {
+        if (this._isStaleNavigation(navigationId, controller)) return;
         await new Promise((resolve) => setTimeout(resolve, 10));
       }
     }
@@ -333,27 +341,28 @@ var TestNavigationMixin = (superClass) => {
     /**
      * Load items with simple tracking
      */
-    async _loadItems(itemIds) {
+    async _loadItems(itemIds, navigationId, controller) {
       if (!this._testElement || itemIds.length === 0) return;
       const itemRefs = itemIds.map((id) => this._findItemRef(id));
       this._clearLoadedItems();
       this._clearStimulusRef();
-      const results = await Promise.all(itemRefs.map((ref) => this._loadSingleItem(ref)));
+      const results = await Promise.all(itemRefs.map((ref) => this._loadSingleItem(ref, navigationId, controller)));
       const validResults = results.filter(Boolean);
+      if (this._isStaleNavigation(navigationId, controller)) return;
       validResults.forEach(({ itemRef, doc }) => {
         if (itemRef && doc) itemRef.xmlDoc = doc;
       });
       this._loadResults = validResults;
     }
-    async _loadSingleItem(itemRef) {
+    async _loadSingleItem(itemRef, navigationId, controller) {
       try {
-        let transformer = await qtiTransformItem(this.cacheTransform).load(
-          itemRef.href,
-          this._activeController?.signal
-        );
+        let transformer = await qtiTransformItem(this.cacheTransform).load(itemRef.href, controller.signal);
         if (this.postLoadTransformCallback) {
           transformer = await this.postLoadTransformCallback(transformer, itemRef);
         }
+        if (this._isStaleNavigation(navigationId, controller)) {
+          return null;
+        }
         return { itemRef, doc: transformer.htmlDoc() };
       } catch (error) {
         if (error.name === "AbortError") {
@@ -409,6 +418,9 @@ var TestNavigationMixin = (superClass) => {
     _clearStimulusRef() {
       this.querySelectorAll("[data-stimulus-idref]").forEach((el) => el.innerHTML = "");
     }
+    _isStaleNavigation(navigationId, controller) {
+      return controller.signal.aborted || navigationId !== this._navigationId;
+    }
     _createNavigationError(error, type, id) {
       return {
         message: error.message || `Failed to load ${type}: ${id}`,
@@ -3327,4 +3339,4 @@ lit-html/node/private-ssr-support.js:
    * SPDX-License-Identifier: BSD-3-Clause
    *)
 */
-//# sourceMappingURL=chunk-352OTVTY.js.map
+//# sourceMappingURL=chunk-ERONHL4R.js.map