#5758 - change api

Author: novikov82

packages/survey-creator-core/src/components/action-container-view-model.ts

@@ -98,16 +98,6 @@ export class SurveyElementAdornerBase<T extends SurveyElement = SurveyElement> e
     return this.collapsed && this.creator.dragDropSurveyElements.insideContainer;
   }
 
-  protected creatorDragStartHandler = () => {
-    if (this.surveyElement.isPage) this.collapsedByDrag = this.creator.collapsePagesOnDragStart;
-    if (this.surveyElement.isPanel) this.collapsedByDrag = this.creator.collapsePanelsOnDragStart;
-    if (this.surveyElement.isQuestion) this.collapsedByDrag = this.creator.collapseQuestionsOnDragStart;
-  }
-
-  protected creatorDragEndHandler = () => {
-    this.collapsedByDrag = false;
-  }
-
   @property({ defaultValue: true }) allowExpandCollapse: boolean;
   @property({
     onSet: (val, target: SurveyElementAdornerBase<T>) => {
@@ -126,7 +116,7 @@ export class SurveyElementAdornerBase<T extends SurveyElement = SurveyElement> e
   private dragCollapsedTimer;
 
   protected dragIn() {
-    if ((this.surveyElement.isPanel || this.surveyElement.isPage) && this.calculatedCollapsed) {
+    if ((this.surveyElement.isPanel || this.surveyElement.isPage) && this.collapsed) {
       this.dragCollapsedTimer = setTimeout(() => {
         this.expandWithDragIn();
       }, this.creator.expandOnDragTimeOut);
@@ -153,11 +143,13 @@ export class SurveyElementAdornerBase<T extends SurveyElement = SurveyElement> e
     protected surveyElement: T
   ) {
     super();
-    this.creator.onDragStart.add(this.creatorDragStartHandler);
-    this.creator.onDragEnd.add(this.creatorDragEndHandler);
     this.designerStateManager = (creator.getPlugin("designer") as TabDesignerPlugin)?.designerStateManager;
     this.designerStateManager?.initForElement(surveyElement);
     this.selectedPropPageFunc = (sender: Base, options: any) => {
+      // TODO: discuss and check
+      if (options.name === "state") {
+        this.collapsed = !this.surveyElement.isExpanded;
+      }
       if (options.name === "dragTypeOverMe") {
         if (!!options.newValue && this.dragInsideCollapsedContainer) this.dragIn(); else this.dragOut();
       }

packages/survey-creator-core/src/creator-base.ts

@@ -3801,9 +3801,14 @@ export class SurveyCreatorModel extends Base
    */
   @property({ defaultValue: "never" }) expandCollapseButtonVisibility?: "never" | "onhover" | "always";
 
-  @property() collapsePagesOnDragStart?: boolean;
-  @property() collapsePanelsOnDragStart?: boolean;
-  @property() collapseQuestionsOnDragStart?: boolean;
+  /*
+  *
+  */
+  @property() collapseOnDrag: boolean;
+
+  @property() collapsePagesOnDragStart: boolean;
+  @property() collapsePanelsOnDragStart: boolean;
+  @property() collapseQuestionsOnDragStart: boolean;
   expandOnDragTimeOut: number = 1000;
 
   selectFromStringEditor: boolean;

packages/survey-creator-core/src/creator-options.ts

@@ -273,7 +273,5 @@ export interface ICreatorOptions {
   enableLinkFileEditor?: boolean;
 
   expandCollapseButtonVisibility?: "never" | "onhover" | "always";
-  collapsePagesOnDragStart?: boolean;
-  collapsePanelsOnDragStart?: boolean;
-  collapseQuestionsOnDragStart?: boolean;
+  collapsedByDrag?: boolean;
 }