From 972ecfdb1a274ad18cabdd63ddfcfb71d311a286 Mon Sep 17 00:00:00 2001
From: Andrew Telnov <andrew.telnov@gmail.com>
Date: Mon, 7 Sep 2020 15:43:29 +0300
Subject: [PATCH] Fix: when page moved , the setModified of type "PAGE_MOVED"
 has not excute #943

---
 src/components/pages-editor.ts | 26 +++++++++++++++++---------
 src/editor.ts                  |  7 ++-----
 src/pages-editor.ts            |  5 +++++
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/components/pages-editor.ts b/src/components/pages-editor.ts
index 3ce19da82f..2e2184d8f5 100644
--- a/src/components/pages-editor.ts
+++ b/src/components/pages-editor.ts
@@ -1,5 +1,5 @@
 import * as ko from "knockout";
-import { SurveyHelper, editorLocalization } from '../entries';
+import { SurveyHelper, editorLocalization } from "../entries";
 import "./pages-editor.scss";
 import { PagesEditor } from "../pages-editor";
 import { StylesManager } from "../stylesmanager";
@@ -18,9 +18,7 @@ export class PagesEditorViewModel {
           ".svd-pages"
         );
         if (!!pagesElement) {
-          this.hasScroller(
-            pagesElement.scrollWidth > pagesElement.offsetWidth
-          );
+          this.hasScroller(pagesElement.scrollWidth > pagesElement.offsetWidth);
         }
       }, 100);
 
@@ -55,7 +53,7 @@ export class PagesEditorViewModel {
       pagesElement.offsetLeft -
       pagesElement.offsetWidth / 2;
     this.updateMenuPosition();
-  }
+  };
 
   onWheel(model, event) {
     var pagesElement = model.element.querySelector(".svd-pages");
@@ -86,7 +84,9 @@ export class PagesEditorViewModel {
 
   getPageClass = (page) => {
     var result =
-      page === this.model.selectedPage() ? "svd_selected_page svd-light-bg-color" : "";
+      page === this.model.selectedPage()
+        ? "svd_selected_page svd-light-bg-color"
+        : "";
 
     if (this.model.pages.indexOf(page) !== this.model.pages.length - 1) {
       result += " svd-border-right-none";
@@ -96,7 +96,8 @@ export class PagesEditorViewModel {
   };
 
   getPageMenuIconClass = (page) => {
-    var baseIconName = StylesManager.currentTheme() === "modern" ? "dots" : "gear";
+    var baseIconName =
+      StylesManager.currentTheme() === "modern" ? "dots" : "gear";
     return page === this.model.selectedPage() && this.model.isActive()
       ? "icon-" + baseIconName + "active"
       : "icon-" + baseIconName;
@@ -110,12 +111,14 @@ export class PagesEditorViewModel {
   };
 
   public movingPage = null;
+  private movedFrom: number = -1;
   get sortableOptions() {
     return {
       handle: ".svd-page-name",
       animation: 150,
       onStart: () => {
         this.movingPage = null;
+        this.movedFrom = -1;
         this.model.creator.undoRedoManager.startTransaction(
           "pages drag drop transaction"
         );
@@ -126,12 +129,17 @@ export class PagesEditorViewModel {
         this.model.blockPagesRebuilt(false);
         this.model.creator.undoRedoManager.stopTransaction();
         if (!!this.movingPage) {
-          this.model.selectedPage(this.movingPage);
+          this.model.movePage(this.movingPage, this.movedFrom);
         }
       },
       onUpdate: (evt, itemV) => {
         this.movingPage = itemV;
-        if (SurveyHelper.moveItemInArray(this.model.pages, itemV, evt.newIndex)) {
+        if (this.movedFrom < 0) {
+          this.movedFrom = this.model.pages.indexOf(this.movingPage);
+        }
+        if (
+          SurveyHelper.moveItemInArray(this.model.pages, itemV, evt.newIndex)
+        ) {
           // Remove sortables "unbound" element
           evt.item.parentNode.removeChild(evt.item);
         }
diff --git a/src/editor.ts b/src/editor.ts
index da9cdbcfb2..efa0338190 100644
--- a/src/editor.ts
+++ b/src/editor.ts
@@ -1857,11 +1857,8 @@ export class SurveyCreator implements ISurveyObjectEditorOptions {
   public getLocString(str: string) {
     return editorLocalization.getString(str);
   }
-  public movePage = (indexFrom: number, indexTo: number) => {
-    var page = <Survey.Page>this.survey.pages[indexTo];
-    this.surveyObjects.survey = null; // TODO may be we don't need this hack
-    this.surveyObjects.survey = this.survey;
-    this.selectedElement = page;
+  public movePage = (page: Survey.PageModel, indexFrom: number) => {
+    var indexTo = this.survey.pages.indexOf(page);
     this.setModified({
       type: "PAGE_MOVED",
       page: page,
diff --git a/src/pages-editor.ts b/src/pages-editor.ts
index ab8f0e8364..5b3f338231 100644
--- a/src/pages-editor.ts
+++ b/src/pages-editor.ts
@@ -89,6 +89,11 @@ export class PagesEditor {
     this.creator.deletePage();
   };
 
+  movePage = (page: Survey.PageModel, indexFrom: number) => {
+    this.selectedPage(page);
+    this.creator.movePage(page, indexFrom);
+  };
+
   showPageSettings(page: Survey.PageModel) {
     this.creator.showQuestionEditor(page);
   }