Merge branch 'master' of https://github.com/surveyjs/survey-library

surveyjs · Aug 22, 2023 · 3b0239f · 3b0239f
2 parents 444e0d8 + 28e4d45
commit 3b0239f
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 1 deletion.
diff --git a/src/defaultV2-theme/blocks/sd-table.scss b/src/defaultV2-theme/blocks/sd-table.scss
@@ -51,6 +51,10 @@
     td:first-of-type {
       background-color: $background-dim-light;
 
+      &.sd-matrix__text--checked {
+          background-color: $primary-light;
+      }
+
       .sd-input {
         background-color: $primary-foreground;
       }

diff --git a/src/question_custom.ts b/src/question_custom.ts
@@ -39,7 +39,9 @@ export interface ICustomQuestionTypeConfiguration {
    */
   title?: string;
   /**
-   * An icon name for the custom question type.
+   * The name of an icon to use for the custom question type.
+   *
+   * [UI Icons](https://surveyjs.io/form-library/documentation/icons (linkStyle))
    */
   iconName?: string;
   /**

diff --git a/...gressionTests/tests/defaultV2/etalons/question-matrix-rubric-alternate-rows.png b/...gressionTests/tests/defaultV2/etalons/question-matrix-rubric-alternate-rows.png
diff --git a/visualRegressionTests/tests/defaultV2/matrix.ts b/visualRegressionTests/tests/defaultV2/matrix.ts
@@ -772,5 +772,53 @@ frameworks.forEach(framework => {
       await takeElementScreenshot("question-matrix-with-boolean-column.png", questionRoot, t, comparer);
     });
   });
+  test("Matrix rubric alternate rows", async (t) => {
+    await wrapVisualTest(t, async (t, comparer) => {
+      await t.resizeWindow(800, 600);
+      await initSurvey(framework, {
+        "pages": [
+          {
+            "name": "page1",
+            "elements": [
+              {
+                "type": "matrix",
+                "name": "planningPerformance",
+                "title": "Question",
+                "hideNumber": true,
+                "defaultValue": {
+                  "Row 1": "Column 1",
+                  "Row 2": "Column 2"
+                },
+                "alternateRows": true,
+                "columns": [
+                  "Column 1",
+                  "Column 2"
+                ],
+                "rows": [
+                  "Row 1",
+                  "Row 2"
+                ],
+                "cells": {
+                  "Row 1": {
+                    "Column 1": "Abc",
+                    "Column 2": "Cde"
+                  },
+                  "Row 2": {
+                    "Column 1": "Fgh",
+                    "Column 2": "Igk"
+                  }
+                }
+              }
+            ]
+          }
+        ],
+        "widthMode": "static"
+      });
+      //await t.click(Selector("body"), { offsetX: 5, offsetY: 5 });
+      const rowElement = Selector(".sd-row");
+
+      await takeElementScreenshot("question-matrix-rubric-alternate-rows.png", rowElement, t, comparer);
+    });
+  });
 
 });