From 733d914ca39221be7369711d80910b4439c7552c Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Sun, 3 Oct 2021 17:42:45 +0200 Subject: [PATCH] Add default RTE position to left 0 --- src/canvas/index.js | 3 ++- src/rich_text_editor/index.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/canvas/index.js b/src/canvas/index.js index 6751fc41e..7f1769eac 100644 --- a/src/canvas/index.js +++ b/src/canvas/index.js @@ -34,6 +34,7 @@ * @module Canvas */ +import { isUndefined } from 'underscore'; import { getElement, getViewEl } from 'utils/mixins'; import defaults from './config/config'; import Canvas from './model/Canvas'; @@ -431,7 +432,7 @@ export default () => { const { event } = opts; let top = -toolbarH; - let left = pos.width - toolbarW; + let left = !isUndefined(opts.left) ? opts.left : pos.width - toolbarW; left = pos.left < -left ? -pos.left : left; left = elRight > frCvOff.width ? left - (elRight - frCvOff.width) : left; diff --git a/src/rich_text_editor/index.js b/src/rich_text_editor/index.js index fe9afc135..1f533bdb6 100644 --- a/src/rich_text_editor/index.js +++ b/src/rich_text_editor/index.js @@ -277,7 +277,8 @@ export default () => { const canvas = config.em.get('Canvas'); const { style } = toolbar; const pos = canvas.getTargetToElementFixed(lastEl, toolbar, { - event: 'rteToolbarPosUpdate' + event: 'rteToolbarPosUpdate', + left: 0 }); style.top = pos.top + un;