From 9527e6c7320fe9302ea117c8f82083233db91967 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Sat, 9 Sep 2023 11:52:28 +0400
Subject: [PATCH] Fix move in Layers. Closes #5355

---
 src/canvas/index.ts                  |  4 ++--
 src/navigator/view/ItemsView.ts      |  1 +
 src/style_manager/view/LayersView.ts |  1 +
 src/utils/Sorter.ts                  | 10 +++++-----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/canvas/index.ts b/src/canvas/index.ts
index 0b8d046a2..47ad5203a 100644
--- a/src/canvas/index.ts
+++ b/src/canvas/index.ts
@@ -555,7 +555,7 @@ export default class CanvasModule extends Module<CanvasConfig> {
    * Start autoscroll
    * @private
    */
-  startAutoscroll(frame: Frame) {
+  startAutoscroll(frame?: Frame) {
     const fr = (frame && frame.view) || this.em.getCurrentFrame();
     fr && fr.startAutoscroll();
   }
@@ -564,7 +564,7 @@ export default class CanvasModule extends Module<CanvasConfig> {
    * Stop autoscroll
    * @private
    */
-  stopAutoscroll(frame: Frame) {
+  stopAutoscroll(frame?: Frame) {
     const fr = (frame && frame.view) || this.em.getCurrentFrame();
     fr && fr.stopAutoscroll();
   }
diff --git a/src/navigator/view/ItemsView.ts b/src/navigator/view/ItemsView.ts
index 8fcd08393..fdca2cf4a 100644
--- a/src/navigator/view/ItemsView.ts
+++ b/src/navigator/view/ItemsView.ts
@@ -42,6 +42,7 @@ export default class ItemsView extends View {
         nested: 1,
         ppfx,
         pfx,
+        em,
       });
     }
 
diff --git a/src/style_manager/view/LayersView.ts b/src/style_manager/view/LayersView.ts
index e3c03ae5f..c43e329c3 100644
--- a/src/style_manager/view/LayersView.ts
+++ b/src/style_manager/view/LayersView.ts
@@ -38,6 +38,7 @@ export default class LayersView extends View<Layer> {
           containerSel: `.${pfx}layers`,
           itemSel: `.${pfx}layer`,
           pfx: config.pStylePrefix,
+          em,
         })
       : '';
     // @ts-ignore
diff --git a/src/utils/Sorter.ts b/src/utils/Sorter.ts
index 952c29633..9b7833c87 100644
--- a/src/utils/Sorter.ts
+++ b/src/utils/Sorter.ts
@@ -207,7 +207,7 @@ export default class Sorter extends View {
   updateTextViewCursorPosition(e: any) {
     const { em } = this;
     if (!em) return;
-    const Canvas = em.get('Canvas');
+    const Canvas = em.Canvas;
     const targetDoc = Canvas.getDocument();
     let range = null;
 
@@ -223,8 +223,8 @@ export default class Sorter extends View {
 
     const sel = Canvas.getWindow().getSelection();
     Canvas.getFrameEl().focus();
-    sel.removeAllRanges();
-    range && sel.addRange(range);
+    sel?.removeAllRanges();
+    range && sel?.addRange(range);
     this.setContentEditable(this.activeTextModel, true);
   }
 
@@ -242,7 +242,7 @@ export default class Sorter extends View {
    */
   toggleSortCursor(active?: boolean) {
     const { em } = this;
-    const cv = em && em.get('Canvas');
+    const cv = em?.Canvas;
 
     // Avoid updating body className as it causes a huge repaint
     // Noticeable with "fast" drag of blocks
@@ -527,7 +527,7 @@ export default class Sorter extends View {
     var rX = e.pageX - this.elL + this.el.scrollLeft;
 
     if (this.canvasRelative && em) {
-      const mousePos = em.get('Canvas').getMouseRelativeCanvas(e, { noScroll: 1 });
+      const mousePos = em.Canvas.getMouseRelativeCanvas(e, { noScroll: 1 });
       rX = mousePos.x;
       rY = mousePos.y;
     }