survey-creator-core 1.9.97 → 1.9.98

package/survey-creator-core.js

@@ -1,5 +1,5 @@
 /*!
- * SurveyJS Creator v1.9.97
+ * SurveyJS Creator v1.9.98
  * (c) 2015-2023 Devsoft Baltic OÜ - http://surveyjs.io/
  * Github: https://github.com/surveyjs/survey-creator
  * License: https://surveyjs.io/Licenses#SurveyCreator
@@ -1630,7 +1630,6 @@ var PageAdorner = /** @class */ (function (_super) {
                         "description"
                     ]);
                     currentPage.name = _survey_helper__WEBPACK_IMPORTED_MODULE_4__["SurveyHelper"].getNewPageName(_this.creator.survey.pages);
-                    _this.dragTypeOverMe = null;
                     return true;
                 })) {
                     _this.creator.survey.currentPage = currentPage;
@@ -1645,30 +1644,51 @@ var PageAdorner = /** @class */ (function (_super) {
             _this.currentAddQuestionType = type;
             _this.addGhostPage();
         });
-        _this.attachElement(_this.page);
+        _this.attachElement(page);
         return _this;
     }
+    PageAdorner.prototype.updateDragTypeOverMe = function () {
+        this.dragTypeOverMe = this.page.dragTypeOverMe;
+    };
     PageAdorner.prototype.attachElement = function (surveyElement) {
         var _this = this;
         _super.prototype.attachElement.call(this, surveyElement);
-        if (!!this.page) {
-            this.dragTypeOverMe = new survey_core__WEBPACK_IMPORTED_MODULE_1__["ComputedUpdater"](function () { return _this.page.dragTypeOverMe; });
-            this.page["surveyChangedCallback"] = function () {
-                _this.isPageLive = !!_this.page.survey;
+        this.dragTypeOverMe = null;
+        if (!!surveyElement) {
+            surveyElement["surveyChangedCallback"] = function () {
+                _this.isPageLive = !!surveyElement.survey;
             };
             if (this.isGhost) {
                 this.updateActionsProperties();
-                this.page.registerFunctionOnPropertiesValueChanged(["title", "description"], function () {
+                surveyElement.registerFunctionOnPropertiesValueChanged(["title", "description"], function () {
                     _this.addGhostPage();
                 });
-                this.patchPageForDragDrop(this.page, this.addGhostPage);
+                this.patchPageForDragDrop(surveyElement, this.addGhostPage);
             }
-            this.page.onFirstRendering();
-            this.page.updateCustomWidgets();
-            this.page.setWasShown(true);
+            surveyElement.registerFunctionOnPropertiesValueChanged(["dragTypeOverMe"], function () {
+                _this.updateDragTypeOverMe();
+            });
+            surveyElement.onFirstRendering();
+            surveyElement.updateCustomWidgets();
+            surveyElement.setWasShown(true);
             this.checkActionProperties();
+            this.dragTypeOverMe = surveyElement.dragTypeOverMe;
         }
     };
+    PageAdorner.prototype.detachElement = function (surveyElement) {
+        if (!!surveyElement) {
+            surveyElement.unRegisterFunctionOnPropertiesValueChanged([
+                "dragTypeOverMe"
+            ]);
+            surveyElement.unRegisterFunctionOnPropertiesValueChanged([
+                "title",
+                "description"
+            ]);
+            surveyElement["surveyChangedCallback"] = undefined;
+        }
+        _super.prototype.detachElement.call(this, surveyElement);
+        this.dragTypeOverMe = null;
+    };
     PageAdorner.prototype.onElementSelectedChanged = function (isSelected) {
         _super.prototype.onElementSelectedChanged.call(this, isSelected);
         this.isSelected = isSelected;
@@ -1687,13 +1707,7 @@ var PageAdorner = /** @class */ (function (_super) {
     };
     PageAdorner.prototype.dispose = function () {
         _super.prototype.dispose.call(this);
-        if (!!this.page) {
-            this.page.unRegisterFunctionOnPropertiesValueChanged([
-                "title",
-                "description"
-            ]);
-            this.page["surveyChangedCallback"] = undefined;
-        }
+        this.detachElement(this.page);
         this.onPropertyValueChangedCallback = undefined;
     };
     Object.defineProperty(PageAdorner.prototype, "isGhost", {
@@ -1999,7 +2013,7 @@ var QuestionImageAdornerViewModel = /** @class */ (function (_super) {
     QuestionImageAdornerViewModel.prototype.initFilePresentationModel = function () {
         var _this = this;
         this.filePresentationModel = survey_core__WEBPACK_IMPORTED_MODULE_1__["Serializer"].createClass("file", { name: this.question.name });
-        var surveyModel = this.question.getSurvey();
+        var surveyModel = new survey_core__WEBPACK_IMPORTED_MODULE_1__["SurveyModel"]();
         this.filePresentationModel.setSurveyImpl(surveyModel);
         this.filePresentationModel.forceIsInputReadOnly = !this.creator.isCanModifyProperty(this.question, "imageLink");
         this.filePresentationModel.dragAreaPlaceholder = this.placeholderText;
@@ -3670,6 +3684,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 var StringItemsNavigatorBase = /** @class */ (function () {
     function StringItemsNavigatorBase(question) {
         this.question = question;
@@ -4059,7 +4074,19 @@ var StringEditorViewModelBase = /** @class */ (function (_super) {
             !(!this.locString.text && clearedText == this.locString.calculatedText)) {
             if (!this.errorText) {
                 if (this.locString.owner instanceof survey_core__WEBPACK_IMPORTED_MODULE_1__["ItemValue"] && this.creator.inplaceEditForValues) {
-                    this.locString.owner.value = clearedText;
+                    var itemValue = this.locString.owner;
+                    if (itemValue.value !== clearedText) {
+                        if (!!itemValue.locOwner && !!itemValue.ownerPropertyName) {
+                            var choices = itemValue.locOwner[itemValue.ownerPropertyName];
+                            if (Array.isArray(choices) && !!survey_core__WEBPACK_IMPORTED_MODULE_1__["ItemValue"].getItemByValue(choices, clearedText)) {
+                                clearedText = Object(_utils_utils__WEBPACK_IMPORTED_MODULE_3__["getNextItemValue"])(clearedText, choices);
+                                if (!!event && !!event.target) {
+                                    event.target.innerText = clearedText;
+                                }
+                            }
+                        }
+                        itemValue.value = clearedText;
+                    }
                 }
                 else {
                     var oldStoreDefaultText = this.locString.storeDefaultText;
@@ -6103,42 +6130,44 @@ var LogicItemEditor = /** @class */ (function (_super) {
         }).filter(function (action) { return !!action; });
     };
     LogicItemEditor.prototype.onUpdateQuestionCssClasses = function (options) {
-        options.cssClasses.answered = "svc-logic-question--answered";
-        if (options.question.name === "logicTypeName") {
-            options.question.allowRootStyle = false;
-            options.cssClasses.control += " svc-logic-operator svc-logic-operator--action";
-            options.cssClasses.error.root = "svc-logic-operator__error";
-            options.cssClasses.onError = "svc-logic-operator--error";
-        }
-        if (options.question.name === "elementSelector" || options.question.name === "setToName" || options.question.name === "fromName" || options.question.name === "gotoName") {
-            options.question.allowRootStyle = false;
-            options.cssClasses.control += " svc-logic-operator svc-logic-operator--question";
-            options.cssClasses.error.root = "svc-logic-operator__error";
-            options.cssClasses.onError = "svc-logic-operator--error";
-        }
-        if (options.question.name === "setToName" || options.question.name === "fromName") {
-            options.question.allowRootStyle = false;
-            options.question.titleLocation = "left";
-            options.question.startWithNewLine = false;
-            options.cssClasses.error.root = "svc-logic-operator__error";
-            options.cssClasses.onError = "svc-logic-operator--error";
-        }
-        if (options.question.name === "setValue") {
-            Object(_utils_utils__WEBPACK_IMPORTED_MODULE_8__["assignDefaultV2Classes"])(options.cssClasses, options.question.getType());
-            options.cssClasses.mainRoot += " svc-logic-question-value sd-element--with-frame";
-        }
-        if (options.question.name === "removeAction") {
-            options.question.allowRootStyle = false;
-            options.cssClasses.mainRoot += " svc-logic-condition-remove-question";
-        }
-        // options.cssClasses.mainRoot = "sd-question sd-row__question";
-        if (options.question.name === "panel") {
-            options.cssClasses.root += " svc-logic-paneldynamic";
-            options.cssClasses.buttonAdd += " svc-logic-operator--action ";
-            options.cssClasses.iconRemove = "svc-icon-remove";
-            options.cssClasses.buttonRemove = "svc-logic-paneldynamic__button svc-logic-paneldynamic__remove-btn";
-            options.cssClasses.buttonRemoveRight = "svc-logic-paneldynamic__remove-btn--right";
-            options.cssClasses.buttonRemoveText = "svc-logic-paneldynamic__button-remove-text";
+        var cssClasses = options.cssClasses;
+        var question = options.question;
+        cssClasses.answered = "svc-logic-question--answered";
+        if (question.name === "logicTypeName") {
+            question.allowRootStyle = false;
+            cssClasses.control += " svc-logic-operator svc-logic-operator--action";
+            cssClasses.error.root = "svc-logic-operator__error";
+            cssClasses.onError = "svc-logic-operator--error";
+        }
+        if (question.name === "elementSelector" || question.name === "setToName" || question.name === "fromName" || question.name === "gotoName") {
+            question.allowRootStyle = false;
+            cssClasses.control += " svc-logic-operator svc-logic-operator--question";
+            cssClasses.error.root = "svc-logic-operator__error";
+            cssClasses.onError = "svc-logic-operator--error";
+        }
+        if (question.name === "setToName" || question.name === "fromName") {
+            question.allowRootStyle = false;
+            question.titleLocation = "left";
+            question.startWithNewLine = false;
+            cssClasses.error.root = "svc-logic-operator__error";
+            cssClasses.onError = "svc-logic-operator--error";
+        }
+        if (question.name === "setValue" || question.isContentElement) {
+            Object(_utils_utils__WEBPACK_IMPORTED_MODULE_8__["assignDefaultV2Classes"])(cssClasses, question.getType());
+            cssClasses.mainRoot += " svc-logic-question-value sd-element--with-frame";
+        }
+        if (question.name === "removeAction") {
+            question.allowRootStyle = false;
+            cssClasses.mainRoot += " svc-logic-condition-remove-question";
+        }
+        // cssClasses.mainRoot = "sd-question sd-row__question";
+        if (question.name === "panel") {
+            cssClasses.root += " svc-logic-paneldynamic";
+            cssClasses.buttonAdd += " svc-logic-operator--action ";
+            cssClasses.iconRemove = "svc-icon-remove";
+            cssClasses.buttonRemove = "svc-logic-paneldynamic__button svc-logic-paneldynamic__remove-btn";
+            cssClasses.buttonRemoveRight = "svc-logic-paneldynamic__remove-btn--right";
+            cssClasses.buttonRemoveText = "svc-logic-paneldynamic__button-remove-text";
         }
     };
     LogicItemEditor.prototype.onUpdatePanelCssClasses = function (options) {
@@ -9931,12 +9960,21 @@ survey_core__WEBPACK_IMPORTED_MODULE_0__["ComponentCollection"].Instance.add({
         }
     ],
     onInit: function () {
-        survey_core__WEBPACK_IMPORTED_MODULE_0__["Serializer"].addProperty("colorsettings", {
-            name: "choices:itemvalue[]"
-        });
+        survey_core__WEBPACK_IMPORTED_MODULE_0__["Serializer"].addProperties("colorsettings", [{
+                name: "choices:itemvalue[]",
+            },
+            {
+                name: "colorTitleLocation:string",
+                default: "hidden",
+            },
+            {
+                name: "colorTitle:string",
+            }
+        ]);
     },
     onLoaded: function (question) {
-        syncPropertiesFromCompositeToColor(question, "titleLocation", question.titleLocation);
+        syncPropertiesFromCompositeToColor(question, "colorTitle", question.colorTitle);
+        syncPropertiesFromCompositeToColor(question, "colorTitleLocation", question.colorTitleLocation);
         syncPropertiesFromCompositeToColor(question, "choices", question.choices);
     },
     onPropertyChanged: function (question, propertyName, newValue) {
@@ -9954,15 +9992,11 @@ survey_core__WEBPACK_IMPORTED_MODULE_0__["ComponentCollection"].Instance.add({
 });
 function syncPropertiesFromCompositeToColor(question, propertyName, newValue) {
     var colorQuestion = question.contentPanel.questions[0];
-    if (propertyName == "titleLocation") {
-        if (newValue == "left") {
-            question.titleLocation = "hidden";
-            colorQuestion.title = question.title;
-            colorQuestion.titleLocation = newValue;
-        }
-        else {
-            colorQuestion.titleLocation = "hidden";
-        }
+    if (propertyName == "colorTitleLocation") {
+        colorQuestion.titleLocation = newValue;
+    }
+    if (propertyName == "colorTitle") {
+        colorQuestion.title = newValue;
     }
     if (propertyName == "choices") {
         colorQuestion.choices = newValue;
@@ -9979,11 +10013,13 @@ function createColor(value) {
 /*!************************************************************************!*\
   !*** ./src/components/tabs/theme-custom-questions/element-settings.ts ***!
   \************************************************************************/
-/*! no exports provided */
+/*! exports provided: elementSettingsToCssVariable, elementSettingsFromCssVariable */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "elementSettingsToCssVariable", function() { return elementSettingsToCssVariable; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "elementSettingsFromCssVariable", function() { return elementSettingsFromCssVariable; });
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! survey-core */ "survey-core");
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(survey_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _editorLocalization__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../editorLocalization */ "./src/editorLocalization.ts");
@@ -9996,15 +10032,17 @@ survey_core__WEBPACK_IMPORTED_MODULE_0__["ComponentCollection"].Instance.add({
         {
             type: "colorsettings",
             name: "backcolor",
-            title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.backcolor"),
-            titleLocation: "left",
+            colorTitle: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.backcolor"),
+            colorTitleLocation: "left",
+            titleLocation: "hidden",
             descriptionLocation: "hidden"
         },
         {
             type: "colorsettings",
             name: "hovercolor",
-            title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.hovercolor"),
-            titleLocation: "left",
+            colorTitle: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.hovercolor"),
+            colorTitleLocation: "left",
+            titleLocation: "hidden",
             descriptionLocation: "hidden"
         },
         {
@@ -10030,6 +10068,33 @@ survey_core__WEBPACK_IMPORTED_MODULE_0__["ComponentCollection"].Instance.add({
     onValueChanged: function (question, name, newValue) {
     },
 });
+function elementSettingsToCssVariable(question, themeCssVariables) {
+    Object.keys(question.value).forEach(function (key) {
+        if (key === "corner")
+            return;
+        themeCssVariables["--sjs-" + question.name.toLocaleLowerCase() + "-" + key] = question.value[key];
+    });
+}
+function elementSettingsFromCssVariable(question, themeCssVariables, defaultBackcolorVariable, defaultHovercolorVariable) {
+    var result = {};
+    Object.keys(themeCssVariables).filter(function (key) { return key.indexOf(question.name.toLocaleLowerCase()) !== -1; }).forEach(function (key) {
+        var propertyName = key.split("-").pop();
+        if (propertyName === "cornerRadius") {
+            result["corner"] = parseFloat(themeCssVariables[key].toString());
+        }
+        else {
+            result[propertyName] = themeCssVariables[key];
+        }
+    });
+    if (Object.keys(result).length === 0) {
+        question.contentPanel.getQuestionByName("backcolor").value = defaultBackcolorVariable;
+        question.contentPanel.getQuestionByName("hovercolor").value = defaultHovercolorVariable;
+    }
+    else {
+        question.value = result;
+    }
+    return result;
+}
 
 
 /***/ }),
@@ -10038,12 +10103,14 @@ survey_core__WEBPACK_IMPORTED_MODULE_0__["ComponentCollection"].Instance.add({
 /*!*********************************************************************!*\
   !*** ./src/components/tabs/theme-custom-questions/font-settings.ts ***!
   \*********************************************************************/
-/*! exports provided: DefaultFonts */
+/*! exports provided: DefaultFonts, fontsettingsToCssVariable, fontsettingsFromCssVariable */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DefaultFonts", function() { return DefaultFonts; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fontsettingsToCssVariable", function() { return fontsettingsToCssVariable; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fontsettingsFromCssVariable", function() { return fontsettingsFromCssVariable; });
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! survey-core */ "survey-core");
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(survey_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _editorLocalization__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../editorLocalization */ "./src/editorLocalization.ts");
@@ -10089,8 +10156,9 @@ survey_core__WEBPACK_IMPORTED_MODULE_0__["ComponentCollection"].Instance.add({
         {
             type: "colorsettings",
             name: "color",
-            title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.color"),
-            titleLocation: "left",
+            colorTitle: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.color"),
+            colorTitleLocation: "left",
+            titleLocation: "hidden",
             descriptionLocation: "hidden"
         },
         {
@@ -10112,6 +10180,27 @@ survey_core__WEBPACK_IMPORTED_MODULE_0__["ComponentCollection"].Instance.add({
     onValueChanged: function (question, name, newValue) {
     },
 });
+function fontsettingsToCssVariable(question, themeCssVariables) {
+    Object.keys(question.value).forEach(function (key) {
+        var _a;
+        var innerQ = question.contentPanel.getQuestionByName(key);
+        themeCssVariables["--sjs-font-" + question.name.toLocaleLowerCase() + "-" + key] = question.value[key] + (((_a = innerQ.unit) === null || _a === void 0 ? void 0 : _a.toString()) || "");
+    });
+}
+function fontsettingsFromCssVariable(question, themeCssVariables, defaultColorVariable) {
+    var result = {};
+    Object.keys(themeCssVariables).filter(function (key) { return key.indexOf(question.name.toLocaleLowerCase()) !== -1; }).forEach(function (key) {
+        var propertyName = key.split("-").pop();
+        result[propertyName] = themeCssVariables[key];
+    });
+    if (Object.keys(result).length !== 0) {
+        question.value = result;
+    }
+    else if (!!defaultColorVariable) {
+        question.contentPanel.getQuestionByName("color").value = defaultColorVariable;
+    }
+    return result;
+}
 
 
 /***/ }),
@@ -10400,6 +10489,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../utils/utils */ "./src/utils/utils.ts");
 /* harmony import */ var _creator_settings__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../creator-settings */ "./src/creator-settings.ts");
 /* harmony import */ var _theme_custom_questions_font_settings__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./theme-custom-questions/font-settings */ "./src/components/tabs/theme-custom-questions/font-settings.ts");
+/* harmony import */ var _theme_custom_questions_element_settings__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./theme-custom-questions/element-settings */ "./src/components/tabs/theme-custom-questions/element-settings.ts");
+
 
 
 
@@ -10825,7 +10916,9 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
             var _a, _b;
             if (_this.blockChanges)
                 return;
-            _this.themeChanges[options.name] = options.value;
+            if (options.name.indexOf("--") === 0) {
+                _this.themeChanges[options.name] = options.value;
+            }
             if (["themeName", "themeMode", "themePalette"].indexOf(options.name) !== -1) {
                 _this[options.name] = options.value;
                 _this.initializeColorCalculator();
@@ -10869,18 +10962,10 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                 _this.themeChanges["--sjs-question-background"] = Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["ingectAlpha"])(baseColor, panelBackgroundTransparencyValue / 100);
             }
             if (((_a = options.question) === null || _a === void 0 ? void 0 : _a.getType()) === "fontsettings") {
-                Object.keys(options.value).forEach(function (key) {
-                    var _a;
-                    var innerQ = options.question.contentPanel.getQuestionByName(key);
-                    _this.themeChanges["--sjs-font-" + options.name.toLocaleLowerCase() + "-" + key] = options.value[key] + (((_a = innerQ.unit) === null || _a === void 0 ? void 0 : _a.toString()) || "");
-                });
+                Object(_theme_custom_questions_font_settings__WEBPACK_IMPORTED_MODULE_8__["fontsettingsToCssVariable"])(options.question, _this.themeChanges);
             }
             if (((_b = options.question) === null || _b === void 0 ? void 0 : _b.getType()) === "elementsettings") {
-                Object.keys(options.value).forEach(function (key) {
-                    if (key === "corner")
-                        return;
-                    _this.themeChanges["--sjs-" + options.name.toLocaleLowerCase() + "-" + key] = options.value[key];
-                });
+                Object(_theme_custom_questions_element_settings__WEBPACK_IMPORTED_MODULE_9__["elementSettingsToCssVariable"])(options.question, _this.themeChanges);
             }
             var newTheme = {};
             Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(newTheme, _this.currentTheme.cssVariables, _this.themeChanges);
@@ -10914,14 +10999,14 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
         themeEditorSurvey.getQuestionByName("backgroundImage").value = this.backgroundImage;
         themeEditorSurvey.getQuestionByName("backgroundImageFit").value = this.backgroundImageFit;
         themeEditorSurvey.getQuestionByName("backgroundImageAttachment").value = this.backgroundImageAttachment;
-        themeEditorSurvey.getQuestionByName("questionPanel").contentPanel.getQuestionByName("backcolor").value = newCssVariables["--sjs-general-backcolor"];
-        themeEditorSurvey.getQuestionByName("questionPanel").contentPanel.getQuestionByName("hovercolor").value = newCssVariables["--sjs-general-backcolor-dark"];
-        themeEditorSurvey.getQuestionByName("editorPanel").contentPanel.getQuestionByName("backcolor").value = newCssVariables["--sjs-general-backcolor-dim-light"];
-        themeEditorSurvey.getQuestionByName("editorPanel").contentPanel.getQuestionByName("hovercolor").value = newCssVariables["--sjs-general-backcolor-dim-dark"];
-        themeEditorSurvey.getQuestionByName("pageTitle").contentPanel.getQuestionByName("color").value = newCssVariables["--sjs-general-dim-forecolor"];
-        themeEditorSurvey.getQuestionByName("pageDescription").contentPanel.getQuestionByName("color").value = newCssVariables["--sjs-general-dim-forecolor-light"];
-        themeEditorSurvey.getQuestionByName("questionTitle").contentPanel.getQuestionByName("color").value = newCssVariables["--sjs-general-forecolor"];
-        themeEditorSurvey.getQuestionByName("questionDescription").contentPanel.getQuestionByName("color").value = newCssVariables["--sjs-general-forecolor-light"];
+        Object(_theme_custom_questions_element_settings__WEBPACK_IMPORTED_MODULE_9__["elementSettingsFromCssVariable"])(themeEditorSurvey.getQuestionByName("questionPanel"), newCssVariables, newCssVariables["--sjs-general-backcolor"], newCssVariables["--sjs-general-backcolor-dark"]);
+        Object(_theme_custom_questions_element_settings__WEBPACK_IMPORTED_MODULE_9__["elementSettingsFromCssVariable"])(themeEditorSurvey.getQuestionByName("editorPanel"), newCssVariables, newCssVariables["--sjs-general-backcolor-dim-light"], newCssVariables["--sjs-general-backcolor-dim-dark"]);
+        Object(_theme_custom_questions_font_settings__WEBPACK_IMPORTED_MODULE_8__["fontsettingsFromCssVariable"])(themeEditorSurvey.getQuestionByName("surveyTitle"), newCssVariables);
+        Object(_theme_custom_questions_font_settings__WEBPACK_IMPORTED_MODULE_8__["fontsettingsFromCssVariable"])(themeEditorSurvey.getQuestionByName("pageTitle"), newCssVariables, newCssVariables["--sjs-general-dim-forecolor"]);
+        Object(_theme_custom_questions_font_settings__WEBPACK_IMPORTED_MODULE_8__["fontsettingsFromCssVariable"])(themeEditorSurvey.getQuestionByName("pageDescription"), newCssVariables, newCssVariables["--sjs-general-dim-forecolor-light"]);
+        Object(_theme_custom_questions_font_settings__WEBPACK_IMPORTED_MODULE_8__["fontsettingsFromCssVariable"])(themeEditorSurvey.getQuestionByName("questionTitle"), newCssVariables, newCssVariables["--sjs-general-forecolor"]);
+        Object(_theme_custom_questions_font_settings__WEBPACK_IMPORTED_MODULE_8__["fontsettingsFromCssVariable"])(themeEditorSurvey.getQuestionByName("questionDescription"), newCssVariables, newCssVariables["--sjs-general-forecolor-light"]);
+        Object(_theme_custom_questions_font_settings__WEBPACK_IMPORTED_MODULE_8__["fontsettingsFromCssVariable"])(themeEditorSurvey.getQuestionByName("editorFont"), newCssVariables);
         themeEditorSurvey.getAllQuestions().forEach(function (question) {
             if (["color", "colorsettings"].indexOf(question.getType()) !== -1) {
                 question.choices = Object.keys(PredefinedColors[_this.themePalette]).map(function (colorName) { return new survey_core__WEBPACK_IMPORTED_MODULE_2__["ItemValue"](PredefinedColors[_this.themePalette][colorName], Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.colors." + colorName)); });
@@ -10956,7 +11041,7 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                 },
                                 {
                                     type: "panel",
-                                    name: "themeMode",
+                                    name: "themeSettings",
                                     title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.themeMode"),
                                     elements: [
                                         {
@@ -11154,22 +11239,25 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                         {
                                             type: "colorsettings",
                                             name: "--sjs-primary-backcolor",
-                                            title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryDefaultColor"),
-                                            titleLocation: "left",
+                                            colorTitle: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryDefaultColor"),
+                                            colorTitleLocation: "left",
+                                            titleLocation: "hidden",
                                             descriptionLocation: "hidden",
                                         },
                                         {
                                             type: "colorsettings",
                                             name: "--sjs-primary-backcolor-dark",
-                                            title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryDarkColor"),
-                                            titleLocation: "left",
+                                            colorTitle: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryDarkColor"),
+                                            colorTitleLocation: "left",
+                                            titleLocation: "hidden",
                                             descriptionLocation: "hidden",
                                         },
                                         {
                                             type: "colorsettings",
                                             name: "--sjs-primary-backcolor-light",
-                                            title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryLightColor"),
-                                            titleLocation: "left",
+                                            colorTitle: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryLightColor"),
+                                            colorTitleLocation: "left",
+                                            titleLocation: "hidden",
                                             descriptionLocation: "hidden",
                                         }
                                     ]
@@ -11180,15 +11268,17 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                         {
                                             type: "colorsettings",
                                             name: "--sjs-primary-forecolor",
-                                            title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryForecolor"),
-                                            titleLocation: "left",
+                                            colorTitle: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryForecolor"),
+                                            colorTitleLocation: "left",
+                                            titleLocation: "hidden",
                                             descriptionLocation: "hidden",
                                         },
                                         {
                                             type: "colorsettings",
                                             name: "--sjs-primary-forecolor-light",
-                                            title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryForecolorLight"),
-                                            titleLocation: "left",
+                                            colorTitle: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryForecolorLight"),
+                                            colorTitleLocation: "left",
+                                            titleLocation: "hidden",
                                             descriptionLocation: "hidden",
                                         }
                                     ]
@@ -11343,15 +11433,17 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                         {
                                             type: "colorsettings",
                                             name: "--sjs-border-default",
-                                            title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.borderDefault"),
-                                            titleLocation: "left",
+                                            colorTitle: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.borderDefault"),
+                                            colorTitleLocation: "left",
+                                            titleLocation: "hidden",
                                             descriptionLocation: "hidden",
                                         },
                                         {
                                             type: "colorsettings",
                                             name: "--sjs-border-light",
-                                            title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.borderLight"),
-                                            titleLocation: "left",
+                                            colorTitle: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.borderLight"),
+                                            colorTitleLocation: "left",
+                                            titleLocation: "hidden",
                                             descriptionLocation: "hidden",
                                         }
                                     ]
@@ -13555,6 +13647,7 @@ var CreatorBase = /** @class */ (function (_super) {
     function CreatorBase(options, options2) {
         var _this = _super.call(this) || this;
         _this.options = options;
+        _this.startEditTitleOnQuestionAdded = true;
         _this.isRTLValue = false;
         _this.alwaySaveTextInPropertyEditorsValue = false;
         _this.pageEditModeValue = "standard";
@@ -15183,17 +15276,14 @@ var CreatorBase = /** @class */ (function (_super) {
         this.dragDropSurveyElements = new _survey_elements__WEBPACK_IMPORTED_MODULE_25__["DragDropSurveyElements"](null, this);
         var isDraggedFromToolbox = false;
         this.dragDropSurveyElements.onDragStart.add(function (sender, options) {
-            var panel = sender.dropTarget.parent;
             isDraggedFromToolbox = !sender.draggedElement.parent;
             _this.onDragStart.fire(sender, options);
             _this.startUndoRedoTransaction("drag drop");
-            _this.undoRedoManager.setUndoCallbackForTransaction(function () {
-                panel.updateRows();
-            });
         });
         this.dragDropSurveyElements.onDragEnd.add(function (sender, options) {
             _this.stopUndoRedoTransaction();
-            _this.selectElement(options.draggedElement, undefined, false, isDraggedFromToolbox);
+            var editTitle = isDraggedFromToolbox && _this.startEditTitleOnQuestionAdded;
+            _this.selectElement(options.draggedElement, undefined, false, editTitle);
             isDraggedFromToolbox = false;
             _this.onDragEnd.fire(sender, options);
         });
@@ -16081,7 +16171,7 @@ var CreatorBase = /** @class */ (function (_super) {
             }
             this.survey.lazyRendering = false;
             this.doClickQuestionCore(newElement, modifiedType, -1, panel);
-            this.selectElement(newElement, null, true, true);
+            this.selectElement(newElement, null, true, this.startEditTitleOnQuestionAdded);
         }
     };
     CreatorBase.prototype.getJSONForNewElement = function (json) {
@@ -18283,7 +18373,7 @@ var __spreadArray = function (to, from) {
 /*!******************************!*\
   !*** ./src/entries/index.ts ***!
   \******************************/
-/*! exports provided: Version, enStrings, editorLocalization, defaultStrings, localization, QuestionConvertMode, settings, EmptySurveyCreatorOptions, CreatorAction, TabbedMenuItem, TabbedMenuContainer, ToolbarActionContainer, CreatorEvent, CreatorBase, SurveyCreatorModel, StylesManager, initializeDesignTimeSurveyModel, editableStringRendererName, getElementWrapperComponentName, getQuestionContentWrapperComponentName, getElementWrapperComponentData, getItemValueWrapperComponentName, getItemValueWrapperComponentData, isStringEditable, isTextInput, registerAdorner, removeAdorners, CreatorResponsivityManager, EmbedModel, TabEmbedPlugin, AceJsonEditorModel, TabJsonEditorAcePlugin, JsonEditorBaseModel, TabJsonEditorBasePlugin, TextareaJsonEditorModel, TabJsonEditorTextareaPlugin, TestSurveyTabViewModel, TabTestPlugin, createColor, createBoxShadow, parseBoxShadow, DefaultFonts, Themes, PredefinedThemes, PredefinedColors, ThemeSurveyTabViewModel, TabThemePlugin, initLogicOperator, LogicEvent, SurveyLogic, TranslationItemBase, TranslationItemString, TranslationItem, TranslationGroup, Translation, translationCss, TabTranslationPlugin, initialSettingsAllowShowEmptyTitleInDesignMode, TabDesignerViewModel, TabDesignerPlugin, SurveyLogicUI, TabLogicPlugin, logicCss, ToolboxToolViewModel, PageNavigatorViewModel, PageAdorner, RowViewModel, QuestionAdornerViewModel, QuestionDropdownAdornerViewModel, QuestionImageAdornerViewModel, QuestionRatingAdornerViewModel, ItemValueWrapperViewModel, ImageItemValueWrapperViewModel, MatrixCellWrapperEditSurvey, MatrixCellWrapperViewModel, SurveySimulatorModel, DEFAULT_MONITOR_DPI, simulatorDevices, SurveyResultsItemModel, SurveyResultsModel, LogoImageViewModel, StringItemsNavigatorBase, StringEditorConnector, StringEditorViewModelBase, QuestionEmbeddedSurveyModel, QuestionLinkValueModel, EditorLocalization, getLocString, SurveyJSON5, QuestionSpinEditorModel, QuestionColorModel, QuestionFileEditorModel, setSurveyJSONForPropertyGrid, PropertyEditorSetupValue, PropertyGridEditorCollection, PropertyGridTitleActionsCreator, PropertyJSONGenerator, PropertyGridModel, PropertyGridEditor, PropertyGridEditorBoolean, PropertyGridEditorStringBase, PropertyGridEditorString, PropertyGridLinkEditor, PropertyGridEditorNumber, PropertyGridEditorImageSize, PropertyGridEditorText, PropertyGridEditorHtml, PropertyGridEditorColor, PropertyGridEditorStringArray, PropertyGridEditorDropdown, PropertyGridEditorSet, PropertyGridEditorPage, PropertyGridEditorQuestion, PropertyGridEditorQuestionSelectBase, PropertyGridEditorQuestionValue, PropertyGridEditorExpression, PropertyGridEditorCondition, PropertyGridEditorMatrix, PropertyGridEditorMatrixItemValues, PropertyGridEditorMatrixRateValues, PropertyGridEditorMatrixColumns, PropertyGridEditorMatrixPages, PropertyGridEditorMatrixCalculatedValues, PropertyGridEditorMatrixHtmlConditions, PropertyGridEditorMatrixUrlConditions, PropertyGridEditorMatrixMutlipleTextItems, PropertyGridEditorMatrixMultipleTypes, PropertyGridEditorMatrixValidators, PropertyGridEditorMatrixTriggers, PropertyGridEditorBindings, PropertyGridViewModel, ObjectSelectorItem, ObjectSelector, ObjectSelectorModel, PropertyGridEditorQuestionRestfull, PropertyGridValueEditorBase, PropertyGridCellsEditor, PropertyGridValueEditor, PropertyGridRowValueEditor, PropertyGridPanelValueEditor, PropertyGridTriggerValueEditor, PropertyGridTriggerValueInLogicEditor, propertyGridCss, QuestionConverter, svgBundle, SurveyTextWorkerError, SurveyTextWorkerParserError, SurveyTextWorkerJsonError, SurveyTextWorker, JsonDuplicateNameError, QuestionToolboxCategory, QuestionToolboxItem, QuestionToolbox, SidebarModel, SidebarTabModel, getNextItemValue, getNextItemText, getNextValue, findParentNode, focusFirstControl, getFirstNonTextElement, getNodesFromKoComponentInfo, propertyExists, isPropertyVisible, toggleHovered, clearNewLines, select, copyObject, copyCssClasses, assignDefaultV2Classes, wrapTextByCurlyBraces, capitalize, notShortCircuitAnd, imageMimeTypes, getAcceptedTypesByContentMode, getQuestionFromObj, ingectAlpha, convertRgbaToString, parseRgbaFromString, parseColor, HSBToRGB, RGBToHSB, assign, ColorCalculator, SurveyQuestionEditorDefinition, ObjType, SurveyHelper, ResizeManager, UndoRedoPlugin, undoRedoTransaction, ignoreUndoRedo, UndoRedoManager, Transaction, UndoRedoAction, UndoRedoArrayAction, PagesController */
+/*! exports provided: Version, enStrings, editorLocalization, defaultStrings, localization, QuestionConvertMode, settings, EmptySurveyCreatorOptions, CreatorAction, TabbedMenuItem, TabbedMenuContainer, ToolbarActionContainer, CreatorEvent, CreatorBase, SurveyCreatorModel, StylesManager, initializeDesignTimeSurveyModel, editableStringRendererName, getElementWrapperComponentName, getQuestionContentWrapperComponentName, getElementWrapperComponentData, getItemValueWrapperComponentName, getItemValueWrapperComponentData, isStringEditable, isTextInput, registerAdorner, removeAdorners, CreatorResponsivityManager, EmbedModel, TabEmbedPlugin, AceJsonEditorModel, TabJsonEditorAcePlugin, JsonEditorBaseModel, TabJsonEditorBasePlugin, TextareaJsonEditorModel, TabJsonEditorTextareaPlugin, TestSurveyTabViewModel, TabTestPlugin, createColor, createBoxShadow, parseBoxShadow, DefaultFonts, fontsettingsToCssVariable, fontsettingsFromCssVariable, elementSettingsToCssVariable, elementSettingsFromCssVariable, Themes, PredefinedThemes, PredefinedColors, ThemeSurveyTabViewModel, TabThemePlugin, initLogicOperator, LogicEvent, SurveyLogic, TranslationItemBase, TranslationItemString, TranslationItem, TranslationGroup, Translation, translationCss, TabTranslationPlugin, initialSettingsAllowShowEmptyTitleInDesignMode, TabDesignerViewModel, TabDesignerPlugin, SurveyLogicUI, TabLogicPlugin, logicCss, ToolboxToolViewModel, PageNavigatorViewModel, PageAdorner, RowViewModel, QuestionAdornerViewModel, QuestionDropdownAdornerViewModel, QuestionImageAdornerViewModel, QuestionRatingAdornerViewModel, ItemValueWrapperViewModel, ImageItemValueWrapperViewModel, MatrixCellWrapperEditSurvey, MatrixCellWrapperViewModel, SurveySimulatorModel, DEFAULT_MONITOR_DPI, simulatorDevices, SurveyResultsItemModel, SurveyResultsModel, LogoImageViewModel, StringItemsNavigatorBase, StringEditorConnector, StringEditorViewModelBase, QuestionEmbeddedSurveyModel, QuestionLinkValueModel, EditorLocalization, getLocString, SurveyJSON5, QuestionSpinEditorModel, QuestionColorModel, QuestionFileEditorModel, setSurveyJSONForPropertyGrid, PropertyEditorSetupValue, PropertyGridEditorCollection, PropertyGridTitleActionsCreator, PropertyJSONGenerator, PropertyGridModel, PropertyGridEditor, PropertyGridEditorBoolean, PropertyGridEditorStringBase, PropertyGridEditorString, PropertyGridLinkEditor, PropertyGridEditorNumber, PropertyGridEditorImageSize, PropertyGridEditorText, PropertyGridEditorHtml, PropertyGridEditorColor, PropertyGridEditorStringArray, PropertyGridEditorDropdown, PropertyGridEditorSet, PropertyGridEditorPage, PropertyGridEditorQuestion, PropertyGridEditorQuestionSelectBase, PropertyGridEditorQuestionValue, PropertyGridEditorExpression, PropertyGridEditorCondition, PropertyGridEditorMatrix, PropertyGridEditorMatrixItemValues, PropertyGridEditorMatrixRateValues, PropertyGridEditorMatrixColumns, PropertyGridEditorMatrixPages, PropertyGridEditorMatrixCalculatedValues, PropertyGridEditorMatrixHtmlConditions, PropertyGridEditorMatrixUrlConditions, PropertyGridEditorMatrixMutlipleTextItems, PropertyGridEditorMatrixMultipleTypes, PropertyGridEditorMatrixValidators, PropertyGridEditorMatrixTriggers, PropertyGridEditorBindings, PropertyGridViewModel, ObjectSelectorItem, ObjectSelector, ObjectSelectorModel, PropertyGridEditorQuestionRestfull, PropertyGridValueEditorBase, PropertyGridCellsEditor, PropertyGridValueEditor, PropertyGridRowValueEditor, PropertyGridPanelValueEditor, PropertyGridTriggerValueEditor, PropertyGridTriggerValueInLogicEditor, propertyGridCss, QuestionConverter, svgBundle, SurveyTextWorkerError, SurveyTextWorkerParserError, SurveyTextWorkerJsonError, SurveyTextWorker, JsonDuplicateNameError, QuestionToolboxCategory, QuestionToolboxItem, QuestionToolbox, SidebarModel, SidebarTabModel, getNextItemValue, getNextItemText, getNextValue, findParentNode, focusFirstControl, getFirstNonTextElement, getNodesFromKoComponentInfo, propertyExists, isPropertyVisible, toggleHovered, clearNewLines, select, copyObject, copyCssClasses, assignDefaultV2Classes, wrapTextByCurlyBraces, capitalize, notShortCircuitAnd, imageMimeTypes, getAcceptedTypesByContentMode, getQuestionFromObj, ingectAlpha, convertRgbaToString, parseRgbaFromString, parseColor, HSBToRGB, RGBToHSB, assign, ColorCalculator, SurveyQuestionEditorDefinition, ObjType, SurveyHelper, ResizeManager, UndoRedoPlugin, undoRedoTransaction, ignoreUndoRedo, UndoRedoManager, Transaction, UndoRedoAction, UndoRedoArrayAction, PagesController */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -18385,8 +18475,16 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _components_tabs_theme_custom_questions_font_settings__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../components/tabs/theme-custom-questions/font-settings */ "./src/components/tabs/theme-custom-questions/font-settings.ts");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "DefaultFonts", function() { return _components_tabs_theme_custom_questions_font_settings__WEBPACK_IMPORTED_MODULE_13__["DefaultFonts"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fontsettingsToCssVariable", function() { return _components_tabs_theme_custom_questions_font_settings__WEBPACK_IMPORTED_MODULE_13__["fontsettingsToCssVariable"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fontsettingsFromCssVariable", function() { return _components_tabs_theme_custom_questions_font_settings__WEBPACK_IMPORTED_MODULE_13__["fontsettingsFromCssVariable"]; });
+
 /* harmony import */ var _components_tabs_theme_custom_questions_element_settings__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../components/tabs/theme-custom-questions/element-settings */ "./src/components/tabs/theme-custom-questions/element-settings.ts");
-/* empty/unused harmony star reexport *//* harmony import */ var _components_tabs_theme__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../components/tabs/theme */ "./src/components/tabs/theme.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementSettingsToCssVariable", function() { return _components_tabs_theme_custom_questions_element_settings__WEBPACK_IMPORTED_MODULE_14__["elementSettingsToCssVariable"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementSettingsFromCssVariable", function() { return _components_tabs_theme_custom_questions_element_settings__WEBPACK_IMPORTED_MODULE_14__["elementSettingsFromCssVariable"]; });
+
+/* harmony import */ var _components_tabs_theme__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../components/tabs/theme */ "./src/components/tabs/theme.ts");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Themes", function() { return _components_tabs_theme__WEBPACK_IMPORTED_MODULE_15__["Themes"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "PredefinedThemes", function() { return _components_tabs_theme__WEBPACK_IMPORTED_MODULE_15__["PredefinedThemes"]; });
@@ -18752,7 +18850,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(/*! survey-core */ "survey-core");
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_70___default = /*#__PURE__*/__webpack_require__.n(survey_core__WEBPACK_IMPORTED_MODULE_70__);
 var Version;
-Version = "" + "1.9.97";
+Version = "" + "1.9.98";
 //should be loaded before other styles for easier override 
 __webpack_require__(/*! ../utils/context-button.scss */ "./src/utils/context-button.scss");
 
@@ -18841,7 +18939,7 @@ __webpack_require__(/*! ../utils/design.scss */ "./src/utils/design.scss");
 __webpack_require__(/*! ../utils/layout.scss */ "./src/utils/layout.scss");
 
 survey_core__WEBPACK_IMPORTED_MODULE_70__["settings"].supportCreatorV2 = true;
-Object(survey_core__WEBPACK_IMPORTED_MODULE_70__["checkLibraryVersion"])("" + "1.9.97", "survey-creator-core");
+Object(survey_core__WEBPACK_IMPORTED_MODULE_70__["checkLibraryVersion"])("" + "1.9.98", "survey-creator-core");
 
 
 /***/ }),
@@ -21120,8 +21218,8 @@ var enStrings = {
             expressionInvalid: "The logic expression is empty or invalid. Please correct it.",
             noActionError: "Please, add at least one action.",
             actionInvalid: "Please, fix problems in your action(s).",
-            uncompletedRule_title: "Leave the tab?",
-            uncompletedRule_text: "One or more logical rules are uncompleted. If you leave the tab, those changes that cannot be applied will vanish. Are you sure you want to leave?",
+            uncompletedRule_title: "Logical rules are incomplete",
+            uncompletedRule_text: "You have not completed some of the logical rules. If you leave the tab now, the changes will be lost. Do you still want to leave the tab without completing the changes?",
             uncompletedRule_apply: "Yes",
             uncompletedRule_cancel: "No, I want to complete the rules",
             expressionSetup: "",
@@ -21431,7 +21529,7 @@ var enStrings = {
         readOnly: "Read-only",
         enableIf: "Editable if",
         emptyRowsText: "\"No rows\" message",
-        size: "Input size (in characters)",
+        size: "Input field size (in characters)",
         separateSpecialChoices: "Separate special choices (None, Other, Select All)",
         choicesFromQuestion: "Copy choices from the following question",
         choicesFromQuestionMode: "Which choices to copy?",
@@ -21761,6 +21859,7 @@ var enStrings = {
     },
     pehelp: {
         cookieName: "Cookies prevent users from filling out the same survey twice.",
+        size: "Resizes the visible area of the input field. Please use the <b>Validation → Maximum length</b> setting to limit the input length.",
         format: "Use {0} as a placeholder for the actual value.",
         totalText: "Visible only when at least one column has Total type or Total expression.",
         acceptedTypes: "Refer to the [accept](https://www.w3schools.com/tags/att_input_accept.asp) attribute description for more information.",
@@ -24247,38 +24346,39 @@ var ConditionEditor = /** @class */ (function (_super) {
         this.updateQuestionsWidth(panel);
     };
     ConditionEditor.prototype.onUpdateQuestionCssClasses = function (options) {
-        options.cssClasses.answered = "svc-logic-question--answered";
-        if (options.question.name === "conjunction") {
-            options.question.allowRootStyle = false;
-            options.cssClasses.control += " svc-logic-operator svc-logic-operator--conjunction ";
-        }
-        if (options.question.name === "questionName") {
-            options.question.allowRootStyle = false;
-            options.cssClasses.control += " svc-logic-operator svc-logic-operator--question";
-            options.cssClasses.error.root = "svc-logic-operator__error";
-            options.cssClasses.onError = "svc-logic-operator--error";
-        }
-        if (options.question.name === "operator") {
-            options.question.allowRootStyle = false;
-            options.cssClasses.control += " svc-logic-operator svc-logic-operator--operator";
-        }
-        if (options.question.name === "removeAction") {
-            options.question.allowRootStyle = false;
-            options.cssClasses.mainRoot += " svc-logic-condition-remove-question";
-        }
-        // options.cssClasses.mainRoot += "sd-question sd-row__question";
-        if (options.question.name === "questionValue" || options.question.isContentElement) {
-            Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assignDefaultV2Classes"])(options.cssClasses, options.question.getType());
-            options.cssClasses.mainRoot += " svc-logic-question-value sd-element--with-frame";
-            options.cssClasses.error.root = "svc-logic-operator__error";
-        }
-        if (options.question.name === "panel") {
-            options.cssClasses.root += " svc-logic-paneldynamic";
-            options.cssClasses.buttonAdd += " svc-logic-operator--operator";
-            options.cssClasses.iconRemove = "svc-icon-remove";
-            options.cssClasses.buttonRemove = "svc-logic-paneldynamic__button svc-logic-paneldynamic__remove-btn";
-            options.cssClasses.buttonRemoveRight = "svc-logic-paneldynamic__remove-btn--right";
-            options.cssClasses.buttonRemoveText = "svc-logic-paneldynamic__button-remove-text";
+        var cssClasses = options.cssClasses;
+        var question = options.question;
+        cssClasses.answered = "svc-logic-question--answered";
+        if (question.name === "conjunction") {
+            question.allowRootStyle = false;
+            cssClasses.control += " svc-logic-operator svc-logic-operator--conjunction ";
+        }
+        if (question.name === "questionName") {
+            question.allowRootStyle = false;
+            cssClasses.control += " svc-logic-operator svc-logic-operator--question";
+            cssClasses.error.root = "svc-logic-operator__error";
+            cssClasses.onError = "svc-logic-operator--error";
+        }
+        if (question.name === "operator") {
+            question.allowRootStyle = false;
+            cssClasses.control += " svc-logic-operator svc-logic-operator--operator";
+        }
+        if (question.name === "removeAction") {
+            question.allowRootStyle = false;
+            cssClasses.mainRoot += " svc-logic-condition-remove-question";
+        }
+        if (question.name === "questionValue" || question.isContentElement) {
+            Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assignDefaultV2Classes"])(cssClasses, question.getType());
+            cssClasses.mainRoot += " svc-logic-question-value sd-element--with-frame";
+            cssClasses.error.root = "svc-logic-operator__error";
+        }
+        if (question.name === "panel") {
+            cssClasses.root += " svc-logic-paneldynamic";
+            cssClasses.buttonAdd += " svc-logic-operator--operator";
+            cssClasses.iconRemove = "svc-icon-remove";
+            cssClasses.buttonRemove = "svc-logic-paneldynamic__button svc-logic-paneldynamic__remove-btn";
+            cssClasses.buttonRemoveRight = "svc-logic-paneldynamic__remove-btn--right";
+            cssClasses.buttonRemoveText = "svc-logic-paneldynamic__button-remove-text";
         }
     };
     ConditionEditor.prototype.onValueChanged = function (options) {
@@ -25549,13 +25649,15 @@ var PropertyGridModel = /** @class */ (function () {
     };
     PropertyGridModel.prototype.validateQuestionValue = function (obj, question, prop, val) {
         if (question.isRequired && (survey_core__WEBPACK_IMPORTED_MODULE_1__["Helpers"].isValueEmpty(val) || question["valueChangingEmpty"]))
-            return _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("pe.propertyIsEmpty");
+            return this.getErrorTextOnValidate(_editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("pe.propertyIsEmpty"), prop.name, obj, val);
         if (this.isPropNameInValid(obj, prop, val) || question["nameHasError"])
-            return _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("pe.propertyNameIsIncorrect");
+            return this.getErrorTextOnValidate(_editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("pe.propertyNameIsIncorrect"), prop.name, obj, val);
         var editorError = PropertyGridEditorCollection.validateValue(obj, question, prop, val);
-        if (!!editorError)
-            return editorError;
-        return this.options.onGetErrorTextOnValidationCallback(prop.name, obj, val);
+        return this.getErrorTextOnValidate(editorError, prop.name, obj, val);
+    };
+    PropertyGridModel.prototype.getErrorTextOnValidate = function (defaultError, propName, obj, val) {
+        var customError = this.options.onGetErrorTextOnValidationCallback(propName, obj, val);
+        return !!customError ? customError : defaultError;
     };
     PropertyGridModel.prototype.onValidateQuestion = function (options) {
         var q = options.question;