Fix: Keep active item position on save/restore (fixes #295) (#296)

* Fix: Keep active item position on save/restore (fixes #295) * Fix: storeUserAnswer on setActiveItem Moved from adaptlearning/adapt-contrib-core#494 * Revert * FW bump for core dependency --------- Co-authored-by: joe-allen-89 <[email protected]>
adaptlearning · Feb 5, 2024 · 1c0e9d7 · 1c0e9d7
1 parent 5f0df20
commit 1c0e9d7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "adapt-contrib-narrative",
   "version": "7.8.0",
-  "framework": ">=5.31.2",
+  "framework": ">=5.35.6",
   "homepage": "https://github.com/adaptlearning/adapt-contrib-narrative",
   "bugs": "https://github.com/adaptlearning/adapt-contrib-narrative/issues",
   "component": "narrative",

diff --git a/js/NarrativeModel.js b/js/NarrativeModel.js
@@ -1,3 +1,24 @@
 import ItemsComponentModel from 'core/js/models/itemsComponentModel';
 
-export default class NarrativeModel extends ItemsComponentModel {}
+export default class NarrativeModel extends ItemsComponentModel {
+  restoreUserAnswers() {
+    const numberArray = this.get('_userAnswer');
+    if (!numberArray) return;
+    const children = this.getChildren();
+    const shouldRestoreActiveItem = (numberArray.length > children.length);
+    if (shouldRestoreActiveItem) {
+      const activeItemIndex = numberArray.pop();
+      this.setActiveItem(activeItemIndex);
+    }
+    children.forEach(child => child.set('_isVisited', Boolean(numberArray[child.get('_index')])));
+  }
+
+  storeUserAnswer() {
+    const items = this.getChildren().slice(0);
+    items.sort((a, b) => a.get('_index') - b.get('_index'));
+    const numberArray = items.map(child => child.get('_isVisited') ? 1 : 0);
+    const activeItem = this.getActiveItem();
+    if (activeItem) numberArray.push(activeItem.get('_index'));
+    this.set('_userAnswer', numberArray);
+  }
+}
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "adapt-contrib-narrative",
   "version": "7.8.0",
-  "framework": ">=5.31.2",
+  "framework": ">=5.35.6",
   "homepage": "https://github.com/adaptlearning/adapt-contrib-narrative",
   "bugs": "https://github.com/adaptlearning/adapt-contrib-narrative/issues",
   "component": "narrative",