survey-creator-core 1.9.85 → 1.9.87

package/survey-creator-core.js

@@ -1,5 +1,5 @@
 /*!
- * SurveyJS Creator v1.9.85
+ * SurveyJS Creator v1.9.87
  * (c) 2015-2023 Devsoft Baltic OÜ - http://surveyjs.io/
  * Github: https://github.com/surveyjs/survey-creator
  * License: https://surveyjs.io/Licenses#SurveyCreator
@@ -2042,9 +2042,24 @@ var QuestionRatingAdornerViewModel = /** @class */ (function (_super) {
     };
     Object.defineProperty(QuestionRatingAdornerViewModel.prototype, "allowAdd", {
         get: function () {
-            if (this.creator.readOnly)
-                return false;
-            return QuestionRatingAdornerViewModel.allowAddForElement(this.element, this.creator.maximumRateValues);
+            return !this.creator.readOnly;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(QuestionRatingAdornerViewModel.prototype, "enableAdd", {
+        get: function () {
+            return this.allowAdd && QuestionRatingAdornerViewModel.allowAddForElement(this.element, this.creator.maximumRateValues);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(QuestionRatingAdornerViewModel.prototype, "addClassNames", {
+        get: function () {
+            return new survey_core__WEBPACK_IMPORTED_MODULE_1__["CssClassBuilder"]()
+                .append("svc-item-value-controls__button")
+                .append("svc-item-value-controls__button--disabled", !this.enableAdd)
+                .append("svc-item-value-controls__add").toString();
         },
         enumerable: false,
         configurable: true
@@ -2054,9 +2069,24 @@ var QuestionRatingAdornerViewModel = /** @class */ (function (_super) {
     };
     Object.defineProperty(QuestionRatingAdornerViewModel.prototype, "allowRemove", {
         get: function () {
-            if (this.creator.readOnly)
-                return false;
-            return QuestionRatingAdornerViewModel.allowRemoveForElement(this.element);
+            return !this.creator.readOnly;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(QuestionRatingAdornerViewModel.prototype, "enableRemove", {
+        get: function () {
+            return this.allowRemove && QuestionRatingAdornerViewModel.allowRemoveForElement(this.element);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(QuestionRatingAdornerViewModel.prototype, "removeClassNames", {
+        get: function () {
+            return new survey_core__WEBPACK_IMPORTED_MODULE_1__["CssClassBuilder"]()
+                .append("svc-item-value-controls__button")
+                .append("svc-item-value-controls__button--disabled", !this.enableRemove)
+                .append("svc-item-value-controls__remove").toString();
         },
         enumerable: false,
         configurable: true
@@ -2328,23 +2358,26 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
     };
     QuestionAdornerViewModel.prototype.createConvertInputType = function () {
         var _this = this;
-        if (this.surveyElement.getType() !== "text")
-            return null;
-        var prop = survey_core__WEBPACK_IMPORTED_MODULE_1__["Serializer"].findProperty("text", "inputType");
+        var prop = null;
+        if (this.surveyElement.getType() === "text")
+            prop = survey_core__WEBPACK_IMPORTED_MODULE_1__["Serializer"].findProperty("text", "inputType");
+        if (this.surveyElement.getType() === "rating")
+            prop = survey_core__WEBPACK_IMPORTED_MODULE_1__["Serializer"].findProperty("rating", "rateDisplayMode");
         if (!prop || !Object(_utils_utils__WEBPACK_IMPORTED_MODULE_4__["isPropertyVisible"])(this.surveyElement, prop.name))
             return null;
-        var inputType = this.surveyElement.inputType;
+        var propName = prop.name;
+        var questionSubType = this.surveyElement.getPropertyValue(propName);
         var items = prop.getChoices(this.surveyElement, function (chs) { });
         var availableTypes = [];
         items.forEach(function (item) {
             availableTypes.push({ id: item, title: _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getPropertyValueInEditor(prop.name, item) });
         });
-        var newAction = this.createDropdownModel("convertInputType", availableTypes, true, 1, inputType, function (item) {
-            _this.surveyElement.inputType = item.id;
+        var newAction = this.createDropdownModel("convertInputType", availableTypes, true, 1, questionSubType, function (item) {
+            _this.surveyElement.setPropertyValue(propName, item.id);
             newAction.title = item.title;
         });
-        this.surveyElement.registerFunctionOnPropertyValueChanged("inputType", function () {
-            var item = _this.getSelectedItem(availableTypes, _this.surveyElement.inputType);
+        this.surveyElement.registerFunctionOnPropertyValueChanged(propName, function () {
+            var item = _this.getSelectedItem(availableTypes, _this.surveyElement.getPropertyValue(propName));
             if (!item)
                 return;
             var popup = newAction.popupModel;
@@ -4109,6 +4142,7 @@ var TabDesignerPlugin = /** @class */ (function () {
     TabDesignerPlugin.prototype.activate = function () {
         this.model = new _designer__WEBPACK_IMPORTED_MODULE_4__["TabDesignerViewModel"](this.creator);
         this.creator.sidebar.activeTab = this.propertyGridTab.id;
+        this.creator.focusElement(undefined, true);
     };
     TabDesignerPlugin.prototype.deactivate = function () {
         this.model = undefined;
@@ -15133,7 +15167,13 @@ var settings = {
         showAddQuestionButton: true
     },
     logic: {
-        defaultOperator: "equal",
+        get defaultOperator() { return settings.logic.defaultOperators.default; },
+        set defaultOperator(val) { settings.logic.defaultOperators.default = val; },
+        defaultOperators: {
+            default: "equal",
+            checkbox: "allof",
+            tagbox: "allof"
+        },
         visibleActions: [],
         logicItemTitleMaxChars: 50,
         openBracket: "{",
@@ -15205,7 +15245,7 @@ var settings = {
             image: {
                 imageLink: "https://surveyjs.io/Content/Images/examples/image-picker/lion.jpg",
                 imageFit: "cover",
-                imageHeight: "100%",
+                imageHeight: "auto",
                 imageWidth: "100%"
             }
         }
@@ -15346,12 +15386,12 @@ var QuestionColorModel = /** @class */ (function (_super) {
                 newValue += "0";
             }
         }
-        return newValue.toUpperCase();
+        return newValue;
     };
     QuestionColorModel.prototype.setNewValue = function (newValue) {
-        this._renderedValue = "";
+        this.resetRenderedValue();
         _super.prototype.setNewValue.call(this, this.getCorrectedValue(newValue));
-        this._renderedValue = this.value;
+        this.updateRenderedValue();
     };
     QuestionColorModel.prototype.onBeforeInput = function (event) {
         if (!!event.data && !/[\d\w#]/.test(event.data)) {
@@ -15364,10 +15404,16 @@ var QuestionColorModel = /** @class */ (function (_super) {
     QuestionColorModel.prototype.getType = function () {
         return "color";
     };
+    QuestionColorModel.prototype.resetRenderedValue = function () {
+        this._renderedValue = undefined;
+    };
+    QuestionColorModel.prototype.updateRenderedValue = function () {
+        this._renderedValue = this.value;
+    };
     Object.defineProperty(QuestionColorModel.prototype, "renderedValue", {
         get: function () {
             var _a, _b;
-            return (_b = (_a = this._renderedValue) !== null && _a !== void 0 ? _a : this.value) !== null && _b !== void 0 ? _b : "#000000";
+            return ((_b = (_a = this._renderedValue) !== null && _a !== void 0 ? _a : this.value) !== null && _b !== void 0 ? _b : "#000000").toUpperCase();
         },
         enumerable: false,
         configurable: true
@@ -15382,6 +15428,10 @@ var QuestionColorModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    QuestionColorModel.prototype.onSurveyValueChanged = function (newValue) {
+        _super.prototype.onSurveyValueChanged.call(this, newValue);
+        this.updateRenderedValue();
+    };
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
         Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["property"])()
     ], QuestionColorModel.prototype, "unit", void 0);
@@ -16573,7 +16623,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(/*! survey-core */ "survey-core");
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_64___default = /*#__PURE__*/__webpack_require__.n(survey_core__WEBPACK_IMPORTED_MODULE_64__);
 var Version;
-Version = "" + "1.9.85";
+Version = "" + "1.9.87";
 
 
 
@@ -16654,7 +16704,7 @@ __webpack_require__(/*! ../utils/design.scss */ "./src/utils/design.scss");
 __webpack_require__(/*! ../utils/layout.scss */ "./src/utils/layout.scss");
 
 survey_core__WEBPACK_IMPORTED_MODULE_64__["settings"].supportCreatorV2 = true;
-Object(survey_core__WEBPACK_IMPORTED_MODULE_64__["checkLibraryVersion"])("" + "1.9.85", "survey-creator-core");
+Object(survey_core__WEBPACK_IMPORTED_MODULE_64__["checkLibraryVersion"])("" + "1.9.87", "survey-creator-core");
 
 
 /***/ }),
@@ -18714,27 +18764,27 @@ var enStrings = {
     // Question types
     qt: {
         default: "Default",
-        checkbox: "Checkbox",
-        comment: "Comment",
+        checkbox: "Checkboxes",
+        comment: "Long Text",
         imagepicker: "Image Picker",
         ranking: "Ranking",
         image: "Image",
         dropdown: "Dropdown",
-        tagbox: "Tag Box",
-        file: "File",
+        tagbox: "Multi-Select Dropdown",
+        file: "File Upload",
         html: "HTML",
-        matrix: "Single-Choice Matrix",
-        matrixdropdown: "Multiple-Choice Matrix",
+        matrix: "Single-Select Matrix",
+        matrixdropdown: "Multi-Select Matrix",
         matrixdynamic: "Dynamic Matrix",
-        multipletext: "Multiple Text",
+        multipletext: "Multiple Textboxes",
         panel: "Panel",
         paneldynamic: "Dynamic Panel",
-        radiogroup: "Radiogroup",
-        rating: "Rating",
-        text: "Single Input",
-        boolean: "Boolean",
+        radiogroup: "Radio Button Group",
+        rating: "Rating Scale",
+        text: "Single-Line Input",
+        boolean: "Yes/No (Boolean)",
         expression: "Expression (read-only)",
-        signaturepad: "Signature Pad",
+        signaturepad: "Signature",
         buttongroup: "Button Group"
     },
     // Strings in SurveyJS Creator
@@ -20855,7 +20905,7 @@ __webpack_require__.r(__webpack_exports__);
 var ConditionEditorItem = /** @class */ (function () {
     function ConditionEditorItem() {
         this.conjunction = "and";
-        this.operator = _creator_settings__WEBPACK_IMPORTED_MODULE_2__["settings"].logic.defaultOperator;
+        this.operator = _creator_settings__WEBPACK_IMPORTED_MODULE_2__["settings"].logic.defaultOperators.default;
     }
     return ConditionEditorItem;
 }());
@@ -21456,7 +21506,8 @@ var ConditionEditor = /** @class */ (function (_super) {
         questionOperator.choices = this.getOperators();
         questionOperator.value = item.operator;
         questionOperator.onOpened.add(function (_, opt) {
-            var json = _this.getQuestionConditionJson(panel.getQuestionByName("questionName").value, _this.defaultOperator);
+            var questionName = panel.getQuestionByName("questionName").value;
+            var json = _this.getQuestionConditionJson(questionName);
             var qType = !!json ? json.type : null;
             opt.choices.forEach(function (choice, index) {
                 var isOperatorEnabled = ConditionEditor.isOperatorEnabled(qType, _creator_settings__WEBPACK_IMPORTED_MODULE_2__["settings"].operators[choice.value]);
@@ -21731,6 +21782,9 @@ var ConditionEditor = /** @class */ (function (_super) {
         var question = this.getConditionQuestion(questionName);
         if (!question)
             return null;
+        if (!operator) {
+            operator = this.getDefaultOperatorByQuestion(question);
+        }
         if (questionName.indexOf(question.getValueName()) == 0) {
             path = questionName.substring(question.getValueName().length);
         }
@@ -21745,9 +21799,6 @@ var ConditionEditor = /** @class */ (function (_super) {
             path = path.substring(1);
         }
         var json = question && question.getConditionJson ? question.getConditionJson(operator, path) : null;
-        // if (!!json && json.type == "radiogroup") {
-        //   json.type = "dropdown";
-        // }
         if (!!json && json.type == "expression") {
             json.type = "text";
         }
@@ -21762,7 +21813,7 @@ var ConditionEditor = /** @class */ (function (_super) {
         var questionName = panel.getQuestionByName("questionName");
         if (!questionName)
             return;
-        var json = this.getQuestionConditionJson(questionName.value, this.defaultOperator);
+        var json = this.getQuestionConditionJson(questionName.value);
         var qType = !!json ? json.type : null;
         var questionOperator = panel.getQuestionByName("operator");
         if (!questionOperator)
@@ -21803,10 +21854,21 @@ var ConditionEditor = /** @class */ (function (_super) {
         }
     };
     Object.defineProperty(ConditionEditor.prototype, "defaultOperator", {
-        get: function () { return _creator_settings__WEBPACK_IMPORTED_MODULE_2__["settings"].logic.defaultOperator; },
+        get: function () { return _creator_settings__WEBPACK_IMPORTED_MODULE_2__["settings"].logic.defaultOperators.default; },
         enumerable: false,
         configurable: true
     });
+    ConditionEditor.prototype.getDefaultOperatorByQuestionName = function (questionName) {
+        return this.getDefaultOperatorByQuestion(this.getConditionQuestion(questionName));
+    };
+    ConditionEditor.prototype.getDefaultOperatorByQuestion = function (question) {
+        if (!!question) {
+            var defOps = _creator_settings__WEBPACK_IMPORTED_MODULE_2__["settings"].logic.defaultOperators;
+            if (!!defOps[question.getType()])
+                return defOps[question.getType()];
+        }
+        return this.defaultOperator;
+    };
     ConditionEditor.prototype.getFirstEnabledOperator = function (choices) {
         for (var i = 0; i < choices.length; i++) {
             if (choices[i].isEnabled) {
@@ -21823,7 +21885,7 @@ var ConditionEditor = /** @class */ (function (_super) {
             this.context = this.getContextFromPanels();
             this.rebuildQuestionValue(panel);
             if (!this.isSettingPanelValues) {
-                panel.getQuestionByName("operator").value = this.defaultOperator;
+                panel.getQuestionByName("operator").value = this.getDefaultOperatorByQuestionName(panel.getQuestionByName("questionName").value);
             }
         }
         if (name == "operator") {
@@ -24307,7 +24369,7 @@ var PropertyGridEditorMatrixRateValues = /** @class */ (function (_super) {
         var _this = this;
         _super.prototype.onCreated.call(this, obj, question, prop);
         var matrixQuestion = question;
-        this.updateAllowAddRemove(matrixQuestion, obj);
+        this.updateAllowAddRemove(matrixQuestion, ((obj instanceof survey_core__WEBPACK_IMPORTED_MODULE_1__["MatrixDropdownColumn"]) ? obj.templateQuestion : obj));
         obj.onPropertyChanged.add(function (sender, options) {
             if (options.name == "rateCount" || options.name == "rateDisplayMode") {
                 _this.updateAllowAddRemove(matrixQuestion, obj);
@@ -26487,6 +26549,7 @@ var QuestionConverter = /** @class */ (function () {
         QuestionConverter.updateJSONForRating(json, convertToClass, defaultJSON);
         QuestionConverter.updateJSONForMatrices(json, convertToClass, convertFromClass);
         QuestionConverter.updateJSONForPanels(json, convertToClass, convertFromClass);
+        QuestionConverter.updateJSONForBarrating(json, convertToClass);
     };
     QuestionConverter.updateJSONFromQuestionDefaultSettings = function (json, convertToClass, defaultJSON) {
         var questionDefaultSettings = _toolbox__WEBPACK_IMPORTED_MODULE_2__["QuestionToolbox"].getQuestionDefaultSettings(convertToClass);
@@ -26535,6 +26598,11 @@ var QuestionConverter = /** @class */ (function () {
             json.choices = json.rateValues;
         }
     };
+    QuestionConverter.updateJSONForBarrating = function (json, convertToClass) {
+        if (convertToClass === "barrating") {
+            json.choices = [1, 2, 3, 4, 5];
+        }
+    };
     QuestionConverter.updateJSONForPanels = function (json, convertToClass, convertFromClass) {
         if (survey_core__WEBPACK_IMPORTED_MODULE_0__["Serializer"].isDescendantOf(convertToClass, "paneldynamic") &&
             survey_core__WEBPACK_IMPORTED_MODULE_0__["Serializer"].isDescendantOf(convertFromClass, "panel") &&
@@ -26989,7 +27057,7 @@ var SurveyHelper = /** @class */ (function () {
                 text += "\n";
             text += item.value;
             if (item.pureText)
-                text += "|" + item.pureText;
+                text += survey_core__WEBPACK_IMPORTED_MODULE_0__["ItemValue"].Separator + item.pureText;
         });
         return text;
     };