From eb4e438bdfd97ba686312268464ef9ef40aa73d3 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Fri, 31 Mar 2023 16:23:26 +0400
Subject: [PATCH] Prevent top/left update if not in standard drag mode

---
 src/commands/view/SelectComponent.ts  |  6 ++++--
 src/dom_components/model/Component.ts | 10 +++++++++-
 src/dom_components/model/types.ts     |  2 +-
 src/editor/index.ts                   |  3 ++-
 src/editor/model/Editor.ts            | 12 +++++++++---
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/commands/view/SelectComponent.ts b/src/commands/view/SelectComponent.ts
index d754fbf1f..732808992 100644
--- a/src/commands/view/SelectComponent.ts
+++ b/src/commands/view/SelectComponent.ts
@@ -455,8 +455,10 @@ export default {
             style[keyHeight] = autoHeight ? 'auto' : `${rect.h}${unitHeight}`;
           }
 
-          style.top = rect.t + unitHeight;
-          style.left = rect.l + unitWidth;
+          if (em.getDragMode(model)) {
+            style.top = `${rect.t}${unitHeight}`;
+            style.left = `${rect.l}${unitWidth}`;
+          }
 
           modelToStyle.addStyle({ ...style, en }, { avoidStore: !store });
           const updateEvent = 'update:component:style';
diff --git a/src/dom_components/model/Component.ts b/src/dom_components/model/Component.ts
index faf599991..aab8f1c0c 100644
--- a/src/dom_components/model/Component.ts
+++ b/src/dom_components/model/Component.ts
@@ -351,13 +351,21 @@ export default class Component extends StyleableModel<ComponentProperties> {
   /**
    * Change the drag mode of the component.
    * To get more about this feature read: https://github.com/GrapesJS/grapesjs/issues/1936
-   * @param {String} value Drag mode, options: 'absolute' | 'translate'
+   * @param {String} value Drag mode, options: `'absolute'` | `'translate'` | `''`
    * @returns {this}
    */
   setDragMode(value?: DragMode) {
     return this.set('dmode', value);
   }
 
+  /**
+   * Get the drag mode of the component.
+   * @returns {String} Drag mode value, options: `'absolute'` | `'translate'` | `''`
+   */
+  getDragMode(): DragMode {
+    return this.get('dmode') || '';
+  }
+
   /**
    * Find inner components by query string.
    * **ATTENTION**: this method works only with already rendered component
diff --git a/src/dom_components/model/types.ts b/src/dom_components/model/types.ts
index fbce40c22..56f4279e2 100644
--- a/src/dom_components/model/types.ts
+++ b/src/dom_components/model/types.ts
@@ -9,7 +9,7 @@ import Component from './Component';
 import Components from './Components';
 import { ToolbarButtonProps } from './ToolbarButton';
 
-export type DragMode = 'translate' | 'absolute';
+export type DragMode = 'translate' | 'absolute' | '';
 
 export interface ComponentProperties {
   /**
diff --git a/src/editor/index.ts b/src/editor/index.ts
index 24eec7862..bc37d4eee 100644
--- a/src/editor/index.ts
+++ b/src/editor/index.ts
@@ -69,6 +69,7 @@ import ComponentManager, { ComponentEvent } from '../dom_components';
 import Component from '../dom_components/model/Component';
 import Components from '../dom_components/model/Components';
 import ComponentWrapper from '../dom_components/model/ComponentWrapper';
+import { DragMode } from '../dom_components/model/types';
 import I18nModule from '../i18n';
 import KeymapsModule, { KeymapEvent } from '../keymaps';
 import ModalModule, { ModalEvent } from '../modal_dialog';
@@ -682,7 +683,7 @@ export default class Editor implements IBaseModule<EditorConfig> {
    * @param {String} value Drag mode, options: 'absolute' | 'translate'
    * @returns {this}
    */
-  setDragMode(value: string) {
+  setDragMode(value: DragMode) {
     this.em.setDragMode(value);
     return this;
   }
diff --git a/src/editor/model/Editor.ts b/src/editor/model/Editor.ts
index 658f44484..1c4785d41 100644
--- a/src/editor/model/Editor.ts
+++ b/src/editor/model/Editor.ts
@@ -40,6 +40,7 @@ import ComponentView from '../../dom_components/view/ComponentView';
 import { ProjectData } from '../../storage_manager/model/IStorage';
 import CssRules from '../../css_composer/model/CssRules';
 import Frame from '../../canvas/model/Frame';
+import { DragMode } from '../../dom_components/model/types';
 
 Backbone.$ = $;
 
@@ -935,10 +936,15 @@ export default class EditorModel extends Model {
     return this.get('Canvas').getZoomMultiplier();
   }
 
-  setDragMode(value: string) {
+  setDragMode(value: DragMode) {
     return this.set('dmode', value);
   }
 
+  getDragMode(component?: Component): DragMode {
+    const mode = component?.getDragMode() || this.get('dmode');
+    return mode || '';
+  }
+
   t(...args: any[]) {
     const i18n = this.get('I18n');
     return i18n?.t(...args);
@@ -948,8 +954,8 @@ export default class EditorModel extends Model {
    * Returns true if the editor is in absolute mode
    * @returns {Boolean}
    */
-  inAbsoluteMode() {
-    return this.get('dmode') === 'absolute';
+  inAbsoluteMode(component?: Component) {
+    return this.getDragMode(component) === 'absolute';
   }
 
   /**