Merge branch 'master' into a11y/6058-better-structure

surveyjs · May 17, 2023 · 318dadc · 318dadc
2 parents 01b8b22 + a5a6f8f
commit 318dadc
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.9.88](https://github.com/surveyjs/survey-library/compare/v1.9.87...v1.9.88) (2023-05-16)
+
 ## [1.9.87](https://github.com/surveyjs/survey-library/compare/v1.9.86...v1.9.87) (2023-05-11)
 
 ## [1.9.86](https://github.com/surveyjs/survey-library/compare/v1.9.85...v1.9.86) (2023-05-03)

diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "testcafe:ci:angular": "testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome:headless testCafe/ --app \"http-server ./packages/survey-angular-ui/example/dist --proxy http://localhost:8080? -p 8080\" --selector-timeout 1500 --reporter minimal --env=angular",
     "prepare": "husky install"
   },
-  "version": "1.9.87",
+  "version": "1.9.88",
   "name": "survey-library",
   "private": true,
   "devDependencies": {

diff --git a/packages/survey-angular-ui/CHANGELOG.md b/packages/survey-angular-ui/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.9.88](https://github.com/surveyjs/surveyjs/compare/v1.9.87...v1.9.88) (2023-05-16)
+
 ## [1.9.87](https://github.com/surveyjs/surveyjs/compare/v1.9.86...v1.9.87) (2023-05-11)
 
 ## [1.9.86](https://github.com/surveyjs/surveyjs/compare/v1.9.85...v1.9.86) (2023-05-03)

diff --git a/packages/survey-angular-ui/package.json b/packages/survey-angular-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "survey-angular-ui",
-  "version": "1.9.87",
+  "version": "1.9.88",
   "description": "survey.js is a JavaScript Survey Library. It is a modern way to add a survey to your website. It uses JSON for survey metadata and results.",
   "keywords": [
     "Survey",

diff --git a/packages/survey-angular-ui/src/string-viewer.component.html b/packages/survey-angular-ui/src/string-viewer.component.html
@@ -1,2 +1,2 @@
 <span *ngIf="!model.hasHtml" class="sv-string-viewer">{{model.renderedHtml}}</span>
-<span *ngIf="model.hasHtml" class="sv-string-viewer" [innerHtml]="model.renderedHtml"></span>
+<span *ngIf="model.hasHtml" class="sv-string-viewer" [innerHtml]="model.renderedHtml | safeHtml"></span>
diff --git a/tests/markup/etalon_question.ts b/tests/markup/etalon_question.ts
@@ -1,6 +1,27 @@
 import { StylesManager } from "survey-core";
 import { registerMarkupTest } from "./helper";
-
+registerMarkupTest(
+  {
+    name: "Test question title with html markup",
+    json: {
+      questions: [
+        {
+          name: "name",
+          type: "text",
+          descriptionLocation: "hidden",
+          title: "<span style='font-size:12px'><strong><span style='font-family:Comic Sans MS,cursive'><span style='color:#f1c40f'>HI</span></span></strong></span>",
+        }
+      ]
+    },
+    snapshot: "question-title-with-html",
+    before: () => StylesManager.applyTheme("defaultV2"),
+    after: () => StylesManager.applyTheme("default"),
+    initSurvey: survey => survey.onTextMarkdown.add(function (survey, options) {
+      let str = options.text;
+      options.html = str;
+    }),
+  },
+);
 registerMarkupTest(
   {
     name: "Test question with errors above v2",

diff --git a/tests/markup/snapshots/question-title-with-html.snap.html b/tests/markup/snapshots/question-title-with-html.snap.html
@@ -0,0 +1,19 @@
+<h5 aria-label="<span style='font-size:12px'>
+	<strong>
+		<span style='font-family:Comic Sans MS,cursive'>
+			<span style='color:#f1c40f'>HI</span>
+		</span>
+	</strong>
+</span>" class="sd-element__title sd-question__title sd-title" id="testid0_ariaTitle">
+<span aria-hidden="true" class="sd-element__num" style="position:static;">1.</span>
+<span>&nbsp;</span>
+<span class="sv-string-viewer">
+	<span style="font-size:12px;">
+		<strong>
+			<span style="font-family:Comic Sans MS,cursive;">
+				<span style="color:#f1c40f;">HI</span>
+			</span>
+		</strong>
+	</span>
+</span>
+</h5>