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

package/fesm/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
@@ -13466,6 +13466,11 @@ class PreviewViewModel extends external_survey_core_namespaceObject.Base {
         this.updatePageList();
         this.show();
     }
+    isSurveyRunning() {
+        var _a;
+        const state = (_a = this.survey) === null || _a === void 0 ? void 0 : _a.state;
+        return state === "running" || state === "starting";
+    }
     buildActions() {
         const pageActions = [];
         const setNearPage = (isNext) => {
@@ -13486,7 +13491,7 @@ class PreviewViewModel extends external_survey_core_namespaceObject.Base {
         };
         if (this.prevPageAction) {
             this.prevPageAction.visible = new external_survey_core_namespaceObject.ComputedUpdater(() => {
-                const isRunning = this.survey.state === "running";
+                const isRunning = this.isSurveyRunning();
                 const isActiveTab = this.getTabName() === this.surveyProvider.activeTab;
                 return notShortCircuitAnd(this.isRunning, isActiveTab, this.pageListItems.length > 1) && isRunning;
             });
@@ -13518,11 +13523,11 @@ class PreviewViewModel extends external_survey_core_namespaceObject.Base {
         });
         pageActions.push(this.selectPageAction);
         this.selectPageAction.visible = new external_survey_core_namespaceObject.ComputedUpdater(() => {
-            return this.survey.state === "running";
+            return this.isSurveyRunning();
         });
         if (this.nextPageAction) {
             this.nextPageAction.visible = new external_survey_core_namespaceObject.ComputedUpdater(() => {
-                const isRunning = this.survey.state === "running";
+                const isRunning = this.isSurveyRunning();
                 const isActiveTab = this.getTabName() === this.surveyProvider.activeTab;
                 return notShortCircuitAnd(this.isRunning, isActiveTab, this.pageListItems.length > 1) && isRunning;
             });
@@ -18258,6 +18263,9 @@ class PropertyGridModel {
     }
     setObj(value) {
         this.objValue = value;
+        if (this.onSetNewObjectCallback) {
+            this.onSetNewObjectCallback();
+        }
         this.classNameProperty = !!this.obj
             ? PropertyJSONGenerator.getClassNameProperty(this.obj)
             : "";
@@ -18267,24 +18275,33 @@ class PropertyGridModel {
         this.titleActionsCreator = !!this.obj
             ? new PropertyGridTitleActionsCreator(this.obj, this.options)
             : undefined;
-        var json = this.getSurveyJSON();
+        if (!this.surveyValue)
+            return;
+        this.clearSurveyValue();
+        this.createSurveyValue();
+    }
+    clearSurveyValue() {
+        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();
+    }
+    createSurveyValue() {
+        const 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, (survey) => {
             this.onCreateSurvey(survey);
         });
+        if (this.onNewSurveyCreatedCallback) {
+            this.onNewSurveyCreatedCallback();
+        }
         if (!this.obj)
             return;
         this.survey.onValueChanged.add((sender, options) => {
@@ -18351,9 +18368,6 @@ class PropertyGridModel {
             }
         });
         this.survey.editingObj = this.obj;
-        if (this.objValueChangedCallback) {
-            this.objValueChangedCallback();
-        }
         this.updateDependedPropertiesEditors();
         if (this.showOneCategoryInPropertyGrid) {
             this.survey.onCurrentPageChanged.add((sender, options) => {
@@ -18461,6 +18475,9 @@ class PropertyGridModel {
         this.optionsValue = !!val ? val : new EmptySurveyCreatorOptions();
     }
     get survey() {
+        if (!this.surveyValue) {
+            this.createSurveyValue();
+        }
         return this.surveyValue;
     }
     validate() {
@@ -18503,6 +18520,8 @@ class PropertyGridModel {
         });
     }
     expandCategoryIfNeeded() {
+        if (!this.surveyValue)
+            return;
         const expandedTabName = settings.propertyGrid.defaultExpandedTabName;
         if (!!expandedTabName && !this.getPropertyGridExpandedCategory()) {
             const panel = this.survey.getPanelByName(expandedTabName);
@@ -18596,9 +18615,6 @@ class PropertyGridModel {
             options.name === this.classNameProperty &&
             this.classNameValue !== options.value) {
             this.setObj(this.obj);
-            if (this.onSetNewObjectCallback) {
-                this.onSetNewObjectCallback();
-            }
             if (!!this.survey) {
                 const question = this.survey.getQuestionByName(options.name);
                 if (!!question) {
@@ -20461,13 +20477,12 @@ class SurveyElementAdornerBase extends external_survey_core_namespaceObject.Base
     get renderedCollapsed() {
         return !!this._renderedCollapsed;
     }
-    createActionContainers() {
-        this.actionContainer = this.createActionContainer();
-        this.topActionContainer = new external_survey_core_namespaceObject.ActionContainer();
-        this.topActionContainer.sizeMode = "small";
+    createTopActionContainer() {
+        const actionContainer = new external_survey_core_namespaceObject.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",
@@ -20475,6 +20490,7 @@ class SurveyElementAdornerBase extends external_survey_core_namespaceObject.Base
                 itemTitleWithIcon: "svc-survey-element-toolbar-item__title--with-icon",
             };
         }
+        return actionContainer;
     }
     createActionContainer() {
         const actionContainer = new SurveyElementActionContainer();
@@ -20535,10 +20551,32 @@ class SurveyElementAdornerBase extends external_survey_core_namespaceObject.Base
                 this.updateActionsProperties();
             }
         };
+        this.actionVisibilityCache = {};
         this.expandCollapseAction = this.getExpandCollapseAction();
-        this.createActionContainers();
         this.attachToUI(surveyElement);
     }
+    get isActionContainerCreated() {
+        return !!this.actionContainerValue;
+    }
+    get actionContainer() {
+        if (!this.actionContainerValue) {
+            this.actionContainerValue = this.createActionContainer();
+            if (this.surveyElement) {
+                this.updateActionsContainer(this.surveyElement);
+                this.updateActionsVisibility(false);
+            }
+        }
+        return this.actionContainerValue;
+    }
+    get topActionContainer() {
+        if (!this.topActionContainerValue) {
+            this.topActionContainerValue = this.createTopActionContainer();
+            if (this.surveyElement) {
+                this.updateActionsVisibility(true);
+            }
+        }
+        return this.topActionContainerValue;
+    }
     static GetAdorner(surveyElement) {
         return surveyElement.getPropertyValue(SurveyElementAdornerBase.AdornerValueName);
     }
@@ -20614,13 +20652,17 @@ class SurveyElementAdornerBase extends external_survey_core_namespaceObject.Base
     }
     dispose() {
         this.detachFromUI();
-        if (!this.actionContainer.isDisposed) {
-            this.actionContainer.dispose();
-        }
+        this.disposeActions(this.actionContainerValue);
+        this.disposeActions(this.topActionContainerValue);
         super.dispose();
         this.sidebarFlyoutModeChangedFunc = undefined;
         this.animationCollapsed = undefined;
     }
+    disposeActions(container) {
+        if (!!container && !container.isDisposed) {
+            container.dispose();
+        }
+    }
     onElementSelectedChanged(isSelected) {
         if (!isSelected)
             return;
@@ -20641,19 +20683,27 @@ class SurveyElementAdornerBase extends external_survey_core_namespaceObject.Base
         };
     }
     cleanActionsContainer() {
-        const actions = this.actionContainer.actions;
-        this.actionContainer.setItems([]);
+        const container = this.actionContainerValue;
+        if (!container)
+            return;
+        const actions = container.actions;
+        container.setItems([]);
         actions.forEach(action => action.dispose && action.dispose());
     }
     updateActionsContainer(surveyElement) {
+        if (!this.actionContainerValue)
+            return;
         const actions = [];
         this.buildActions(actions);
         this.creator.onElementMenuItemsChanged(surveyElement, actions);
-        this.actionContainer.setItems(actions);
+        this.actionContainerValue.setItems(actions);
     }
     updateActionsProperties() {
         if (this.isDisposed)
             return;
+        this.updateActionsPropertiesCore();
+    }
+    updateActionsPropertiesCore() {
         this.updateElementAllowOptions(this.creator.getElementAllowOperations(this.surveyElement), this.isOperationsAllow());
     }
     getAllowDragging(options) {
@@ -20682,12 +20732,21 @@ class SurveyElementAdornerBase extends external_survey_core_namespaceObject.Base
         return !this.creator.readOnly;
     }
     updateActionVisibility(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;
+            }
+        }
+    }
+    updateActionsVisibility(isTop) {
+        for (var key in this.actionVisibilityCache) {
+            this.updateActionVisibility(key, this.actionVisibilityCache[key]);
+        }
     }
     getActionById(id) {
         return this.actionContainer.getActionById(id) || this.topActionContainer.getActionById(id);
@@ -26277,8 +26336,11 @@ class PropertyGridViewModel extends external_survey_core_namespaceObject.Base {
         this.searchManager = new SearchManagerPropertyGrid();
         this.searchEnabled = settings.propertyGrid.enableSearch;
         this.selectedElementName = this.getTitle();
-        this.propertyGridModel.objValueChangedCallback = () => {
-            this.onSurveyChanged();
+        this.propertyGridModel.onSetNewObjectCallback = () => {
+            this.onSurveyObjChanged();
+        };
+        this.propertyGridModel.onNewSurveyCreatedCallback = () => {
+            this.onNewSurveyCreated();
         };
         this.propertyGridModel.changedFromActionCallback = (obj, propertyName) => {
             if (!!this.selectionController) {
@@ -26291,7 +26353,13 @@ class PropertyGridViewModel extends external_survey_core_namespaceObject.Base {
                 this.selectorPopupModel.horizontalPosition = this.creator.sidebarLocation == "right" ? "left" : "right";
             }
         });
-        this.onSurveyChanged();
+        this.onSurveyObjChanged();
+    }
+    get survey() {
+        return this.getPropertyValue("survey", undefined, () => this.propertyGridModel.survey);
+    }
+    set survey(val) {
+        this.setPropertyValue("survey", val);
     }
     get rootCss() {
         return new external_survey_core_namespaceObject.CssClassBuilder()
@@ -26311,7 +26379,14 @@ class PropertyGridViewModel extends external_survey_core_namespaceObject.Base {
     get selectionController() {
         return this.creator.selectionHistoryController;
     }
-    onSurveyChanged() {
+    onSurveyObjChanged() {
+        this.updateTitle();
+        if (this.selectionController) {
+            this.hasPrev = this.selectionController.hasPrev;
+            this.hasNext = this.selectionController.hasNext;
+        }
+    }
+    onNewSurveyCreated() {
         this.survey = this.propertyGridModel.survey;
         this.searchManager.setSurvey(this.survey);
         if (!!this.survey) {
@@ -26321,10 +26396,8 @@ class PropertyGridViewModel extends external_survey_core_namespaceObject.Base {
                 }
             });
         }
-        this.updateTitle();
-        if (this.selectionController) {
-            this.hasPrev = this.selectionController.hasPrev;
-            this.hasNext = this.selectionController.hasNext;
+        if (this.onNewSurveyCreatedCallback) {
+            this.onNewSurveyCreatedCallback();
         }
     }
     updateTitle() {
@@ -26424,9 +26497,6 @@ __decorate([
 __decorate([
     (0,external_survey_core_namespaceObject.property)()
 ], PropertyGridViewModel.prototype, "hasNext", void 0);
-__decorate([
-    (0,external_survey_core_namespaceObject.property)()
-], PropertyGridViewModel.prototype, "survey", void 0);
 __decorate([
     (0,external_survey_core_namespaceObject.property)()
 ], PropertyGridViewModel.prototype, "selectedElementName", void 0);
@@ -27691,7 +27761,6 @@ class TabDesignerPlugin {
     }
     updateTabControl() {
         if (this.showOneCategoryInPropertyGrid) {
-            this.updateTabControlActions();
             this.creator.sidebar.sideAreaComponentName = "svc-tab-control";
             this.creator.sidebar.sideAreaComponentData = this.tabControlModel;
         }
@@ -27765,11 +27834,6 @@ class TabDesignerPlugin {
         if (this.creator.showCreatorThemeSettings) {
             this.themeModel.loadTheme(this.creator.creatorTheme);
             this.themePropertyGrid.obj = this.themeModel;
-            this.themePropertyGrid.survey.onUpdatePanelCssClasses.add((_, options) => {
-                options.cssClasses.panel.container += " spg-panel--group";
-            });
-            this.updateThemeChooserChoices();
-            this.updatePredefinedColorChoices();
         }
     }
     setTheme() {
@@ -27777,20 +27841,15 @@ class TabDesignerPlugin {
             this.themeModel.setTheme(this.creator.creatorTheme);
         }
     }
-    updateThemeChooserChoices() {
-        const themeChooser = this.themePropertyGrid.survey.getQuestionByName("themeName");
-        if (!!themeChooser) {
-            themeChooser.choices = PredefinedCreatorThemes.map(theme => ({ value: theme, text: getLocString("creatortheme.names." + theme) }));
-        }
-        this.themePropertyGrid.survey.runExpressions();
-    }
     createCreatorThemeSettingsPage(creator) {
         this.themeModel = new CreatorThemeModel();
         this.themePropertyGrid = new PropertyGridModel(undefined, creator, creatorThemeModelPropertyGridDefinition);
-        this.themePropertyGrid.survey.css.root += "svc-creator-theme-settings";
         this.themePropertyGrid.showOneCategoryInPropertyGrid = true;
         this.themePropertyGrid.surveyInstanceCreatedArea = "designer-tab:creator-settings";
         const themePropertyGridViewModel = new PropertyGridViewModel(this.themePropertyGrid, creator);
+        themePropertyGridViewModel.onNewSurveyCreatedCallback = () => {
+            this.onThemePropertyGridSurveyCreated();
+        };
         themePropertyGridViewModel.searchEnabled = false;
         this.themePropertyGridTab = this.creator.sidebar.addPage("creatorTheme", "svc-property-grid", themePropertyGridViewModel);
         this.themePropertyGridTab.caption = editorLocalization.getString("ed.creatorSettingTitle");
@@ -27828,6 +27887,19 @@ class TabDesignerPlugin {
         });
         this.tabControlModel.bottomToolbar.setItems([settingsAction]);
     }
+    onThemePropertyGridSurveyCreated() {
+        const survey = this.themePropertyGrid.survey;
+        survey.css.root += " svc-creator-theme-settings";
+        survey.onUpdatePanelCssClasses.add((_, options) => {
+            options.cssClasses.panel.container += " spg-panel--group";
+        });
+        const themeChooser = survey.getQuestionByName("themeName");
+        if (!!themeChooser) {
+            themeChooser.choices = PredefinedCreatorThemes.map(theme => ({ value: theme, text: getLocString("creatortheme.names." + theme) }));
+        }
+        survey.runExpressions();
+        this.updatePredefinedColorChoices();
+    }
     constructor(creator) {
         this.creator = creator;
         this._showOneCategoryInPropertyGrid = true;
@@ -27837,10 +27909,10 @@ class TabDesignerPlugin {
         this.showOneCategoryInPropertyGrid = creator.showOneCategoryInPropertyGrid;
         this.propertyGrid.showOneCategoryInPropertyGrid = this.showOneCategoryInPropertyGrid;
         this.propertyGrid.obj = creator.survey;
-        this.propertyGrid.onSetNewObjectCallback = () => {
+        this.propertyGridViewModel = new PropertyGridViewModel(this.propertyGrid, creator);
+        this.propertyGridViewModel.onNewSurveyCreatedCallback = () => {
             this.updateTabControlActions();
         };
-        this.propertyGridViewModel = new PropertyGridViewModel(this.propertyGrid, creator);
         this.propertyGridPlaceholderPage = this.creator.sidebar.addPage("propertyGridPlaceholder", "svc-property-grid-placeholder", this.propertyGridViewModel);
         this.propertyGridPlaceholderPage.caption = editorLocalization.getString("ed.surveySettings");
         this.propertyGridTab = this.creator.sidebar.addPage("propertyGrid", "svc-property-grid", this.propertyGridViewModel, () => {
@@ -31854,9 +31926,9 @@ class SurveyCreatorModel extends external_survey_core_namespaceObject.Base {
         /**
          * 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) {
@@ -32375,6 +32447,9 @@ class SurveyCreatorModel extends external_survey_core_namespaceObject.Base {
      * @returns true if initial survey doesn't have any elements or properties
      */
     initSurveyWithJSON(json, clearState) {
+        if (!json) {
+            json = { "headerView": "advanced" };
+        }
         this.existingPages = {};
         const survey = this.createSurvey({}, "designer", undefined, (survey) => {
             survey.skeletonHeight = 188;
@@ -32437,7 +32512,7 @@ class SurveyCreatorModel extends external_survey_core_namespaceObject.Base {
             var _a;
             const 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);
             }
@@ -32459,7 +32534,7 @@ class SurveyCreatorModel extends external_survey_core_namespaceObject.Base {
             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();
             }
@@ -35189,7 +35264,7 @@ class PageAdorner extends SurveyElementAdornerBase {
             }, null, type || this.currentAddQuestionType || settings.designer.defaultAddQuestionType);
         };
         this.creatorPropertyChanged = (sender, options) => {
-            if (options.name === "isMobileView") {
+            if (options.name === "isMobileView" && this.isActionContainerCreated) {
                 this.actionContainer.alwaysShrink = options.newValue;
             }
         };
@@ -35205,7 +35280,6 @@ class PageAdorner extends SurveyElementAdornerBase {
             this.creator.survey.currentPage = this.page;
         });
         this.dragOrClickHelper = new external_survey_core_namespaceObject.DragOrClickHelper(this.startDragSurveyElement);
-        this.actionContainer.alwaysShrink = this.creator.isMobileView;
         this.creator.onPropertyChanged.add(this.creatorPropertyChanged);
     }
     dispose() {
@@ -35310,8 +35384,21 @@ class PageAdorner extends SurveyElementAdornerBase {
     }
     createActionContainer() {
         const container = super.createActionContainer();
+        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;
+    }
+    createTopActionContainer() {
+        const container = super.createTopActionContainer();
+        container.cssClasses = Object.assign({}, this.containerCssClasses());
+        container.cssClasses.root += " svc-page-toolbar--collapse";
+        return container;
+    }
+    containerCssClasses() {
+        return {
             root: "svc-page-toolbar sv-action-bar",
             item: "svc-page-toolbar__item",
             itemWithTitle: "svc-page-toolbar__item--with-text",
@@ -35321,14 +35408,6 @@ class PageAdorner extends SurveyElementAdornerBase {
             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;
-    }
-    createActionContainers() {
-        super.createActionContainers();
-        this.topActionContainer.cssClasses = Object.assign({}, this.actionContainer.cssClasses);
-        this.topActionContainer.cssClasses.root += " svc-page-toolbar--collapse";
     }
     allowExpandCollapseByDblClick(element) {
         return element.classList.contains("svc-page__content") ||
@@ -35566,14 +35645,9 @@ class QuestionAdornerViewModel extends SurveyElementAdornerBase {
         super(creator, surveyElement);
         this.templateData = templateData;
         this.startDragSurveyElement = (event) => {
-            var _a;
             const element = this.surveyElement;
             const 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 = () => {
@@ -35802,8 +35876,10 @@ class QuestionAdornerViewModel extends SurveyElementAdornerBase {
         super.attachElement(surveyElement);
         if (surveyElement) {
             surveyElement.registerFunctionOnPropertyValueChanged("isRequired", (newValue) => {
-                const requiredAction = this.actionContainer.getActionById("isrequired");
-                this.updateRequiredAction(requiredAction);
+                if (this.isActionContainerCreated) {
+                    const requiredAction = this.actionContainer.getActionById("isrequired");
+                    this.updateRequiredAction(requiredAction);
+                }
             }, "isRequiredAdorner");
         }
     }
@@ -35822,8 +35898,8 @@ class QuestionAdornerViewModel extends SurveyElementAdornerBase {
         }
         super.hover(event, element);
     }
-    createActionContainers() {
-        super.createActionContainers();
+    createActionContainer() {
+        const actionContainer = super.createActionContainer();
         const defaultCssClasses = {
             root: "svc-survey-element-toolbar sv-action-bar",
             item: "svc-survey-element-toolbar__item",
@@ -35835,22 +35911,25 @@ class QuestionAdornerViewModel extends SurveyElementAdornerBase {
             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;
     }
-    getActionById(id) {
-        let res = super.getActionById(id);
-        if (!res) {
-            res = this.topActionContainer.getActionById(id);
+    updateActionsPropertiesCore() {
+        super.updateActionsPropertiesCore();
+        if (this.isActionContainerCreated) {
+            this.updateActionsLocations();
         }
-        return res;
     }
-    updateActionsProperties() {
-        if (this.isDisposed)
-            return;
-        super.updateActionsProperties();
+    updateActionsVisibility(isTop) {
+        super.updateActionsVisibility(isTop);
+        if (!isTop) {
+            this.updateActionsLocations();
+        }
+    }
+    updateActionsLocations() {
         const actions = this.actionContainer.visibleActions;
         let switchToStartLocation = false;
         for (var i = actions.length - 1; i >= 0; i--) {
@@ -39848,7 +39927,7 @@ class CreatorPreset extends CreatorPresetBase {
 
 ;// ./src/entries/index.ts
 let Version;
-Version = `${"2.0.0-rc.5"}`;
+Version = `${"2.0.0-rc.7"}`;
 //should be loaded before other styles for easier override 
 __webpack_require__(5175);
 
@@ -39972,7 +40051,7 @@ __webpack_require__(326);
 __webpack_require__(7671);
 __webpack_require__(5574);
 
-(0,external_survey_core_namespaceObject.checkLibraryVersion)(`${"2.0.0-rc.5"}`, "survey-creator-core");
+(0,external_survey_core_namespaceObject.checkLibraryVersion)(`${"2.0.0-rc.7"}`, "survey-creator-core");
 
 var __webpack_exports__AceJsonEditorModel = __webpack_exports__.wtv;
 var __webpack_exports__ColorCalculator = __webpack_exports__.YbP;