survey-creator-core 1.9.120 → 1.9.122

package/survey-creator-core.js

@@ -1,5 +1,5 @@
 /*!
- * SurveyJS Creator v1.9.120
+ * SurveyJS Creator v1.9.122
  * (c) 2015-2023 Devsoft Baltic OÜ - http://surveyjs.io/
  * Github: https://github.com/surveyjs/survey-creator
  * License: https://surveyjs.io/Licenses#SurveyCreator
@@ -130,7 +130,7 @@ License: MIT
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
- * surveyjs - Survey JavaScript library v1.9.120
+ * surveyjs - Survey JavaScript library v1.9.122
  * Copyright (c) 2015-2023 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -4549,20 +4549,37 @@ var SurveyElementActionContainer = /** @class */ (function (_super) {
     function SurveyElementActionContainer() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    SurveyElementActionContainer.prototype.setModeForActions = function (modes, defaultMode) {
-        this.visibleActions.forEach(function (action) {
-            action.mode = modes[action.id] || defaultMode;
-        });
+    SurveyElementActionContainer.prototype.needToShrink = function (item, shrinkStart, shrinkEnd) {
+        return (item.innerItem.location == "start" && shrinkStart || item.innerItem.location != "start" && shrinkEnd);
     };
-    SurveyElementActionContainer.prototype.skipInputType = function (item, dimension) {
-        return item.id != "convertInputType" ? dimension : 0;
+    SurveyElementActionContainer.prototype.setModeForActions = function (shrinkStart, shrinkEnd, exclude) {
+        var _this = this;
+        if (exclude === void 0) { exclude = []; }
+        this.visibleActions.forEach(function (item) {
+            if (exclude.indexOf(item.id) != -1) {
+                item.mode = "removed";
+                return;
+            }
+            if (_this.needToShrink(item, shrinkStart, shrinkEnd)) {
+                item.mode = item.innerItem.iconName ? "small" : "removed";
+                return;
+            }
+            item.mode = "large";
+        });
     };
-    SurveyElementActionContainer.prototype.skipQuestionType = function (item, dimension) {
-        return item.id != "convertInputType" && item.id != "convertTo" ? dimension : 0;
+    SurveyElementActionContainer.prototype.calcItemSize = function (item, shrinkStart, shrinkEnd, exclude) {
+        if (exclude === void 0) { exclude = []; }
+        if (exclude.indexOf(item.id) != -1)
+            return 0;
+        if (this.needToShrink(item, shrinkStart, shrinkEnd)) {
+            if (!item.innerItem.iconName)
+                return 0;
+            return item.minDimension;
+        }
+        return item.maxDimension;
     };
     SurveyElementActionContainer.prototype.fit = function (dimension, dotsItemSize) {
         var _this = this;
-        var _a;
         if (dimension <= 0)
             return;
         this.dotsItem.visible = false;
@@ -4571,19 +4588,33 @@ var SurveyElementActionContainer = /** @class */ (function (_super) {
             items.forEach(function (i) { return i.mode = "large"; });
             return;
         }
-        if (dimension >= items.reduce(function (sum, i) { return sum += _this.skipInputType(i, i.maxDimension); }, 0)) {
-            this.setModeForActions({ "convertInputType": "removed" }, "large");
+        // if (dimension >= items.reduce((sum, i) => sum += this.skipInputType(i, i.maxDimension), 0)) {
+        //   this.setModeForActions({ "convertInputType": "removed" }, "large");
+        //   return;
+        // }
+        if (dimension >= items.reduce(function (sum, i) { return sum += _this.calcItemSize(i, false, true); }, 0)) {
+            this.setModeForActions(false, true);
             return;
         }
-        if (dimension >= items.reduce(function (sum, i) { return sum += _this.skipQuestionType(i, i.minDimension); }, (_a = this.getActionById("convertTo")) === null || _a === void 0 ? void 0 : _a.maxDimension)) {
-            this.setModeForActions({ "convertInputType": "removed", "convertTo": "large" }, "small");
+        if (dimension >= items.reduce(function (sum, i) { return sum += _this.calcItemSize(i, false, true, ["convertInputType"]); }, 0)) {
+            this.setModeForActions(false, true, ["convertInputType"]);
             return;
         }
-        if (dimension >= items.reduce(function (sum, i) { return sum += _this.skipInputType(i, i.minDimension); }, 0)) {
-            this.setModeForActions({ "convertInputType": "removed", "convertTo": "small" }, "small");
+        if (dimension >= items.reduce(function (sum, i) { return sum += _this.calcItemSize(i, true, true); }, 0)) {
+            this.setModeForActions(true, true);
             return;
         }
-        this.setModeForActions({ "convertInputType": "removed", "convertTo": "small" }, "popup");
+        this.visibleActions.forEach(function (item) {
+            if (item.id == "convertTo") {
+                item.mode = "small";
+                return;
+            }
+            if (item.id == "convertInputType") {
+                item.mode = "removed";
+                return;
+            }
+            item.mode = "popup";
+        });
         this.dotsItem.visible = true;
         this.hiddenItemsListModel.setItems(items.filter(function (i) { return i.mode == "popup"; }).map(function (i) { return i.innerItem; }));
     };
@@ -5010,8 +5041,10 @@ var ImageItemValueWrapperViewModel = /** @class */ (function (_super) {
         var fileInput = model.itemsRoot.getElementsByClassName("svc-choose-file-input")[0];
         model.creator.chooseFiles(fileInput, function (files) {
             model.isUploading = true;
-            model.creator.uploadFiles(files, model.question, function (_, link) {
-                model.item.imageLink = link;
+            model.creator.uploadFiles(files, model.question, function (status, link) {
+                if (status === "success") {
+                    model.item.imageLink = link;
+                }
                 model.isUploading = false;
             });
         }, { element: model.question, item: model.item });
@@ -5019,10 +5052,12 @@ var ImageItemValueWrapperViewModel = /** @class */ (function (_super) {
     ImageItemValueWrapperViewModel.prototype.uploadFiles = function (files) {
         var _this = this;
         this.isUploading = true;
-        this.creator.uploadFiles(files, this.question, function (_, link) {
-            _this.creator.createNewItemValue(_this.question, _this.isChoosingNewFile, function (res) {
-                res.imageLink = link;
-            });
+        this.creator.uploadFiles(files, this.question, function (status, link) {
+            if (status === "success") {
+                _this.creator.createNewItemValue(_this.question, _this.isChoosingNewFile, function (res) {
+                    res.imageLink = link;
+                });
+            }
             _this.isChoosingNewFile = false;
             _this.isUploading = false;
         });
@@ -5851,7 +5886,7 @@ var PageNavigatorViewModel = /** @class */ (function (_super) {
     PageNavigatorViewModel.prototype.setItems = function (items) {
         this.items = items;
         this.pageListModel.setItems(items);
-        this.visible = items.length > 1 || this.pageEditMode === "bypage";
+        this.updateVisibility();
     };
     PageNavigatorViewModel.prototype.buildItems = function () {
         this.currentPage = this.pagesController.currentPage || this.pagesController.pages[0];
@@ -6002,6 +6037,7 @@ var PageNavigatorViewModel = /** @class */ (function (_super) {
         this._resizeObserver.observe(itemsContainer);
     };
     PageNavigatorViewModel.prototype.updateVisibleItems = function (allAvailableHeight) {
+        this.updateVisibility();
         var itemsAvailableHeight = allAvailableHeight - PageNavigatorViewModel.PAGE_NAVIGATION_MENU_ITEM_HEIGHT;
         this.visibleItemsCount = Math.floor(itemsAvailableHeight / PageNavigatorViewModel.PAGE_NAVIGATION_ITEM_HEIGHT);
         var currantPageIndex = this.pagesController.pages.indexOf(this.currentPage);
@@ -6011,6 +6047,17 @@ var PageNavigatorViewModel = /** @class */ (function (_super) {
         }
         this.visibleItemsStartIndex = visibleStart;
     };
+    PageNavigatorViewModel.prototype._updateVisibility = function () {
+        this.hasScrolling = !this._scrollableContainer || (this._scrollableContainer.scrollHeight > this._scrollableContainer.clientHeight);
+        this.visible = this.items.length > 1 && (this.hasScrolling || this.pagesController.creator["pageEditMode"] === "bypage");
+    };
+    PageNavigatorViewModel.prototype.updateVisibility = function () {
+        var _this = this;
+        // this._updateVisibility();
+        setTimeout(function () {
+            _this._updateVisibility();
+        }, 10);
+    };
     Object.defineProperty(PageNavigatorViewModel.prototype, "visibleItems", {
         get: function () {
             if (this.items.length <= this.visibleItemsCount) {
@@ -6023,6 +6070,9 @@ var PageNavigatorViewModel = /** @class */ (function (_super) {
     });
     PageNavigatorViewModel.PAGE_NAVIGATION_MENU_ITEM_HEIGHT = 44;
     PageNavigatorViewModel.PAGE_NAVIGATION_ITEM_HEIGHT = 36;
+    Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
+        Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["property"])({ defaultValue: true })
+    ], PageNavigatorViewModel.prototype, "hasScrolling", void 0);
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
         Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["propertyArray"])()
     ], PageNavigatorViewModel.prototype, "items", void 0);
@@ -6786,6 +6836,16 @@ var QuestionRatingAdornerViewModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(QuestionRatingAdornerViewModel.prototype, "controlsClassNames", {
+        get: function () {
+            return new survey_core__WEBPACK_IMPORTED_MODULE_1__["CssClassBuilder"]()
+                .append("svc-rating-question-controls")
+                .append("svc-item-value-controls")
+                .append("svc-rating-question-controls--labels-top", this.element.rateDescriptionLocation == "top" || this.element.rateDescriptionLocation == "topBottom").toString();
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(QuestionRatingAdornerViewModel.prototype, "addTooltip", {
         get: function () {
             return Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_2__["getLocString"])("pe.addItem");
@@ -7009,6 +7069,19 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
         //this.updateActionsProperties();
         Object(_utils_utils__WEBPACK_IMPORTED_MODULE_4__["toggleHovered"])(event, element);
     };
+    QuestionAdornerViewModel.prototype.updateActionsProperties = function () {
+        if (this.isDisposed)
+            return;
+        _super.prototype.updateActionsProperties.call(this);
+        var actions = this.actionContainer.visibleActions;
+        var switchToStartLocation = false;
+        for (var i = actions.length - 1; i >= 0; i--) {
+            if (actions[i].id === "convertTo")
+                switchToStartLocation = true;
+            if (!actions[i].innerItem.location)
+                actions[i].innerItem.location = switchToStartLocation ? "start" : "end";
+        }
+    };
     QuestionAdornerViewModel.prototype.updateElementAllowOptions = function (options, operationsAllow) {
         _super.prototype.updateElementAllowOptions.call(this, options, operationsAllow);
         this.updateActionVisibility("convertTo", operationsAllow && options.allowChangeType);
@@ -7155,12 +7228,13 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
         var newAction = Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["createDropdownActionModel"])({
             id: id,
             css: "sv-action--convertTo sv-action-bar-item--secondary",
-            iconName: (_a = this.creator.toolbox.getItemByName(this.element.getType())) === null || _a === void 0 ? void 0 : _a.iconName,
+            iconName: id == "convertTo" ? (_a = this.creator.toolbox.getItemByName(this.element.getType())) === null || _a === void 0 ? void 0 : _a.iconName : undefined,
             iconSize: 24,
             title: actionTitle,
             enabled: enabled,
             visibleIndex: index,
             disableShrink: false,
+            location: "start",
             action: function (newType) {
             },
         }, {
@@ -8538,7 +8612,7 @@ var StringEditorViewModelBase = /** @class */ (function (_super) {
         this.connector.onDoActivate.add(this.activate);
     };
     StringEditorViewModelBase.prototype.checkConstraints = function (event) {
-        if (this.maxLength > 0 && event.keyCode >= 32) {
+        if (!this.compostionInProgress && this.maxLength > 0 && event.keyCode >= 32) {
             var text = event.target.innerText || "";
             if (text.length >= this.maxLength) {
                 event.preventDefault();
@@ -14465,11 +14539,15 @@ var TestSurveyTabViewModel = /** @class */ (function (_super) {
 /*!**********************************************!*\
   !*** ./src/components/tabs/theme-builder.ts ***!
   \**********************************************/
-/*! exports provided: ThemeBuilder */
+/*! exports provided: getThemeFullName, getObjectDiffs, getThemeChanges, findSuitableTheme, ThemeBuilder */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getThemeFullName", function() { return getThemeFullName; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getObjectDiffs", function() { return getObjectDiffs; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getThemeChanges", function() { return getThemeChanges; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findSuitableTheme", function() { return findSuitableTheme; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ThemeBuilder", function() { return ThemeBuilder; });
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "./src/entries/helpers.ts");
 /* harmony import */ var _simulator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../simulator */ "./src/components/simulator.ts");
@@ -14485,6 +14563,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _plugins_undo_redo_undo_redo_manager__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../plugins/undo-redo/undo-redo-manager */ "./src/plugins/undo-redo/undo-redo-manager.ts");
 /* harmony import */ var _themes__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./themes */ "./src/components/tabs/themes.ts");
 /* harmony import */ var _theme_custom_questions__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./theme-custom-questions */ "./src/components/tabs/theme-custom-questions/index.ts");
+/* harmony import */ var survey_core_themes__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! survey-core/themes */ "./node_modules/survey-core/themes/index.js");
+/* harmony import */ var survey_core_themes__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(survey_core_themes__WEBPACK_IMPORTED_MODULE_13__);
+
 
 
 
@@ -14499,6 +14580,78 @@ __webpack_require__.r(__webpack_exports__);
 
 
 __webpack_require__(/*! ./theme-builder.scss */ "./src/components/tabs/theme-builder.scss");
+Object.keys(survey_core_themes__WEBPACK_IMPORTED_MODULE_13__).forEach(function (libraryThemeName) {
+    var libraryTheme = survey_core_themes__WEBPACK_IMPORTED_MODULE_13__[libraryThemeName];
+    var creatorThemeVariables = {};
+    var creatorTheme = {};
+    Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(creatorThemeVariables, libraryTheme.cssVariables);
+    Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(creatorTheme, libraryTheme, { cssVariables: creatorThemeVariables });
+    var creatorThemeName = getThemeFullName(libraryTheme);
+    _themes__WEBPACK_IMPORTED_MODULE_11__["Themes"][creatorThemeName] = creatorTheme;
+});
+function getThemeFullName(theme) {
+    var themeName = theme.themeName || ThemeBuilder.DefaultTheme.themeName || "default";
+    var fullThemeName = themeName + "-" + (theme.colorPalette || "light");
+    if (theme.isPanelless === true) {
+        fullThemeName += "-panelless";
+    }
+    return fullThemeName;
+}
+function getObjectDiffs(obj1, obj2) {
+    if (obj2 === void 0) { obj2 = {}; }
+    var result = {};
+    Object.keys(obj1).forEach(function (key) {
+        if (typeof obj1[key] === "object") {
+            result[key] = getObjectDiffs(obj1[key], obj2[key]);
+        }
+        else {
+            if (obj1[key] !== undefined && obj1[key] != obj2[key]) {
+                result[key] = obj1[key];
+            }
+        }
+    });
+    return result;
+}
+function getThemeChanges(fullTheme, baseTheme) {
+    if (!baseTheme) {
+        var probeThemeFullName = getThemeFullName(fullTheme);
+        baseTheme = findSuitableTheme(fullTheme.themeName, fullTheme.colorPalette, fullTheme.isPanelless ? "lightweight" : "panels", probeThemeFullName);
+    }
+    var themeChanges = getObjectDiffs(fullTheme, baseTheme);
+    Object.keys(themeChanges).forEach(function (propertyName) {
+        if (propertyName.toLowerCase().indexOf("background") !== -1) {
+            if (themeChanges[propertyName] === "" || themeChanges[propertyName] === survey_core__WEBPACK_IMPORTED_MODULE_2__["Serializer"].findProperty("survey", propertyName).defaultValue) {
+                delete themeChanges[propertyName];
+            }
+        }
+    });
+    themeChanges.themeName = baseTheme.themeName || ThemeBuilder.DefaultTheme.themeName || "default";
+    themeChanges.colorPalette = baseTheme.colorPalette || "light";
+    themeChanges.isPanelless = !!baseTheme.isPanelless;
+    return themeChanges;
+}
+function findSuitableTheme(themeName, themePalette, themeMode, probeThemeFullName) {
+    var suitableTheme = _themes__WEBPACK_IMPORTED_MODULE_11__["Themes"][probeThemeFullName];
+    if (!!suitableTheme) {
+        return suitableTheme;
+    }
+    var appropriateThemeNames = Object.keys(_themes__WEBPACK_IMPORTED_MODULE_11__["Themes"]).filter(function (fullName) { return fullName.indexOf(themeName + "-") === 0; });
+    for (var _i = 0, appropriateThemeNames_1 = appropriateThemeNames; _i < appropriateThemeNames_1.length; _i++) {
+        var fullThemeName = appropriateThemeNames_1[_i];
+        if (fullThemeName.indexOf(themeName + "-" + themePalette) === 0) {
+            probeThemeFullName = themeName + "-" + themePalette;
+        }
+        if (fullThemeName.indexOf(themeName + "-" + themePalette + (themeMode === "lightweight" ? "-panelless" : "")) === 0) {
+            probeThemeFullName = themeName + "-" + themePalette + (themeMode === "lightweight" ? "-panelless" : "");
+        }
+    }
+    suitableTheme = _themes__WEBPACK_IMPORTED_MODULE_11__["Themes"][appropriateThemeNames[0]];
+    if (!!suitableTheme) {
+        return suitableTheme;
+    }
+    var defaultNearestThemeFullName = getThemeFullName({ themeName: ThemeBuilder.DefaultTheme.themeName, colorPalette: themePalette || "light", isPanelless: themeMode === "lightweight" });
+    return _themes__WEBPACK_IMPORTED_MODULE_11__["Themes"][defaultNearestThemeFullName] || ThemeBuilder.DefaultTheme;
+}
 var ThemeBuilder = /** @class */ (function (_super) {
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"])(ThemeBuilder, _super);
     function ThemeBuilder(surveyProvider, startThemeClasses) {
@@ -14509,7 +14662,7 @@ var ThemeBuilder = /** @class */ (function (_super) {
         _this.pages = new survey_core__WEBPACK_IMPORTED_MODULE_2__["ActionContainer"]();
         _this.themeCssVariablesChanges = {};
         _this.colorCalculator = new _utils_utils__WEBPACK_IMPORTED_MODULE_6__["ColorCalculator"]();
-        _this.blockChanges = false;
+        _this.blockChanges = true;
         _this._availableThemes = _themes__WEBPACK_IMPORTED_MODULE_11__["PredefinedThemes"];
         _this.prevQuestionValues = {};
         _this.onThemeSelected = new survey_core__WEBPACK_IMPORTED_MODULE_2__["EventBase"]();
@@ -14527,11 +14680,12 @@ var ThemeBuilder = /** @class */ (function (_super) {
         _this.themeName = ThemeBuilder.DefaultTheme.themeName || "default";
         Object(_theme_custom_questions__WEBPACK_IMPORTED_MODULE_12__["updateCustomQuestionJSONs"])();
         _this.themeEditorSurveyValue = _this.createThemeEditorSurvey();
-        _this.backgroundImage = _this.surveyProvider.theme.backgroundImage !== undefined ? _this.surveyProvider.theme.backgroundImage : surveyProvider.survey.backgroundImage;
-        _this.backgroundImageFit = _this.surveyProvider.theme.backgroundImageFit !== undefined ? _this.surveyProvider.theme.backgroundImageFit : surveyProvider.survey.backgroundImageFit;
-        _this.backgroundImageAttachment = _this.surveyProvider.theme.backgroundImageAttachment !== undefined ? _this.surveyProvider.theme.backgroundImageAttachment : surveyProvider.survey.backgroundImageAttachment;
-        _this.backgroundOpacity = ((_this.surveyProvider.theme.backgroundOpacity !== undefined ? _this.surveyProvider.theme.backgroundOpacity : surveyProvider.survey.backgroundOpacity) || 1) * 100;
-        _this.loadTheme(_this.surveyProvider.theme);
+        var surveyTheme = _this.surveyProvider.theme;
+        _this.backgroundImage = surveyTheme.backgroundImage !== undefined ? surveyTheme.backgroundImage : surveyProvider.survey.backgroundImage;
+        _this.backgroundImageFit = surveyTheme.backgroundImageFit !== undefined ? surveyTheme.backgroundImageFit : surveyProvider.survey.backgroundImageFit;
+        _this.backgroundImageAttachment = surveyTheme.backgroundImageAttachment !== undefined ? surveyTheme.backgroundImageAttachment : surveyProvider.survey.backgroundImageAttachment;
+        _this.backgroundOpacity = ((surveyTheme.backgroundOpacity !== undefined ? surveyTheme.backgroundOpacity : surveyProvider.survey.backgroundOpacity) || 1) * 100;
+        _this.loadTheme(surveyTheme);
         _this.surveyProvider.hasPendingThemeChanges = false;
         _this.undoRedoManager = new _plugins_undo_redo_undo_redo_manager__WEBPACK_IMPORTED_MODULE_10__["UndoRedoManager"]();
         _this.surveyProvider.onPropertyChanged.add(_this.creatorPropertyChanged);
@@ -14612,29 +14766,32 @@ var ThemeBuilder = /** @class */ (function (_super) {
     ThemeBuilder.prototype.loadTheme = function (theme) {
         this.blockThemeChangedNotifications += 1;
         try {
-            this.themeName = theme.themeName || this.themeName;
-            this.themePalette = theme.colorPalette || this.themePalette;
-            if (theme.isPanelless !== undefined) {
-                this.themeMode = theme.isPanelless === true ? "lightweight" : "panels";
-            }
+            var probeThemeFullName = getThemeFullName(theme);
+            var baseTheme = findSuitableTheme(theme.themeName, theme.colorPalette, theme.isPanelless ? "lightweight" : "panels", probeThemeFullName);
+            var themeChanges = getThemeChanges(theme, baseTheme);
+            if (this.currentTheme === theme) {
+                this.themeCssVariablesChanges = themeChanges.cssVariables || {};
+            }
+            this.themeName = themeChanges.themeName;
+            this.themePalette = themeChanges.colorPalette;
+            this.themeMode = themeChanges.isPanelless === true ? "lightweight" : "panels";
             this.backgroundImage = theme.backgroundImage || this.backgroundImage;
             this.backgroundImageFit = theme.backgroundImageFit || this.backgroundImageFit;
             this.backgroundImageAttachment = theme.backgroundImageAttachment || this.backgroundImageAttachment;
             var effectiveThemeCssVariables = {};
-            var suitableTheme = this.findSuitableTheme(this.themeName);
-            Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(effectiveThemeCssVariables, ThemeBuilder.DefaultTheme.cssVariables || {}, suitableTheme.cssVariables || {});
+            Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(effectiveThemeCssVariables, ThemeBuilder.DefaultTheme.cssVariables || {}, baseTheme.cssVariables || {});
             Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(effectiveThemeCssVariables, theme.cssVariables || {}, this.themeCssVariablesChanges);
             this.trimCssVariables(effectiveThemeCssVariables);
             var effectiveTheme = {
-                backgroundImage: this.backgroundImage || suitableTheme.backgroundImage || "",
-                backgroundImageFit: this.backgroundImageFit || suitableTheme.backgroundImageFit,
-                backgroundImageAttachment: this.backgroundImageAttachment || suitableTheme.backgroundImageAttachment,
-                backgroundOpacity: (this.backgroundOpacity / 100) || suitableTheme.backgroundOpacity,
+                backgroundImage: this.backgroundImage || baseTheme.backgroundImage || "",
+                backgroundImageFit: this.backgroundImageFit || baseTheme.backgroundImageFit,
+                backgroundImageAttachment: this.backgroundImageAttachment || baseTheme.backgroundImageAttachment,
+                backgroundOpacity: (this.backgroundOpacity / 100) || baseTheme.backgroundOpacity,
             };
-            var headerSettings = {};
-            Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(headerSettings, suitableTheme.header || {});
-            if (Object.keys(headerSettings).length > 0) {
-                effectiveTheme.header = headerSettings;
+            var effectiveHeaderSettings = {};
+            Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(effectiveHeaderSettings, baseTheme.header || {});
+            if (Object.keys(effectiveHeaderSettings).length > 0) {
+                effectiveTheme.header = effectiveHeaderSettings;
             }
             Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(effectiveTheme, theme, { cssVariables: effectiveThemeCssVariables, themeName: this.themeName, colorPalette: this.themePalette, isPanelless: this.themeMode === "lightweight" });
             this.surveyProvider.theme = effectiveTheme;
@@ -14906,13 +15063,13 @@ var ThemeBuilder = /** @class */ (function (_super) {
         var _a;
         if (["themeName", "themeMode", "themePalette"].indexOf(options.name) !== -1) {
             if (options.name === "themeName") {
-                this.loadTheme(this.findSuitableTheme(options.value) || (_a = {}, _a[options.name] = options.value, _a));
+                this.loadTheme(this.findSuitableTheme(options.value) || (_a = {}, _a[options.name] = options.value, _a.isPanelless = this.themeMode === "lightweight", _a.colorPalette = this.themePalette, _a));
             }
             if (options.name === "themeMode") {
-                this.loadTheme({ isPanelless: options.value === "lightweight" });
+                this.loadTheme({ themeName: this.themeName, isPanelless: options.value === "lightweight", colorPalette: this.themePalette });
             }
             if (options.name === "themePalette") {
-                this.loadTheme({ colorPalette: options.value });
+                this.loadTheme({ themeName: this.themeName, isPanelless: this.themeMode === "lightweight", colorPalette: options.value });
             }
             this.themeModified({ theme: this.currentTheme });
             return true;
@@ -15084,8 +15241,8 @@ var ThemeBuilder = /** @class */ (function (_super) {
         return themeEditorSurvey;
     };
     ThemeBuilder.prototype.findSuitableTheme = function (themeName) {
-        var probeThemeFullName = Object(_themes__WEBPACK_IMPORTED_MODULE_11__["getThemeFullName"])({ themeName: themeName, colorPalette: this.themePalette, isPanelless: this.themeMode === "lightweight" });
-        return Object(_themes__WEBPACK_IMPORTED_MODULE_11__["findSuitableTheme"])(themeName, this.themePalette, this.themeMode, probeThemeFullName);
+        var probeThemeFullName = getThemeFullName({ themeName: themeName, colorPalette: this.themePalette, isPanelless: this.themeMode === "lightweight" });
+        return findSuitableTheme(themeName, this.themePalette, this.themeMode, probeThemeFullName);
     };
     ThemeBuilder.prototype.patchFileEditors = function (survey) {
         var _this = this;
@@ -15103,12 +15260,13 @@ var ThemeBuilder = /** @class */ (function (_super) {
         return result;
     };
     ThemeBuilder.prototype.setHeaderBackgroundColorCssVariable = function (headerSettings) {
+        var _a;
         var headerBackgroundColorValue = undefined;
         if (headerSettings["backgroundColorSwitch"] === "none") {
-            headerBackgroundColorValue = "trasparent";
+            headerBackgroundColorValue = "transparent";
         }
         else if (headerSettings["backgroundColorSwitch"] === "custom") {
-            headerBackgroundColorValue = headerSettings.backgroundColor;
+            headerBackgroundColorValue = (_a = headerSettings.backgroundColor) !== null && _a !== void 0 ? _a : "transparent";
         }
         this.themeCssVariablesChanges["--sjs-header-backcolor"] = headerBackgroundColorValue;
     };
@@ -15130,7 +15288,7 @@ var ThemeBuilder = /** @class */ (function (_super) {
     ThemeBuilder.prototype.getBackgroundColorSwitchByValue = function (backgroundColor) {
         if (!backgroundColor)
             return "accentColor";
-        if (backgroundColor === "trasparent")
+        if (backgroundColor === "transparent")
             return "none";
         return "custom";
     };
@@ -15155,7 +15313,7 @@ var ThemeBuilder = /** @class */ (function (_super) {
         panel.getQuestionByName("descriptionPositionY").readOnly = !this.survey.description;
     };
     ThemeBuilder.prototype.setCoverColorsFromThemeVariables = function (question, cssVariable) {
-        if (!!question && !!cssVariable && cssVariable !== "trasparent") {
+        if (!!question && !!cssVariable && cssVariable !== "transparent") {
             question.value = cssVariable;
         }
     };
@@ -15270,7 +15428,9 @@ var ThemeBuilder = /** @class */ (function (_super) {
         });
     };
     ThemeBuilder.prototype.updateSimulatorTheme = function () {
-        this.survey.applyTheme(this.currentTheme);
+        if (!!this.survey) {
+            this.survey.applyTheme(this.currentTheme);
+        }
     };
     Object.defineProperty(ThemeBuilder.prototype, "saveThemeFunc", {
         /**
@@ -15518,6 +15678,7 @@ var ThemeBuilder = /** @class */ (function (_super) {
                                                         {
                                                             type: "color",
                                                             name: "backgroundColor",
+                                                            allowEmptyValue: true,
                                                             enableIf: "{panel.backgroundColorSwitch} = 'custom'",
                                                             titleLocation: "hidden",
                                                             descriptionLocation: "hidden",
@@ -16612,9 +16773,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ThemeTabPlugin", function() { return ThemeTabPlugin; });
 /* 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");
-/* harmony import */ var _theme_builder__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./theme-builder */ "./src/components/tabs/theme-builder.ts");
-/* harmony import */ var _creator_settings__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../creator-settings */ "./src/creator-settings.ts");
+/* harmony import */ var _creator_settings__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../creator-settings */ "./src/creator-settings.ts");
+/* harmony import */ var _editorLocalization__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../editorLocalization */ "./src/editorLocalization.ts");
+/* harmony import */ var _theme_builder__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./theme-builder */ "./src/components/tabs/theme-builder.ts");
 /* harmony import */ var _themes__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./themes */ "./src/components/tabs/themes.ts");
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../utils/utils */ "./src/utils/utils.ts");
 
@@ -16623,21 +16784,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-function getObjectDiffs(obj1, obj2) {
-    if (obj2 === void 0) { obj2 = {}; }
-    var result = {};
-    Object.keys(obj1).forEach(function (key) {
-        if (typeof obj1[key] === "object") {
-            result[key] = getObjectDiffs(obj1[key], obj2[key]);
-        }
-        else {
-            if (obj1[key] !== undefined && obj1[key] != obj2[key]) {
-                result[key] = obj1[key];
-            }
-        }
-    });
-    return result;
-}
 /**
  * An object that enables you to modify, add, and remove UI themes and handle theme-related events. To access this object, use the [`themeEditor`](https://surveyjs.io/survey-creator/documentation/api-reference/survey-creator#themeEditor) property on a Survey Creator instance:
  *
@@ -16658,7 +16804,7 @@ var ThemeTabPlugin = /** @class */ (function () {
     function ThemeTabPlugin(creator) {
         var _this = this;
         this.creator = creator;
-        this.simulatorTheme = survey_core__WEBPACK_IMPORTED_MODULE_0__["surveyCss"][survey_core__WEBPACK_IMPORTED_MODULE_0__["defaultV2ThemeName"]];
+        this.simulatorCssClasses = survey_core__WEBPACK_IMPORTED_MODULE_0__["surveyCss"][survey_core__WEBPACK_IMPORTED_MODULE_0__["defaultV2ThemeName"]];
         this._availableThemes = [].concat(_themes__WEBPACK_IMPORTED_MODULE_4__["PredefinedThemes"]);
         this.saveToFileHandler = _utils_utils__WEBPACK_IMPORTED_MODULE_5__["saveToFileHandler"];
         /**
@@ -16702,10 +16848,10 @@ var ThemeTabPlugin = /** @class */ (function () {
          */
         this.onAllowModifyTheme = new survey_core__WEBPACK_IMPORTED_MODULE_0__["EventBase"]();
         creator.addPluginTab("theme", this, "ed.themeSurvey");
-        this.simulatorTheme = survey_core__WEBPACK_IMPORTED_MODULE_0__["surveyCss"][survey_core__WEBPACK_IMPORTED_MODULE_0__["defaultV2ThemeName"]];
+        this.simulatorCssClasses = survey_core__WEBPACK_IMPORTED_MODULE_0__["surveyCss"][survey_core__WEBPACK_IMPORTED_MODULE_0__["defaultV2ThemeName"]];
         this.createActions().forEach(function (action) { return creator.toolbar.actions.push(action); });
         this.sidebarTab = this.creator.sidebar.addTab("theme");
-        this.sidebarTab.caption = _editorLocalization__WEBPACK_IMPORTED_MODULE_1__["editorLocalization"].getString("ed.themePropertyGridTitle");
+        this.sidebarTab.caption = _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("ed.themePropertyGridTitle");
         creator.registerShortcut("undo_theme", {
             name: "undo",
             affectedTab: "theme",
@@ -16736,9 +16882,7 @@ var ThemeTabPlugin = /** @class */ (function () {
         return new survey_core__WEBPACK_IMPORTED_MODULE_0__["ComputedUpdater"](function () { return _this.creator.activeTab === "theme"; });
     };
     ThemeTabPlugin.prototype.activate = function () {
-        this.model = new _theme_builder__WEBPACK_IMPORTED_MODULE_2__["ThemeBuilder"](this.creator, this.simulatorTheme);
-        this.model.availableThemes = this.availableThemes;
-        this.model.simulator.landscape = this.creator.previewOrientation != "portrait";
+        this.model = new _theme_builder__WEBPACK_IMPORTED_MODULE_3__["ThemeBuilder"](this.creator, this.simulatorCssClasses);
         this.update();
         this.sidebarTab.model = this.model.themeEditorSurvey;
         this.sidebarTab.componentName = "survey-widget";
@@ -16748,13 +16892,15 @@ var ThemeTabPlugin = /** @class */ (function () {
         var _this = this;
         if (!this.model)
             return;
-        var options = {
-            showPagesInTestSurveyTab: this.creator.showPagesInTestSurveyTab,
-        };
+        this.model.availableThemes = this.availableThemes;
+        this.model.simulator.landscape = this.creator.previewOrientation != "portrait";
         this.model.testAgainAction = this.testAgainAction;
         this.model.availableThemes = this.availableThemes;
         this.model.prevPageAction = this.prevPageAction;
         this.model.nextPageAction = this.nextPageAction;
+        var options = {
+            showPagesInTestSurveyTab: this.creator.showPagesInTestSurveyTab,
+        };
         this.model.initialize(this.creator.JSON, options);
         if (this.creator.showInvisibleElementsInTestSurveyTab) {
             this.invisibleToggleAction.css = this.model.showInvisibleElements ? "sv-action-bar-item--active" : "";
@@ -16772,7 +16918,7 @@ var ThemeTabPlugin = /** @class */ (function () {
             }
         });
         this.model.onThemeSelected.add(function (sender, options) {
-            _this.resetTheme.enabled = Object(_themes__WEBPACK_IMPORTED_MODULE_4__["getThemeFullName"])(sender.defaultSessionTheme) !== Object(_themes__WEBPACK_IMPORTED_MODULE_4__["getThemeFullName"])(options.theme);
+            _this.resetTheme.enabled = Object(_theme_builder__WEBPACK_IMPORTED_MODULE_3__["getThemeFullName"])(sender.defaultSessionTheme) !== Object(_theme_builder__WEBPACK_IMPORTED_MODULE_3__["getThemeFullName"])(options.theme);
             _this.saveThemeAction.enabled = true;
             _this.onThemeSelected.fire(_this, options);
         });
@@ -16784,11 +16930,11 @@ var ThemeTabPlugin = /** @class */ (function () {
         this.model.onAllowModifyTheme.add(function (sender, options) {
             _this.onAllowModifyTheme.fire(_this, options);
         });
-        this.resetTheme.enabled = Object(_themes__WEBPACK_IMPORTED_MODULE_4__["getThemeFullName"])(this.model.defaultSessionTheme) !== Object(_themes__WEBPACK_IMPORTED_MODULE_4__["getThemeFullName"])(this.creator.theme) || this.isModified;
+        this.resetTheme.enabled = Object(_theme_builder__WEBPACK_IMPORTED_MODULE_3__["getThemeFullName"])(this.model.defaultSessionTheme) !== Object(_theme_builder__WEBPACK_IMPORTED_MODULE_3__["getThemeFullName"])(this.creator.theme) || this.isModified;
     };
     ThemeTabPlugin.prototype.deactivate = function () {
         if (this.model) {
-            this.simulatorTheme = this.model.simulator.survey.css;
+            this.simulatorCssClasses = this.model.simulator.survey.css;
             this.model.onPropertyChanged.clear();
             this.model.onThemeSelected.clear();
             this.model.onThemePropertyChanged.clear();
@@ -16804,7 +16950,6 @@ var ThemeTabPlugin = /** @class */ (function () {
     };
     ThemeTabPlugin.prototype.exportToFile = function (fileName) {
         var themeCopy = JSON.parse(JSON.stringify(this.creator.theme));
-        themeCopy.themeName = themeCopy.themeName + "_exported";
         var themeData = JSON.stringify(themeCopy, null, 4);
         var themeBlob = new Blob([themeData], { type: "application/json" });
         this.saveToFileHandler(fileName, themeBlob);
@@ -16814,9 +16959,8 @@ var ThemeTabPlugin = /** @class */ (function () {
         var fileReader = new FileReader();
         fileReader.onload = function (e) {
             var theme = JSON.parse(fileReader.result);
-            _this.addTheme(theme);
-            if (_this.model) {
-                _this.model.setTheme(theme);
+            if (!!_this.model) {
+                _this.model.loadTheme(theme);
             }
             callback && callback(theme);
         };
@@ -16906,11 +17050,11 @@ var ThemeTabPlugin = /** @class */ (function () {
             mode: "small",
             visible: this.createVisibleUpdater(),
             action: function () {
-                survey_core__WEBPACK_IMPORTED_MODULE_0__["settings"].confirmActionAsync(Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("ed.themeResetConfirmation"), function (confirm) {
+                survey_core__WEBPACK_IMPORTED_MODULE_0__["settings"].confirmActionAsync(Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_2__["getLocString"])("ed.themeResetConfirmation"), function (confirm) {
                     if (confirm) {
                         _this.model.resetTheme();
                     }
-                }, Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("ed.themeResetConfirmationOk"));
+                }, Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_2__["getLocString"])("ed.themeResetConfirmationOk"));
             }
         });
         items.push(this.resetTheme);
@@ -16966,7 +17110,7 @@ var ThemeTabPlugin = /** @class */ (function () {
             mode: "small",
             component: "sv-action-bar-item",
             action: function () {
-                _this.exportToFile(_creator_settings__WEBPACK_IMPORTED_MODULE_3__["settings"].theme.exportFileName);
+                _this.exportToFile(_creator_settings__WEBPACK_IMPORTED_MODULE_1__["settings"].theme.exportFileName);
             }
         });
         items.push(this.exportAction);
@@ -16980,7 +17124,7 @@ var ThemeTabPlugin = /** @class */ (function () {
                 action: function () {
                     _this.model.showInvisibleElements = !_this.model.showInvisibleElements;
                     _this.invisibleToggleAction.css = _this.model.showInvisibleElements ? "sv-action-bar-item--active" : "";
-                    _this.invisibleToggleAction.title = Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])(!_this.model.showInvisibleElements ? "ts.showInvisibleElements" : "ts.hideInvisibleElements");
+                    _this.invisibleToggleAction.title = Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_2__["getLocString"])(!_this.model.showInvisibleElements ? "ts.showInvisibleElements" : "ts.hideInvisibleElements");
                 }
             });
         }
@@ -17047,12 +17191,12 @@ var ThemeTabPlugin = /** @class */ (function () {
      */
     ThemeTabPlugin.prototype.addTheme = function (theme, setAsDefault) {
         if (setAsDefault === void 0) { setAsDefault = false; }
-        var fullThemeName = Object(_themes__WEBPACK_IMPORTED_MODULE_4__["getThemeFullName"])(theme);
+        var fullThemeName = Object(_theme_builder__WEBPACK_IMPORTED_MODULE_3__["getThemeFullName"])(theme);
         _themes__WEBPACK_IMPORTED_MODULE_4__["Themes"][fullThemeName] = theme;
         if (this._availableThemes.indexOf(theme.themeName) === -1) {
             if (setAsDefault) {
                 this.availableThemes = [theme.themeName].concat(this.availableThemes);
-                _theme_builder__WEBPACK_IMPORTED_MODULE_2__["ThemeBuilder"].DefaultTheme = theme;
+                _theme_builder__WEBPACK_IMPORTED_MODULE_3__["ThemeBuilder"].DefaultTheme = theme;
             }
             else {
                 this.availableThemes = this.availableThemes.concat([theme.themeName]);
@@ -17074,11 +17218,11 @@ var ThemeTabPlugin = /** @class */ (function () {
     ThemeTabPlugin.prototype.removeTheme = function (themeAccessor, includeModifications) {
         if (includeModifications === void 0) { includeModifications = false; }
         var themeToDelete = typeof themeAccessor === "string" ? _themes__WEBPACK_IMPORTED_MODULE_4__["Themes"][themeAccessor] : themeAccessor;
-        var fullThemeName = typeof themeAccessor === "string" ? themeAccessor : Object(_themes__WEBPACK_IMPORTED_MODULE_4__["getThemeFullName"])(themeToDelete);
+        var fullThemeName = typeof themeAccessor === "string" ? themeAccessor : Object(_theme_builder__WEBPACK_IMPORTED_MODULE_3__["getThemeFullName"])(themeToDelete);
         if (!!themeToDelete) {
             delete _themes__WEBPACK_IMPORTED_MODULE_4__["Themes"][fullThemeName];
-            if (_theme_builder__WEBPACK_IMPORTED_MODULE_2__["ThemeBuilder"].DefaultTheme === themeToDelete) {
-                _theme_builder__WEBPACK_IMPORTED_MODULE_2__["ThemeBuilder"].DefaultTheme = _themes__WEBPACK_IMPORTED_MODULE_4__["Themes"]["default-light"] || _themes__WEBPACK_IMPORTED_MODULE_4__["Themes"][Object.keys(_themes__WEBPACK_IMPORTED_MODULE_4__["Themes"])[0]];
+            if (_theme_builder__WEBPACK_IMPORTED_MODULE_3__["ThemeBuilder"].DefaultTheme === themeToDelete) {
+                _theme_builder__WEBPACK_IMPORTED_MODULE_3__["ThemeBuilder"].DefaultTheme = _themes__WEBPACK_IMPORTED_MODULE_4__["Themes"]["default-light"] || _themes__WEBPACK_IMPORTED_MODULE_4__["Themes"][Object.keys(_themes__WEBPACK_IMPORTED_MODULE_4__["Themes"])[0]];
             }
             var registeredThemeNames = Object.keys(_themes__WEBPACK_IMPORTED_MODULE_4__["Themes"]);
             var themeModifications = registeredThemeNames.filter(function (themeName) { return themeName.indexOf(themeToDelete.themeName + "-") === 0; });
@@ -17111,21 +17255,7 @@ var ThemeTabPlugin = /** @class */ (function () {
         return this.getThemeChanges();
     };
     ThemeTabPlugin.prototype.getThemeChanges = function () {
-        var fullTheme = this.creator.theme;
-        var probeThemeFullName = Object(_themes__WEBPACK_IMPORTED_MODULE_4__["getThemeFullName"])(fullTheme);
-        var baseTheme = Object(_themes__WEBPACK_IMPORTED_MODULE_4__["findSuitableTheme"])(fullTheme.themeName, fullTheme.colorPalette, fullTheme.isPanelless ? "lightweight" : "panels", probeThemeFullName);
-        var themeChanges = getObjectDiffs(fullTheme, baseTheme);
-        Object.keys(themeChanges).forEach(function (propertyName) {
-            if (propertyName.toLowerCase().indexOf("background") !== -1) {
-                if (themeChanges[propertyName] === "" || themeChanges[propertyName] === survey_core__WEBPACK_IMPORTED_MODULE_0__["Serializer"].findProperty("survey", propertyName).defaultValue) {
-                    delete themeChanges[propertyName];
-                }
-            }
-        });
-        themeChanges.themeName = fullTheme.themeName || _theme_builder__WEBPACK_IMPORTED_MODULE_2__["ThemeBuilder"].DefaultTheme.themeName || "default";
-        themeChanges.colorPalette = fullTheme.colorPalette || "light";
-        themeChanges.isPanelless = !!fullTheme.isPanelless;
-        return themeChanges;
+        return Object(_theme_builder__WEBPACK_IMPORTED_MODULE_3__["getThemeChanges"])(this.creator.theme);
     };
     Object.defineProperty(ThemeTabPlugin.prototype, "isModified", {
         /**
@@ -17143,6 +17273,7 @@ var ThemeTabPlugin = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    ThemeTabPlugin.DefaultTheme = _themes__WEBPACK_IMPORTED_MODULE_4__["Themes"]["default-light"];
     return ThemeTabPlugin;
 }());
 
@@ -17154,40 +17285,16 @@ var ThemeTabPlugin = /** @class */ (function () {
 /*!***************************************!*\
   !*** ./src/components/tabs/themes.ts ***!
   \***************************************/
-/*! exports provided: Themes, PredefinedThemes, getThemeFullName, PredefinedColors, findSuitableTheme */
+/*! exports provided: Themes, PredefinedThemes, PredefinedColors */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Themes", function() { return Themes; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PredefinedThemes", function() { return PredefinedThemes; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getThemeFullName", function() { return getThemeFullName; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PredefinedColors", function() { return PredefinedColors; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findSuitableTheme", function() { return findSuitableTheme; });
-/* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../utils/utils */ "./src/utils/utils.ts");
-/* harmony import */ var survey_core_themes__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! survey-core/themes */ "./node_modules/survey-core/themes/index.js");
-/* harmony import */ var survey_core_themes__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(survey_core_themes__WEBPACK_IMPORTED_MODULE_1__);
-
-
 var Themes = {};
 var PredefinedThemes = ["default", "sharp", "borderless", "flat", "plain", "doubleborder", "layered", "solid", "threedimensional", "contrast"];
-function getThemeFullName(theme) {
-    var themeName = theme.themeName || "default";
-    var fullThemeName = themeName + "-" + (theme.colorPalette || "light");
-    if (theme.isPanelless === true) {
-        fullThemeName += "-panelless";
-    }
-    return fullThemeName;
-}
-Object.keys(survey_core_themes__WEBPACK_IMPORTED_MODULE_1__).forEach(function (libraryThemeName) {
-    var libraryTheme = survey_core_themes__WEBPACK_IMPORTED_MODULE_1__[libraryThemeName];
-    var creatorThemeVariables = {};
-    var creatorTheme = {};
-    Object(_utils_utils__WEBPACK_IMPORTED_MODULE_0__["assign"])(creatorThemeVariables, libraryTheme.cssVariables);
-    Object(_utils_utils__WEBPACK_IMPORTED_MODULE_0__["assign"])(creatorTheme, libraryTheme, { cssVariables: creatorThemeVariables });
-    var creatorThemeName = getThemeFullName(libraryTheme);
-    Themes[creatorThemeName] = creatorTheme;
-});
 var PredefinedColors = {
     light: {
         teal: "rgba(11, 128, 128, 1)",
@@ -17208,23 +17315,6 @@ var PredefinedColors = {
         green: "rgba(140, 204, 90, 1)"
     }
 };
-function findSuitableTheme(themeName, themePalette, themeMode, probeThemeFullName) {
-    var suitableTheme = Themes[probeThemeFullName];
-    if (!!suitableTheme) {
-        return suitableTheme;
-    }
-    var appropriateThemeNames = Object.keys(Themes).filter(function (fullName) { return fullName.indexOf(themeName + "-") === 0; });
-    for (var _i = 0, appropriateThemeNames_1 = appropriateThemeNames; _i < appropriateThemeNames_1.length; _i++) {
-        var fullThemeName = appropriateThemeNames_1[_i];
-        if (fullThemeName.indexOf(themeName + "-" + themePalette) === 0) {
-            probeThemeFullName = themeName + "-" + themePalette;
-        }
-        if (fullThemeName.indexOf(themeName + "-" + themePalette + (themeMode === "lightweight" ? "-panelless" : "")) === 0) {
-            probeThemeFullName = themeName + "-" + themePalette + (themeMode === "lightweight" ? "-panelless" : "");
-        }
-    }
-    return Themes[probeThemeFullName] || Themes[appropriateThemeNames[0]];
-}
 
 
 /***/ }),
@@ -21621,9 +21711,9 @@ var CreatorBase = /** @class */ (function (_super) {
         _survey_elements__WEBPACK_IMPORTED_MODULE_24__["DragDropSurveyElements"].restrictDragQuestionBetweenPages =
             _creator_settings__WEBPACK_IMPORTED_MODULE_2__["settings"].dragDrop.restrictDragQuestionBetweenPages;
         this.dragDropSurveyElements = new _survey_elements__WEBPACK_IMPORTED_MODULE_24__["DragDropSurveyElements"](null, this);
+        this.dragDropSurveyElements.onGetMaxNestedPanels = function () { return _this.maxNestedPanels; };
         var isDraggedFromToolbox = false;
         this.dragDropSurveyElements.onDragStart.add(function (sender, options) {
-            _this.dragDropSurveyElements.maxNestedPanels = _this.maxNestedPanels;
             isDraggedFromToolbox = !sender.draggedElement.parent;
             _this.onDragStart.fire(sender, options);
             _this.startUndoRedoTransaction("drag drop");
@@ -22775,6 +22865,12 @@ var CreatorBase = /** @class */ (function (_super) {
         this.onPropertyGridShowModal.fire(this, options);
     };
     CreatorBase.prototype.onCanDeleteItemCallback = function (object, item, allowDelete) {
+        if (!!item && item["isPage"]) {
+            if (this.pageEditMode === "bypage")
+                return item !== this.survey.currentPage;
+            if (this.pageEditMode === "single")
+                return false;
+        }
         return this.canDeleteItem(object, item, allowDelete);
     };
     CreatorBase.prototype.onCollectionItemDeletingCallback = function (obj, property, collection, item) {
@@ -23474,12 +23570,23 @@ function isContentElement(element) {
     }
     return false;
 }
+function getQuestionFromElement(element) {
+    if (!element)
+        return null;
+    if (!!element.row)
+        return element.row.data;
+    if (!!element.column)
+        return element.column.colOwner;
+    return null;
+}
 var editableStringRendererName = "svc-string-editor";
 function getElementWrapperComponentName(element, reason, isPopupEditorContent) {
     if (reason === "logo-image") {
         return "svc-logo-image";
     }
     if (reason === "cell" || reason === "column-header" || reason === "row-header") {
+        if (isContentElement(getQuestionFromElement(element)))
+            return undefined;
         return "svc-matrix-cell";
     }
     if (!isContentElement(element)) {
@@ -23554,8 +23661,11 @@ function getItemValueWrapperComponentData(item, question, creator) {
     };
 }
 function isStringEditable(element, name) {
-    var parentIsMatrix = !!element.data && element.parentQuestion instanceof survey_core__WEBPACK_IMPORTED_MODULE_1__["QuestionMatrixDropdownModelBase"];
-    return !parentIsMatrix && (!isContentElement(element) || element.isEditableTemplateElement);
+    if (element.parentQuestion instanceof survey_core__WEBPACK_IMPORTED_MODULE_1__["QuestionMatrixDropdownModelBase"]) {
+        if (!!element.data || isContentElement(element.parentQuestion))
+            return false;
+    }
+    return !isContentElement(element) || element.isEditableTemplateElement;
 }
 function isTextInput(target) {
     if (!target.tagName)
@@ -24024,9 +24134,11 @@ var QuestionColorModel = /** @class */ (function (_super) {
         }
         newValue = (newValue.match(/#([0-9a-fA-F]){1,6}/) || [DEFAULT_COLOR])[0];
         if (newValue.length === 4) {
+            var value = newValue.slice(0, 1);
             for (var i = 1; i < 4; i++) {
-                newValue += newValue[i];
+                value += newValue[i] + newValue[i];
             }
+            newValue = value;
         }
         if (newValue.length < 7) {
             var length_1 = newValue.length;
@@ -24036,6 +24148,12 @@ var QuestionColorModel = /** @class */ (function (_super) {
         }
         return newValue;
     };
+    QuestionColorModel.prototype.isNewValueEqualsToValue = function (newValue) {
+        if (_super.prototype.isNewValueEqualsToValue.call(this, newValue) || this.isTwoValueEquals(newValue, this.value, true, true))
+            return true;
+        else
+            return false;
+    };
     QuestionColorModel.prototype.setNewValue = function (newValue) {
         this.resetRenderedValue();
         _super.prototype.setNewValue.call(this, this.getCorrectedValue(newValue));
@@ -25195,7 +25313,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, AceJsonEditorModel, TabJsonEditorAcePlugin, JsonEditorBaseModel, TabJsonEditorBasePlugin, TextareaJsonEditorModel, TabJsonEditorTextareaPlugin, TestSurveyTabViewModel, TabTestPlugin, updateColorSettingsJSON, createColor, updateBoxShadowSettingsJSON, createBoxShadow, parseBoxShadow, DefaultFonts, updateFontSettingsJSON, fontsettingsToCssVariable, fontsettingsFromCssVariable, updateElementSettingsJSON, elementSettingsToCssVariable, elementSettingsFromCssVariable, Themes, PredefinedThemes, getThemeFullName, PredefinedColors, findSuitableTheme, ThemeBuilder, ThemeTabPlugin, initLogicOperator, LogicEvent, SurveyLogic, TranslationItemBase, TranslationItemString, TranslationItem, TranslationGroup, Translation, TranslationEditor, createImportCSVAction, createExportCSVAction, 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, ResetValueAdorner, QuestionTextWithResetModel, QuestionCommentWithResetModel, setSurveyJSONForPropertyGrid, PropertyEditorSetupValue, PropertyGridEditorCollection, PropertyGridTitleActionsCreator, PropertyJSONGenerator, PropertyGridModel, PropertyGridEditor, PropertyGridEditorBoolean, PropertyGridEditorStringBase, PropertyGridEditorString, PropertyGridLinkEditor, PropertyGridEditorColor, PropertyGridEditorNumber, PropertyGridEditorImageSize, PropertyGridEditorText, PropertyGridEditorHtml, PropertyGridEditorStringArray, PropertyGridEditorDropdown, PropertyGridEditorSet, PropertyGridEditorPage, PropertyGridEditorQuestion, PropertyGridEditorQuestionSelectBase, PropertyGridEditorQuestionCarryForward, 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, SearchManager, 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, scrollElementIntoView, ingectAlpha, convertRgbaToString, parseRgbaFromString, parseColor, HSBToRGB, RGBToHSB, assign, ColorCalculator, saveToFileHandler, 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, AceJsonEditorModel, TabJsonEditorAcePlugin, JsonEditorBaseModel, TabJsonEditorBasePlugin, TextareaJsonEditorModel, TabJsonEditorTextareaPlugin, TestSurveyTabViewModel, TabTestPlugin, updateColorSettingsJSON, createColor, updateBoxShadowSettingsJSON, createBoxShadow, parseBoxShadow, DefaultFonts, updateFontSettingsJSON, fontsettingsToCssVariable, fontsettingsFromCssVariable, updateElementSettingsJSON, elementSettingsToCssVariable, elementSettingsFromCssVariable, Themes, PredefinedThemes, PredefinedColors, getThemeFullName, getObjectDiffs, getThemeChanges, findSuitableTheme, ThemeBuilder, ThemeTabPlugin, initLogicOperator, LogicEvent, SurveyLogic, TranslationItemBase, TranslationItemString, TranslationItem, TranslationGroup, Translation, TranslationEditor, createImportCSVAction, createExportCSVAction, 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, ResetValueAdorner, QuestionTextWithResetModel, QuestionCommentWithResetModel, setSurveyJSONForPropertyGrid, PropertyEditorSetupValue, PropertyGridEditorCollection, PropertyGridTitleActionsCreator, PropertyJSONGenerator, PropertyGridModel, PropertyGridEditor, PropertyGridEditorBoolean, PropertyGridEditorStringBase, PropertyGridEditorString, PropertyGridLinkEditor, PropertyGridEditorColor, PropertyGridEditorNumber, PropertyGridEditorImageSize, PropertyGridEditorText, PropertyGridEditorHtml, PropertyGridEditorStringArray, PropertyGridEditorDropdown, PropertyGridEditorSet, PropertyGridEditorPage, PropertyGridEditorQuestion, PropertyGridEditorQuestionSelectBase, PropertyGridEditorQuestionCarryForward, 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, SearchManager, 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, scrollElementIntoView, ingectAlpha, convertRgbaToString, parseRgbaFromString, parseColor, HSBToRGB, RGBToHSB, assign, ColorCalculator, saveToFileHandler, SurveyQuestionEditorDefinition, ObjType, SurveyHelper, ResizeManager, UndoRedoPlugin, undoRedoTransaction, ignoreUndoRedo, UndoRedoManager, Transaction, UndoRedoAction, UndoRedoArrayAction, PagesController */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -25314,13 +25432,17 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "PredefinedThemes", function() { return _components_tabs_themes__WEBPACK_IMPORTED_MODULE_14__["PredefinedThemes"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getThemeFullName", function() { return _components_tabs_themes__WEBPACK_IMPORTED_MODULE_14__["getThemeFullName"]; });
-
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "PredefinedColors", function() { return _components_tabs_themes__WEBPACK_IMPORTED_MODULE_14__["PredefinedColors"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findSuitableTheme", function() { return _components_tabs_themes__WEBPACK_IMPORTED_MODULE_14__["findSuitableTheme"]; });
-
 /* harmony import */ var _components_tabs_theme_builder__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../components/tabs/theme-builder */ "./src/components/tabs/theme-builder.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getThemeFullName", function() { return _components_tabs_theme_builder__WEBPACK_IMPORTED_MODULE_15__["getThemeFullName"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getObjectDiffs", function() { return _components_tabs_theme_builder__WEBPACK_IMPORTED_MODULE_15__["getObjectDiffs"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getThemeChanges", function() { return _components_tabs_theme_builder__WEBPACK_IMPORTED_MODULE_15__["getThemeChanges"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findSuitableTheme", function() { return _components_tabs_theme_builder__WEBPACK_IMPORTED_MODULE_15__["findSuitableTheme"]; });
+
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ThemeBuilder", function() { return _components_tabs_theme_builder__WEBPACK_IMPORTED_MODULE_15__["ThemeBuilder"]; });
 
 /* harmony import */ var _components_tabs_theme_plugin__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../components/tabs/theme-plugin */ "./src/components/tabs/theme-plugin.ts");
@@ -25702,7 +25824,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(/*! survey-core */ "survey-core");
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_72___default = /*#__PURE__*/__webpack_require__.n(survey_core__WEBPACK_IMPORTED_MODULE_72__);
 var Version;
-Version = "" + "1.9.120";
+Version = "" + "1.9.122";
 //should be loaded before other styles for easier override 
 __webpack_require__(/*! ../utils/context-button.scss */ "./src/utils/context-button.scss");
 
@@ -25793,7 +25915,7 @@ __webpack_require__(/*! ../utils/design.scss */ "./src/utils/design.scss");
 __webpack_require__(/*! ../utils/layout.scss */ "./src/utils/layout.scss");
 
 survey_core__WEBPACK_IMPORTED_MODULE_72__["settings"].supportCreatorV2 = true;
-Object(survey_core__WEBPACK_IMPORTED_MODULE_72__["checkLibraryVersion"])("" + "1.9.120", "survey-creator-core");
+Object(survey_core__WEBPACK_IMPORTED_MODULE_72__["checkLibraryVersion"])("" + "1.9.122", "survey-creator-core");
 
 
 /***/ }),
@@ -28639,6 +28761,7 @@ var enStrings = {
         both: "Both",
         left: "Left",
         right: "Right",
+        leftRight: "Left and right",
         color: "color",
         date: "date",
         datetime: "datetime",
@@ -34191,13 +34314,6 @@ var PropertyGridEditorMatrixPages = /** @class */ (function (_super) {
     PropertyGridEditorMatrixPages.prototype.fit = function (prop) {
         return prop.type == "surveypages";
     };
-    PropertyGridEditorMatrixPages.prototype.onMatrixAllowRemoveRow = function (obj, row) {
-        var page = row.editingObj;
-        if (!page || !page.survey) {
-            return;
-        }
-        return page.survey.currentPage !== page;
-    };
     PropertyGridEditorMatrixPages.prototype.getColumnClassName = function (obj, prop) {
         return "page@" + obj.getType();
     };
@@ -36932,7 +37048,6 @@ var DragDropSurveyElements = /** @class */ (function (_super) {
         // protected ghostSurveyElement: IElement = null;
         _this.dragOverIndicatorElement = null;
         _this.isDraggedElementSelected = false;
-        _this.maxNestedPanels = -1;
         _this.doBanDropHere = function () {
             _this.removeDragOverMarker(_this.dragOverIndicatorElement);
             _this.removeDragOverMarker(_this.dropTarget);
@@ -37026,6 +37141,11 @@ var DragDropSurveyElements = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(DragDropSurveyElements.prototype, "maxNestedPanels", {
+        get: function () { return this.onGetMaxNestedPanels ? this.onGetMaxNestedPanels() : -1; },
+        enumerable: false,
+        configurable: true
+    });
     // private isRight: boolean;
     // protected prevIsRight: boolean;
     DragDropSurveyElements.prototype.startDragToolboxItem = function (event, draggedElementJson, toolboxItemModel) {
@@ -38985,6 +39105,7 @@ var QuestionToolbox = /** @class */ (function (_super) {
             iconName: iconName,
             title: title,
             tooltip: title,
+            className: "svc-toolbox__item svc-toolbox__item--" + iconName,
             json: elementJson,
             isCopied: false,
             category: category