survey-creator-core 1.9.95 → 1.9.96

package/survey-creator-core.i18n.js

@@ -1,5 +1,5 @@
 /*!
- * SurveyJS Creator v1.9.95
+ * SurveyJS Creator v1.9.96
  * (c) 2015-2023 Devsoft Baltic OÜ - http://surveyjs.io/
  * Github: https://github.com/surveyjs/survey-creator
  * License: https://surveyjs.io/Licenses#SurveyCreator

package/survey-creator-core.i18n.min.js

@@ -1,5 +1,5 @@
 /*!
- * SurveyJS Creator v1.9.95
+ * SurveyJS Creator v1.9.96
  * (c) 2015-2023 Devsoft Baltic OÜ - http://surveyjs.io/
  * Github: https://github.com/surveyjs/survey-creator
  * License: https://surveyjs.io/Licenses#SurveyCreator

package/survey-creator-core.js

@@ -1,5 +1,5 @@
 /*!
- * SurveyJS Creator v1.9.95
+ * SurveyJS Creator v1.9.96
  * (c) 2015-2023 Devsoft Baltic OÜ - http://surveyjs.io/
  * Github: https://github.com/surveyjs/survey-creator
  * License: https://surveyjs.io/Licenses#SurveyCreator
@@ -1133,6 +1133,7 @@ __webpack_require__(/*! ./matrix-cell.scss */ "./src/components/matrix-cell.scss
 var MatrixCellWrapperEditSurvey = /** @class */ (function () {
     function MatrixCellWrapperEditSurvey(creator, cellQuestion) {
         this.cellQuestion = cellQuestion;
+        this.creator = creator;
         var questionJSON = cellQuestion.toJSON();
         questionJSON.type = cellQuestion.getType();
         this.surveyValue = creator.createSurvey({ questions: [questionJSON] }, "modal-question-editor");
@@ -1163,8 +1164,11 @@ var MatrixCellWrapperEditSurvey = /** @class */ (function () {
         if (!!prevCellType) {
             questionJSON.cellType = prevCellType;
         }
+        if (survey_core__WEBPACK_IMPORTED_MODULE_1__["Helpers"].isTwoValueEquals(questionJSON, columnJSON))
+            return;
         column.fromJSON(questionJSON);
         matrix.onColumnCellTypeChanged(column);
+        this.creator.setModified({ type: "MATRIX_CELL_EDITOR", column: column });
     };
     return MatrixCellWrapperEditSurvey;
 }());
@@ -9483,6 +9487,7 @@ var TestSurveyTabViewModel = /** @class */ (function (_super) {
         configurable: true
     });
     TestSurveyTabViewModel.prototype.updateSimulatorSurvey = function (json, theme) {
+        var _this = this;
         var newSurvey = this.surveyProvider.createSurvey(json || {}, "test");
         if (this.surveyProvider.showThemeTab) {
             newSurvey.applyTheme(this.surveyProvider.theme);
@@ -9523,6 +9528,16 @@ var TestSurveyTabViewModel = /** @class */ (function (_super) {
         this.survey.onPageVisibleChanged.add(function (sender, options) {
             self.updatePageItem(options.page);
         });
+        this.survey.onPopupVisibleChanged.add(function (_, options) {
+            if (options.visible) {
+                _this.onScrollCallback = function () {
+                    options.popup.toggleVisibility();
+                };
+            }
+            else {
+                _this.onScrollCallback = undefined;
+            }
+        });
     };
     TestSurveyTabViewModel.prototype.setJSON = function (json, currTheme) {
         this.json = json;
@@ -9704,6 +9719,11 @@ var TestSurveyTabViewModel = /** @class */ (function (_super) {
         this.nextPageAction.css = isNextEnabled ? "sv-action-bar-item--secondary" : "";
         this.nextPageAction.enabled = isNextEnabled;
     };
+    TestSurveyTabViewModel.prototype.onScroll = function () {
+        if (this.onScrollCallback)
+            this.onScrollCallback();
+        return true;
+    };
     Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
         Object(survey_core__WEBPACK_IMPORTED_MODULE_2__["property"])({
             defaultValue: false,
@@ -9898,12 +9918,40 @@ survey_core__WEBPACK_IMPORTED_MODULE_0__["ComponentCollection"].Instance.add({
             titleLocation: "left"
         }
     ],
+    onInit: function () {
+        survey_core__WEBPACK_IMPORTED_MODULE_0__["Serializer"].addProperty("colorsettings", {
+            name: "choices:itemvalue[]"
+        });
+    },
+    onLoaded: function (question) {
+        syncPropertiesFromCompositeToColor(question, "titleLocation", question.titleLocation);
+        syncPropertiesFromCompositeToColor(question, "choices", question.choices);
+    },
+    onPropertyChanged: function (question, propertyName, newValue) {
+        syncPropertiesFromCompositeToColor(question, propertyName, newValue);
+    },
     onCreated: function (question) {
         question.valueFromDataCallback = function (newValue) { return typeof newValue == "string" ? Object(_utils_utils__WEBPACK_IMPORTED_MODULE_2__["parseColor"])(newValue) : newValue; };
         question.valueToDataCallback = function (newValue) { return !!newValue ? (typeof newValue == "string" ? newValue : createColor(newValue)) : ""; };
         question.contentPanel.questions.forEach(function (q) { return q.allowRootStyle = false; });
     }
 });
+function syncPropertiesFromCompositeToColor(question, propertyName, newValue) {
+    var colorQuestion = question.contentPanel.questions[0];
+    if (propertyName == "titleLocation") {
+        if (newValue == "left") {
+            question.titleLocation = "hidden";
+            colorQuestion.title = question.title;
+            colorQuestion.titleLocation = newValue;
+        }
+        else {
+            colorQuestion.titleLocation = "hidden";
+        }
+    }
+    if (propertyName == "choices") {
+        colorQuestion.choices = newValue;
+    }
+}
 function createColor(value) {
     return Object(_utils_utils__WEBPACK_IMPORTED_MODULE_2__["ingectAlpha"])(value.color, value.opacity / 100);
 }
@@ -9987,6 +10035,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 var DefaultFonts = [
+    "Open Sans",
     "Arial, sans-serif",
     "Brush Script MT, cursive",
     "Courier New, monospace",
@@ -10248,7 +10297,7 @@ var TabThemePlugin = /** @class */ (function () {
                 return (_this.creator.activeTab === "theme");
             }),
             action: function () {
-                _this.model.applySelectedTheme();
+                _this.model.resetTheme();
             }
         });
         items.push(this.resetTheme);
@@ -10458,16 +10507,13 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    ThemeSurveyTabViewModel.prototype.applySelectedTheme = function (saveChanges) {
-        if (saveChanges === void 0) { saveChanges = false; }
+    ThemeSurveyTabViewModel.prototype.applySelectedTheme = function () {
         var newTheme = {};
         Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(newTheme, Themes[this.getFullThemeName("default")], Themes[this.getFullThemeName()]);
         if (this.survey["isCompact"]) {
             Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(newTheme, Themes[this.getFullThemeName() + "-lw"]);
         }
-        if (saveChanges) {
-            Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(newTheme, this.themeChanges);
-        }
+        Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(newTheme, this.themeChanges);
         this.currentTheme.cssVariables = newTheme;
         this.loadThemeIntoPropertyGrid(this.themeEditorSurvey);
         this.setThemeToSurvey();
@@ -10612,6 +10658,10 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
         }
         this.pageListItems = pages;
     };
+    ThemeSurveyTabViewModel.prototype.resetTheme = function () {
+        this.themeChanges = {};
+        this.applySelectedTheme();
+    };
     ThemeSurveyTabViewModel.prototype.show = function () {
         this.showInvisibleElements = false;
         this.activePage = this.survey.activePage;
@@ -10769,12 +10819,13 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                 if (options.name === "themeMode") {
                     _this.survey["isCompact"] = options.value === "lightweight";
                     _this.currentTheme.isCompact = options.value === "lightweight";
+                    _this.applySelectedTheme();
                 }
                 else {
                     _this.currentTheme["themeName"] = _this.themeName;
                     _this.currentTheme["themePalette"] = _this.themePalette;
+                    _this.resetTheme();
                 }
-                _this.applySelectedTheme(options.name === "themeMode");
                 return;
             }
             if (["backgroundImage", "backgroundImageFit"].indexOf(options.name) !== -1) {
@@ -10858,7 +10909,7 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
         themeEditorSurvey.getQuestionByName("questionTitle").contentPanel.getQuestionByName("color").value = newCssVariables["--sjs-general-forecolor"];
         themeEditorSurvey.getQuestionByName("questionDescription").contentPanel.getQuestionByName("color").value = newCssVariables["--sjs-general-forecolor-light"];
         themeEditorSurvey.getAllQuestions().forEach(function (question) {
-            if (["color"].indexOf(question.getType()) !== -1) {
+            if (["color", "colorsettings"].indexOf(question.getType()) !== -1) {
                 question.choices = Object.keys(PredefinedColors[_this.themePalette]).map(function (colorName) { return new survey_core__WEBPACK_IMPORTED_MODULE_2__["ItemValue"](PredefinedColors[_this.themePalette][colorName], Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.colors." + colorName)); });
             }
         });
@@ -10926,14 +10977,12 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                     name: "--sjs-primary-backcolor",
                                     title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryColor"),
                                     descriptionLocation: "hidden",
-                                    defaultValue: "rgba(25, 179, 148, 1)"
                                 },
                                 {
                                     type: "color",
                                     name: "--sjs-general-backcolor-dim",
                                     title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.backgroundDimColor"),
                                     descriptionLocation: "hidden",
-                                    defaultValue: "rgba(243, 243, 243, 1)"
                                 },
                                 {
                                     type: "panel",
@@ -11074,7 +11123,6 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                     name: "--sjs-general-backcolor-dim",
                                     title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.backgroundDimColor"),
                                     descriptionLocation: "hidden",
-                                    defaultValue: "rgba(243, 243, 243, 1)"
                                 }, {
                                     type: "panel",
                                     title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.accentBackground"),
@@ -11085,7 +11133,6 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                             title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryDefaultColor"),
                                             titleLocation: "left",
                                             descriptionLocation: "hidden",
-                                            defaultValue: "rgba(25, 179, 148, 1)"
                                         },
                                         {
                                             type: "color",
@@ -11093,7 +11140,6 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                             title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryDarkColor"),
                                             titleLocation: "left",
                                             descriptionLocation: "hidden",
-                                            defaultValue: "rgba(20, 164, 139, 1)"
                                         },
                                         {
                                             type: "color",
@@ -11101,7 +11147,6 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                             title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryLightColor"),
                                             titleLocation: "left",
                                             descriptionLocation: "hidden",
-                                            defaultValue: "rgba(232, 247, 244, 1)"
                                         }
                                     ]
                                 }, {
@@ -11114,7 +11159,6 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                             title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryForecolor"),
                                             titleLocation: "left",
                                             descriptionLocation: "hidden",
-                                            defaultValue: "rgba(255, 255, 255, 1)"
                                         },
                                         {
                                             type: "color",
@@ -11122,7 +11166,6 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                             title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.primaryForecolorLight"),
                                             titleLocation: "left",
                                             descriptionLocation: "hidden",
-                                            defaultValue: "rgba(255, 255, 255, 1)"
                                         }
                                     ]
                                 }
@@ -11270,7 +11313,6 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                             title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.borderDefault"),
                                             titleLocation: "left",
                                             descriptionLocation: "hidden",
-                                            defaultValue: "rgba(214, 214, 214, 1)"
                                         },
                                         {
                                             type: "color",
@@ -11278,7 +11320,6 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                                             title: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_3__["getLocString"])("theme.borderLight"),
                                             titleLocation: "left",
                                             descriptionLocation: "hidden",
-                                            defaultValue: "rgba(232, 232, 232, 1)"
                                         }
                                     ]
                                 }]
@@ -17248,6 +17289,8 @@ var QuestionColorModel = /** @class */ (function (_super) {
         return _this;
     }
     QuestionColorModel.prototype.getCorrectedValue = function (newValue) {
+        if (newValue == undefined || newValue == null)
+            return newValue;
         newValue = Object(_utils_utils__WEBPACK_IMPORTED_MODULE_2__["parseColor"])(newValue !== null && newValue !== void 0 ? newValue : "").color;
         newValue = (newValue.match(/#(\d|\w){1,6}/) || [DEFAULT_COLOR])[0];
         if (newValue.length === 4) {
@@ -17344,9 +17387,7 @@ var QuestionColorModel = /** @class */ (function (_super) {
     });
     QuestionColorModel.prototype.createDropdownAction = function () {
         var _this = this;
-        var action = Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["createDropdownActionModelAdvanced"])({
-            iconName: this.cssClasses.colorDropdownIcon
-        }, {
+        var action = Object(survey_core__WEBPACK_IMPORTED_MODULE_1__["createDropdownActionModelAdvanced"])({}, {
             onSelectionChanged: function (item) {
                 _this.value = item.value;
             },
@@ -17358,15 +17399,23 @@ var QuestionColorModel = /** @class */ (function (_super) {
         });
         var popupModel = action.popupModel;
         var listModel = popupModel.contentComponentData.model;
-        listModel.cssClasses = {
-            itemBody: listModel.cssClasses.itemBody + " " + this.cssClasses.colorItem
-        };
         popupModel.setWidthByTarget = true;
         popupModel.positionMode = "fixed";
         listModel.isItemSelected = function (itemValue) { return itemValue.value == _this.value; };
-        action.cssClasses = { item: this.cssClasses.colorDropdown };
         return action;
     };
+    QuestionColorModel.prototype.calcCssClasses = function (css) {
+        var classes = _super.prototype.calcCssClasses.call(this, css);
+        var dropdownAction = this.dropdownAction;
+        dropdownAction.cssClasses = { item: classes.colorDropdown };
+        dropdownAction.iconName = classes.colorDropdownIcon;
+        var listModel = dropdownAction.popupModel.contentComponentData.model;
+        listModel.cssClasses = {};
+        listModel.cssClasses = {
+            itemBody: listModel.cssClasses.itemBody + " " + classes.colorItem
+        };
+        return classes;
+    };
     QuestionColorModel.prototype.updateChoices = function () {
         this.dropdownAction.popupModel.contentComponentData.model.setItems(this.choices);
     };
@@ -17584,6 +17633,8 @@ var QuestionSpinEditorModel = /** @class */ (function (_super) {
         configurable: true
     });
     QuestionSpinEditorModel.prototype.correctValue = function (newValue) {
+        if (newValue == undefined || newValue == null)
+            return newValue;
         var renderedMax = Number(this.renderedMax);
         var renderedMin = Number(this.renderedMin);
         newValue = typeof newValue === "string" ? parseFloat(newValue) : newValue;
@@ -18617,7 +18668,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.95";
+Version = "" + "1.9.96";
 //should be loaded before other styles for easier override 
 __webpack_require__(/*! ../utils/context-button.scss */ "./src/utils/context-button.scss");
 
@@ -18706,7 +18757,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.95", "survey-creator-core");
+Object(survey_core__WEBPACK_IMPORTED_MODULE_70__["checkLibraryVersion"])("" + "1.9.96", "survey-creator-core");
 
 
 /***/ }),
@@ -22244,7 +22295,7 @@ var UndoRedoManager = /** @class */ (function () {
         transaction.addAction(action);
     };
     UndoRedoManager.prototype.isCorrectProperty = function (sender, propertyName) {
-        var prop = survey_core__WEBPACK_IMPORTED_MODULE_0__["Serializer"].findProperty(sender.getType(), propertyName);
+        var prop = survey_core__WEBPACK_IMPORTED_MODULE_0__["Serializer"].getOriginalProperty(sender, propertyName);
         return !!prop && prop.isSerializable;
     };
     UndoRedoManager.prototype.tryMergeTransaction = function (sender, propertyName, newValue) {
@@ -22432,7 +22483,7 @@ var UndoRedoAction = /** @class */ (function () {
     UndoRedoAction.prototype.tryMerge = function (sender, propertyName, newValue) {
         if (sender !== this._sender || propertyName !== this._propertyName || newValue == this._oldValue)
             return false;
-        var prop = survey_core__WEBPACK_IMPORTED_MODULE_0__["Serializer"].findProperty(sender.getType(), propertyName);
+        var prop = survey_core__WEBPACK_IMPORTED_MODULE_0__["Serializer"].getOriginalProperty(sender, propertyName);
         if (!prop || (prop.type !== "string" && prop.type !== "text"))
             return false;
         if (new Date().getTime() - this.tickCount > UndoRedoAction.maximumMergeTime)