From 7bca438ab8948ebdf39cf323b3876cbb9eea3255 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Thu, 10 Aug 2023 13:40:08 -0700
Subject: [PATCH] Revert "fix: removed X & Y from toolbox.ts and replaced movBy
 to moveTo (#7333)" (#7375)

This reverts commit dbe926db4af5d8b1e722b1f0c1869d72ff24968b.

The reverted commit made it so that RTL flyouts were rendered incorrectly.
---
 core/flyout_horizontal.ts | 5 ++---
 core/flyout_vertical.ts   | 8 +++-----
 core/utils/toolbox.ts     | 2 ++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/flyout_horizontal.ts b/core/flyout_horizontal.ts
index 019570493..ad27ca1dc 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 {Coordinate} from './utils/coordinate.js';
+import type {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,8 +285,7 @@ export class HorizontalFlyout extends Flyout {
         } else {
           moveX = cursorX - tab;
         }
-        // No 'reason' provided since events are disabled.
-        block!.moveTo(new Coordinate(moveX, cursorY));
+        block!.moveBy(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 9dac14d73..d0c4a5d58 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 {Coordinate} from './utils/coordinate.js';
+import type {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,8 +246,7 @@ export class VerticalFlyout extends Flyout {
         const moveX = block!.outputConnection
           ? cursorX - this.tabWidth_
           : cursorX;
-        // No 'reason' provided since events are disabled.
-        block!.moveTo(new Coordinate(moveX, cursorY));
+        block!.moveBy(moveX, cursorY);
 
         const rect = this.createRect_(
           block!,
@@ -358,8 +357,7 @@ export class VerticalFlyout extends Flyout {
           if (!block.outputConnection) {
             newX -= this.tabWidth_;
           }
-          // No 'reason' provided since events are disabled.
-          block.moveTo(new Coordinate(newX - oldX, 0));
+          block.moveBy(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 c192d4079..b2d71e3b6 100644
--- a/core/utils/toolbox.ts
+++ b/core/utils/toolbox.ts
@@ -24,6 +24,8 @@ export interface BlockInfo {
   disabled?: string | boolean;
   enabled?: boolean;
   id?: string;
+  x?: number;
+  y?: number;
   collapsed?: boolean;
   inline?: boolean;
   data?: string;