From 352cd13eb12aabe10b0826b2006fbd7e7f093547 Mon Sep 17 00:00:00 2001
From: Andrew Telnov <andrew.telnov@gmail.com>
Date: Wed, 3 Jan 2024 16:26:38 +0200
Subject: [PATCH 1/7] Dropdown Matrix - When a column's Required If rule is
 configured, the required mark doesn't appear in Vertical column orientation
 mode fix #7615

---
 src/question_matrixdropdownrendered.ts        |  27 +--------
 tests/question_matrixdropdownbasetests.ts     |   5 +-
 .../matrixdropdown-column-non-required.png    | Bin 0 -> 6855 bytes
 .../matrixdropdown-column-required.png        | Bin 0 -> 7053 bytes
 .../tests/defaultV2/matrixdropdown.ts         |  56 ++++++++++++++++++
 5 files changed, 62 insertions(+), 26 deletions(-)
 create mode 100644 visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-non-required.png
 create mode 100644 visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-required.png
 create mode 100644 visualRegressionTests/tests/defaultV2/matrixdropdown.ts

diff --git a/src/question_matrixdropdownrendered.ts b/src/question_matrixdropdownrendered.ts
index 47d4fe8bc8..7e144823b4 100644
--- a/src/question_matrixdropdownrendered.ts
+++ b/src/question_matrixdropdownrendered.ts
@@ -29,7 +29,6 @@ export class QuestionMatrixDropdownRenderedCell {
   public choiceIndex: number;
   public isOtherChoice: boolean;
   public matrix: QuestionMatrixDropdownModelBase;
-  public requiredText: string;
   public isEmpty: boolean;
   public colSpans: number = 1;
   public panel: PanelModel;
@@ -42,6 +41,9 @@ export class QuestionMatrixDropdownRenderedCell {
   public constructor() {
     this.idValue = QuestionMatrixDropdownRenderedCell.counter++;
   }
+  public get requiredText(): string {
+    return this.column && this.column.isRenderedRequired ? this.column.requiredText : undefined;
+  }
   public get hasQuestion(): boolean {
     return !!this.question && !this.isErrorsCell;
   }
@@ -867,9 +869,6 @@ export class QuestionMatrixDropdownRenderedTable extends Base {
         .append(hCell.className)
         .append(this.cssClasses.rowTextCell)
         .append(this.cssClasses.columnTitleCell).toString();
-      if (!choice) {
-        this.setRequriedToHeaderCell(column, hCell);
-      }
       res.cells.push(hCell);
     }
     var rows = this.matrix.visibleRows;
@@ -1014,7 +1013,6 @@ export class QuestionMatrixDropdownRenderedTable extends Base {
     cell: QuestionMatrixDropdownRenderedCell
   ) {
     this.setHeaderCellWidth(column, cell);
-    this.setRequriedToHeaderCell(column, cell);
   }
   private setHeaderCellWidth(
     column: MatrixDropdownColumn,
@@ -1023,25 +1021,6 @@ export class QuestionMatrixDropdownRenderedTable extends Base {
     cell.minWidth = column != null ? this.matrix.getColumnWidth(column) : this.matrix.getRowTitleWidth();
     cell.width = column != null ? column.width : this.matrix.getRowTitleWidth();
   }
-  private setRequriedToHeaderCell(
-    column: MatrixDropdownColumn,
-    cell: QuestionMatrixDropdownRenderedCell
-  ) {
-    if (!!column && column.isRequired && this.matrix.survey) {
-      cell.requiredText = this.matrix.survey.requiredText;
-    }
-  }
-  private createRemoveRowCell(
-    row: MatrixDropdownRowModelBase
-  ): QuestionMatrixDropdownRenderedCell {
-    var res = new QuestionMatrixDropdownRenderedCell();
-    res.row = row;
-    res.isRemoveRow = this.canRemoveRow(row);
-    if (!!this.cssClasses.cell) {
-      res.className = this.cssClasses.cell;
-    }
-    return res;
-  }
   private createTextCell(
     locTitle: LocalizableString
   ): QuestionMatrixDropdownRenderedCell {
diff --git a/tests/question_matrixdropdownbasetests.ts b/tests/question_matrixdropdownbasetests.ts
index 9ed4c04b5c..e92e5592ac 100644
--- a/tests/question_matrixdropdownbasetests.ts
+++ b/tests/question_matrixdropdownbasetests.ts
@@ -228,8 +228,9 @@ QUnit.test("column cell css classes for vertical layout", function (assert) {
 
   const matrix = <QuestionMatrixDropdownModelBase>survey.getQuestionByName("question1");
   assert.equal(matrix.renderedTable.headerRow.cells.length, 3);
-  assert.equal(matrix.renderedTable.headerRow.cells[1].className, "sv_matrix_cell_header", "column 1");
-  assert.equal(matrix.renderedTable.headerRow.cells[2].className, "sv_matrix_cell_header", "column 2");
+  const cssHeader = survey.css.matrixdropdown.headerCell;
+  assert.equal(matrix.renderedTable.headerRow.cells[1].className, cssHeader, "column 1");
+  assert.equal(matrix.renderedTable.headerRow.cells[2].className, cssHeader, "column 2");
 });
 
 QUnit.test("column cell css classes by matrix cellType test", function (assert) {
diff --git a/visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-non-required.png b/visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-non-required.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dcacac8e4bd6713e35aa000e6687d834cc8cf1c
GIT binary patch
literal 6855
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
Jd*Ax`e*jWhdfos4

literal 0
HcmV?d00001

diff --git a/visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-required.png b/visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-required.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b5854da362aa7e7cd293651288205c1f2a7597e
GIT binary patch
literal 7053
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
B0et`f

literal 0
HcmV?d00001

diff --git a/visualRegressionTests/tests/defaultV2/matrixdropdown.ts b/visualRegressionTests/tests/defaultV2/matrixdropdown.ts
new file mode 100644
index 0000000000..cb22e3b508
--- /dev/null
+++ b/visualRegressionTests/tests/defaultV2/matrixdropdown.ts
@@ -0,0 +1,56 @@
+import { Selector, ClientFunction } from "testcafe";
+import { url, frameworks, initSurvey, url_test, applyTheme, takeElementScreenshot, wrapVisualTest, resetFocusToBody, resetHoverToBody } from "../../helper";
+
+const title = "Matrixdropdown Screenshot";
+
+fixture`${title}`.page`${url}`.beforeEach(async (t) => {
+
+});
+
+const theme = "defaultV2";
+
+frameworks.forEach(framework => {
+  fixture`${framework} ${title} ${theme}`.page`${url_test}${theme}/${framework}`.beforeEach(async t => {
+    await applyTheme(theme);
+  });
+  test("Column requiredIf and vertical layout", async (t) => {
+    await wrapVisualTest(t, async (t, comparer) => {
+      await t.resizeWindow(900, 900);
+      await initSurvey(framework, {
+        "focusFirstQuestionAutomatic": true,
+        "elements": [{
+          "type": "radiogroup",
+          "name": "question2",
+          "defaultValue": "Item1",
+          "choices": [
+            "Item1",
+            "Item2",
+            "Item3"
+          ]
+        },
+        {
+          "type": "matrixdropdown",
+          "name": "question1",
+          "columns": [
+            {
+              "name": "Column 1",
+              "cellType": "text",
+              "requiredIf": "{question2} = 'Item1'"
+            }
+          ],
+          "columnLayout": "vertical",
+          "rows": [
+            "Row 1",
+            "Row 2"
+          ]
+        }] }
+      );
+      const matrixdynamicRoot = Selector(".sd-question").nth(1);
+      await takeElementScreenshot("matrixdropdown-column-required.png", matrixdynamicRoot, t, comparer);
+      await t.pressKey("down");
+      await takeElementScreenshot("matrixdropdown-column-non-required.png", matrixdynamicRoot, t, comparer);
+      await t.pressKey("up");
+      await takeElementScreenshot("matrixdropdown-column-required.png", matrixdynamicRoot, t, comparer);
+    });
+  });
+});
\ No newline at end of file

From 569d665ef30b2e0b14286a96ee3e64378de7fc2d Mon Sep 17 00:00:00 2001
From: Andrew Telnov <andrew.telnov@gmail.com>
Date: Wed, 3 Jan 2024 17:35:00 +0200
Subject: [PATCH 2/7] Add mask #7615

---
 .../matrixdropdown-column-required_mask.png      | Bin 0 -> 1323 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-required_mask.png

diff --git a/visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-required_mask.png b/visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-required_mask.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4ea0b3b27e6912b9080bce3c6126462f307ccbc
GIT binary patch
literal 1323
zcmeAS@N?(olHy`uVBq!ia0y~yU{+yZU}WTA1B!HhNnF9e!1Bq{#WAFU@$JEbyiA4+
z%o|L0{SDW%xv9XBGyk_314Bb2P;J5zMg|6nOrRz=DWK5AQK8Y07)=v2&I<EBh@Z3k
zS@NEjfnkj)FzYG%|Hynkhk@b1_AHc)_=MB`?LBD*h96--l?ObS85j&M0TuL^fb@(C
dVT8mdCfg_;7Uw11CxHRP;OXk;vd$@?2>=mG<L3YX

literal 0
HcmV?d00001


From f835895869ca899e5826e83d869f9208fddd3aa3 Mon Sep 17 00:00:00 2001
From: Andrew Telnov <andrew.telnov@gmail.com>
Date: Thu, 4 Jan 2024 12:57:42 +0200
Subject: [PATCH 3/7] Replace visual test with functional test #7615

---
 testCafe/questions/matrixdropdown.js          |  46 ++++++++++++++
 .../matrixdropdown-column-non-required.png    | Bin 6855 -> 0 bytes
 .../matrixdropdown-column-required.png        | Bin 7053 -> 0 bytes
 .../matrixdropdown-column-required_mask.png   | Bin 1323 -> 0 bytes
 .../tests/defaultV2/matrixdropdown.ts         |  56 ------------------
 5 files changed, 46 insertions(+), 56 deletions(-)
 delete mode 100644 visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-non-required.png
 delete mode 100644 visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-required.png
 delete mode 100644 visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-required_mask.png
 delete mode 100644 visualRegressionTests/tests/defaultV2/matrixdropdown.ts

diff --git a/testCafe/questions/matrixdropdown.js b/testCafe/questions/matrixdropdown.js
index 6696d3b893..e7e49ad22b 100644
--- a/testCafe/questions/matrixdropdown.js
+++ b/testCafe/questions/matrixdropdown.js
@@ -107,3 +107,49 @@ frameworks.forEach(framework => {
     });
   });
 });
+
+const json2 = {
+  "focusFirstQuestionAutomatic": true,
+  "elements": [{
+    "type": "radiogroup",
+    "name": "question2",
+    "defaultValue": "Item1",
+    "choices": [
+      "Item1",
+      "Item2",
+      "Item3"
+    ]
+  },
+  {
+    "type": "matrixdropdown",
+    "name": "question1",
+    "columns": [
+      {
+        "name": "Column 1",
+        "cellType": "text",
+        "requiredIf": "{question2} = 'Item1'"
+      }
+    ],
+    "columnLayout": "vertical",
+    "rows": [
+      "Row 1",
+      "Row 2"
+    ]
+  }] 
+};
+frameworks.forEach(framework => {
+  fixture`${framework} ${title}`.page`${url}${framework}`.beforeEach(
+    async t => {
+      await initSurvey(framework, json2);
+    }
+  );
+
+  test("Column requiredIf and vertical layout", async t => {
+    const requiredSpan = Selector("span").withExactText("*");
+    await t.expect(requiredSpan.exists).ok();
+    await t.pressKey("down");
+    await t.expect(requiredSpan.exists).notOk();
+    await t.pressKey("up");
+    await t.expect(requiredSpan.exists).ok();
+  });
+});
diff --git a/visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-non-required.png b/visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-non-required.png
deleted file mode 100644
index 5dcacac8e4bd6713e35aa000e6687d834cc8cf1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6855
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
Jd*Ax`e*jWhdfos4

diff --git a/visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-required.png b/visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-required.png
deleted file mode 100644
index 9b5854da362aa7e7cd293651288205c1f2a7597e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7053
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
B0et`f

diff --git a/visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-required_mask.png b/visualRegressionTests/tests/defaultV2/etalons/matrixdropdown-column-required_mask.png
deleted file mode 100644
index d4ea0b3b27e6912b9080bce3c6126462f307ccbc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1323
zcmeAS@N?(olHy`uVBq!ia0y~yU{+yZU}WTA1B!HhNnF9e!1Bq{#WAFU@$JEbyiA4+
z%o|L0{SDW%xv9XBGyk_314Bb2P;J5zMg|6nOrRz=DWK5AQK8Y07)=v2&I<EBh@Z3k
zS@NEjfnkj)FzYG%|Hynkhk@b1_AHc)_=MB`?LBD*h96--l?ObS85j&M0TuL^fb@(C
dVT8mdCfg_;7Uw11CxHRP;OXk;vd$@?2>=mG<L3YX

diff --git a/visualRegressionTests/tests/defaultV2/matrixdropdown.ts b/visualRegressionTests/tests/defaultV2/matrixdropdown.ts
deleted file mode 100644
index cb22e3b508..0000000000
--- a/visualRegressionTests/tests/defaultV2/matrixdropdown.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Selector, ClientFunction } from "testcafe";
-import { url, frameworks, initSurvey, url_test, applyTheme, takeElementScreenshot, wrapVisualTest, resetFocusToBody, resetHoverToBody } from "../../helper";
-
-const title = "Matrixdropdown Screenshot";
-
-fixture`${title}`.page`${url}`.beforeEach(async (t) => {
-
-});
-
-const theme = "defaultV2";
-
-frameworks.forEach(framework => {
-  fixture`${framework} ${title} ${theme}`.page`${url_test}${theme}/${framework}`.beforeEach(async t => {
-    await applyTheme(theme);
-  });
-  test("Column requiredIf and vertical layout", async (t) => {
-    await wrapVisualTest(t, async (t, comparer) => {
-      await t.resizeWindow(900, 900);
-      await initSurvey(framework, {
-        "focusFirstQuestionAutomatic": true,
-        "elements": [{
-          "type": "radiogroup",
-          "name": "question2",
-          "defaultValue": "Item1",
-          "choices": [
-            "Item1",
-            "Item2",
-            "Item3"
-          ]
-        },
-        {
-          "type": "matrixdropdown",
-          "name": "question1",
-          "columns": [
-            {
-              "name": "Column 1",
-              "cellType": "text",
-              "requiredIf": "{question2} = 'Item1'"
-            }
-          ],
-          "columnLayout": "vertical",
-          "rows": [
-            "Row 1",
-            "Row 2"
-          ]
-        }] }
-      );
-      const matrixdynamicRoot = Selector(".sd-question").nth(1);
-      await takeElementScreenshot("matrixdropdown-column-required.png", matrixdynamicRoot, t, comparer);
-      await t.pressKey("down");
-      await takeElementScreenshot("matrixdropdown-column-non-required.png", matrixdynamicRoot, t, comparer);
-      await t.pressKey("up");
-      await takeElementScreenshot("matrixdropdown-column-required.png", matrixdynamicRoot, t, comparer);
-    });
-  });
-});
\ No newline at end of file

From d6fd8707b62f3d1802e6c095312adfca846a2e46 Mon Sep 17 00:00:00 2001
From: Andrew Telnov <andrew.telnov@gmail.com>
Date: Thu, 4 Jan 2024 13:03:54 +0200
Subject: [PATCH 4/7] Fix lint error #7615

---
 testCafe/questions/matrixdropdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testCafe/questions/matrixdropdown.js b/testCafe/questions/matrixdropdown.js
index e7e49ad22b..3edb42a2b7 100644
--- a/testCafe/questions/matrixdropdown.js
+++ b/testCafe/questions/matrixdropdown.js
@@ -135,7 +135,7 @@ const json2 = {
       "Row 1",
       "Row 2"
     ]
-  }] 
+  }]
 };
 frameworks.forEach(framework => {
   fixture`${framework} ${title}`.page`${url}${framework}`.beforeEach(

From 85a06781dd70a6a9075d40bd17bac353adc50cbc Mon Sep 17 00:00:00 2001
From: Andrew Telnov <andrew.telnov@gmail.com>
Date: Thu, 4 Jan 2024 14:18:12 +0200
Subject: [PATCH 5/7] Fix angular functional test #7615

---
 .../src/questions/matrixdropdowncell.component.html           | 2 +-
 .../src/questions/matrixdropdowncell.component.ts             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.html b/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.html
index f94187de44..346a56c3db 100644
--- a/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.html
+++ b/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.html
@@ -34,7 +34,7 @@
       <ng-template
         [component]="{ name: question.getCellWrapperComponentName($any(cell)), data: { componentData: question.getCellWrapperComponentData($any(cell))} }">
         <sv-ng-string [model]="cell.locTitle"></sv-ng-string>
-        <span *ngIf="!!cell.requiredText" [class]="question.cssClasses.cellRequiredText">{{ cell.requiredText }}</span>
+        <span *ngIf="isRequiredCell" [class]="question.cssClasses.cellRequiredText">{{ cell.requiredText }}</span>
       </ng-template>
     </ng-container>
   </td>
diff --git a/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.ts b/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.ts
index d4c6d1a695..b3cf11f444 100644
--- a/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.ts
+++ b/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.ts
@@ -4,6 +4,7 @@ import {
   Question,
   QuestionMatrixDropdownModelBase,
   QuestionMatrixDropdownRenderedCell,
+  QuestionMatrixDropdownColumn,
   MatrixDropdownRowModelBase,
   SurveyModel
 } from "survey-core";
@@ -72,6 +73,9 @@ export class MatrixDropdownCellComponent extends BaseAngular<Question> {
       return { width: this.cell.width, minWidth: this.cell.minWidth };
     return null;
   }
+  public get isRequiredCell(): boolean {
+    return !!this.cell.column && this.cell.column.isRenderedRequired;
+  }
   ngAfterViewInit() {
     if (!this.cell.hasQuestion || !this.question || !this.question.survey) return;
     const el = this.cellContainer.nativeElement;

From 75bc222c18f69a6695fc4d12e86c108c225822d3 Mon Sep 17 00:00:00 2001
From: Andrew Telnov <andrew.telnov@gmail.com>
Date: Thu, 4 Jan 2024 14:36:10 +0200
Subject: [PATCH 6/7] FIx Angular compilation #7615

---
 .../src/questions/matrixdropdowncell.component.ts                | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.ts b/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.ts
index b3cf11f444..782095f4b0 100644
--- a/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.ts
+++ b/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.ts
@@ -4,7 +4,6 @@ import {
   Question,
   QuestionMatrixDropdownModelBase,
   QuestionMatrixDropdownRenderedCell,
-  QuestionMatrixDropdownColumn,
   MatrixDropdownRowModelBase,
   SurveyModel
 } from "survey-core";

From f4c18e6240bd50396ff41154580dc474af3805a6 Mon Sep 17 00:00:00 2001
From: Andrew Telnov <andrew.telnov@gmail.com>
Date: Thu, 4 Jan 2024 15:03:24 +0200
Subject: [PATCH 7/7] FIx angular functional test #7615

---
 .../src/questions/matrixdropdowncell.component.ts              | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.ts b/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.ts
index 782095f4b0..0f06139752 100644
--- a/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.ts
+++ b/packages/survey-angular-ui/src/questions/matrixdropdowncell.component.ts
@@ -23,6 +23,9 @@ export class MatrixDropdownCellComponent extends BaseAngular<Question> {
     if(this.cell.hasQuestion) {
       return this.cell.question;
     }
+    if(!!this.cell.column) {
+      return this.cell.column;
+    }
     return null as any;
   }
   public get row(): MatrixDropdownRowModelBase {