Browse Source

Fix getTargetToElementFixed

pull/5649/head
Artur Arseniev 3 years ago
parent
commit
9c384d940d
  1. 13
      src/canvas/index.ts
  2. 2
      src/commands/view/SelectComponent.ts
  3. 2
      src/rich_text_editor/index.ts

13
src/canvas/index.ts

@ -415,8 +415,15 @@ export default class CanvasModule extends Module<CanvasConfig> {
};
}
getTargetToElementFixed(el: any, elToMove: any, opts: any = {}) {
const pos = opts.pos || this.getElementPos(el);
/**
*
* @param {HTMLElement} el The element on which I'd attach the toolbar
* @param {HTMLElement} elToMove The target in this case could be the toolbar
* @param {Object} opts
* @private
*/
getTargetToElementFixed(el: HTMLElement, elToMove: HTMLElement, opts: any = {}) {
const pos = opts.pos || this.getElementPos(el, { noScroll: true });
const cvOff = opts.canvasOff || this.canvasRectOffset(el, pos);
const toolbarH = elToMove.offsetHeight || 0;
const toolbarW = elToMove.offsetWidth || 0;
@ -574,7 +581,7 @@ export default class CanvasModule extends Module<CanvasConfig> {
* @example
* canvas.setZoom(50); // set zoom to 50%
*/
setZoom(value: number|string) {
setZoom(value: number | string) {
this.canvas.set('zoom', typeof value === 'string' ? parseFloat(value) : value);
return this;
}

2
src/commands/view/SelectComponent.ts

@ -651,7 +651,7 @@ export default {
const unit = 'px';
const toolsEl = this.toggleToolsEl(1);
const { style } = toolsEl;
const targetToElem = canvas.getTargetToElementFixed(el, canvas.getToolbarEl(), { pos });
const targetToElem = canvas.getTargetToElementFixed(el, canvas.getToolbarEl()!, { pos });
const topOff = targetToElem.canvasOffsetTop;
const leftOff = targetToElem.canvasOffsetLeft;
style.top = topOff + unit;

2
src/rich_text_editor/index.ts

@ -305,7 +305,7 @@ export default class RichTextEditorModule extends Module<RichTextEditorConfig &
const un = 'px';
const canvas = em.Canvas;
const { style } = toolbar;
const pos = canvas.getTargetToElementFixed(this.lastEl, toolbar, {
const pos = canvas.getTargetToElementFixed(this.lastEl!, toolbar, {
event: 'rteToolbarPosUpdate',
left: 0,
});

Loading…
Cancel
Save