Merge branch 'dev' into layers

src/canvas/index.ts

@@ -470,14 +470,15 @@ export default class CanvasModule extends Module<CanvasConfig> {
    * @private
    */
   getMouseRelativePos(e: any, opts: any = {}) {
-    var addTop = 0;
+    const subWinOffset = opts.subWinOffset;
-    var addLeft = 0;
+    const doc = e.target.ownerDocument;
-    var subWinOffset = opts.subWinOffset;
+    const win = doc.defaultView || doc.parentWindow;
-    var doc = e.target.ownerDocument;
+    const frame = win.frameElement;
-    var win = doc.defaultView || doc.parentWindow;
+    const yOffset = subWinOffset ? win.pageYOffset : 0;
-    var frame = win.frameElement;
+    const xOffset = subWinOffset ? win.pageXOffset : 0;
-    var yOffset = subWinOffset ? win.pageYOffset : 0;
+    const zoomMlt = this.getZoomMultiplier();
-    var xOffset = subWinOffset ? win.pageXOffset : 0;
+    let addTop = 0;
+    let addLeft = 0;
 
     if (frame) {
       var frameRect = frame.getBoundingClientRect();
@@ -486,8 +487,8 @@ export default class CanvasModule extends Module<CanvasConfig> {
     }
 
     return {
-      y: e.clientY + addTop - yOffset,
+      y: (e.clientY + addTop - yOffset) * zoomMlt,
-      x: e.clientX + addLeft - xOffset,
+      x: (e.clientX + addLeft - xOffset) * zoomMlt,
     };
   }
 

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;

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, '-');
   }
 }