Merge branch 'master' of https://github.com/surveyjs/widgets

Author: andrewtelnov

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.8.12](https://github.com/surveyjs/custom-widgets/compare/v1.8.11...v1.8.12) (2020-10-28)
+
+### [1.8.11](https://github.com/surveyjs/custom-widgets/compare/v1.8.10...v1.8.11) (2020-10-23)
+
 ### [1.8.10](https://github.com/surveyjs/custom-widgets/compare/v1.8.9...v1.8.10) (2020-10-21)
 
 ### [1.8.9](https://github.com/surveyjs/custom-widgets/compare/v1.8.8...v1.8.9) (2020-10-14)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "surveyjs-widgets",
-  "version": "1.8.10",
+  "version": "1.8.12",
   "scripts": {
     "start": "npm run build && live-server",
     "watch": "webpack --env.buildType dev --watch",

package.json

@@ -107,6 +107,23 @@ function init(Survey, $) {
             .trigger("change");
         } else {
           $el.val(question.value).trigger("change");
+
+          if (
+            question.allowAddNewTag &&
+            $el.val().length !== question.value.length
+          ) {
+            question.value.forEach(function (choiceValue) {
+              if ($el.val().indexOf(choiceValue) === -1) {
+                var newOption = new Option(
+                  choiceValue,
+                  choiceValue,
+                  true,
+                  true
+                );
+                $el.append(newOption).trigger("change");
+              }
+            });
+          }
         }
         self.fixStyles(el);
         updateComment();

src/select2-tagbox.js

@@ -63,6 +63,7 @@ function init(Survey, $) {
         if (isSettingValue) return;
         question.comment = $otherElement.val();
       });
+
       var updateComment = function () {
         $otherElement.val(question.comment);
         if (question.isOtherSelected) {
@@ -105,12 +106,18 @@ function init(Survey, $) {
           $el.select2(settings);
           question.keepIncorrectValues = true;
         } else {
-          settings.data = question.visibleChoices.map(function (choice) {
-            return {
-              id: choice.value,
-              text: choice.text,
-            };
-          });
+          var data = [];
+          if (!!settings.placeholder || question.showOptionsCaption) {
+            data.push({ id: "", text: "" });
+          }
+          settings.data = data.concat(
+            question.visibleChoices.map(function (choice) {
+              return {
+                id: choice.value,
+                text: choice.text,
+              };
+            })
+          );
           $el.select2(settings);
         }
         // fixed width accrording to https://stackoverflow.com/questions/45276778/select2-not-responsive-width-larger-than-container