Refactor fillSingleInputQuestionsInContainer function

surveyjs · Feb 27, 2025 · abdd75e · abdd75e
1 parent 8a62733
commit abdd75e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/packages/survey-core/src/question.ts b/packages/survey-core/src/question.ts
@@ -907,7 +907,7 @@ export class Question extends SurveyElement<Question>
   protected getSingleInputQuestions(): Array<Question> {
     return this.getNestedQuestions(true, false);
   }
-  protected fillSingleInputQuestionsInContainer(res: Array<Question>): void {}
+  protected fillSingleInputQuestionsInContainer(res: Array<Question>, innerQuestion: Question): void {}
   protected getSingleInputQuestionsForDynamic(): Array<Question> {
     const res = new Array<Question>();
     const q = this.getPropertyValue("singleInputQuestion");

diff --git a/packages/survey-core/src/question_matrixdynamic.ts b/packages/survey-core/src/question_matrixdynamic.ts
@@ -709,13 +709,10 @@ export class QuestionMatrixDynamicModel extends QuestionMatrixDropdownModelBase
     }
     return this.getSingleInputQuestionsForDynamic();
   }
-  protected fillSingleInputQuestionsInContainer(res: Array<Question>): void {
-    const q = this.getPropertyValue("singleInputQuestion");
-    if(!!q && q !== this) {
-      const row = this.getRowByQuestion(q);
-      if(row) {
-        row.questions.forEach(q => q.addNestedQuestion(res, true, false));
-      }
+  protected fillSingleInputQuestionsInContainer(res: Array<Question>, innerQuestion: Question): void {
+    const row = this.getRowByQuestion(innerQuestion);
+    if(row) {
+      row.questions.forEach(q => q.addNestedQuestion(res, true, false));
     }
   }
 

diff --git a/packages/survey-core/src/question_paneldynamic.ts b/packages/survey-core/src/question_paneldynamic.ts
@@ -1187,13 +1187,10 @@ export class QuestionPanelDynamicModel extends Question
     this.onFirstRendering();
     return this.getSingleInputQuestionsForDynamic();
   }
-  protected fillSingleInputQuestionsInContainer(res: Array<Question>): void {
-    const q = this.getPropertyValue("singleInputQuestion");
-    if(!!q && q !== this) {
-      const panel = this.getPanelByQuestion(q);
-      if(panel) {
-        panel.questions.forEach(q => q.addNestedQuestion(res, true, false));
-      }
+  protected fillSingleInputQuestionsInContainer(res: Array<Question>, innerQuestion: Question): void {
+    const panel = this.getPanelByQuestion(innerQuestion);
+    if(panel) {
+      panel.questions.forEach(q => q.addNestedQuestion(res, true, false));
     }
   }
   protected getSingleQuestionLocTitleCore(): LocalizableString {