survey-creator-core 1.9.98 → 1.9.99

package/survey-creator-core.js

@@ -1,5 +1,5 @@
 /*!
- * SurveyJS Creator v1.9.98
+ * 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
@@ -5097,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);
@@ -9848,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"
@@ -10148,9 +10150,9 @@ 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") },
             ],
         },
         {
@@ -10534,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();
@@ -10623,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;
@@ -10719,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);
@@ -10765,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;
@@ -10924,12 +10936,12 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                 _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;
@@ -10943,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;
@@ -10970,6 +10986,7 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
             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; });
@@ -11018,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 = {
@@ -11040,31 +11060,24 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                     allowClear: false
                                 },
                                 {
-                                    type: "panel",
-                                    name: "themeSettings",
+                                    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"
                                 }
                             ]
                         },
@@ -11098,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") },
@@ -11109,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") },
@@ -11119,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",
@@ -13940,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.
          *
@@ -14263,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.
@@ -14637,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.
@@ -15566,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);
@@ -16462,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;
@@ -16498,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) {
@@ -16510,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 () {
@@ -16533,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.
@@ -16768,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);
@@ -17336,7 +17443,8 @@ var settings = {
      * Drag Drop Settings
      */
     dragDrop: {
-        restrictDragQuestionBetweenPages: false
+        restrictDragQuestionBetweenPages: false,
+        allowDragToTheSameLine: true
     },
     /**
      * Creator layout settings
@@ -17401,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) { };
@@ -17507,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 };
     };
@@ -17550,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;
             },
@@ -17699,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"]));
 
@@ -18850,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.98";
+Version = "" + "1.9.99";
 //should be loaded before other styles for easier override 
 __webpack_require__(/*! ../utils/context-button.scss */ "./src/utils/context-button.scss");
 
@@ -18939,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.98", "survey-creator-core");
+Object(survey_core__WEBPACK_IMPORTED_MODULE_70__["checkLibraryVersion"])("" + "1.9.99", "survey-creator-core");
 
 
 /***/ }),
@@ -21958,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",
@@ -23118,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",
@@ -23133,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"
@@ -23944,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);
             });
@@ -23976,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;
@@ -24021,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;
     };
@@ -25508,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);
@@ -29412,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) {
@@ -29427,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;
@@ -29459,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) {
@@ -32087,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;
     }