survey-creator-core 2.0.0-rc.5 → 2.0.0-rc.7

package/survey-creator-core.js

@@ -1,5 +1,5 @@
 /*!
- * SurveyJS Creator v2.0.0-rc.5
+ * SurveyJS Creator v2.0.0-rc.7
  * (c) 2015-2025 Devsoft Baltic OÜ - http://surveyjs.io/
  * Github: https://github.com/surveyjs/survey-creator
  * License: https://surveyjs.io/Licenses#SurveyCreator
@@ -158,8 +158,8 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
                 _this.updateActionsProperties();
             }
         };
+        _this.actionVisibilityCache = {};
         _this.expandCollapseAction = _this.getExpandCollapseAction();
-        _this.createActionContainers();
         _this.attachToUI(surveyElement);
         return _this;
     }
@@ -274,13 +274,12 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    SurveyElementAdornerBase.prototype.createActionContainers = function () {
-        this.actionContainer = this.createActionContainer();
-        this.topActionContainer = new survey_core__WEBPACK_IMPORTED_MODULE_1__.ActionContainer();
-        this.topActionContainer.sizeMode = "small";
+    SurveyElementAdornerBase.prototype.createTopActionContainer = function () {
+        var actionContainer = new survey_core__WEBPACK_IMPORTED_MODULE_1__.ActionContainer();
+        actionContainer.sizeMode = "small";
         if (this.creator.expandCollapseButtonVisibility != "never") {
-            this.topActionContainer.setItems([this.expandCollapseAction]);
-            this.topActionContainer.cssClasses = {
+            actionContainer.setItems([this.expandCollapseAction]);
+            actionContainer.cssClasses = {
                 root: "svc-survey-element-top-toolbar sv-action-bar",
                 item: "svc-survey-element-top-toolbar__item",
                 itemIcon: "svc-survey-element-toolbar-item__icon",
@@ -288,6 +287,7 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
                 itemTitleWithIcon: "svc-survey-element-toolbar-item__title--with-icon",
             };
         }
+        return actionContainer;
     };
     SurveyElementAdornerBase.prototype.createActionContainer = function () {
         var actionContainer = new SurveyElementActionContainer();
@@ -339,6 +339,40 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(SurveyElementAdornerBase.prototype, "isActionContainerCreated", {
+        get: function () {
+            return !!this.actionContainerValue;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(SurveyElementAdornerBase.prototype, "actionContainer", {
+        get: function () {
+            if (!this.actionContainerValue) {
+                this.actionContainerValue = this.createActionContainer();
+                if (this.surveyElement) {
+                    this.updateActionsContainer(this.surveyElement);
+                    this.updateActionsVisibility(false);
+                }
+            }
+            return this.actionContainerValue;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(SurveyElementAdornerBase.prototype, "topActionContainer", {
+        get: function () {
+            if (!this.topActionContainerValue) {
+                this.topActionContainerValue = this.createTopActionContainer();
+                if (this.surveyElement) {
+                    this.updateActionsVisibility(true);
+                }
+            }
+            return this.topActionContainerValue;
+        },
+        enumerable: false,
+        configurable: true
+    });
     SurveyElementAdornerBase.GetAdorner = function (surveyElement) {
         return surveyElement.getPropertyValue(SurveyElementAdornerBase.AdornerValueName);
     };
@@ -415,13 +449,17 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
     };
     SurveyElementAdornerBase.prototype.dispose = function () {
         this.detachFromUI();
-        if (!this.actionContainer.isDisposed) {
-            this.actionContainer.dispose();
-        }
+        this.disposeActions(this.actionContainerValue);
+        this.disposeActions(this.topActionContainerValue);
         _super.prototype.dispose.call(this);
         this.sidebarFlyoutModeChangedFunc = undefined;
         this.animationCollapsed = undefined;
     };
+    SurveyElementAdornerBase.prototype.disposeActions = function (container) {
+        if (!!container && !container.isDisposed) {
+            container.dispose();
+        }
+    };
     SurveyElementAdornerBase.prototype.onElementSelectedChanged = function (isSelected) {
         if (!isSelected)
             return;
@@ -443,19 +481,27 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
         };
     };
     SurveyElementAdornerBase.prototype.cleanActionsContainer = function () {
-        var actions = this.actionContainer.actions;
-        this.actionContainer.setItems([]);
+        var container = this.actionContainerValue;
+        if (!container)
+            return;
+        var actions = container.actions;
+        container.setItems([]);
         actions.forEach(function (action) { return action.dispose && action.dispose(); });
     };
     SurveyElementAdornerBase.prototype.updateActionsContainer = function (surveyElement) {
+        if (!this.actionContainerValue)
+            return;
         var actions = [];
         this.buildActions(actions);
         this.creator.onElementMenuItemsChanged(surveyElement, actions);
-        this.actionContainer.setItems(actions);
+        this.actionContainerValue.setItems(actions);
     };
     SurveyElementAdornerBase.prototype.updateActionsProperties = function () {
         if (this.isDisposed)
             return;
+        this.updateActionsPropertiesCore();
+    };
+    SurveyElementAdornerBase.prototype.updateActionsPropertiesCore = function () {
         this.updateElementAllowOptions(this.creator.getElementAllowOperations(this.surveyElement), this.isOperationsAllow());
     };
     SurveyElementAdornerBase.prototype.getAllowDragging = function (options) {
@@ -484,12 +530,21 @@ var SurveyElementAdornerBase = /** @class */ (function (_super) {
         return !this.creator.readOnly;
     };
     SurveyElementAdornerBase.prototype.updateActionVisibility = function (id, isVisible) {
-        var action = this.getActionById(id);
-        if (!action)
-            return;
-        if (action.visible == isVisible)
-            return;
-        action.visible = isVisible;
+        var _a, _b;
+        var action = ((_a = this.actionContainerValue) === null || _a === void 0 ? void 0 : _a.getActionById(id)) || ((_b = this.topActionContainerValue) === null || _b === void 0 ? void 0 : _b.getActionById(id));
+        if (!action) {
+            this.actionVisibilityCache[id] = isVisible;
+        }
+        else {
+            if (action.visible !== isVisible) {
+                action.visible = isVisible;
+            }
+        }
+    };
+    SurveyElementAdornerBase.prototype.updateActionsVisibility = function (isTop) {
+        for (var key in this.actionVisibilityCache) {
+            this.updateActionVisibility(key, this.actionVisibilityCache[key]);
+        }
     };
     SurveyElementAdornerBase.prototype.getActionById = function (id) {
         return this.actionContainer.getActionById(id) || this.topActionContainer.getActionById(id);
@@ -2146,7 +2201,7 @@ var PageAdorner = /** @class */ (function (_super) {
             }, null, type || _this.currentAddQuestionType || _creator_settings__WEBPACK_IMPORTED_MODULE_5__.settings.designer.defaultAddQuestionType);
         };
         _this.creatorPropertyChanged = function (sender, options) {
-            if (options.name === "isMobileView") {
+            if (options.name === "isMobileView" && _this.isActionContainerCreated) {
                 _this.actionContainer.alwaysShrink = options.newValue;
             }
         };
@@ -2162,7 +2217,6 @@ var PageAdorner = /** @class */ (function (_super) {
             _this.creator.survey.currentPage = _this.page;
         });
         _this.dragOrClickHelper = new survey_core__WEBPACK_IMPORTED_MODULE_1__.DragOrClickHelper(_this.startDragSurveyElement);
-        _this.actionContainer.alwaysShrink = _this.creator.isMobileView;
         _this.creator.onPropertyChanged.add(_this.creatorPropertyChanged);
         return _this;
     }
@@ -2297,8 +2351,21 @@ var PageAdorner = /** @class */ (function (_super) {
     });
     PageAdorner.prototype.createActionContainer = function () {
         var container = _super.prototype.createActionContainer.call(this);
+        container.alwaysShrink = this.creator.isMobileView;
         container.sizeMode = "small";
-        container.cssClasses = {
+        container.cssClasses = this.containerCssClasses();
+        container.dotsItem.iconSize = "auto";
+        container.dotsItem.cssClasses.itemIcon += " svc-page-toolbar-item__icon";
+        return container;
+    };
+    PageAdorner.prototype.createTopActionContainer = function () {
+        var container = _super.prototype.createTopActionContainer.call(this);
+        container.cssClasses = (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__assign)({}, this.containerCssClasses());
+        container.cssClasses.root += " svc-page-toolbar--collapse";
+        return container;
+    };
+    PageAdorner.prototype.containerCssClasses = function () {
+        return {
             root: "svc-page-toolbar sv-action-bar",
             item: "svc-page-toolbar__item",
             itemWithTitle: "svc-page-toolbar__item--with-text",
@@ -2308,14 +2375,6 @@ var PageAdorner = /** @class */ (function (_super) {
             itemTitle: "svc-page-toolbar-item__title",
             itemTitleWithIcon: "svc-page-toolbar-item__title--with-icon",
         };
-        container.dotsItem.iconSize = "auto";
-        container.dotsItem.cssClasses.itemIcon += " svc-page-toolbar-item__icon";
-        return container;
-    };
-    PageAdorner.prototype.createActionContainers = function () {
-        _super.prototype.createActionContainers.call(this);
-        this.topActionContainer.cssClasses = (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__assign)({}, this.actionContainer.cssClasses);
-        this.topActionContainer.cssClasses.root += " svc-page-toolbar--collapse";
     };
     PageAdorner.prototype.allowExpandCollapseByDblClick = function (element) {
         return element.classList.contains("svc-page__content") ||
@@ -3096,14 +3155,9 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
         var _this = _super.call(this, creator, surveyElement) || this;
         _this.templateData = templateData;
         _this.startDragSurveyElement = function (event) {
-            var _a;
             var element = _this.surveyElement;
             var isElementSelected = _this.creator.selectedElement === element;
             _this.dragDropHelper.startDragSurveyElement(event, element, isElementSelected);
-            if (!!element && _this.creator.collapseOnDrag) {
-                (_a = _this.creator.designerStateManager) === null || _a === void 0 ? void 0 : _a.suspend();
-                _this.creator.collapseAllPagesOnDragStart(element);
-            }
             return true;
         };
         _this.addNewQuestion = function () {
@@ -3372,8 +3426,10 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
         _super.prototype.attachElement.call(this, surveyElement);
         if (surveyElement) {
             surveyElement.registerFunctionOnPropertyValueChanged("isRequired", function (newValue) {
-                var requiredAction = _this.actionContainer.getActionById("isrequired");
-                _this.updateRequiredAction(requiredAction);
+                if (_this.isActionContainerCreated) {
+                    var requiredAction = _this.actionContainer.getActionById("isrequired");
+                    _this.updateRequiredAction(requiredAction);
+                }
             }, "isRequiredAdorner");
         }
     };
@@ -3400,8 +3456,8 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
         }
         _super.prototype.hover.call(this, event, element);
     };
-    QuestionAdornerViewModel.prototype.createActionContainers = function () {
-        _super.prototype.createActionContainers.call(this);
+    QuestionAdornerViewModel.prototype.createActionContainer = function () {
+        var actionContainer = _super.prototype.createActionContainer.call(this);
         var defaultCssClasses = {
             root: "svc-survey-element-toolbar sv-action-bar",
             item: "svc-survey-element-toolbar__item",
@@ -3413,22 +3469,25 @@ var QuestionAdornerViewModel = /** @class */ (function (_super) {
             itemTitle: "svc-survey-element-toolbar-item__title",
             itemTitleWithIcon: "svc-survey-element-toolbar-item__title--with-icon",
         };
-        this.actionContainer.sizeMode = "small";
-        this.actionContainer.cssClasses = defaultCssClasses;
-        this.actionContainer.dotsItem.css += " svc-survey-element-toolbar__dots-item";
-        this.actionContainer.dotsItem.innerCss += " svc-survey-element-toolbar__item";
+        actionContainer.sizeMode = "small";
+        actionContainer.cssClasses = defaultCssClasses;
+        actionContainer.dotsItem.css += " svc-survey-element-toolbar__dots-item";
+        actionContainer.dotsItem.innerCss += " svc-survey-element-toolbar__item";
+        return actionContainer;
     };
-    QuestionAdornerViewModel.prototype.getActionById = function (id) {
-        var res = _super.prototype.getActionById.call(this, id);
-        if (!res) {
-            res = this.topActionContainer.getActionById(id);
+    QuestionAdornerViewModel.prototype.updateActionsPropertiesCore = function () {
+        _super.prototype.updateActionsPropertiesCore.call(this);
+        if (this.isActionContainerCreated) {
+            this.updateActionsLocations();
         }
-        return res;
     };
-    QuestionAdornerViewModel.prototype.updateActionsProperties = function () {
-        if (this.isDisposed)
-            return;
-        _super.prototype.updateActionsProperties.call(this);
+    QuestionAdornerViewModel.prototype.updateActionsVisibility = function (isTop) {
+        _super.prototype.updateActionsVisibility.call(this, isTop);
+        if (!isTop) {
+            this.updateActionsLocations();
+        }
+    };
+    QuestionAdornerViewModel.prototype.updateActionsLocations = function () {
         var actions = this.actionContainer.visibleActions;
         var switchToStartLocation = false;
         for (var i = actions.length - 1; i >= 0; i--) {
@@ -6171,10 +6230,10 @@ var TabDesignerPlugin = /** @class */ (function () {
         this.showOneCategoryInPropertyGrid = creator.showOneCategoryInPropertyGrid;
         this.propertyGrid.showOneCategoryInPropertyGrid = this.showOneCategoryInPropertyGrid;
         this.propertyGrid.obj = creator.survey;
-        this.propertyGrid.onSetNewObjectCallback = function () {
+        this.propertyGridViewModel = new _property_grid_property_grid_view_model__WEBPACK_IMPORTED_MODULE_3__.PropertyGridViewModel(this.propertyGrid, creator);
+        this.propertyGridViewModel.onNewSurveyCreatedCallback = function () {
             _this.updateTabControlActions();
         };
-        this.propertyGridViewModel = new _property_grid_property_grid_view_model__WEBPACK_IMPORTED_MODULE_3__.PropertyGridViewModel(this.propertyGrid, creator);
         this.propertyGridPlaceholderPage = this.creator.sidebar.addPage("propertyGridPlaceholder", "svc-property-grid-placeholder", this.propertyGridViewModel);
         this.propertyGridPlaceholderPage.caption = _editorLocalization__WEBPACK_IMPORTED_MODULE_9__.editorLocalization.getString("ed.surveySettings");
         this.propertyGridTab = this.creator.sidebar.addPage("propertyGrid", "svc-property-grid", this.propertyGridViewModel, function () {
@@ -6270,7 +6329,6 @@ var TabDesignerPlugin = /** @class */ (function () {
     };
     TabDesignerPlugin.prototype.updateTabControl = function () {
         if (this.showOneCategoryInPropertyGrid) {
-            this.updateTabControlActions();
             this.creator.sidebar.sideAreaComponentName = "svc-tab-control";
             this.creator.sidebar.sideAreaComponentData = this.tabControlModel;
         }
@@ -6349,11 +6407,6 @@ var TabDesignerPlugin = /** @class */ (function () {
         if (this.creator.showCreatorThemeSettings) {
             this.themeModel.loadTheme(this.creator.creatorTheme);
             this.themePropertyGrid.obj = this.themeModel;
-            this.themePropertyGrid.survey.onUpdatePanelCssClasses.add(function (_, options) {
-                options.cssClasses.panel.container += " spg-panel--group";
-            });
-            this.updateThemeChooserChoices();
-            this.updatePredefinedColorChoices();
         }
     };
     TabDesignerPlugin.prototype.setTheme = function () {
@@ -6361,21 +6414,16 @@ var TabDesignerPlugin = /** @class */ (function () {
             this.themeModel.setTheme(this.creator.creatorTheme);
         }
     };
-    TabDesignerPlugin.prototype.updateThemeChooserChoices = function () {
-        var themeChooser = this.themePropertyGrid.survey.getQuestionByName("themeName");
-        if (!!themeChooser) {
-            themeChooser.choices = _creator_theme_creator_themes__WEBPACK_IMPORTED_MODULE_12__.PredefinedCreatorThemes.map(function (theme) { return ({ value: theme, text: (0,_editorLocalization__WEBPACK_IMPORTED_MODULE_9__.getLocString)("creatortheme.names." + theme) }); });
-        }
-        this.themePropertyGrid.survey.runExpressions();
-    };
     TabDesignerPlugin.prototype.createCreatorThemeSettingsPage = function (creator) {
         var _this = this;
         this.themeModel = new _creator_theme_creator_theme_model__WEBPACK_IMPORTED_MODULE_11__.CreatorThemeModel();
         this.themePropertyGrid = new _property_grid__WEBPACK_IMPORTED_MODULE_2__.PropertyGridModel(undefined, creator, _creator_theme_creator_theme_model_definition__WEBPACK_IMPORTED_MODULE_10__.creatorThemeModelPropertyGridDefinition);
-        this.themePropertyGrid.survey.css.root += "svc-creator-theme-settings";
         this.themePropertyGrid.showOneCategoryInPropertyGrid = true;
         this.themePropertyGrid.surveyInstanceCreatedArea = "designer-tab:creator-settings";
         var themePropertyGridViewModel = new _property_grid_property_grid_view_model__WEBPACK_IMPORTED_MODULE_3__.PropertyGridViewModel(this.themePropertyGrid, creator);
+        themePropertyGridViewModel.onNewSurveyCreatedCallback = function () {
+            _this.onThemePropertyGridSurveyCreated();
+        };
         themePropertyGridViewModel.searchEnabled = false;
         this.themePropertyGridTab = this.creator.sidebar.addPage("creatorTheme", "svc-property-grid", themePropertyGridViewModel);
         this.themePropertyGridTab.caption = _editorLocalization__WEBPACK_IMPORTED_MODULE_9__.editorLocalization.getString("ed.creatorSettingTitle");
@@ -6413,6 +6461,19 @@ var TabDesignerPlugin = /** @class */ (function () {
         });
         this.tabControlModel.bottomToolbar.setItems([settingsAction]);
     };
+    TabDesignerPlugin.prototype.onThemePropertyGridSurveyCreated = function () {
+        var survey = this.themePropertyGrid.survey;
+        survey.css.root += " svc-creator-theme-settings";
+        survey.onUpdatePanelCssClasses.add(function (_, options) {
+            options.cssClasses.panel.container += " spg-panel--group";
+        });
+        var themeChooser = survey.getQuestionByName("themeName");
+        if (!!themeChooser) {
+            themeChooser.choices = _creator_theme_creator_themes__WEBPACK_IMPORTED_MODULE_12__.PredefinedCreatorThemes.map(function (theme) { return ({ value: theme, text: (0,_editorLocalization__WEBPACK_IMPORTED_MODULE_9__.getLocString)("creatortheme.names." + theme) }); });
+        }
+        survey.runExpressions();
+        this.updatePredefinedColorChoices();
+    };
     TabDesignerPlugin.prototype.updateTabControlActions = function () {
         var _this = this;
         var _a;
@@ -12395,6 +12456,11 @@ var PreviewViewModel = /** @class */ (function (_super) {
         this.updatePageList();
         this.show();
     };
+    PreviewViewModel.prototype.isSurveyRunning = function () {
+        var _a;
+        var state = (_a = this.survey) === null || _a === void 0 ? void 0 : _a.state;
+        return state === "running" || state === "starting";
+    };
     PreviewViewModel.prototype.buildActions = function () {
         var _this = this;
         var pageActions = [];
@@ -12416,7 +12482,7 @@ var PreviewViewModel = /** @class */ (function (_super) {
         };
         if (this.prevPageAction) {
             this.prevPageAction.visible = new survey_core__WEBPACK_IMPORTED_MODULE_2__.ComputedUpdater(function () {
-                var isRunning = _this.survey.state === "running";
+                var isRunning = _this.isSurveyRunning();
                 var isActiveTab = _this.getTabName() === _this.surveyProvider.activeTab;
                 return (0,_utils_utils__WEBPACK_IMPORTED_MODULE_4__.notShortCircuitAnd)(_this.isRunning, isActiveTab, _this.pageListItems.length > 1) && isRunning;
             });
@@ -12448,11 +12514,11 @@ var PreviewViewModel = /** @class */ (function (_super) {
         });
         pageActions.push(this.selectPageAction);
         this.selectPageAction.visible = new survey_core__WEBPACK_IMPORTED_MODULE_2__.ComputedUpdater(function () {
-            return _this.survey.state === "running";
+            return _this.isSurveyRunning();
         });
         if (this.nextPageAction) {
             this.nextPageAction.visible = new survey_core__WEBPACK_IMPORTED_MODULE_2__.ComputedUpdater(function () {
-                var isRunning = _this.survey.state === "running";
+                var isRunning = _this.isSurveyRunning();
                 var isActiveTab = _this.getTabName() === _this.surveyProvider.activeTab;
                 return (0,_utils_utils__WEBPACK_IMPORTED_MODULE_4__.notShortCircuitAnd)(_this.isRunning, isActiveTab, _this.pageListItems.length > 1) && isRunning;
             });
@@ -19398,9 +19464,9 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
         /**
          * Specifies whether to collapse pages on the design surface when users start dragging a survey element.
          *
-         * Default value: `true`
+         * Default value: `false`
          */
-        _this.collapseOnDrag = true;
+        _this.collapseOnDrag = false;
         if (!!options2 ||
             typeof _this.options === "string" ||
             _this.options instanceof String) {
@@ -20794,6 +20860,9 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
      */
     SurveyCreatorModel.prototype.initSurveyWithJSON = function (json, clearState) {
         var _this = this;
+        if (!json) {
+            json = { "headerView": "advanced" };
+        }
         this.existingPages = {};
         var survey = this.createSurvey({}, "designer", undefined, function (survey) {
             survey.skeletonHeight = 188;
@@ -20857,7 +20926,7 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
             var _a;
             var element = sender.draggedElement;
             isDraggedFromToolbox = !element.parent && !element.isPage;
-            if (!!element && element.isPage && _this.collapseOnDrag) {
+            if (!!element && (element.isPage || _this.collapseOnDrag)) {
                 (_a = _this.designerStateManager) === null || _a === void 0 ? void 0 : _a.suspend();
                 _this.collapseAllPagesOnDragStart(element);
             }
@@ -20879,7 +20948,7 @@ var SurveyCreatorModel = /** @class */ (function (_super) {
             var _a;
             isDraggedFromToolbox = false;
             _this.stopUndoRedoTransaction();
-            if (!!options.draggedElement && _this.collapseOnDrag) {
+            if (!!options.draggedElement && (options.draggedElement.isPage || _this.collapseOnDrag)) {
                 (_a = _this.designerStateManager) === null || _a === void 0 ? void 0 : _a.release();
                 _this.restoreElementsState();
             }
@@ -37402,8 +37471,10 @@ var PropertyGridModel = /** @class */ (function () {
         }
     };
     PropertyGridModel.prototype.setObj = function (value) {
-        var _this = this;
         this.objValue = value;
+        if (this.onSetNewObjectCallback) {
+            this.onSetNewObjectCallback();
+        }
         this.classNameProperty = !!this.obj
             ? PropertyJSONGenerator.getClassNameProperty(this.obj)
             : "";
@@ -37413,24 +37484,34 @@ var PropertyGridModel = /** @class */ (function () {
         this.titleActionsCreator = !!this.obj
             ? new PropertyGridTitleActionsCreator(this.obj, this.options)
             : undefined;
+        if (!this.surveyValue)
+            return;
+        this.clearSurveyValue();
+        this.createSurveyValue();
+    };
+    PropertyGridModel.prototype.clearSurveyValue = function () {
+        this.surveyValue.onValidateQuestion.clear();
+        this.surveyValue.onValueChanging.clear();
+        this.surveyValue.onValueChanged.clear();
+        this.surveyValue.onMatrixCellValueChanging.clear();
+        this.surveyValue.onMatrixCellValidate.clear();
+        this.surveyValue.onMatrixCellValueChanged.clear();
+        this.surveyValue.editingObj = undefined;
+        this.surveyValue.data = {};
+        this.surveyValue.dispose();
+    };
+    PropertyGridModel.prototype.createSurveyValue = function () {
+        var _this = this;
         var json = this.getSurveyJSON();
         if (this.options.readOnly) {
             json.mode = "display";
         }
-        if (!!this.surveyValue) {
-            this.surveyValue.onValidateQuestion.clear();
-            this.surveyValue.onValueChanging.clear();
-            this.surveyValue.onValueChanged.clear();
-            this.surveyValue.onMatrixCellValueChanging.clear();
-            this.surveyValue.onMatrixCellValidate.clear();
-            this.surveyValue.onMatrixCellValueChanged.clear();
-            this.surveyValue.editingObj = undefined;
-            this.surveyValue.data = {};
-            this.surveyValue.dispose();
-        }
         this.surveyValue = this.createSurvey(json, function (survey) {
             _this.onCreateSurvey(survey);
         });
+        if (this.onNewSurveyCreatedCallback) {
+            this.onNewSurveyCreatedCallback();
+        }
         if (!this.obj)
             return;
         this.survey.onValueChanged.add(function (sender, options) {
@@ -37497,9 +37578,6 @@ var PropertyGridModel = /** @class */ (function () {
             }
         });
         this.survey.editingObj = this.obj;
-        if (this.objValueChangedCallback) {
-            this.objValueChangedCallback();
-        }
         this.updateDependedPropertiesEditors();
         if (this.showOneCategoryInPropertyGrid) {
             this.survey.onCurrentPageChanged.add(function (sender, options) {
@@ -37613,6 +37691,9 @@ var PropertyGridModel = /** @class */ (function () {
     });
     Object.defineProperty(PropertyGridModel.prototype, "survey", {
         get: function () {
+            if (!this.surveyValue) {
+                this.createSurveyValue();
+            }
             return this.surveyValue;
         },
         enumerable: false,
@@ -37658,6 +37739,8 @@ var PropertyGridModel = /** @class */ (function () {
         });
     };
     PropertyGridModel.prototype.expandCategoryIfNeeded = function () {
+        if (!this.surveyValue)
+            return;
         var expandedTabName = _creator_settings__WEBPACK_IMPORTED_MODULE_6__.settings.propertyGrid.defaultExpandedTabName;
         if (!!expandedTabName && !this.getPropertyGridExpandedCategory()) {
             var panel = this.survey.getPanelByName(expandedTabName);
@@ -37752,9 +37835,6 @@ var PropertyGridModel = /** @class */ (function () {
             options.name === this.classNameProperty &&
             this.classNameValue !== options.value) {
             this.setObj(this.obj);
-            if (this.onSetNewObjectCallback) {
-                this.onSetNewObjectCallback();
-            }
             if (!!this.survey) {
                 var question = this.survey.getQuestionByName(options.name);
                 if (!!question) {
@@ -39988,8 +40068,11 @@ var PropertyGridViewModel = /** @class */ (function (_super) {
         _this.searchManager = new _search_manager__WEBPACK_IMPORTED_MODULE_6__.SearchManagerPropertyGrid();
         _this.searchEnabled = _creator_settings__WEBPACK_IMPORTED_MODULE_4__.settings.propertyGrid.enableSearch;
         _this.selectedElementName = _this.getTitle();
-        _this.propertyGridModel.objValueChangedCallback = function () {
-            _this.onSurveyChanged();
+        _this.propertyGridModel.onSetNewObjectCallback = function () {
+            _this.onSurveyObjChanged();
+        };
+        _this.propertyGridModel.onNewSurveyCreatedCallback = function () {
+            _this.onNewSurveyCreated();
         };
         _this.propertyGridModel.changedFromActionCallback = function (obj, propertyName) {
             if (!!_this.selectionController) {
@@ -40002,9 +40085,20 @@ var PropertyGridViewModel = /** @class */ (function (_super) {
                 _this.selectorPopupModel.horizontalPosition = _this.creator.sidebarLocation == "right" ? "left" : "right";
             }
         });
-        _this.onSurveyChanged();
+        _this.onSurveyObjChanged();
         return _this;
     }
+    Object.defineProperty(PropertyGridViewModel.prototype, "survey", {
+        get: function () {
+            var _this = this;
+            return this.getPropertyValue("survey", undefined, function () { return _this.propertyGridModel.survey; });
+        },
+        set: function (val) {
+            this.setPropertyValue("survey", val);
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(PropertyGridViewModel.prototype, "rootCss", {
         get: function () {
             return new survey_core__WEBPACK_IMPORTED_MODULE_1__.CssClassBuilder()
@@ -40031,7 +40125,14 @@ var PropertyGridViewModel = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    PropertyGridViewModel.prototype.onSurveyChanged = function () {
+    PropertyGridViewModel.prototype.onSurveyObjChanged = function () {
+        this.updateTitle();
+        if (this.selectionController) {
+            this.hasPrev = this.selectionController.hasPrev;
+            this.hasNext = this.selectionController.hasNext;
+        }
+    };
+    PropertyGridViewModel.prototype.onNewSurveyCreated = function () {
         var _this = this;
         this.survey = this.propertyGridModel.survey;
         this.searchManager.setSurvey(this.survey);
@@ -40042,10 +40143,8 @@ var PropertyGridViewModel = /** @class */ (function (_super) {
                 }
             });
         }
-        this.updateTitle();
-        if (this.selectionController) {
-            this.hasPrev = this.selectionController.hasPrev;
-            this.hasNext = this.selectionController.hasNext;
+        if (this.onNewSurveyCreatedCallback) {
+            this.onNewSurveyCreatedCallback();
         }
     };
     PropertyGridViewModel.prototype.updateTitle = function () {
@@ -40146,9 +40245,6 @@ var PropertyGridViewModel = /** @class */ (function (_super) {
     (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__decorate)([
         (0,survey_core__WEBPACK_IMPORTED_MODULE_1__.property)()
     ], PropertyGridViewModel.prototype, "hasNext", void 0);
-    (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__decorate)([
-        (0,survey_core__WEBPACK_IMPORTED_MODULE_1__.property)()
-    ], PropertyGridViewModel.prototype, "survey", void 0);
     (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__decorate)([
         (0,survey_core__WEBPACK_IMPORTED_MODULE_1__.property)()
     ], PropertyGridViewModel.prototype, "selectedElementName", void 0);
@@ -47031,7 +47127,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(/*! survey-core */ "survey-core");
 /* harmony import */ var survey_core__WEBPACK_IMPORTED_MODULE_100___default = /*#__PURE__*/__webpack_require__.n(survey_core__WEBPACK_IMPORTED_MODULE_100__);
 var Version;
-Version = "".concat("2.0.0-rc.5");
+Version = "".concat("2.0.0-rc.7");
 //should be loaded before other styles for easier override 
 __webpack_require__(/*! ../utils/context-button.scss */ "./src/utils/context-button.scss");
 
@@ -47155,7 +47251,7 @@ __webpack_require__(/*! ../property-grid-theme/property-grid.scss */ "./src/prop
 __webpack_require__(/*! ../utils/layout.scss */ "./src/utils/layout.scss");
 __webpack_require__(/*! ../custom-questions/boolean-switch.scss */ "./src/custom-questions/boolean-switch.scss");
 
-(0,survey_core__WEBPACK_IMPORTED_MODULE_100__.checkLibraryVersion)("".concat("2.0.0-rc.5"), "survey-creator-core");
+(0,survey_core__WEBPACK_IMPORTED_MODULE_100__.checkLibraryVersion)("".concat("2.0.0-rc.7"), "survey-creator-core");
 
 })();