Browse Source

Fix move in Layers. Closes #5355

pull/5399/head
Artur Arseniev 3 years ago
parent
commit
9527e6c732
  1. 4
      src/canvas/index.ts
  2. 1
      src/navigator/view/ItemsView.ts
  3. 1
      src/style_manager/view/LayersView.ts
  4. 10
      src/utils/Sorter.ts

4
src/canvas/index.ts

@ -555,7 +555,7 @@ export default class CanvasModule extends Module<CanvasConfig> {
* Start autoscroll * Start autoscroll
* @private * @private
*/ */
startAutoscroll(frame: Frame) { startAutoscroll(frame?: Frame) {
const fr = (frame && frame.view) || this.em.getCurrentFrame(); const fr = (frame && frame.view) || this.em.getCurrentFrame();
fr && fr.startAutoscroll(); fr && fr.startAutoscroll();
} }
@ -564,7 +564,7 @@ export default class CanvasModule extends Module<CanvasConfig> {
* Stop autoscroll * Stop autoscroll
* @private * @private
*/ */
stopAutoscroll(frame: Frame) { stopAutoscroll(frame?: Frame) {
const fr = (frame && frame.view) || this.em.getCurrentFrame(); const fr = (frame && frame.view) || this.em.getCurrentFrame();
fr && fr.stopAutoscroll(); fr && fr.stopAutoscroll();
} }

1
src/navigator/view/ItemsView.ts

@ -42,6 +42,7 @@ export default class ItemsView extends View {
nested: 1, nested: 1,
ppfx, ppfx,
pfx, pfx,
em,
}); });
} }

1
src/style_manager/view/LayersView.ts

@ -38,6 +38,7 @@ export default class LayersView extends View<Layer> {
containerSel: `.${pfx}layers`, containerSel: `.${pfx}layers`,
itemSel: `.${pfx}layer`, itemSel: `.${pfx}layer`,
pfx: config.pStylePrefix, pfx: config.pStylePrefix,
em,
}) })
: ''; : '';
// @ts-ignore // @ts-ignore

10
src/utils/Sorter.ts

@ -207,7 +207,7 @@ export default class Sorter extends View {
updateTextViewCursorPosition(e: any) { updateTextViewCursorPosition(e: any) {
const { em } = this; const { em } = this;
if (!em) return; if (!em) return;
const Canvas = em.get('Canvas'); const Canvas = em.Canvas;
const targetDoc = Canvas.getDocument(); const targetDoc = Canvas.getDocument();
let range = null; let range = null;
@ -223,8 +223,8 @@ export default class Sorter extends View {
const sel = Canvas.getWindow().getSelection(); const sel = Canvas.getWindow().getSelection();
Canvas.getFrameEl().focus(); Canvas.getFrameEl().focus();
sel.removeAllRanges(); sel?.removeAllRanges();
range && sel.addRange(range); range && sel?.addRange(range);
this.setContentEditable(this.activeTextModel, true); this.setContentEditable(this.activeTextModel, true);
} }
@ -242,7 +242,7 @@ export default class Sorter extends View {
*/ */
toggleSortCursor(active?: boolean) { toggleSortCursor(active?: boolean) {
const { em } = this; const { em } = this;
const cv = em && em.get('Canvas'); const cv = em?.Canvas;
// Avoid updating body className as it causes a huge repaint // Avoid updating body className as it causes a huge repaint
// Noticeable with "fast" drag of blocks // Noticeable with "fast" drag of blocks
@ -527,7 +527,7 @@ export default class Sorter extends View {
var rX = e.pageX - this.elL + this.el.scrollLeft; var rX = e.pageX - this.elL + this.el.scrollLeft;
if (this.canvasRelative && em) { if (this.canvasRelative && em) {
const mousePos = em.get('Canvas').getMouseRelativeCanvas(e, { noScroll: 1 }); const mousePos = em.Canvas.getMouseRelativeCanvas(e, { noScroll: 1 });
rX = mousePos.x; rX = mousePos.x;
rY = mousePos.y; rY = mousePos.y;
} }

Loading…
Cancel
Save