From 0bb7eb4b4a24cbc179a52ff909df76146ca050a0 Mon Sep 17 00:00:00 2001
From: Andrew <andrew.telnov@gmail.com>
Date: Thu, 11 Jul 2024 10:54:11 +0300
Subject: [PATCH] Progress Bar counts invisible questions when calculating the
 total progress value #8514 (#8531)

---
 src/question_matrixdropdownbase.ts |  3 ++-
 tests/surveytests.ts               | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/question_matrixdropdownbase.ts b/src/question_matrixdropdownbase.ts
index e7238c9950..5352fe8b93 100644
--- a/src/question_matrixdropdownbase.ts
+++ b/src/question_matrixdropdownbase.ts
@@ -1925,9 +1925,10 @@ export class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel<Mat
     for (var i = 0; i < this.columns.length; i++) {
       const col = this.columns[i];
       if (!col.templateQuestion.hasInput) continue;
+      const hasValue = !Helpers.isValueEmpty(rowValue[col.name]);
+      if(!hasValue && !!col.templateQuestion.visibleIf) continue;
       res.questionCount += 1;
       res.requiredQuestionCount += col.isRequired;
-      const hasValue = !Helpers.isValueEmpty(rowValue[col.name]);
       res.answeredQuestionCount += hasValue ? 1 : 0;
       res.requiredAnsweredQuestionCount += hasValue && col.isRequired ? 1 : 0;
     }
diff --git a/tests/surveytests.ts b/tests/surveytests.ts
index 2a646f8dec..1f8a7f33ee 100644
--- a/tests/surveytests.ts
+++ b/tests/surveytests.ts
@@ -939,6 +939,30 @@ QUnit.test("progressText, 'requiredQuestions' type and design mode", function (
   assert.equal(survey.getProgressTypeComponent(), "sv-progress-requiredquestions", "requiredQuestions component");
   assert.equal(survey.progressText, "Answered 0/2 questions");
 });
+QUnit.test("progressText, 'questions' type, invisible cells and data", function (
+  assert
+) {
+  var survey = new SurveyModel({
+    progressBarType: "questions",
+    elements: [
+      { type: "matrixdynamic", name: "matrix",
+        columns: [
+          { cellType: "text", name: "col1" },
+          { cellType: "boolean", name: "col2" },
+          { cellType: "text", name: "col3", visibleIf: "{row.col2}=true" },
+        ]
+      }
+    ]
+  });
+  survey.data = { matrix: [{ col1: "abc1", col2: true, col3: "edf1" }, { col1: "abc1", col2: false }] };
+  assert.equal(survey.progressText, "Answered 5/5 questions", "#1");
+  const matrix = survey.getQuestionByName("matrix");
+  const rows = matrix.visibleRows;
+  rows[1].getQuestionByName("col2").value = true;
+  assert.equal(survey.progressText, "Answered 5/6 questions", "#2");
+  rows[1].getQuestionByName("col3").value = "abc";
+  assert.equal(survey.progressText, "Answered 6/6 questions", "#3");
+});
 QUnit.test("progressText, 'requiredQuestions' type and required matrix dropdown, bug#5375", function (
   assert
 ) {