FIx creator tests. Do not re-create rows on creating them

surveyjs · Sep 16, 2024 · e2886e9 · e2886e9
1 parent 3fdbdc7
commit e2886e9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/packages/survey-core/src/question_matrixdropdownbase.ts b/packages/survey-core/src/question_matrixdropdownbase.ts
@@ -1709,23 +1709,27 @@ export class QuestionMatrixDropdownModelBase extends QuestionMatrixBaseModel<Mat
   protected isColumnVisible(column: any): boolean {
     return column.isColumnVisible;
   }
+  private isGenereatingRows: boolean;
   protected getVisibleRows(): Array<MatrixDropdownRowModelBase> {
     if (this.isUpdateLocked) return null;
+    if(this.isGenereatingRows) return [];
     if(!!this.visibleRowsArray) return this.visibleRowsArray;
     this.generateVisibleRowsIfNeeded();
     this.visibleRowsArray = this.getVisibleFromGenerated(this.generatedVisibleRows);
-    if (this.data) {
-      this.runCellsCondition(
-        this.data.getFilteredValues(),
-        this.data.getFilteredProperties()
-      );
-    }
     return this.visibleRowsArray;
   }
   private generateVisibleRowsIfNeeded(): void {
-    if (!this.isUpdateLocked && !this.generatedVisibleRows) {
+    if (!this.isUpdateLocked && !this.generatedVisibleRows && !this.generatedVisibleRows) {
+      this.isGenereatingRows = true;
       this.generatedVisibleRows = this.generateRows();
+      this.isGenereatingRows = false;
       this.generatedVisibleRows.forEach((row) => this.onMatrixRowCreated(row));
+      if (this.data) {
+        this.runCellsCondition(
+          this.data.getFilteredValues(),
+          this.data.getFilteredProperties()
+        );
+      }
       if(!!this.generatedVisibleRows) {
         this.updateValueOnRowsGeneration(this.generatedVisibleRows);
         this.updateIsAnswered();

diff --git a/packages/survey-core/src/question_matrixdynamic.ts b/packages/survey-core/src/question_matrixdynamic.ts
@@ -240,6 +240,7 @@ export class QuestionMatrixDynamicModel extends QuestionMatrixDropdownModelBase
     }
     if (this.generatedVisibleRows || prevValue == 0) {
       if (!this.generatedVisibleRows) {
+        this.clearGeneratedRows();
         this.generatedVisibleRows = [];
       }
       this.generatedVisibleRows.splice(val);