From 7f2f0c460c46c4646f830d2fea1057805b1114cc Mon Sep 17 00:00:00 2001
From: Mahmudul Hasan <mahmudbappy.pri@gmail.com>
Date: Wed, 4 Oct 2023 01:03:26 +0600
Subject: [PATCH 1/3] Allow `/` in class names (#5433). Closes #5432

* Allow `/` in class names

This will allow following tailwind classes: md:w-1/2

* refactor: replaced double quote with single quote
---
 src/selector_manager/model/Selector.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/selector_manager/model/Selector.ts b/src/selector_manager/model/Selector.ts
index d13a2966c..38b957f87 100644
--- a/src/selector_manager/model/Selector.ts
+++ b/src/selector_manager/model/Selector.ts
@@ -179,7 +179,7 @@ export default class Selector extends Model {
    * @private
    */
   static escapeName(name: string) {
-    return `${name}`.trim().replace(/([^a-z0-9\w-\:@]+)/gi, '-');
+    return `${name}`.trim().replace(/([^a-z0-9\w-\\:@\\/]+)/gi, '-');
   }
 }
 

From 30341c286577c7c748f636008bd3a15d1a94ee2c Mon Sep 17 00:00:00 2001
From: Koen van Staveren <koenvanstaveren@hotmail.com>
Date: Tue, 3 Oct 2023 21:39:05 +0200
Subject: [PATCH 2/3] fix: resizing when zoomed (#5436)

---
 src/canvas/index.ts         | 7 +++++--
 src/commands/view/Resize.ts | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/canvas/index.ts b/src/canvas/index.ts
index 47ad5203a..0a260fac7 100644
--- a/src/canvas/index.ts
+++ b/src/canvas/index.ts
@@ -485,9 +485,12 @@ export default class CanvasModule extends Module<CanvasConfig> {
       addLeft = frameRect.left || 0;
     }
 
+    const zoom = this.getZoomDecimal();
+    const zoomOffset = 1 / zoom;
+
     return {
-      y: e.clientY + addTop - yOffset,
-      x: e.clientX + addLeft - xOffset,
+      y: (e.clientY + addTop - yOffset) * zoomOffset,
+      x: (e.clientX + addLeft - xOffset) * zoomOffset,
     };
   }
 
diff --git a/src/commands/view/Resize.ts b/src/commands/view/Resize.ts
index 5df162e2d..07f429d2b 100644
--- a/src/commands/view/Resize.ts
+++ b/src/commands/view/Resize.ts
@@ -10,7 +10,7 @@ export default {
       appendTo: canvas.getResizerEl(),
       prefix: editor.getConfig().stylePrefix,
       posFetcher: canvasView.getElementPos.bind(canvasView),
-      mousePosFetcher: canvas.getMouseRelativePos,
+      mousePosFetcher: canvas.getMouseRelativePos.bind(canvas),
       ...(opt.options || {}),
     };
     let { canvasResizer } = this;

From bb6f152588fbbec1bca217b0f113c676dca3fe84 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Tue, 3 Oct 2023 23:45:44 +0400
Subject: [PATCH 3/3] Up getMouseRelativePos

---
 src/canvas/index.ts | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/canvas/index.ts b/src/canvas/index.ts
index 0a260fac7..5eec3359c 100644
--- a/src/canvas/index.ts
+++ b/src/canvas/index.ts
@@ -470,14 +470,15 @@ export default class CanvasModule extends Module<CanvasConfig> {
    * @private
    */
   getMouseRelativePos(e: any, opts: any = {}) {
-    var addTop = 0;
-    var addLeft = 0;
-    var subWinOffset = opts.subWinOffset;
-    var doc = e.target.ownerDocument;
-    var win = doc.defaultView || doc.parentWindow;
-    var frame = win.frameElement;
-    var yOffset = subWinOffset ? win.pageYOffset : 0;
-    var xOffset = subWinOffset ? win.pageXOffset : 0;
+    const subWinOffset = opts.subWinOffset;
+    const doc = e.target.ownerDocument;
+    const win = doc.defaultView || doc.parentWindow;
+    const frame = win.frameElement;
+    const yOffset = subWinOffset ? win.pageYOffset : 0;
+    const xOffset = subWinOffset ? win.pageXOffset : 0;
+    const zoomMlt = this.getZoomMultiplier();
+    let addTop = 0;
+    let addLeft = 0;
 
     if (frame) {
       var frameRect = frame.getBoundingClientRect();
@@ -485,12 +486,9 @@ export default class CanvasModule extends Module<CanvasConfig> {
       addLeft = frameRect.left || 0;
     }
 
-    const zoom = this.getZoomDecimal();
-    const zoomOffset = 1 / zoom;
-
     return {
-      y: (e.clientY + addTop - yOffset) * zoomOffset,
-      x: (e.clientX + addLeft - xOffset) * zoomOffset,
+      y: (e.clientY + addTop - yOffset) * zoomMlt,
+      x: (e.clientX + addLeft - xOffset) * zoomMlt,
     };
   }