Reverse refactor

packages/excalidraw/components/Stats/Angle.tsx

@@ -11,13 +11,8 @@ import type Scene from "@excalidraw/element/Scene";
 
 import { angleIcon } from "../icons";
 
-import DragInput from "./DragInput";
+import DragInput, { type DragInputCallbackType } from "./DragInput";
-import {
+import { getStepSizedValue, isPropertyEditable, updateBindings } from "./utils";
-  type DragInputCallbackType,
-  getStepSizedValue,
-  isPropertyEditable,
-  updateBindings,
-} from "./utils";
 
 import type { AppState } from "../../types";
 

packages/excalidraw/components/Stats/Dimension.tsx

@@ -12,12 +12,8 @@ import type { ExcalidrawElement } from "@excalidraw/element/types";
 
 import type Scene from "@excalidraw/element/Scene";
 
-import DragInput from "./DragInput";
+import DragInput, { type DragInputCallbackType } from "./DragInput";
-import {
+import { getStepSizedValue, isPropertyEditable } from "./utils";
-  type DragInputCallbackType,
-  getStepSizedValue,
-  isPropertyEditable,
-} from "./utils";
 
 import type { AppState } from "../../types";
 

packages/excalidraw/components/Stats/DragInput.tsx

@@ -13,13 +13,30 @@ import { CaptureUpdateAction } from "../../store";
 import { useApp } from "../App";
 import { InlineIcon } from "../InlineIcon";
 
-import { type DragInputCallbackType, SMALLEST_DELTA } from "./utils";
+import { SMALLEST_DELTA } from "./utils";
 
 import "./DragInput.scss";
 
 import type { StatsInputProperty } from "./utils";
 import type { AppState } from "../../types";
 
+export type DragInputCallbackType<
+  P extends StatsInputProperty,
+  E = ExcalidrawElement,
+> = (props: {
+  accumulatedChange: number;
+  instantChange: number;
+  originalElements: readonly E[];
+  originalElementsMap: ElementsMap;
+  shouldKeepAspectRatio: boolean;
+  shouldChangeByStepSize: boolean;
+  scene: Scene;
+  nextValue?: number;
+  property: P;
+  originalAppState: AppState;
+  setInputValue: (value: number) => void;
+}) => void;
+
 interface StatsDragInputProps<
   T extends StatsInputProperty,
   E = ExcalidrawElement,

packages/excalidraw/components/Stats/FontSize.tsx

@@ -16,8 +16,8 @@ import type Scene from "@excalidraw/element/Scene";
 
 import { fontSizeIcon } from "../icons";
 
-import StatsDragInput from "./DragInput";
+import StatsDragInput, { type DragInputCallbackType } from "./DragInput";
-import { type DragInputCallbackType, getStepSizedValue } from "./utils";
+import { getStepSizedValue } from "./utils";
 
 import type { AppState } from "../../types";
 

packages/excalidraw/components/Stats/MultiAngle.tsx

@@ -13,12 +13,8 @@ import type Scene from "@excalidraw/element/Scene";
 
 import { angleIcon } from "../icons";
 
-import DragInput from "./DragInput";
+import DragInput, { type DragInputCallbackType } from "./DragInput";
-import {
+import { getStepSizedValue, isPropertyEditable } from "./utils";
-  type DragInputCallbackType,
-  getStepSizedValue,
-  isPropertyEditable,
-} from "./utils";
 
 import type { AppState } from "../../types";
 

packages/excalidraw/components/Stats/MultiDimension.tsx

@@ -24,9 +24,9 @@ import type {
 
 import type Scene from "@excalidraw/element/Scene";
 
-import DragInput from "./DragInput";
+import DragInput, { type DragInputCallbackType } from "./DragInput";
 import { getAtomicUnits, getStepSizedValue, isPropertyEditable } from "./utils";
-import { type DragInputCallbackType, getElementsInAtomicUnit } from "./utils";
+import { getElementsInAtomicUnit } from "./utils";
 
 import type { AtomicUnit } from "./utils";
 import type { AppState } from "../../types";

packages/excalidraw/components/Stats/MultiFontSize.tsx

@@ -19,8 +19,8 @@ import type Scene from "@excalidraw/element/Scene";
 
 import { fontSizeIcon } from "../icons";
 
-import StatsDragInput from "./DragInput";
+import StatsDragInput, { type DragInputCallbackType } from "./DragInput";
-import { DragInputCallbackType, getStepSizedValue } from "./utils";
+import { getStepSizedValue } from "./utils";
 
 import type { AppState } from "../../types";
 

packages/excalidraw/components/Stats/utils.ts

@@ -31,6 +31,7 @@ import type {
 import type Scene from "@excalidraw/element/Scene";
 
 import type { AppState } from "../../types";
+import type { DragInputCallbackType } from "./DragInput";
 
 export type StatsInputProperty =
   | "x"
@@ -41,23 +42,6 @@ export type StatsInputProperty =
   | "fontSize"
   | "gridStep";
 
-export type DragInputCallbackType<
-  P extends StatsInputProperty,
-  E = ExcalidrawElement,
-> = (props: {
-  accumulatedChange: number;
-  instantChange: number;
-  originalElements: readonly E[];
-  originalElementsMap: ElementsMap;
-  shouldKeepAspectRatio: boolean;
-  shouldChangeByStepSize: boolean;
-  scene: Scene;
-  nextValue?: number;
-  property: P;
-  originalAppState: AppState;
-  setInputValue: (value: number) => void;
-}) => void;
-
 export const SMALLEST_DELTA = 0.01;
 
 export const isPropertyEditable = (