survey-creator-core 1.9.91 → 1.9.93

package/survey-creator-core.js

@@ -1,5 +1,5 @@
 /*!
- * SurveyJS Creator v1.9.91
+ * SurveyJS Creator v1.9.93
  * (c) 2015-2023 Devsoft Baltic OÜ - http://surveyjs.io/
  * Github: https://github.com/surveyjs/survey-creator
  * License: https://surveyjs.io/Licenses#SurveyCreator
@@ -209,10 +209,13 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
         this.updateActionsProperties();
     };
     SurveyElementAdornerBase.prototype.updateActionsProperties = function () {
+        if (this.isDisposed)
+            return;
         this.updateElementAllowOptions(this.creator.getElementAllowOperations(this.surveyElement), this.isOperationsAllow());
     };
     SurveyElementAdornerBase.prototype.updateElementAllowOptions = function (options, operationsAllow) {
         this.allowDragging = operationsAllow && options.allowDragging;
+        this.allowEditOption = (options.allowEdit == undefined || !!options.allowEdit);
         this.updateActionVisibility("delete", operationsAllow && options.allowDelete);
         this.updateActionVisibility("duplicate", operationsAllow && options.allowCopy);
         var settingsVisibility = (options.allowEdit !== undefined) ? (operationsAllow && options.allowEdit) : this.creator.sidebar.flyoutMode;
@@ -277,7 +280,7 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
     };
     Object.defineProperty(SurveyElementAdornerBase.prototype, "allowEdit", {
         get: function () {
-            return !!this.creator && !this.creator.readOnly;
+            return !!this.creator && !this.creator.readOnly && this.allowEditOption;
         },
         enumerable: false,
         configurable: true
@@ -1988,7 +1991,7 @@ var QuestionImageAdornerViewModel = /** @class */ (function (_super) {
         var _this = this;
         this.filePresentationModel = survey_core__WEBPACK_IMPORTED_MODULE_1__["Serializer"].createClass("file", { name: this.question.name });
         this.filePresentationModel.setSurveyImpl(this.question.getSurvey());
-        this.filePresentationModel.forceIsInputReadOnly = false;
+        this.filePresentationModel.forceIsInputReadOnly = !this.creator.isCanModifyProperty(this.question, "imageLink");
         this.filePresentationModel.dragAreaPlaceholder = this.placeholderText;
         this.filePresentationModel.chooseButtonCaption = this.chooseImageText;
         this.filePresentationModel.acceptedTypes = "image/*";
@@ -2403,6 +2406,27 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(QuestionAdornerViewModel.prototype, "isUsingCarryForward", {
+        get: function () {
+            var _a;
+            return (_a = this.element) === null || _a === void 0 ? void 0 : _a.isUsingCarryForward;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    QuestionAdornerViewModel.prototype.createCarryForwardParams = function () {
+        var _this = this;
+        var _a;
+        if (!this.isUsingCarryForward)
+            return null;
+        var name = (_a = this.element) === null || _a === void 0 ? void 0 : _a.choicesFromQuestion;
+        if (!name)
+            return null;
+        var question = this.creator.survey.getQuestionByName(name);
+        if (!question)
+            return null;
+        return { question: question, text: this.creator.getLocString("ed.carryForwardChoicesCopied"), onClick: function () { _this.creator.selectElement(question); } };
+    };
     QuestionAdornerViewModel.prototype.dispose = function () {
         this.surveyElement.unRegisterFunctionOnPropertyValueChanged("isRequired", "isRequiredAdorner");
         this.surveyElement.unRegisterFunctionOnPropertyValueChanged("inputType", "inputTypeAdorner");
@@ -4055,7 +4079,7 @@ var StringEditorViewModelBase = /** @class */ (function (_super) {
         }
     };
     StringEditorViewModelBase.prototype.onKeyDown = function (event) {
-        if (event.keyCode === 13) {
+        if (event.keyCode === 13 && (this.editAsText || !event.shiftKey)) {
             this.blurEditor();
             if (!event.ctrlKey && !event.metaKey) {
                 this.connector.onEditComplete.fire(this, {});
@@ -9739,10 +9763,8 @@ survey_core__WEBPACK_IMPORTED_MODULE_1__["ComponentCollection"].Instance.add({
     showInToolbox: false,
     questionJSON: {
         "type": "paneldynamic",
-        "panelCount": 1,
-        //temp
-        "maxPanelCount": 1,
         "minPanelCount": 1,
+        "panelAddText": Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_0__["getLocString"])("theme.boxShadowAddRule"),
         "templateElements": [
             {
                 "type": "spinedit",
@@ -9969,9 +9991,9 @@ survey_core__WEBPACK_IMPORTED_MODULE_0__["ComponentCollection"].Instance.add({
             descriptionLocation: "hidden",
             choices: [
                 { value: "400", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightRegular") },
-                { value: "500", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightHeavy") },
-                { value: "600", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightSemiBold") },
-                { value: "700", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightBold") },
+                { value: "500", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightSemiBold") },
+                { value: "600", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightBold") },
+                { value: "700", text: Object(_editorLocalization__WEBPACK_IMPORTED_MODULE_1__["getLocString"])("theme.fontWeightHeavy") },
             ],
             defaultValue: "400"
         },
@@ -10034,8 +10056,8 @@ var TabThemePlugin = /** @class */ (function () {
         creator.addPluginTab("theme", this, "ed.themeSurvey");
         this.simulatorTheme = survey_core__WEBPACK_IMPORTED_MODULE_1__["surveyCss"][survey_core__WEBPACK_IMPORTED_MODULE_1__["defaultV2ThemeName"]];
         this.createActions().forEach(function (action) { return creator.toolbar.actions.push(action); });
-        this.sidebarTab = this.creator.sidebar.addTab("preview");
-        this.sidebarTab.caption = _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("ed.previewPropertyGridTitle");
+        this.sidebarTab = this.creator.sidebar.addTab("theme");
+        this.sidebarTab.caption = _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("ed.themePropertyGridTitle");
     }
     TabThemePlugin.prototype.getSimulatorDevicesTitle = function () {
         if (!this.model)
@@ -10068,6 +10090,7 @@ var TabThemePlugin = /** @class */ (function () {
         this.sidebarTab.model = this.model.themeEditorSurvey;
         this.sidebarTab.componentName = "survey-widget";
         this.creator.sidebar.activeTab = this.sidebarTab.id;
+        this.resetTheme.visible = true;
         this.importAction.visible = true;
         this.exportAction.visible = true;
     };
@@ -10099,6 +10122,7 @@ var TabThemePlugin = /** @class */ (function () {
         }
         this.sidebarTab.visible = false;
         this.testAgainAction.visible = false;
+        this.resetTheme.visible = false;
         this.importAction.visible = false;
         this.exportAction.visible = false;
         this.invisibleToggleAction && (this.invisibleToggleAction.visible = false);
@@ -10189,6 +10213,18 @@ var TabThemePlugin = /** @class */ (function () {
             iconName: "icon-arrow-right_16x16",
             visible: false
         });
+        this.resetTheme = new survey_core__WEBPACK_IMPORTED_MODULE_1__["Action"]({
+            id: "resetTheme",
+            iconName: "icon-reset",
+            mode: "small",
+            visible: new survey_core__WEBPACK_IMPORTED_MODULE_1__["ComputedUpdater"](function () {
+                return (_this.creator.activeTab === "theme");
+            }),
+            action: function () {
+                _this.model.applySelectedTheme();
+            }
+        });
+        items.push(this.resetTheme);
         this.importAction = new survey_core__WEBPACK_IMPORTED_MODULE_1__["Action"]({
             id: "svc-theme-import",
             iconName: "icon-load",
@@ -10369,6 +10405,20 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    ThemeSurveyTabViewModel.prototype.applySelectedTheme = function (saveChanges) {
+        if (saveChanges === void 0) { saveChanges = false; }
+        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);
+        }
+        this.themeEditorSurvey.mergeData(newTheme);
+        this.surveyProvider.theme.cssVariables = newTheme;
+        this.setThemeToSurvey();
+    };
     ThemeSurveyTabViewModel.prototype.loadTheme = function (theme) {
         this.themeName = theme["themeName"];
         this.themePalette = theme["themePalette"];
@@ -10658,14 +10708,7 @@ var ThemeSurveyTabViewModel = /** @class */ (function (_super) {
                     _this.surveyProvider.theme["themeName"] = _this.themeName;
                     _this.surveyProvider.theme["themePalette"] = _this.themePalette;
                 }
-                var newTheme_1 = {};
-                Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(newTheme_1, Themes[_this.getFullThemeName("default")], Themes[_this.getFullThemeName()]);
-                if (_this.survey["isCompact"]) {
-                    Object(_utils_utils__WEBPACK_IMPORTED_MODULE_6__["assign"])(newTheme_1, Themes[_this.getFullThemeName() + "-lw"]);
-                }
-                themeEditorSurvey.mergeData(newTheme_1);
-                _this.surveyProvider.theme.cssVariables = newTheme_1;
-                _this.setThemeToSurvey();
+                _this.applySelectedTheme(options.name === "themeMode");
                 return;
             }
             if (["backgroundImage", "backgroundImageFit"].indexOf(options.name) !== -1) {
@@ -13751,6 +13794,8 @@ var CreatorBase = /** @class */ (function (_super) {
          * - `sender` - the survey creator object that fires the event
          * - `options.files` - the Javascript File objects array
          * - `options.callback(status, imageLink)` - called on upload complete
+         *
+         *  [View Demo](https://surveyjs.io/survey-creator/examples/file-upload/ (linkStyle))
          * @see uploadFiles
          */
         _this.onUploadFile = new CreatorEvent();
@@ -15190,6 +15235,9 @@ var CreatorBase = /** @class */ (function (_super) {
         survey["needRenderIcons"] = false;
         if (reason != "designer" && reason != "test") {
             survey.locale = _editorLocalization__WEBPACK_IMPORTED_MODULE_3__["editorLocalization"].currentLocale;
+            if (!json["clearInvisibleValues"]) {
+                survey.clearInvisibleValues = "onComplete";
+            }
         }
         this.onSurveyInstanceCreated.fire(this, { survey: survey, reason: reason });
         return survey;
@@ -18446,7 +18494,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.91";
+Version = "" + "1.9.93";
 //should be loaded before other styles for easier override 
 __webpack_require__(/*! ../utils/context-button.scss */ "./src/utils/context-button.scss");
 
@@ -18535,7 +18583,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.91", "survey-creator-core");
+Object(survey_core__WEBPACK_IMPORTED_MODULE_70__["checkLibraryVersion"])("" + "1.9.93", "survey-creator-core");
 
 
 /***/ }),
@@ -18845,6 +18893,7 @@ var map = {
 	"./rating.svg": "./src/images/rating.svg",
 	"./redo.svg": "./src/images/redo.svg",
 	"./remove_16x16.svg": "./src/images/remove_16x16.svg",
+	"./reset.svg": "./src/images/reset.svg",
 	"./save.svg": "./src/images/save.svg",
 	"./select-page.svg": "./src/images/select-page.svg",
 	"./settings.svg": "./src/images/settings.svg",
@@ -19686,6 +19735,17 @@ module.exports = "<svg viewBox=\"0 0 16 16\" xmlns=\"http://www.w3.org/2000/svg\
 
 /***/ }),
 
+/***/ "./src/images/reset.svg":
+/*!******************************!*\
+  !*** ./src/images/reset.svg ***!
+  \******************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = "<svg viewBox=\"0 0 24 24\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M12.01 2.993C11.8 2.993 11.59 3.023 11.37 3.043L12.71 1.703L11.3 0.292999L7.59 4.003L11.3 7.713L12.71 6.303L11.46 5.053C11.64 5.043 11.82 5.013 12 5.013C15.86 5.013 19 8.153 19 12.013C19 15.873 15.86 19.013 12 19.013C8.14 19.013 5 15.873 5 12.013C5 11.463 4.55 11.013 4 11.013C3.45 11.013 3 11.463 3 12.013C3 16.973 7.04 21.013 12 21.013C16.96 21.013 21 16.973 21 12.013C21 7.053 16.97 2.993 12.01 2.993Z\"></path></svg>"
+
+/***/ }),
+
 /***/ "./src/images/save.svg":
 /*!*****************************!*\
   !*** ./src/images/save.svg ***!
@@ -20712,7 +20772,7 @@ var enStrings = {
         propertyEditorError: "Error",
         saveError: "Error! Editor content is not saved.",
         translationPropertyGridTitle: "Language Settings",
-        previewPropertyGridTitle: "Theme Settings",
+        themePropertyGridTitle: "Theme Settings",
         translationLanguages: "Languages",
         translationAddLanguage: "Select language to translate",
         translationShowAllStrings: "All Strings",
@@ -20730,6 +20790,7 @@ var enStrings = {
         underline: "Underline",
         addNewQuestion: "Add Question",
         selectPage: "Select page...",
+        carryForwardChoicesCopied: "Choices are copied from",
         htmlPlaceHolder: "HTML content will be here.",
         panelPlaceHolder: "Drop a question from the toolbox here.",
         surveyPlaceHolder: "The survey is empty. Drag an element from the toolbox or click the button below.",
@@ -20863,6 +20924,7 @@ var enStrings = {
         assistantTitle: "Available questions",
         cellsEmptyRowsColumns: "There is should be at least one column or row",
         showPreviewBeforeComplete: "Preview answers before submitting the survey",
+        overridingPropertyPrefix: "Set by ",
         propertyIsEmpty: "Please enter a value",
         propertyIsNoUnique: "Please enter a unique value",
         propertyNameIsNotUnique: "Please enter a unique name",
@@ -21594,11 +21656,12 @@ var enStrings = {
         pageDescription: "Page Description Font",
         boxShadowX: "X",
         boxShadowY: "Y",
+        boxShadowAddRule: "Add More Shadow Effect",
         opacity: "Opacity",
         boxShadowBlur: "Blur",
         boxShadowSpread: "Spread",
         questionShadow: "Question Panel Border / Shadow",
-        editorShadow: "Editor Border / Shadow"
+        editorShadow: "Editor Border / Shadow",
     },
 };
 // Uncomment the line below if you create a custom dictionary.
@@ -21886,13 +21949,19 @@ var UndoRedoController = /** @class */ (function (_super) {
             };
         }
         this.undoRedoManager = new _undo_redo_manager__WEBPACK_IMPORTED_MODULE_3__["UndoRedoManager"]();
-        this.undoRedoManager.changesFinishedCallback = function (changes) {
-            _this.creator.notifySurveyPropertyChanged({
-                name: changes.propertyName,
-                target: changes.object,
-                oldValue: changes.oldValue,
-                newValue: changes.newValue
-            });
+        this.undoRedoManager.changesFinishedCallback = function (actions, isUndo) {
+            for (var i = actions.length - 1; i >= 0; i--) {
+                var action = actions[i];
+                if (!!action) {
+                    var changes = action.getChanges(isUndo);
+                    _this.creator.notifySurveyPropertyChanged({
+                        name: changes.propertyName,
+                        target: changes.object,
+                        oldValue: changes.oldValue,
+                        newValue: changes.newValue
+                    });
+                }
+            }
         };
         this.undoRedoManager.canUndoRedoCallback = function () {
             _this.updateUndeRedoActions();
@@ -22078,9 +22147,10 @@ var UndoRedoManager = /** @class */ (function () {
     };
     UndoRedoManager.prototype.notifyChangesFinished = function (transaction, isUndo) {
         if (isUndo === void 0) { isUndo = false; }
-        if (transaction.actions.length > 0 && transaction.actions[0]) {
+        if (transaction.actions.length > 0) {
             !!this.changesFinishedCallback &&
-                this.changesFinishedCallback(transaction.actions[0].getChanges(isUndo));
+                this.changesFinishedCallback(transaction.actions, isUndo);
+            // this.changesFinishedCallback(transaction.actions[0].getChanges(isUndo));
         }
     };
     UndoRedoManager.prototype.canUndoRedoCallback = function () { };
@@ -22328,8 +22398,8 @@ var propertyGridCss = {
         root: "spg-paneldynamic",
         navigation: "spg-paneldynamic__navigation",
         title: "spg-title spg-question__title",
-        button: "spg-btn",
-        buttonRemove: "spg-paneldynamic__remove-btn",
+        button: "spg-action-button spg-action-button--text",
+        buttonRemove: "spg-action-button--danger",
         buttonAdd: "spg-paneldynamic__add-btn",
         progressTop: "spg-paneldynamic__progress spg-paneldynamic__progress--top",
         progressBottom: "spg-paneldynamic__progress spg-paneldynamic__progress--bottom",
@@ -22339,6 +22409,7 @@ var propertyGridCss = {
         progress: "spg-progress",
         progressBar: "spg-progress__bar",
         progressText: "spg-paneldynamic__progress-text",
+        panelFooter: "spg-panel__footer",
         separator: "spg-paneldynamic__separator"
     },
     progress: "spg-progress spg-body__progress",
@@ -23732,15 +23803,33 @@ var ConditionEditor = /** @class */ (function (_super) {
             path = path.substring(1);
         }
         var json = question && question.getConditionJson ? question.getConditionJson(operator, path) : null;
-        if (!!json && json.type == "expression") {
+        if (!json)
+            return null;
+        if (!!json.choicesFromQuestion) {
+            this.updateChoicesFromQuestion(json);
+        }
+        if (json.type == "expression") {
             json.type = "text";
         }
-        if (!!json && operator == "anyof") {
+        if (operator == "anyof") {
             if (!ConditionEditor.isClassContains(json.type, ["checkbox"], [])) {
                 json.type = "checkbox";
             }
         }
-        return !!json ? json : null;
+        return json;
+    };
+    ConditionEditor.prototype.updateChoicesFromQuestion = function (json) {
+        var question = this.getConditionQuestion(json.choicesFromQuestion);
+        if (!question)
+            return;
+        delete json.choicesFromQuestion;
+        var questionJSON = question.toJSON();
+        if (!!questionJSON.choices) {
+            json.choices = questionJSON.choices;
+        }
+        if (!!questionJSON.choicesByUrl) {
+            json.choicesByUrl = questionJSON.choicesByUrl;
+        }
     };
     ConditionEditor.prototype.updateOperatorEnables = function (panel) {
         var questionName = panel.getQuestionByName("questionName");
@@ -24361,7 +24450,13 @@ function propertyVisibleIf(params) {
         return false;
     return this.question.property.visibleIf(this.question.obj);
 }
+function propertyEnableIf(params) {
+    if (!this.question || !this.question.obj || !this.question.property)
+        return false;
+    return !this.question.obj[this.question.property.overridingProperty];
+}
 survey_core__WEBPACK_IMPORTED_MODULE_1__["FunctionFactory"].Instance.register("propertyVisibleIf", propertyVisibleIf);
+survey_core__WEBPACK_IMPORTED_MODULE_1__["FunctionFactory"].Instance.register("propertyEnableIf", propertyEnableIf);
 function setSurveyJSONForPropertyGrid(json, updateOnTyping, titleLocationLeft) {
     if (updateOnTyping === void 0) { updateOnTyping = true; }
     if (titleLocationLeft === void 0) { titleLocationLeft = true; }
@@ -24686,10 +24781,21 @@ var PropertyJSONGenerator = /** @class */ (function () {
             q.obj = this.obj;
             q.options = this.options;
             var eventVisibility = this.getVisibilityOnEvent(prop);
-            q.readOnly = q.readOnly || this.isPropertyReadOnly(prop);
+            var eventReadOnly = this.isPropertyReadOnly(prop);
+            q.readOnly = q.readOnly || eventReadOnly;
             q.visible = q.visible && eventVisibility;
-            if (!!prop.visibleIf) {
-                q.visibleIf = eventVisibility ? "propertyVisibleIf() = true" : "";
+            if (!!prop.visibleIf && eventVisibility) {
+                q.visibleIf = "propertyVisibleIf() = true";
+            }
+            if (!!prop.overridingProperty) {
+                q.onUpdateCssClassesCallback = function (css) {
+                    css.questionWrapper = "spg-boolean-wrapper--overriding";
+                };
+                if (!eventReadOnly) {
+                    q.enableIf = "propertyEnableIf() = true";
+                }
+                var overridingQuestion = this.createOverridingQuestion(panel, q, prop.overridingProperty);
+                q.parent.addElement(overridingQuestion, q.parent.elements.indexOf(q) + 1);
             }
             q.descriptionLocation = "hidden";
             var helpText = _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getPropertyHelpInEditor(this.obj.getType(), prop.name, prop.type);
@@ -24707,6 +24813,27 @@ var PropertyJSONGenerator = /** @class */ (function () {
     PropertyJSONGenerator.prototype.isPropertyReadOnly = function (prop) {
         return PropertyJSONGenerator.isPropertyReadOnly(prop, this.options, this.obj, this.parentObj, this.parentProperty);
     };
+    PropertyJSONGenerator.prototype.createOverridingQuestion = function (panel, question, overridingProp) {
+        var linkValue = survey_core__WEBPACK_IMPORTED_MODULE_1__["Serializer"].createClass("linkvalue");
+        linkValue.name = question.name + "_" + "overridingProperty";
+        linkValue.startWithNewLine = false;
+        linkValue.property = question.property;
+        linkValue.obj = question.obj;
+        linkValue.visibleIf = "propertyEnableIf() = false";
+        var overridingQuestion = panel.getQuestionByName(overridingProp);
+        var text = !!overridingQuestion ? overridingQuestion.title : overridingProp;
+        linkValue.linkValueText = _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("pe.overridingPropertyPrefix") + text;
+        linkValue.titleLocation = "hidden";
+        linkValue.onUpdateCssClassesCallback = function (css) {
+            css.questionWrapper = "spg-link-wrapper--overriding";
+        };
+        if (!!overridingQuestion) {
+            linkValue.linkClickCallback = function () {
+                overridingQuestion.focus();
+            };
+        }
+        return linkValue;
+    };
     PropertyJSONGenerator.prototype.getClasPropName = function () {
         if (!!this.parentObj && !!this.parentProperty)
             return this.parentProperty.name;
@@ -24795,6 +24922,10 @@ var PropertyJSONGenerator = /** @class */ (function () {
         json.isRequired = prop.isRequired;
         json.requiredErrorText = _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("pe.propertyIsEmpty");
         json.title = this.getQuestionTitle(prop, title);
+        if (["page", "panelbase"].indexOf(prop.className) && json.name === "name") {
+            json.isRequired = true;
+            json.requiredErrorText = _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("pe.propertyIsEmpty");
+        }
         var propDescr = (_a = _question_editor_definition__WEBPACK_IMPORTED_MODULE_8__["SurveyQuestionEditorDefinition"].definition[this.obj.getType()]) === null || _a === void 0 ? void 0 : _a.properties.filter(function (property) { return property["name"] === prop.name; })[0];
         if (typeof propDescr === "object" && propDescr.placeholder) {
             json.placeholder = _editorLocalization__WEBPACK_IMPORTED_MODULE_2__["editorLocalization"].getString("pe." + propDescr.placeholder);
@@ -25323,18 +25454,27 @@ var PropertyGridEditor = /** @class */ (function () {
     PropertyGridEditor.prototype.isSupportGrouping = function () {
         return false;
     };
-    PropertyGridEditor.prototype.onUpdateQuestionCssClasses = function (obj, options) {
-        if (!this.isSupportGrouping())
-            return;
-        var question = options.question;
+    PropertyGridEditor.prototype.hasPreviousElementForGrouping = function (question) {
         if (!question || !question.parent)
-            return;
+            return false;
         var index = question.parent.elements.indexOf(question);
         if (index < 1)
             return;
-        if (question.parent.elements[index - 1].getType() !== question.getType())
+        var prevElement = question.parent.elements[index - 1];
+        var prevPrevElement = question.parent.elements[index - 2];
+        if (prevElement.getType() === question.getType())
+            return true;
+        //in case of overriding property
+        if (index > 1 && !prevElement.startWithNewLine && prevPrevElement["property"] === prevElement["property"] && prevPrevElement.getType() === question.getType())
+            return true;
+        return false;
+    };
+    PropertyGridEditor.prototype.onUpdateQuestionCssClasses = function (obj, options) {
+        if (!this.isSupportGrouping())
             return;
-        options.cssClasses.mainRoot += " spg-row-narrow__question";
+        if (this.hasPreviousElementForGrouping(options.question)) {
+            options.cssClasses.mainRoot += " spg-row-narrow__question";
+        }
     };
     return PropertyGridEditor;
 }());
@@ -28546,6 +28686,7 @@ var QuestionConverter = /** @class */ (function () {
         }
         QuestionConverter.updateJSON(json, convertToClass, obj.getType(), defaultJSON);
         newQuestion.fromJSON(json);
+        QuestionConverter.removeValidators(newQuestion);
         var panel = obj.parent;
         var index = panel.elements.indexOf(obj);
         panel.isConverting = true;
@@ -28628,6 +28769,18 @@ var QuestionConverter = /** @class */ (function () {
             delete json.templateElements;
         }
     };
+    QuestionConverter.removeValidators = function (question) {
+        var validators = question.validators;
+        if (!Array.isArray(validators) || validators.length === 0)
+            return;
+        var supported = question.getSupportedValidators();
+        for (var i = validators.length - 1; i >= 0; i--) {
+            var valType = validators[i].getType().replace("validator", "");
+            if (supported.indexOf(valType) < 0) {
+                validators.splice(i, 1);
+            }
+        }
+    };
     QuestionConverter.convertInfo = {};
     return QuestionConverter;
 }());