From dbe926db4af5d8b1e722b1f0c1869d72ff24968b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=A4=A6=E0=A5=87=E0=A4=B5=E0=A4=BE=E0=A4=82=E0=A4=B6=20?= =?UTF-8?q?=E0=A4=B5=E0=A4=BE=E0=A4=B0=E0=A5=8D=E0=A4=B7=E0=A5=8D=E0=A4=A3?= =?UTF-8?q?=E0=A5=87=E0=A4=AF?= Date: Fri, 4 Aug 2023 21:17:30 +0530 Subject: [PATCH] fix: removed X & Y from toolbox.ts and replaced movBy to moveTo (#7333) * fix: removed X & Y from toolbox.ts and replaced movBy to moveTo in Horizontal/ Vertical flyout * forget to run npm lint and format * removed the mistakenly added comment --- core/flyout_horizontal.ts | 5 +++-- core/flyout_vertical.ts | 8 +++++--- core/utils/toolbox.ts | 2 -- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/core/flyout_horizontal.ts b/core/flyout_horizontal.ts index ad27ca1dcf5..019570493c3 100644 --- a/core/flyout_horizontal.ts +++ b/core/flyout_horizontal.ts @@ -19,7 +19,7 @@ import type {FlyoutButton} from './flyout_button.js'; import type {Options} from './options.js'; import * as registry from './registry.js'; import {Scrollbar} from './scrollbar.js'; -import type {Coordinate} from './utils/coordinate.js'; +import {Coordinate} from './utils/coordinate.js'; import {Rect} from './utils/rect.js'; import * as toolbox from './utils/toolbox.js'; import * as WidgetDiv from './widgetdiv.js'; @@ -285,7 +285,8 @@ export class HorizontalFlyout extends Flyout { } else { moveX = cursorX - tab; } - block!.moveBy(moveX, cursorY); + // No 'reason' provided since events are disabled. + block!.moveTo(new Coordinate(moveX, cursorY)); const rect = this.createRect_(block!, moveX, cursorY, blockHW, i); cursorX += blockHW.width + gaps[i]; diff --git a/core/flyout_vertical.ts b/core/flyout_vertical.ts index d0c4a5d585e..9dac14d7313 100644 --- a/core/flyout_vertical.ts +++ b/core/flyout_vertical.ts @@ -19,7 +19,7 @@ import type {FlyoutButton} from './flyout_button.js'; import type {Options} from './options.js'; import * as registry from './registry.js'; import {Scrollbar} from './scrollbar.js'; -import type {Coordinate} from './utils/coordinate.js'; +import {Coordinate} from './utils/coordinate.js'; import {Rect} from './utils/rect.js'; import * as toolbox from './utils/toolbox.js'; import * as WidgetDiv from './widgetdiv.js'; @@ -246,7 +246,8 @@ export class VerticalFlyout extends Flyout { const moveX = block!.outputConnection ? cursorX - this.tabWidth_ : cursorX; - block!.moveBy(moveX, cursorY); + // No 'reason' provided since events are disabled. + block!.moveTo(new Coordinate(moveX, cursorY)); const rect = this.createRect_( block!, @@ -357,7 +358,8 @@ export class VerticalFlyout extends Flyout { if (!block.outputConnection) { newX -= this.tabWidth_; } - block.moveBy(newX - oldX, 0); + // No 'reason' provided since events are disabled. + block.moveTo(new Coordinate(newX - oldX, 0)); } if (this.rectMap_.has(block)) { this.moveRectToBlock_(this.rectMap_.get(block)!, block); diff --git a/core/utils/toolbox.ts b/core/utils/toolbox.ts index b2d71e3b6fe..c192d40792c 100644 --- a/core/utils/toolbox.ts +++ b/core/utils/toolbox.ts @@ -24,8 +24,6 @@ export interface BlockInfo { disabled?: string | boolean; enabled?: boolean; id?: string; - x?: number; - y?: number; collapsed?: boolean; inline?: boolean; data?: string;