project-booster-vue 9.4.0 → 9.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "9.4.0",
+  "version": "9.5.0",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/question/PbQuestion.vue

@@ -432,14 +432,13 @@ export default defineComponent({
         const questionPossibleAnswer = this.questionPossibleAnswers.get(answerCode);
         if (
           questionPossibleAnswer &&
-          (questionPossibleAnswer?.selected ||
-            answerValues.findIndex(
-              (answer: ScenarioStepAnswer | string) =>
-                (typeof answer === 'string' && answer === answerCode) ||
-                (typeof answer === 'object' &&
-                  (<ScenarioStepAnswer>answer)?.code === answerCode &&
-                  (<ScenarioStepAnswer>answer)?.selected),
-            ) >= 0) &&
+          answerValues.findIndex(
+            (answer: ScenarioStepAnswer | string) =>
+              (typeof answer === 'string' && answer === answerCode) ||
+              (typeof answer === 'object' &&
+                (<ScenarioStepAnswer>answer)?.code === answerCode &&
+                (<ScenarioStepAnswer>answer)?.selected),
+          ) >= 0 &&
           areConditionsValid(questionPossibleAnswer.conditions!, this.answers, this.runtimeOptions)
         ) {
           this.selectedAnswers.set(answerCode, true);
@@ -499,10 +498,9 @@ export default defineComponent({
       if (!this.payload.multiSelect) {
         this.initAnswersSelectedState(this.payload.answers);
       }
-      answer.selected = !answer.selected;
 
       if (this.payload.multiSelect) {
-        this.selectedAnswers.set(answer.code, answer.selected);
+        this.selectedAnswers.set(answer.code, !this.selectedAnswers.get(answer.code) ?? true);
 
         const selected = Object.fromEntries(Object.entries(this.selectedAnswers).filter(([, value]) => value === true));
         /**
@@ -514,7 +512,7 @@ export default defineComponent({
         Object.keys(Object.fromEntries(this.selectedAnswers)).forEach((answerCode) => {
           this.selectedAnswers.set(answerCode, false);
         });
-        this.selectedAnswers.set(answer.code, answer.selected);
+        this.selectedAnswers.set(answer.code, !this.selectedAnswers.get(answer.code) ?? true);
 
         /**
          * Emitted when step is completed

package/src/components/scenario/PbScenario.vue

@@ -289,7 +289,12 @@ export default defineComponent({
       let stepIndex = state.value.history.stepIndex - 1;
 
       const steps = state.value.history.steps ?? [];
-      while (stepIndex > 0 && steps[stepIndex - 1].step.type !== 'STEP') {
+      while (
+        stepIndex > 0 &&
+        steps[stepIndex - 1] &&
+        steps[stepIndex - 1].step &&
+        steps[stepIndex - 1].step.type !== 'STEP'
+      ) {
         stepIndex--;
       }
 
@@ -356,7 +361,13 @@ export default defineComponent({
       }
     };
     const goToStep = (stepIndex: number) => {
-      let requestedStep = state.value.history?.steps?.[stepIndex - 1];
+      let requestedStep = state.value.history?.steps ? state.value.history.steps[stepIndex - 1] : undefined;
+
+      if (!requestedStep) {
+        requestedStep = state.value.history?.steps
+          ? state.value.history.steps[state.value.history.stepIndex - 1]
+          : undefined;
+      }
 
       if (requestedStep) {
         if (requestedStep.step.resetAnswersOnBack) {