survey-creator-core 1.9.97 → 1.9.99

package/survey-creator-core.js

@@ -1,5 +1,5 @@
 /*!
- * SurveyJS Creator v1.9.97
+ * SurveyJS Creator v1.9.99
  * (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,29 +1644,50 @@ 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);
@@ -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;
@@ -5070,15 +5097,19 @@ var AceJsonEditorModel = /** @class */ (function (_super) {
         this.isProcessingImmediately = false;
     };
     AceJsonEditorModel.prototype.init = function (aceEditor) {
+        var _a, _b;
         this.aceEditor = aceEditor;
-        this.aceEditor.commands["removeCommand"]("find");
+        var aceModules = (_b = (_a = window["ace"]) === null || _a === void 0 ? void 0 : _a.define) === null || _b === void 0 ? void 0 : _b.modules;
+        if (!(aceModules && aceModules["ace/ext/searchbox"])) {
+            this.aceEditor.commands["removeCommand"]("find");
+        }
         this.aceEditor.setReadOnly(this.readOnly);
         if (AceJsonEditorModel.aceBasePath) {
             try {
                 window["ace"]["config"].set("basePath", AceJsonEditorModel.aceBasePath);
                 this.aceEditor.session.setMode("ace/mode/json");
             }
-            catch (_a) { }
+            catch (_c) { }
         }
         var self = this;
         this.aceEditor.setShowPrintMargin(false);
@@ -6103,42 +6134,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) {
@@ -9819,13 +9852,11 @@ survey_core__WEBPACK_IMPORTED_MODULE_1__["ComponentCollection"].Instance.add({
                 "unit": "px",
                 "title": Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_0__["getLocString"])("theme.boxShadowX"),
                 "titleLocation": "left",
-                "min": 0,
             },
             {
                 "type": "spinedit",
                 "name": "y",
                 "unit": "px",
-                "min": 0,
                 "startWithNewLine": false,
                 "title": Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_0__["getLocString"])("theme.boxShadowY"),
                 "titleLocation": "left"
@@ -9931,12 +9962,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 +9994,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 +10015,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 +10034,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 +10070,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 +10105,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");
@@ -10081,16 +10150,17 @@ survey_core__WEBPACK_IMPORTED_MODULE_0__["ComponentCollection"].Instance.add({
             descriptionLocation: "hidden",
             choices: [
                 { value: "400", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightRegular") },
-                { value: "500", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightSemiBold") },
-                { value: "600", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightBold") },
-                { value: "700", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightHeavy") },
+                { value: "600", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightSemiBold") },
+                { value: "700", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightBold") },
+                { value: "800", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightHeavy") },
             ],
         },
         {
             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 +10182,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 +10491,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");
+
 
 
 
@@ -10443,6 +10536,7 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
         _this.themeChanges = {};
         _this.colorCalculator = new _utils_utils__WEBPACK_IMPORTED_MODULE_6__["ColorCalculator"]();
         _this.blockChanges = false;
+        _this.blockThemeChangedNotifications = 0;
         _this.simulator = new _simulator__WEBPACK_IMPORTED_MODULE_1__["SurveySimulatorModel"]();
         _this.loadTheme(_this.surveyProvider.theme);
         _this.themeEditorSurveyValue = _this.createThemeEditorSurvey();
@@ -10532,8 +10626,8 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
     };
     ThemeSurveyTabViewModel.prototype.loadTheme = function (theme) {
         this.themeName = theme.themeName;
-        this.themePalette = theme.themePalette;
-        this.themeMode = theme.isCompact ? "lightweight" : undefined;
+        this.themePalette = theme.colorPalette;
+        this.themeMode = theme.isPanelless ? "lightweight" : undefined;
         this.backgroundImage = theme.backgroundImage;
         this.backgroundImageFit = theme.backgroundImageFit;
         this.backgroundImageAttachment = theme.backgroundImageAttachment;
@@ -10628,12 +10722,18 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
         this.updateSimulatorSurvey(json, currTheme);
     };
     ThemeSurveyTabViewModel.prototype.initialize = function (json, options) {
-        this.setJSON(json, this.startTheme);
-        this.updatePageList();
-        if (options.showPagesInTestSurveyTab !== undefined) {
-            this.showPagesInTestSurveyTab = options.showPagesInTestSurveyTab;
+        this.blockThemeChangedNotifications += 1;
+        try {
+            this.setJSON(json, this.startTheme);
+            this.updatePageList();
+            if (options.showPagesInTestSurveyTab !== undefined) {
+                this.showPagesInTestSurveyTab = options.showPagesInTestSurveyTab;
+            }
+            this.buildActions();
+        }
+        finally {
+            this.blockThemeChangedNotifications -= 1;
         }
-        this.buildActions();
     };
     ThemeSurveyTabViewModel.prototype.updatePageItem = function (page) {
         var item = this.getPageItemByPage(page);
@@ -10674,6 +10774,9 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
     ThemeSurveyTabViewModel.prototype.resetTheme = function () {
         this.themeChanges = {};
         this.applySelectedTheme();
+        if (this.themeName === "default" && this.themeMode === "panels" && this.themePalette === "light") {
+            this.surveyProvider.isThemePristine = true;
+        }
     };
     ThemeSurveyTabViewModel.prototype.show = function () {
         this.showInvisibleElements = false;
@@ -10825,18 +10928,20 @@ 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();
                 if (options.name === "themeMode") {
                     _this.survey["isCompact"] = options.value === "lightweight";
-                    _this.currentTheme.isCompact = options.value === "lightweight";
+                    _this.currentTheme.isPanelless = options.value === "lightweight";
                     _this.applySelectedTheme();
                 }
                 else {
                     _this.currentTheme.themeName = _this.themeName;
-                    _this.currentTheme.themePalette = _this.themePalette;
+                    _this.currentTheme.colorPalette = _this.themePalette;
                     _this.resetTheme();
                 }
                 return;
@@ -10850,6 +10955,10 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                 _this.currentTheme.backgroundOpacity = options.value / 100;
                 return;
             }
+            _this.blockThemeChangedNotifications += 1;
+            if (options.name == "commonScale") {
+                _this.survey.triggerResponsiveness(true);
+            }
             if (options.name === "--sjs-primary-backcolor") {
                 _this.colorCalculator.calculateColors(options.value);
                 _this.themeChanges["--sjs-primary-backcolor"] = options.value;
@@ -10869,22 +10978,15 @@ 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);
             _this.currentTheme.cssVariables = newTheme;
+            _this.blockThemeChangedNotifications -= 1;
             _this.setThemeToSurvey();
         });
         themeEditorSurvey.getAllQuestions().forEach(function (q) { return q.allowRootStyle = false; });
@@ -10914,14 +11016,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)); });
@@ -10933,6 +11035,9 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
             this.surveyProvider.theme = theme;
         }
         this.survey.applyTheme(this.surveyProvider.theme);
+        if (this.blockThemeChangedNotifications == 0) {
+            this.surveyProvider.raiseThemeChanged();
+        }
     };
     ThemeSurveyTabViewModel.prototype.getThemeEditorSurveyJSON = function () {
         var themeEditorSurveyJSON = {
@@ -10955,31 +11060,24 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                     allowClear: false
                                 },
                                 {
-                                    type: "panel",
+                                    type: "buttongroup",
+                                    name: "themePalette",
+                                    titleLocation: "hidden",
+                                    choices: [
+                                        { value: "light", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.themePaletteLight") },
+                                        { value: "dark", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.themePaletteDark") }
+                                    ],
+                                    defaultValue: "light"
+                                },
+                                {
+                                    type: "buttongroup",
                                     name: "themeMode",
                                     title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.themeMode"),
-                                    elements: [
-                                        {
-                                            type: "buttongroup",
-                                            name: "themeMode",
-                                            titleLocation: "hidden",
-                                            choices: [
-                                                { value: "panels", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.themeModePanels") },
-                                                { value: "lightweight", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.themeModeLightweight") }
-                                            ],
-                                            defaultValue: "panels"
-                                        },
-                                        {
-                                            type: "buttongroup",
-                                            name: "themePalette",
-                                            titleLocation: "hidden",
-                                            choices: [
-                                                { value: "light", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.themePaletteLight") },
-                                                { value: "dark", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.themePaletteDark") }
-                                            ],
-                                            defaultValue: "light"
-                                        }
-                                    ]
+                                    choices: [
+                                        { value: "panels", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.themeModePanels") },
+                                        { value: "lightweight", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.themeModeLightweight") }
+                                    ],
+                                    defaultValue: "panels"
                                 }
                             ]
                         },
@@ -11013,6 +11111,7 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                         {
                                             type: "buttongroup",
                                             name: "backgroundImageFit",
+                                            enableIf: "{backgroundImage} notempty",
                                             titleLocation: "hidden",
                                             choices: [
                                                 { value: "auto", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.backgroundImageFitAuto") },
@@ -11024,6 +11123,7 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                         {
                                             type: "buttongroup",
                                             name: "backgroundImageAttachment",
+                                            enableIf: "{backgroundImage} notempty",
                                             titleLocation: "hidden",
                                             choices: [
                                                 { value: "fixed", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.backgroundImageAttachmentFixed") },
@@ -11034,6 +11134,7 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                         {
                                             type: "spinedit",
                                             name: "backgroundOpacity",
+                                            enableIf: "{backgroundImage} notempty",
                                             titleLocation: "left",
                                             title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.backgroundOpacity"),
                                             descriptionLocation: "hidden",
@@ -11154,22 +11255,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 +11284,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 +11449,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 +13663,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";
@@ -13847,6 +13956,22 @@ var CreatorBase = /** @class */ (function (_super) {
          *- options.title the default value of the title. You can change the default value.
          */
         _this.onConditionGetTitle = new CreatorEvent();
+        /**
+         * An event that is raised when Survey Creator populates a condition editor with operators. Use this event to hide individual condition operators.
+         *
+         * Parameters:
+         *
+         * - `sender`: `CreatorBase`\
+         * A Survey Creator instance that raised the event.
+         * - `options.questionName`: `String`\
+         * The name of a question for which conditions are displayed.
+         * - `options.operator`: `"empty"` | `"notempty"` | `"equal"` | `"notequal"` | `"contains"` | `"notcontains"` | `"anyof"` | `"allof"` | `"greater"` | `"less"` | `"greaterorequal"` | `"lessorequal"`\
+         * A condition opeator for which the event is raised.
+         * - `options.show`: `Boolean`\
+         * A Boolean property that you can set to `false` if you want to hide the condition operator.
+         *
+         */
+        _this.onGetConditionOperator = new CreatorEvent();
         /**
          * Use this event to modify the display text of a logic item in the Logic tab.
          *
@@ -14170,7 +14295,7 @@ var CreatorBase = /** @class */ (function (_super) {
          * Default value: `"defaultV2"`
          */
         _this.themeForPreview = "defaultV2";
-        _this.theme = { cssVariables: {} };
+        _this._theme = { cssVariables: {} };
         _this._allowModifyPages = true;
         /**
          * Obsolete. Use the [`showDefaultLanguageInPreviewTab`](https://surveyjs.io/Documentation/Survey-Creator?id=surveycreator#showDefaultLanguageInPreviewTab) property instead.
@@ -14544,6 +14669,26 @@ var CreatorBase = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(CreatorBase.prototype, "theme", {
+        get: function () { return this._theme; },
+        set: function (newTheme) {
+            this._theme = newTheme;
+            this.raiseThemeChanged();
+        },
+        enumerable: false,
+        configurable: true
+    });
+    CreatorBase.prototype.raiseThemeChanged = function () {
+        this.isThemePristine = false;
+        this.hasPendingThemeChanges = true;
+        var options = {
+            propertyName: "theme",
+            obj: this,
+            value: this.theme,
+            type: "THEME_MODIFIED"
+        };
+        this.setModified(options);
+    };
     Object.defineProperty(CreatorBase.prototype, "allowModifyPages", {
         /**
          * Specifies whether users can add, edit, and delete survey pages.
@@ -15183,17 +15328,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);
         });
@@ -15476,10 +15618,11 @@ var CreatorBase = /** @class */ (function (_super) {
         }
     };
     CreatorBase.prototype.setModified = function (options) {
+        var _this = this;
         if (options === void 0) { options = null; }
         this.setState("modified");
         this.onModified.fire(this, options);
-        this.isAutoSave && this.doAutoSave();
+        this.isAutoSave && this.doAutoSave(options.type === "THEME_MODIFIED" ? function () { return _this.doSaveTheme(); } : function () { return _this.doSave(); });
     };
     CreatorBase.prototype.notifySurveyPropertyChanged = function (options) {
         this.clearSurveyLogicForUpdate(options.target, options.name, options.newValue);
@@ -16081,7 +16224,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) {
@@ -16372,6 +16515,17 @@ var CreatorBase = /** @class */ (function (_super) {
         this.onConditionGetTitle.fire(this, options);
         return options.title;
     };
+    CreatorBase.prototype.isConditionOperatorEnabled = function (questionName, operator, isEnabled) {
+        if (this.onGetConditionOperator.isEmpty)
+            return isEnabled;
+        var options = {
+            questionName: questionName,
+            operator: operator,
+            show: isEnabled
+        };
+        this.onGetConditionOperator.fire(this, options);
+        return options.show;
+    };
     CreatorBase.prototype.onLogicGetTitleCallback = function (expression, expressionText, text, logicItem) {
         if (this.onLogicItemDisplayText.isEmpty)
             return text;
@@ -16408,9 +16562,11 @@ var CreatorBase = /** @class */ (function (_super) {
         this.onTranslationExportItem.fire(this, options);
         return options.text;
     };
-    CreatorBase.prototype.doAutoSave = function () {
+    CreatorBase.prototype.doAutoSave = function (saveFunc) {
+        var _this = this;
+        if (saveFunc === void 0) { saveFunc = function () { return _this.doSave(); }; }
         if (this.autoSaveDelay <= 0) {
-            this.doSave();
+            saveFunc();
             return;
         }
         if (!!this.autoSaveTimerId) {
@@ -16420,7 +16576,7 @@ var CreatorBase = /** @class */ (function (_super) {
         this.autoSaveTimerId = setTimeout(function () {
             clearTimeout(self.autoSaveTimerId);
             self.autoSaveTimerId = null;
-            self.doSave();
+            saveFunc();
         }, this.autoSaveDelay);
     };
     CreatorBase.prototype.doSave = function () {
@@ -16443,6 +16599,41 @@ var CreatorBase = /** @class */ (function (_super) {
             });
         }
     };
+    CreatorBase.prototype.doSaveTheme = function () {
+        var _this = this;
+        this.setState("saving");
+        if (this.hasPendingThemeChanges && this.saveThemeFunc) {
+            this.saveNo++;
+            this.saveThemeFunc(this.saveNo, function (no, isSuccess) {
+                if (_this.saveNo !== no)
+                    return;
+                if (isSuccess) {
+                    _this.setState("saved");
+                    _this.hasPendingThemeChanges = false;
+                }
+                else {
+                    _this.setState("modified");
+                    if (_this.showErrorOnFailedSave) {
+                        _this.notify(_this.getLocString("ed.saveError"), "error");
+                    }
+                }
+            });
+        }
+    };
+    Object.defineProperty(CreatorBase.prototype, "saveThemeFunc", {
+        /**
+         * Assign to this property a function that will be called on clicking the 'Save' button or on any change if isAutoSave equals true.
+         * @see isAutoSave
+         */
+        get: function () {
+            return this.saveThemeFuncValue;
+        },
+        set: function (value) {
+            this.saveThemeFuncValue = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(CreatorBase.prototype, "saveSurveyFunc", {
         /**
          * Assign to this property a function that will be called on clicking the 'Save' button or on any change if isAutoSave equals true.
@@ -16678,6 +16869,12 @@ var CreatorBase = /** @class */ (function (_super) {
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
         Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["property"])()
     ], CreatorBase.prototype, "viewType", void 0);
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
+        Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["property"])({ defaultValue: false })
+    ], CreatorBase.prototype, "hasPendingThemeChanges", void 0);
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
+        Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["property"])({ defaultValue: true })
+    ], CreatorBase.prototype, "isThemePristine", void 0);
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
         Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["property"])({ defaultValue: true })
     ], CreatorBase.prototype, "showToolboxValue", void 0);
@@ -17246,7 +17443,8 @@ var settings = {
      * Drag Drop Settings
      */
     dragDrop: {
-        restrictDragQuestionBetweenPages: false
+        restrictDragQuestionBetweenPages: false,
+        allowDragToTheSameLine: true
     },
     /**
      * Creator layout settings
@@ -17311,6 +17509,7 @@ var EmptySurveyCreatorOptions = /** @class */ (function () {
     EmptySurveyCreatorOptions.prototype.onConditionGetTitleCallback = function (expression, title) {
         return title;
     };
+    EmptySurveyCreatorOptions.prototype.isConditionOperatorEnabled = function (questionName, operator, isEnabled) { return isEnabled; };
     EmptySurveyCreatorOptions.prototype.onLogicGetTitleCallback = function (expression, displayExpression, text, logicItem) { return text; };
     EmptySurveyCreatorOptions.prototype.getTranslationExportedText = function (obj, name, locString, locale, text) { return text; };
     EmptySurveyCreatorOptions.prototype.uploadFiles = function (files, question, uploadingCallback) { };
@@ -17417,6 +17616,9 @@ var QuestionColorModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    QuestionColorModel.prototype.getSwatchCss = function () {
+        return new survey_core__WEBPACK_IMPORTED_MODULE_1__["CssClassBuilder"]().append(this.cssClasses.swatch).append(this.cssClasses.swatchDisabled, this.isInputReadOnly).toString();
+    };
     QuestionColorModel.prototype.getSwatchStyle = function () {
         return { backgroundColor: this.renderedValue };
     };
@@ -17460,7 +17662,7 @@ var QuestionColorModel = /** @class */ (function (_super) {
     });
     QuestionColorModel.prototype.createDropdownAction = function () {
         var _this = this;
-        var action = Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["createDropdownActionModelAdvanced"])({}, {
+        var action = Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["createDropdownActionModelAdvanced"])({ enabled: new survey_core__WEBPACK_IMPORTED_MODULE_1__["ComputedUpdater"](function () { return !_this.isInputReadOnly; }) }, {
             onSelectionChanged: function (item) {
                 _this.value = item.value;
             },
@@ -17609,6 +17811,9 @@ var QuestionFileEditorModel = /** @class */ (function (_super) {
     QuestionFileEditorModel.prototype.getIsClearButtonDisabled = function () {
         return !this.value || this.isInputReadOnly;
     };
+    QuestionFileEditorModel.prototype.getChooseButtonCss = function () {
+        return new survey_core__WEBPACK_IMPORTED_MODULE_1__["CssClassBuilder"]().append(this.cssClasses.chooseButton).append(this.cssClasses.chooseButtonDisabled, this.isInputReadOnly).toString();
+    };
     return QuestionFileEditorModel;
 }(survey_core__WEBPACK_IMPORTED_MODULE_1__["QuestionFileModel"]));
 
@@ -18283,7 +18488,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 +18590,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 +18965,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.99";
 //should be loaded before other styles for easier override 
 __webpack_require__(/*! ../utils/context-button.scss */ "./src/utils/context-button.scss");
 
@@ -18841,7 +19054,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.99", "survey-creator-core");
 
 
 /***/ }),
@@ -21120,8 +21333,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 +21644,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 +21974,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.",
@@ -21859,71 +22073,71 @@ var enStrings = {
         iconSize: "Icon size" // Auto-generated string
     },
     theme: {
-        "--background": "Background Color",
-        "--background-dim-light": "Background Dim Light Color",
-        "--primary-foreground": "Primary Foreground Color",
-        "--foreground": "Foreground Color",
-        "--base-unit": "Base Unit",
+        "--background": "Background color",
+        "--background-dim-light": "Background dim light color",
+        "--primary-foreground": "Primary foreground color",
+        "--foreground": "Foreground color",
+        "--base-unit": "Base unit",
         groupGeneral: "General",
         groupAdvanced: "Advanced",
         "themeName": "Theme",
-        "themeMode": "Modes",
-        "themeModePanels": "Panels",
-        "themeModeLightweight": "Lightweight",
+        "themeMode": "Question appearance",
+        "themeModePanels": "Default",
+        "themeModeLightweight": "Without Panels",
         "themePaletteLight": "Light",
         "themePaletteDark": "Dark",
-        primaryColor: "Accent Color",
+        primaryColor: "Accent color",
         primaryDefaultColor: "Default",
         primaryDarkColor: "Hover",
         primaryLightColor: "Selected",
-        "backgroundDimColor": "Background Color",
-        "backgroundImage": "Background Image",
+        "backgroundDimColor": "Background color",
+        "backgroundImage": "Background image",
         "backgroundImageFitAuto": "Auto",
         "backgroundImageFitCover": "Cover",
         "backgroundImageFitContain": "Contain",
         "backgroundOpacity": "Opacity",
         "backgroundImageAttachmentFixed": "Fixed",
         "backgroundImageAttachmentScroll": "Scroll",
-        "panelBackgroundTransparency": "Panel Background Transparency",
-        "questionBackgroundTransparency": "Question Background Transparency",
-        questionPanel: "Question Panel",
-        questionTitle: "Question Title Font",
-        questionDescription: "Question Description Font",
-        editorPanel: "Editor",
-        editorFont: "Editor Font",
-        backcolor: "Default Background",
-        hovercolor: "Hover Background",
-        borderDecoration: "Border Decoration",
-        accentBackground: "Accent Background",
-        accentForeground: "Accent Foreground",
-        primaryForecolor: "Default Color",
-        primaryForecolorLight: "Disabled Color",
-        linesColors: "Lines",
-        borderDefault: "Major",
-        borderLight: "Minor",
-        fontFamily: "Font Family",
-        fontSize: "Font Size",
+        "panelBackgroundTransparency": "Panel background opacity",
+        "questionBackgroundTransparency": "Question background opacity",
+        questionPanel: "Panel background and corner radius",
+        questionTitle: "Question title font",
+        questionDescription: "Question description font",
+        editorPanel: "Input element",
+        editorFont: "Input element font",
+        backcolor: "Default background",
+        hovercolor: "Hover background",
+        borderDecoration: "Border decoration",
+        accentBackground: "Accent background",
+        accentForeground: "Accent foreground",
+        primaryForecolor: "Default color",
+        primaryForecolorLight: "Disabled color",
+        linesColors: "Minor line colors",
+        borderDefault: "Darker",
+        borderLight: "Lighter",
+        fontFamily: "Font family",
+        fontSize: "Font size",
         color: "Color",
         size: "Size",
         fontWeightRegular: "Regular",
         fontWeightHeavy: "Heavy",
-        fontWeightSemiBold: "Semi-Bold",
+        fontWeightSemiBold: "Semi-bold",
         fontWeightBold: "Bold",
         scale: "Scale",
-        cornerRadius: "Corner Radius",
-        surveyTitle: "Survey Title Font",
-        pageTitle: "Page Title Font",
-        pageDescription: "Page Description Font",
+        cornerRadius: "Corner radius",
+        surveyTitle: "Survey title font",
+        pageTitle: "Page title font",
+        pageDescription: "Page description font",
         boxShadowX: "X",
         boxShadowY: "Y",
-        boxShadowAddRule: "Add More Shadow Effect",
+        boxShadowAddRule: "Add Shadow Effect",
         opacity: "Opacity",
         boxShadowBlur: "Blur",
         boxShadowSpread: "Spread",
         boxShadowDrop: "Drop",
         boxShadowInner: "Inner",
-        questionShadow: "Question Panel Border / Shadow",
-        editorShadow: "Editor Border / Shadow",
+        questionShadow: "Shadow effects",
+        editorShadow: "Input element shadow effects",
         names: {
             "default": "Default",
             "contrast": "Contrast",
@@ -23019,6 +23233,7 @@ var propertyGridCss = {
     color: {
         root: "spg-input spg-color-editor spg-input-container",
         swatch: "spg-color-editor__color-swatch",
+        swatchDisabled: "spg-color-editor__color-swatch--disabled",
         colorInput: "spg-color-editor__color-input",
         control: "spg-color-editor__input spg-input-container__input",
         colorDropdown: "spg-input__edit-button",
@@ -23034,7 +23249,8 @@ var propertyGridCss = {
         clearButtonIcon: "icon-clear",
         fileInput: "sd-visuallyhidden",
         clearButton: "spg-input__edit-button",
-        chooseButton: "spg-input__edit-button spg-file-edit__choose-button"
+        chooseButton: "spg-input__edit-button spg-file-edit__choose-button",
+        chooseButtonDisabled: "spg-input__edit-button--disabled"
     },
     linkvalue: {
         content: "spg-link"
@@ -23845,6 +24061,7 @@ var ConditionEditor = /** @class */ (function (_super) {
             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]);
+                isOperatorEnabled = _this.options.isConditionOperatorEnabled(questionName, choice.value, isOperatorEnabled);
                 choice.setIsEnabled(isOperatorEnabled);
                 choice.setIsVisible(isOperatorEnabled);
             });
@@ -23877,10 +24094,14 @@ var ConditionEditor = /** @class */ (function (_super) {
         this.setupConditionQuestionName(item, panel);
         if (!!panel.getQuestionByName("questionValue")) {
             panel.getQuestionByName("questionValue").value = item.value;
+            this.updateSurveyVariable(item);
         }
         this.setupRemoveQuestion(panel);
         this.isSettingPanelValues = false;
     };
+    ConditionEditor.prototype.updateSurveyVariable = function (item) {
+        this.editSurvey.setVariable(item.questionName, item.value);
+    };
     ConditionEditor.prototype.getConditionQuestions = function () {
         if (!this.context)
             return this.allConditionQuestions;
@@ -23922,6 +24143,7 @@ var ConditionEditor = /** @class */ (function (_super) {
         item.operator = panel.getQuestionByName("operator").value;
         if (!!panel.getQuestionByName("questionValue")) {
             item.value = panel.getQuestionByName("questionValue").value;
+            this.updateSurveyVariable(item);
         }
         return item;
     };
@@ -24247,38 +24469,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) {
@@ -25408,6 +25631,7 @@ var PropertyGridModel = /** @class */ (function () {
         if (!this.obj)
             return;
         new PropertyJSONGenerator(this.obj, this.options).setupObjPanel(page, false);
+        this.survey.enterKeyAction = "loseFocus";
         this.survey.addPage(page);
         this.survey.getAllQuestions().forEach(function (q) {
             PropertyGridEditorCollection.onSetup(_this.obj, q, q.property, _this.options);
@@ -25549,13 +25773,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;
@@ -29310,6 +29536,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "./src/entries/helpers.ts");
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! survey-core */ "survey-core");
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(survey_core__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _creator_settings__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./creator-settings */ "./src/creator-settings.ts");
+
 
 
 function calculateIsEdge(dropTargetNode, clientY) {
@@ -29325,6 +29553,14 @@ function calculateDragOverLocation(clientX, clientY, dropTargetNode) {
     var tg = rect.height / rect.width;
     var dx = clientX - rect.x;
     var dy = clientY - rect.y;
+    if (!_creator_settings__WEBPACK_IMPORTED_MODULE_2__["settings"].dragDrop.allowDragToTheSameLine) {
+        if (dy >= rect.height / 2) {
+            return survey_core__WEBPACK_IMPORTED_MODULE_1__["DragTypeOverMeEnum"].Bottom;
+        }
+        else {
+            return survey_core__WEBPACK_IMPORTED_MODULE_1__["DragTypeOverMeEnum"].Top;
+        }
+    }
     if (dy >= tg * dx) {
         if (dy >= -tg * dx + rect.height) {
             return survey_core__WEBPACK_IMPORTED_MODULE_1__["DragTypeOverMeEnum"].Bottom;
@@ -29357,12 +29593,13 @@ var DragDropSurveyElements = /** @class */ (function (_super) {
             _this.removeDragOverMarker(_this.dropTarget);
         };
         _this.doDrop = function () {
+            var _a;
             if (!_this.dropTarget)
                 return;
             var page = _this.parentElement;
             var dragged = _this.draggedElement;
             var src = _this.draggedElement;
-            var dest = _this.dropTarget;
+            var dest = ((_a = _this.dragOverIndicatorElement) === null || _a === void 0 ? void 0 : _a.isPanel) ? _this.dragOverIndicatorElement : _this.dropTarget;
             var row = page.dragDropFindRow(dest);
             var targetIndex = _this.getElementIndexInPanel(dest, row);
             if (_this.dragOverLocation === survey_core__WEBPACK_IMPORTED_MODULE_1__["DragTypeOverMeEnum"].Right || _this.dragOverLocation === survey_core__WEBPACK_IMPORTED_MODULE_1__["DragTypeOverMeEnum"].Bottom) {
@@ -31985,10 +32222,11 @@ function RGBToHSB(r, g, b) {
     return [60 * (h < 0 ? h + 6 : h), v && (n / v) * 100, v * 100];
 }
 function assign() {
-    var objects = [];
+    var inputs = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        objects[_i] = arguments[_i];
+        inputs[_i] = arguments[_i];
     }
+    var objects = (inputs || []).filter(function (obj) { return !!obj; });
     if (objects.length <= 1) {
         return;
     }