From 523e1cdcfcfb732473558b5979bfc0c48302cb98 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Sat, 5 Aug 2023 11:58:19 +0400 Subject: [PATCH] Remove getZoom from CanvasView --- src/canvas/view/CanvasView.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/canvas/view/CanvasView.ts b/src/canvas/view/CanvasView.ts index d5ec604e7..ef5306aec 100644 --- a/src/canvas/view/CanvasView.ts +++ b/src/canvas/view/CanvasView.ts @@ -240,10 +240,6 @@ export default class CanvasView extends ModuleView { module.setCoords(coords.x, coords.y); } - getZoom() { - return this.em.getZoomDecimal(); - } - /** * Checks if the element is visible in the canvas's viewport * @param {HTMLElement} el @@ -318,7 +314,7 @@ export default class CanvasView extends ModuleView { * @public */ getElementPos(el: HTMLElement, opts: ElementPosOpts = {}) { - const zoom = this.getZoom(); + const zoom = this.module.getZoomDecimal(); const frameOffset = this.getFrameOffset(el); const canvasEl = this.el; const canvasOffset = this.getCanvasOffset(); @@ -347,6 +343,7 @@ export default class CanvasView extends ModuleView { if (!el || isTextNode(el)) return {}; const result: MarginPaddingOffsets = {}; const styles = window.getComputedStyle(el); + const zoom = this.module.getZoomDecimal(); const marginPaddingOffsets: (keyof MarginPaddingOffsets)[] = [ 'marginTop', 'marginRight', @@ -358,7 +355,7 @@ export default class CanvasView extends ModuleView { 'paddingLeft', ]; marginPaddingOffsets.forEach(offset => { - result[offset] = parseFloat(styles[offset]) * this.getZoom(); + result[offset] = parseFloat(styles[offset]) * zoom; }); return result; @@ -380,7 +377,7 @@ export default class CanvasView extends ModuleView { }; } const bEl = doc.body; - const zoom = this.getZoom(); + const zoom = this.module.getZoomDecimal(); const fo = this.getFrameOffset(); const co = this.getCanvasOffset(); const { noScroll } = opts;