Merge branch 'master' into bug/6164-a11y-dropdown

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.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)
 
 ## [1.9.85](https://github.com/surveyjs/survey-library/compare/v1.9.84...v1.9.85) (2023-04-25)

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.86",
+  "version": "1.9.87",
   "name": "survey-library",
   "private": true,
   "devDependencies": {

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.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)
 
 ## [1.9.85](https://github.com/surveyjs/surveyjs/compare/v1.9.84...v1.9.85) (2023-04-25)

packages/survey-angular-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "survey-angular-ui",
-  "version": "1.9.86",
+  "version": "1.9.87",
   "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",

src/question_rating.ts

@@ -833,7 +833,7 @@ Serializer.addClass(
       name: "autoGenerate",
       category: "rateValues",
       default: true,
-      choices: [{ value: true, text: "Generate" }, { value: false, text: "Enter manually" }],
+      choices: [true, false],
       visibleIndex: 4
     },
     {

src/react/tagbox-item.tsx

@@ -7,9 +7,6 @@ export class SurveyQuestionTagboxItem extends ReactSurveyElement {
   constructor(props: any) {
     super(props);
   }
-  protected getStateElement(): Base {
-    return this.item;
-  }
   protected get question(): QuestionTagboxModel {
     return this.props.question;
   }

src/survey.ts

@@ -3266,7 +3266,7 @@ export class SurveyModel extends SurveyElementCore
     );
   }
   /**
-   * Returns `true`, if a user has already completed the survey in this browser and there is a cookie about it. Survey goes to `completed` state if the function returns `true`.
+   * Returns `true`, if a user has already completed the survey in this browser and there is a cookie about it. Survey goes to `completedbefore` state if the function returns `true`.
    * @see cookieName
    * @see setCookie
    * @see deleteCookie
@@ -5538,7 +5538,7 @@ export class SurveyModel extends SurveyElementCore
     this.onQuestionsOnPageModeChanged("standard");
     super.endLoadingFromJson();
     if (this.hasCookie) {
-      this.doComplete();
+      this.isCompletedBefore = true;
     }
     this.doElementsOnLoad();
     this.isEndLoadingFromJson = "conditions";

testCafe/questions/tagbox.ts

@@ -119,6 +119,41 @@ frameworks.forEach((framework) => {
       .expect(selectedItems.count).eql(0);
   });
 
+  test("tagbox selected list items", async (t) => {
+    await initSurvey(framework, jsonCloseOnSelectIsDefault);
+    const popupContainer = Selector(".sv-popup__container").filterVisible();
+    const selectedListItem = Selector(".sv-list__item--selected");
+
+    await t
+      .expect(popupContainer.visible).notOk()
+      .click(questionTagbox)
+      .expect(popupContainer.visible).ok()
+
+      .click(getListItemByText("item1"))
+      .click(getListItemByText("item2"))
+      .click(getListItemByText("item3"))
+      .expect(selectedItems.count).eql(3)
+      .expect(selectedListItem.count).eql(3)
+      .expect(selectedListItem.nth(0).textContent).contains("item1")
+      .expect(selectedListItem.nth(1).textContent).contains("item2")
+      .expect(selectedListItem.nth(2).textContent).contains("item3")
+
+      .click(getListItemByText("item1"))
+      .click(getListItemByText("item2"))
+      .click(getListItemByText("item3"))
+      .expect(selectedItems.count).eql(0)
+      .expect(selectedListItem.count).eql(0)
+
+      .click(getListItemByText("item1"))
+      .click(getListItemByText("item2"))
+      .click(getListItemByText("item3"))
+      .expect(selectedItems.count).eql(3)
+      .expect(selectedListItem.count).eql(3)
+      .expect(selectedListItem.nth(0).textContent).contains("item1")
+      .expect(selectedListItem.nth(1).textContent).contains("item2")
+      .expect(selectedListItem.nth(2).textContent).contains("item3");
+  });
+
   test("tagbox editing. CloseOnSelect is default", async (t) => {
     await initSurvey(framework, jsonCloseOnSelectIsDefault);
     await t

testCafe/survey/cookie.js

@@ -48,10 +48,10 @@ frameworks.forEach(framework => {
       .navigateTo(url + framework);
     await initSurvey(framework, json);
 
-    await t.expect(Selector(".sv_completed_page h3").withText("Thank you for completing the survey").visible).ok();
+    await t.expect(Selector(".sv_body h3").withText("Our records show that you have already completed this survey.").visible).ok();
     await deleteCookie();
     await t.hover("input[type=checkbox]");
 
-    await t.expect(Selector(".sv_completed_page h3").withText("Thank you for completing the survey").exist).notOk();
+    await t.expect(Selector(".sv_body h3").withText("Our records show that you have already completed this survey.").exist).notOk();
   });
 });

tests/markup/helper.ts

@@ -333,7 +333,7 @@ function sortInlineStyles(str: string) {
   div.querySelectorAll("*").forEach(el => {
     if(!!el.getAttribute("style")) {
       const inlineStyle = (<string>el.getAttribute("style")).replace(/(;)\s+|;$/g, "$1").split(";");
-      el.setAttribute("style", inlineStyle.sort((a: string, b: string) => a.localeCompare(b)).join("; ") + ";");
+      el.setAttribute("style", inlineStyle.sort((a: string, b: string) => a.localeCompare(b)).map((style => style.replace(/\s*(:)\s*/, "$1"))).join("; ") + ";");
     }
   });
   return div.innerHTML;