From 2e8757ee968d0aa6f1ce74c2d02c148ca9ba8f45 Mon Sep 17 00:00:00 2001 From: Deepen Timalsina Date: Tue, 15 Apr 2025 16:43:05 +0545 Subject: [PATCH] Move renderer folder into src --- excalidraw-app/components/DebugCanvas.tsx | 2 +- packages/excalidraw/clients.ts | 2 +- packages/excalidraw/components/Stats/stats.test.tsx | 2 +- .../excalidraw/components/canvases/InteractiveCanvas.tsx | 2 +- .../excalidraw/components/canvases/NewElementCanvas.tsx | 2 +- packages/excalidraw/components/canvases/StaticCanvas.tsx | 2 +- packages/excalidraw/{ => src}/renderer/helpers.ts | 4 ++-- .../excalidraw/{ => src}/renderer/interactiveScene.ts | 8 ++++---- .../{ => src}/renderer/renderNewElementScene.ts | 2 +- packages/excalidraw/{ => src}/renderer/renderSnaps.ts | 4 ++-- packages/excalidraw/{ => src}/renderer/roundRect.ts | 0 packages/excalidraw/{ => src}/renderer/staticScene.ts | 6 +++--- packages/excalidraw/{ => src}/renderer/staticSvgScene.ts | 7 ++----- packages/excalidraw/src/scene/Renderer.ts | 4 ++-- packages/excalidraw/src/scene/export.ts | 4 ++-- packages/excalidraw/tests/App.test.tsx | 2 +- packages/excalidraw/tests/contextmenu.test.tsx | 2 +- packages/excalidraw/tests/dragCreate.test.tsx | 4 ++-- packages/excalidraw/tests/history.test.tsx | 2 +- packages/excalidraw/tests/linearElementEditor.test.tsx | 4 ++-- packages/excalidraw/tests/move.test.tsx | 4 ++-- packages/excalidraw/tests/multiPointCreate.test.tsx | 4 ++-- packages/excalidraw/tests/regressionTests.test.tsx | 2 +- packages/excalidraw/tests/selection.test.tsx | 4 ++-- 24 files changed, 38 insertions(+), 41 deletions(-) rename packages/excalidraw/{ => src}/renderer/helpers.ts (93%) rename packages/excalidraw/{ => src}/renderer/interactiveScene.ts (99%) rename packages/excalidraw/{ => src}/renderer/renderNewElementScene.ts (95%) rename packages/excalidraw/{ => src}/renderer/renderSnaps.ts (97%) rename packages/excalidraw/{ => src}/renderer/roundRect.ts (100%) rename packages/excalidraw/{ => src}/renderer/staticScene.ts (98%) rename packages/excalidraw/{ => src}/renderer/staticSvgScene.ts (99%) diff --git a/excalidraw-app/components/DebugCanvas.tsx b/excalidraw-app/components/DebugCanvas.tsx index e83a62647..19be66a30 100644 --- a/excalidraw-app/components/DebugCanvas.tsx +++ b/excalidraw-app/components/DebugCanvas.tsx @@ -6,7 +6,7 @@ import { import { bootstrapCanvas, getNormalizedCanvasDimensions, -} from "@excalidraw/excalidraw/renderer/helpers"; +} from "@excalidraw/excalidraw/src/renderer/helpers"; import { type AppState } from "@excalidraw/excalidraw/types"; import { throttleRAF } from "@excalidraw/common"; import { useCallback, useImperativeHandle, useRef } from "react"; diff --git a/packages/excalidraw/clients.ts b/packages/excalidraw/clients.ts index e542474b3..3fac7fec5 100644 --- a/packages/excalidraw/clients.ts +++ b/packages/excalidraw/clients.ts @@ -6,7 +6,7 @@ import { UserIdleState, } from "@excalidraw/common"; -import { roundRect } from "./renderer/roundRect"; +import { roundRect } from "./src/renderer/roundRect"; import type { InteractiveCanvasRenderConfig } from "./src/scene/types"; import type { diff --git a/packages/excalidraw/components/Stats/stats.test.tsx b/packages/excalidraw/components/Stats/stats.test.tsx index fc94da056..9b62711ef 100644 --- a/packages/excalidraw/components/Stats/stats.test.tsx +++ b/packages/excalidraw/components/Stats/stats.test.tsx @@ -20,7 +20,7 @@ import type { import { Excalidraw, getCommonBounds, mutateElement } from "../.."; import { actionGroup } from "../../actions"; import { t } from "../../i18n"; -import * as StaticScene from "../../renderer/staticScene"; +import * as StaticScene from "../../src/renderer/staticScene"; import { API } from "../../tests/helpers/api"; import { Keyboard, Pointer, UI } from "../../tests/helpers/ui"; import { getTextEditor, updateTextEditor } from "../../tests/queries/dom"; diff --git a/packages/excalidraw/components/canvases/InteractiveCanvas.tsx b/packages/excalidraw/components/canvases/InteractiveCanvas.tsx index 4c12777ef..7add30f96 100644 --- a/packages/excalidraw/components/canvases/InteractiveCanvas.tsx +++ b/packages/excalidraw/components/canvases/InteractiveCanvas.tsx @@ -13,7 +13,7 @@ import type { import { t } from "../../i18n"; import { isRenderThrottlingEnabled } from "../../reactUtils"; -import { renderInteractiveScene } from "../../renderer/interactiveScene"; +import { renderInteractiveScene } from "../../src/renderer/interactiveScene"; import type { InteractiveCanvasRenderConfig, diff --git a/packages/excalidraw/components/canvases/NewElementCanvas.tsx b/packages/excalidraw/components/canvases/NewElementCanvas.tsx index ee3972527..64c2a32ea 100644 --- a/packages/excalidraw/components/canvases/NewElementCanvas.tsx +++ b/packages/excalidraw/components/canvases/NewElementCanvas.tsx @@ -3,7 +3,7 @@ import { useEffect, useRef } from "react"; import type { NonDeletedSceneElementsMap } from "@excalidraw/element/types"; import { isRenderThrottlingEnabled } from "../../reactUtils"; -import { renderNewElementScene } from "../../renderer/renderNewElementScene"; +import { renderNewElementScene } from "../../src/renderer/renderNewElementScene"; import type { RenderableElementsMap, diff --git a/packages/excalidraw/components/canvases/StaticCanvas.tsx b/packages/excalidraw/components/canvases/StaticCanvas.tsx index 9d4501893..c1a16a028 100644 --- a/packages/excalidraw/components/canvases/StaticCanvas.tsx +++ b/packages/excalidraw/components/canvases/StaticCanvas.tsx @@ -8,7 +8,7 @@ import type { } from "@excalidraw/element/types"; import { isRenderThrottlingEnabled } from "../../reactUtils"; -import { renderStaticScene } from "../../renderer/staticScene"; +import { renderStaticScene } from "../../src/renderer/staticScene"; import type { RenderableElementsMap, diff --git a/packages/excalidraw/renderer/helpers.ts b/packages/excalidraw/src/renderer/helpers.ts similarity index 93% rename from packages/excalidraw/renderer/helpers.ts rename to packages/excalidraw/src/renderer/helpers.ts index e1fee07e9..f7d9cb118 100644 --- a/packages/excalidraw/renderer/helpers.ts +++ b/packages/excalidraw/src/renderer/helpers.ts @@ -1,7 +1,7 @@ import { THEME, THEME_FILTER } from "@excalidraw/common"; -import type { StaticCanvasRenderConfig } from "../src/scene/types"; -import type { StaticCanvasAppState, AppState } from "../types"; +import type { StaticCanvasRenderConfig } from "../scene/types"; +import type { StaticCanvasAppState, AppState } from "../../types"; export const fillCircle = ( context: CanvasRenderingContext2D, diff --git a/packages/excalidraw/renderer/interactiveScene.ts b/packages/excalidraw/src/renderer/interactiveScene.ts similarity index 99% rename from packages/excalidraw/renderer/interactiveScene.ts rename to packages/excalidraw/src/renderer/interactiveScene.ts index 385d34d90..ef073807e 100644 --- a/packages/excalidraw/renderer/interactiveScene.ts +++ b/packages/excalidraw/src/renderer/interactiveScene.ts @@ -79,10 +79,10 @@ import { getScrollBars, SCROLLBAR_COLOR, SCROLLBAR_WIDTH, -} from "../src/scene/scrollbars"; -import { type InteractiveCanvasAppState } from "../types"; +} from "../scene/scrollbars"; +import { type InteractiveCanvasAppState } from "../../types"; -import { getClientColor, renderRemoteCursors } from "../clients"; +import { getClientColor, renderRemoteCursors } from "../../clients"; import { bootstrapCanvas, @@ -94,7 +94,7 @@ import type { InteractiveCanvasRenderConfig, InteractiveSceneRenderConfig, RenderableElementsMap, -} from "../src/scene/types"; +} from "../scene/types"; const renderElbowArrowMidPointHighlight = ( context: CanvasRenderingContext2D, diff --git a/packages/excalidraw/renderer/renderNewElementScene.ts b/packages/excalidraw/src/renderer/renderNewElementScene.ts similarity index 95% rename from packages/excalidraw/renderer/renderNewElementScene.ts rename to packages/excalidraw/src/renderer/renderNewElementScene.ts index d0ade99cf..bbc14654a 100644 --- a/packages/excalidraw/renderer/renderNewElementScene.ts +++ b/packages/excalidraw/src/renderer/renderNewElementScene.ts @@ -4,7 +4,7 @@ import { renderElement } from "@excalidraw/element/renderElement"; import { bootstrapCanvas, getNormalizedCanvasDimensions } from "./helpers"; -import type { NewElementSceneRenderConfig } from "../src/scene/types"; +import type { NewElementSceneRenderConfig } from "../scene/types"; const _renderNewElementScene = ({ canvas, diff --git a/packages/excalidraw/renderer/renderSnaps.ts b/packages/excalidraw/src/renderer/renderSnaps.ts similarity index 97% rename from packages/excalidraw/renderer/renderSnaps.ts rename to packages/excalidraw/src/renderer/renderSnaps.ts index dd131f779..6acd75b6c 100644 --- a/packages/excalidraw/renderer/renderSnaps.ts +++ b/packages/excalidraw/src/renderer/renderSnaps.ts @@ -2,8 +2,8 @@ import { pointFrom, type GlobalPoint, type LocalPoint } from "@excalidraw/math"; import { THEME } from "@excalidraw/common"; -import type { PointSnapLine, PointerSnapLine } from "../snapping"; -import type { InteractiveCanvasAppState } from "../types"; +import type { PointSnapLine, PointerSnapLine } from "../../snapping"; +import type { InteractiveCanvasAppState } from "../../types"; const SNAP_COLOR_LIGHT = "#ff6b6b"; const SNAP_COLOR_DARK = "#ff0000"; diff --git a/packages/excalidraw/renderer/roundRect.ts b/packages/excalidraw/src/renderer/roundRect.ts similarity index 100% rename from packages/excalidraw/renderer/roundRect.ts rename to packages/excalidraw/src/renderer/roundRect.ts diff --git a/packages/excalidraw/renderer/staticScene.ts b/packages/excalidraw/src/renderer/staticScene.ts similarity index 98% rename from packages/excalidraw/renderer/staticScene.ts rename to packages/excalidraw/src/renderer/staticScene.ts index a46e02542..8b5123f57 100644 --- a/packages/excalidraw/renderer/staticScene.ts +++ b/packages/excalidraw/src/renderer/staticScene.ts @@ -27,15 +27,15 @@ import { EXTERNAL_LINK_IMG, ELEMENT_LINK_IMG, getLinkHandleFromCoords, -} from "../components/hyperlink/helpers"; +} from "../../components/hyperlink/helpers"; import { bootstrapCanvas, getNormalizedCanvasDimensions } from "./helpers"; import type { StaticCanvasRenderConfig, StaticSceneRenderConfig, -} from "../src/scene/types"; -import type { StaticCanvasAppState, Zoom } from "../types"; +} from "../scene/types"; +import type { StaticCanvasAppState, Zoom } from "../../types"; const GridLineColor = { Bold: "#dddddd", diff --git a/packages/excalidraw/renderer/staticSvgScene.ts b/packages/excalidraw/src/renderer/staticSvgScene.ts similarity index 99% rename from packages/excalidraw/renderer/staticSvgScene.ts rename to packages/excalidraw/src/renderer/staticSvgScene.ts index 6912f0fb9..7f26773bc 100644 --- a/packages/excalidraw/renderer/staticSvgScene.ts +++ b/packages/excalidraw/src/renderer/staticSvgScene.ts @@ -47,11 +47,8 @@ import type { NonDeletedExcalidrawElement, } from "@excalidraw/element/types"; -import type { - RenderableElementsMap, - SVGRenderConfig, -} from "../src/scene/types"; -import type { AppState, BinaryFiles } from "../types"; +import type { RenderableElementsMap, SVGRenderConfig } from "../scene/types"; +import type { AppState, BinaryFiles } from "../../types"; import type { Drawable } from "roughjs/bin/core"; import type { RoughSVG } from "roughjs/bin/svg"; diff --git a/packages/excalidraw/src/scene/Renderer.ts b/packages/excalidraw/src/scene/Renderer.ts index 86fb7b2e7..9cb1cfc65 100644 --- a/packages/excalidraw/src/scene/Renderer.ts +++ b/packages/excalidraw/src/scene/Renderer.ts @@ -9,8 +9,8 @@ import type { NonDeletedExcalidrawElement, } from "@excalidraw/element/types"; -import { renderInteractiveSceneThrottled } from "../../renderer/interactiveScene"; -import { renderStaticSceneThrottled } from "../../renderer/staticScene"; +import { renderInteractiveSceneThrottled } from "../renderer/interactiveScene"; +import { renderStaticSceneThrottled } from "../renderer/staticScene"; import type Scene from "./Scene"; import type { RenderableElementsMap } from "./types"; diff --git a/packages/excalidraw/src/scene/export.ts b/packages/excalidraw/src/scene/export.ts index fcba8ac17..8d0e34a39 100644 --- a/packages/excalidraw/src/scene/export.ts +++ b/packages/excalidraw/src/scene/export.ts @@ -63,8 +63,8 @@ import { serializeAsJSON } from "../../data/json"; import { Fonts } from "../../fonts"; -import { renderStaticScene } from "../../renderer/staticScene"; -import { renderSceneToSvg } from "../../renderer/staticSvgScene"; +import { renderStaticScene } from "../renderer/staticScene"; +import { renderSceneToSvg } from "../renderer/staticSvgScene"; import type { RenderableElementsMap } from "./types"; diff --git a/packages/excalidraw/tests/App.test.tsx b/packages/excalidraw/tests/App.test.tsx index 7a1790cee..039abec0d 100644 --- a/packages/excalidraw/tests/App.test.tsx +++ b/packages/excalidraw/tests/App.test.tsx @@ -4,7 +4,7 @@ import { vi } from "vitest"; import { reseed } from "@excalidraw/common"; import { Excalidraw } from "../index"; -import * as StaticScene from "../renderer/staticScene"; +import * as StaticScene from "../src/renderer/staticScene"; import { render, queryByTestId, unmountComponent } from "../tests/test-utils"; const renderStaticScene = vi.spyOn(StaticScene, "renderStaticScene"); diff --git a/packages/excalidraw/tests/contextmenu.test.tsx b/packages/excalidraw/tests/contextmenu.test.tsx index ef36e3d52..1a24147e2 100644 --- a/packages/excalidraw/tests/contextmenu.test.tsx +++ b/packages/excalidraw/tests/contextmenu.test.tsx @@ -7,7 +7,7 @@ import { setDateTimeForTests } from "@excalidraw/common"; import { copiedStyles } from "../actions/actionStyles"; import { Excalidraw } from "../index"; -import * as StaticScene from "../renderer/staticScene"; +import * as StaticScene from "../src/renderer/staticScene"; import { API } from "./helpers/api"; import { UI, Pointer, Keyboard } from "./helpers/ui"; diff --git a/packages/excalidraw/tests/dragCreate.test.tsx b/packages/excalidraw/tests/dragCreate.test.tsx index c33da5e7e..33e0204b6 100644 --- a/packages/excalidraw/tests/dragCreate.test.tsx +++ b/packages/excalidraw/tests/dragCreate.test.tsx @@ -6,8 +6,8 @@ import { KEYS, reseed } from "@excalidraw/common"; import type { ExcalidrawLinearElement } from "@excalidraw/element/types"; import { Excalidraw } from "../index"; -import * as InteractiveScene from "../renderer/interactiveScene"; -import * as StaticScene from "../renderer/staticScene"; +import * as InteractiveScene from "../src/renderer/interactiveScene"; +import * as StaticScene from "../src/renderer/staticScene"; import { render, diff --git a/packages/excalidraw/tests/history.test.tsx b/packages/excalidraw/tests/history.test.tsx index 8dd65c7a5..b5f888191 100644 --- a/packages/excalidraw/tests/history.test.tsx +++ b/packages/excalidraw/tests/history.test.tsx @@ -48,7 +48,7 @@ import { actionToggleViewMode } from "../actions/actionToggleViewMode"; import { getDefaultAppState } from "../appState"; import { HistoryEntry } from "../history"; import { Excalidraw } from "../index"; -import * as StaticScene from "../renderer/staticScene"; +import * as StaticScene from "../src/renderer/staticScene"; import { Snapshot, CaptureUpdateAction } from "../store"; import { AppStateChange, ElementsChange } from "../change"; diff --git a/packages/excalidraw/tests/linearElementEditor.test.tsx b/packages/excalidraw/tests/linearElementEditor.test.tsx index 861998584..1f829745a 100644 --- a/packages/excalidraw/tests/linearElementEditor.test.tsx +++ b/packages/excalidraw/tests/linearElementEditor.test.tsx @@ -31,8 +31,8 @@ import type { } from "@excalidraw/element/types"; import { Excalidraw, mutateElement } from "../index"; -import * as InteractiveCanvas from "../renderer/interactiveScene"; -import * as StaticScene from "../renderer/staticScene"; +import * as InteractiveCanvas from "../src/renderer/interactiveScene"; +import * as StaticScene from "../src/renderer/staticScene"; import { API } from "../tests/helpers/api"; import { Keyboard, Pointer, UI } from "./helpers/ui"; diff --git a/packages/excalidraw/tests/move.test.tsx b/packages/excalidraw/tests/move.test.tsx index d0ef05980..6c43d6699 100644 --- a/packages/excalidraw/tests/move.test.tsx +++ b/packages/excalidraw/tests/move.test.tsx @@ -16,8 +16,8 @@ import type { import type Scene from "@excalidraw/excalidraw/src/scene/Scene"; import { Excalidraw } from "../index"; -import * as InteractiveCanvas from "../renderer/interactiveScene"; -import * as StaticScene from "../renderer/staticScene"; +import * as InteractiveCanvas from "../src/renderer/interactiveScene"; +import * as StaticScene from "../src/renderer/staticScene"; import { UI, Pointer, Keyboard } from "./helpers/ui"; import { render, fireEvent, act, unmountComponent } from "./test-utils"; diff --git a/packages/excalidraw/tests/multiPointCreate.test.tsx b/packages/excalidraw/tests/multiPointCreate.test.tsx index cde3c7f98..f4a009127 100644 --- a/packages/excalidraw/tests/multiPointCreate.test.tsx +++ b/packages/excalidraw/tests/multiPointCreate.test.tsx @@ -7,8 +7,8 @@ import type { ExcalidrawLinearElement } from "@excalidraw/element/types"; import { Excalidraw } from "../index"; -import * as InteractiveCanvas from "../renderer/interactiveScene"; -import * as StaticScene from "../renderer/staticScene"; +import * as InteractiveCanvas from "../src/renderer/interactiveScene"; +import * as StaticScene from "../src/renderer/staticScene"; import { render, diff --git a/packages/excalidraw/tests/regressionTests.test.tsx b/packages/excalidraw/tests/regressionTests.test.tsx index 68765024e..00baee59e 100644 --- a/packages/excalidraw/tests/regressionTests.test.tsx +++ b/packages/excalidraw/tests/regressionTests.test.tsx @@ -8,7 +8,7 @@ import { setDateTimeForTests } from "@excalidraw/common"; import type { ExcalidrawElement } from "@excalidraw/element/types"; import { Excalidraw } from "../index"; -import * as StaticScene from "../renderer/staticScene"; +import * as StaticScene from "../src/renderer/staticScene"; import { API } from "./helpers/api"; import { Keyboard, Pointer, UI } from "./helpers/ui"; diff --git a/packages/excalidraw/tests/selection.test.tsx b/packages/excalidraw/tests/selection.test.tsx index 10f4f7ad9..4e8526c89 100644 --- a/packages/excalidraw/tests/selection.test.tsx +++ b/packages/excalidraw/tests/selection.test.tsx @@ -6,8 +6,8 @@ import { KEYS, reseed } from "@excalidraw/common"; import { SHAPES } from "../components/shapes"; import { Excalidraw } from "../index"; -import * as InteractiveCanvas from "../renderer/interactiveScene"; -import * as StaticScene from "../renderer/staticScene"; +import * as InteractiveCanvas from "../src/renderer/interactiveScene"; +import * as StaticScene from "../src/renderer/staticScene"; import { API } from "./helpers/api"; import { Keyboard, Pointer, UI } from "./helpers/ui";