herum-shared 1.0.11 → 1.0.12

package/fesm2022/herum-shared.mjs

@@ -1408,25 +1408,24 @@ class QuizMultiAnswerQuestionComponent {
     }
     ngOnChanges(changes) {
         if (changes['question'] && this.question) {
-            this.answersForm = this.fb.group({});
+            const isToInitializeFormControls = Object.keys(this.answersForm.controls).length && changes['question'].currentValue.id !== changes['question'].previousValue?.id;
+            if (isToInitializeFormControls)
+                this.answersForm = this.fb.group({});
             this.question.closedContent?.answers?.forEach((answer, index) => {
                 const controlName = this.answerControlNamePrefix + index;
                 this.answersForm.addControl(controlName, new FormControl(this.getFormControlValue(index)));
-                if (Object.keys(this.answersForm.controls).length && changes['question'].currentValue.id !== changes['question'].previousValue?.id) {
+                if (isToInitializeFormControls) {
                     this.answersForm.get(controlName).valueChanges
                         .pipe(takeUntil(this.destroySubject$))
                         .subscribe((isChosen) => this._onAnswersChange(this.question.closedContent?.answers[index], isChosen));
                 }
-                else {
+                else
                     this.answersForm.controls[controlName].setValue(this.getFormControlValue(index), { emitEvent: false });
-                }
             });
-            if (this.areAnswersRevealed || this.isCheckingMode) {
+            if (this.areAnswersRevealed || this.isCheckingMode)
                 this.setAnswerTypeAttributes();
-            }
-            if (this.correctAnswerCount === null || this.correctAnswerCount === undefined) {
+            if (this.correctAnswerCount === null || this.correctAnswerCount === undefined)
                 this.correctAnswerCount = this.question.closedContent?.answers?.filter(answer => answer.isCorrect).length;
-            }
         }
     }
     setAnswerTypeAttributes() {
@@ -1456,13 +1455,20 @@ class QuizMultiAnswerQuestionComponent {
         return quizData.questions.find((question) => question.closedContent?.answers?.find((answer) => answer.id === answerId)?.isCorrect);
     }
     _onAnswersChange(answer, isChosen) {
-        let userAnswer = this.userAnswers.find(userAnswer => userAnswer.id == answer.id);
-        userAnswer ? (userAnswer.isChosen = isChosen) :
-            this.userAnswers.push({
-                id: answer.id,
-                index: answer.index,
-                isChosen
-            });
+        const userAnswerIndex = this.userAnswers.findIndex(userAnswer => userAnswer.id == answer.id);
+        const nextUserAnswer = {
+            id: answer.id,
+            index: answer.index,
+            isChosen: isChosen
+        };
+        if (userAnswerIndex === -1)
+            this.userAnswers.push(nextUserAnswer);
+        else if (!isChosen)
+            this.userAnswers[userAnswerIndex].isChosen = false;
+        else {
+            this.userAnswers.splice(userAnswerIndex, 1);
+            this.userAnswers.push(nextUserAnswer);
+        }
         this.isValid = this.userAnswers.length == this.correctAnswerCount;
         this.onAnswersChange.emit(this.userAnswers);
         this.onValidationChange.emit(this.isValid);