From 1ed3aeb81ca6e217bc86e908a79b4ae730a8751b Mon Sep 17 00:00:00 2001 From: Deepen Timalsina Date: Mon, 14 Apr 2025 21:12:42 +0545 Subject: [PATCH] Move scene folder into src --- packages/element/src/Shape.ts | 2 +- packages/element/src/ShapeCache.ts | 2 +- packages/element/src/align.ts | 2 +- packages/element/src/binding.ts | 2 +- packages/element/src/dragElements.ts | 2 +- packages/element/src/frame.ts | 2 +- packages/element/src/linearElementEditor.ts | 2 +- packages/element/src/mutateElement.ts | 2 +- packages/element/src/renderElement.ts | 2 +- packages/element/src/resizeElements.ts | 2 +- packages/element/src/zindex.ts | 2 +- packages/excalidraw/clients.ts | 2 +- packages/excalidraw/components/Actions.tsx | 2 +- packages/excalidraw/components/App.tsx | 12 ++++++------ .../CommandPalette/CommandPalette.tsx | 2 +- .../components/ElementLinkDialog.tsx | 2 +- packages/excalidraw/components/EyeDropper.tsx | 2 +- .../components/ImageExportDialog.tsx | 2 +- packages/excalidraw/components/LayerUI.tsx | 4 ++-- .../excalidraw/components/LibraryMenu.tsx | 2 +- packages/excalidraw/components/MobileMenu.tsx | 4 ++-- .../components/PasteChartDialog.tsx | 2 +- .../excalidraw/components/Stats/Angle.tsx | 2 +- .../components/Stats/CanvasGrid.tsx | 4 ++-- .../excalidraw/components/Stats/Dimension.tsx | 2 +- .../excalidraw/components/Stats/DragInput.tsx | 2 +- .../excalidraw/components/Stats/FontSize.tsx | 2 +- .../components/Stats/MultiAngle.tsx | 2 +- .../components/Stats/MultiDimension.tsx | 2 +- .../components/Stats/MultiFontSize.tsx | 2 +- .../components/Stats/MultiPosition.tsx | 2 +- .../excalidraw/components/Stats/Position.tsx | 2 +- packages/excalidraw/components/Stats/utils.ts | 2 +- .../components/canvases/InteractiveCanvas.tsx | 2 +- .../components/canvases/NewElementCanvas.tsx | 2 +- .../components/canvases/StaticCanvas.tsx | 2 +- .../components/hyperlink/Hyperlink.tsx | 2 +- packages/excalidraw/fonts/Fonts.ts | 2 +- packages/excalidraw/index-node.ts | 2 +- packages/excalidraw/renderer/helpers.ts | 2 +- .../excalidraw/renderer/interactiveScene.ts | 4 ++-- .../renderer/renderNewElementScene.ts | 2 +- packages/excalidraw/renderer/staticScene.ts | 2 +- .../excalidraw/renderer/staticSvgScene.ts | 5 ++++- .../excalidraw/src/actions/actionAlign.tsx | 2 +- .../excalidraw/src/actions/actionCanvas.tsx | 6 +++--- .../src/actions/actionDeleteSelected.tsx | 2 +- .../src/actions/actionDistribute.tsx | 2 +- .../src/actions/actionDuplicateSelection.tsx | 2 +- .../src/actions/actionElementLink.ts | 2 +- .../src/actions/actionElementLock.ts | 2 +- .../excalidraw/src/actions/actionExport.tsx | 4 ++-- packages/excalidraw/src/actions/actionFlip.ts | 2 +- .../excalidraw/src/actions/actionFrame.ts | 2 +- .../excalidraw/src/actions/actionGroup.tsx | 2 +- .../excalidraw/src/actions/actionLink.tsx | 2 +- .../src/actions/actionProperties.tsx | 2 +- .../excalidraw/src/actions/actionStyles.ts | 2 +- .../src/actions/actionTextAutoResize.ts | 2 +- packages/excalidraw/src/data/blob.ts | 4 ++-- packages/excalidraw/src/data/index.ts | 6 +++--- packages/excalidraw/src/data/restore.ts | 2 +- .../excalidraw/{ => src}/scene/Renderer.ts | 6 +++--- packages/excalidraw/{ => src}/scene/Scene.ts | 2 +- packages/excalidraw/{ => src}/scene/export.ts | 19 +++++++------------ packages/excalidraw/{ => src}/scene/index.ts | 0 .../excalidraw/{ => src}/scene/normalize.ts | 2 +- packages/excalidraw/{ => src}/scene/scroll.ts | 2 +- .../excalidraw/{ => src}/scene/scrollbars.ts | 4 ++-- packages/excalidraw/{ => src}/scene/types.ts | 2 +- packages/excalidraw/{ => src}/scene/zoom.ts | 2 +- packages/excalidraw/types.ts | 2 +- packages/excalidraw/wysiwyg/textWysiwyg.tsx | 2 +- packages/utils/src/export.ts | 2 +- 74 files changed, 100 insertions(+), 102 deletions(-) rename packages/excalidraw/{ => src}/scene/Renderer.ts (95%) rename packages/excalidraw/{ => src}/scene/Scene.ts (99%) rename packages/excalidraw/{ => src}/scene/export.ts (97%) rename packages/excalidraw/{ => src}/scene/index.ts (100%) rename packages/excalidraw/{ => src}/scene/normalize.ts (89%) rename packages/excalidraw/{ => src}/scene/scroll.ts (99%) rename packages/excalidraw/{ => src}/scene/scrollbars.ts (97%) rename packages/excalidraw/{ => src}/scene/types.ts (99%) rename packages/excalidraw/{ => src}/scene/zoom.ts (93%) diff --git a/packages/element/src/Shape.ts b/packages/element/src/Shape.ts index 4def41957..b0d4b716d 100644 --- a/packages/element/src/Shape.ts +++ b/packages/element/src/Shape.ts @@ -6,7 +6,7 @@ import { ROUGHNESS, isTransparent, assertNever } from "@excalidraw/common"; import type { Mutable } from "@excalidraw/common/utility-types"; import type { EmbedsValidationStatus } from "@excalidraw/excalidraw/types"; -import type { ElementShapes } from "@excalidraw/excalidraw/scene/types"; +import type { ElementShapes } from "@excalidraw/excalidraw/src/scene/types"; import { isElbowArrow, diff --git a/packages/element/src/ShapeCache.ts b/packages/element/src/ShapeCache.ts index 8f0c94324..e60255299 100644 --- a/packages/element/src/ShapeCache.ts +++ b/packages/element/src/ShapeCache.ts @@ -9,7 +9,7 @@ import type { import type { ElementShape, ElementShapes, -} from "@excalidraw/excalidraw/scene/types"; +} from "@excalidraw/excalidraw/src/scene/types"; import { _generateElementShape } from "./Shape"; diff --git a/packages/element/src/align.ts b/packages/element/src/align.ts index 61535b434..e0fcf7fea 100644 --- a/packages/element/src/align.ts +++ b/packages/element/src/align.ts @@ -1,4 +1,4 @@ -import type Scene from "@excalidraw/excalidraw/scene/Scene"; +import type Scene from "@excalidraw/excalidraw/src/scene/Scene"; import { updateBoundElements } from "./binding"; import { getCommonBoundingBox } from "./bounds"; diff --git a/packages/element/src/binding.ts b/packages/element/src/binding.ts index 5c32e8c81..27ca9b599 100644 --- a/packages/element/src/binding.ts +++ b/packages/element/src/binding.ts @@ -31,7 +31,7 @@ import { isPointOnShape } from "@excalidraw/utils/collision"; import type { LocalPoint, Radians } from "@excalidraw/math"; -import type Scene from "@excalidraw/excalidraw/scene/Scene"; +import type Scene from "@excalidraw/excalidraw/src/scene/Scene"; import type { AppState } from "@excalidraw/excalidraw/types"; diff --git a/packages/element/src/dragElements.ts b/packages/element/src/dragElements.ts index 669417a54..cb8a5fc62 100644 --- a/packages/element/src/dragElements.ts +++ b/packages/element/src/dragElements.ts @@ -11,7 +11,7 @@ import type { PointerDownState, } from "@excalidraw/excalidraw/types"; -import type Scene from "@excalidraw/excalidraw/scene/Scene"; +import type Scene from "@excalidraw/excalidraw/src/scene/Scene"; import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types"; diff --git a/packages/element/src/frame.ts b/packages/element/src/frame.ts index 7f40148b7..eb2c2138c 100644 --- a/packages/element/src/frame.ts +++ b/packages/element/src/frame.ts @@ -3,7 +3,7 @@ import { isPointWithinBounds, pointFrom } from "@excalidraw/math"; import { doLineSegmentsIntersect } from "@excalidraw/utils/bbox"; import { elementsOverlappingBBox } from "@excalidraw/utils/withinBounds"; -import type { ExcalidrawElementsIncludingDeleted } from "@excalidraw/excalidraw/scene/Scene"; +import type { ExcalidrawElementsIncludingDeleted } from "@excalidraw/excalidraw/src/scene/Scene"; import type { AppClassProperties, diff --git a/packages/element/src/linearElementEditor.ts b/packages/element/src/linearElementEditor.ts index 8a9117bf8..6c8d0a461 100644 --- a/packages/element/src/linearElementEditor.ts +++ b/packages/element/src/linearElementEditor.ts @@ -22,7 +22,7 @@ import { // TODO: remove direct dependency on the scene, should be passed in or injected instead // eslint-disable-next-line @typescript-eslint/no-restricted-imports -import Scene from "@excalidraw/excalidraw/scene/Scene"; +import Scene from "@excalidraw/excalidraw/src/scene/Scene"; import type { Store } from "@excalidraw/excalidraw/store"; diff --git a/packages/element/src/mutateElement.ts b/packages/element/src/mutateElement.ts index d87007369..32b41f28f 100644 --- a/packages/element/src/mutateElement.ts +++ b/packages/element/src/mutateElement.ts @@ -7,7 +7,7 @@ import { // TODO: remove direct dependency on the scene, should be passed in or injected instead // eslint-disable-next-line @typescript-eslint/no-restricted-imports -import Scene from "@excalidraw/excalidraw/scene/Scene"; +import Scene from "@excalidraw/excalidraw/src/scene/Scene"; import type { Radians } from "@excalidraw/math"; diff --git a/packages/element/src/renderElement.ts b/packages/element/src/renderElement.ts index c8091e8ed..44ddd51a7 100644 --- a/packages/element/src/renderElement.ts +++ b/packages/element/src/renderElement.ts @@ -30,7 +30,7 @@ import type { StaticCanvasRenderConfig, RenderableElementsMap, InteractiveCanvasRenderConfig, -} from "@excalidraw/excalidraw/scene/types"; +} from "@excalidraw/excalidraw/src/scene/types"; import { getElementAbsoluteCoords } from "./bounds"; import { getUncroppedImageElement } from "./cropElement"; diff --git a/packages/element/src/resizeElements.ts b/packages/element/src/resizeElements.ts index 3ff405603..1a12426ee 100644 --- a/packages/element/src/resizeElements.ts +++ b/packages/element/src/resizeElements.ts @@ -17,7 +17,7 @@ import { import type { GlobalPoint } from "@excalidraw/math"; -import type Scene from "@excalidraw/excalidraw/scene/Scene"; +import type Scene from "@excalidraw/excalidraw/src/scene/Scene"; import type { PointerDownState } from "@excalidraw/excalidraw/types"; diff --git a/packages/element/src/zindex.ts b/packages/element/src/zindex.ts index e09142e4a..16a5936a0 100644 --- a/packages/element/src/zindex.ts +++ b/packages/element/src/zindex.ts @@ -2,7 +2,7 @@ import { arrayToMap, findIndex, findLastIndex } from "@excalidraw/common"; import type { AppState } from "@excalidraw/excalidraw/types"; -import type Scene from "@excalidraw/excalidraw/scene/Scene"; +import type Scene from "@excalidraw/excalidraw/src/scene/Scene"; import { isFrameLikeElement } from "./typeChecks"; diff --git a/packages/excalidraw/clients.ts b/packages/excalidraw/clients.ts index 9467b1362..e542474b3 100644 --- a/packages/excalidraw/clients.ts +++ b/packages/excalidraw/clients.ts @@ -8,7 +8,7 @@ import { import { roundRect } from "./renderer/roundRect"; -import type { InteractiveCanvasRenderConfig } from "./scene/types"; +import type { InteractiveCanvasRenderConfig } from "./src/scene/types"; import type { Collaborator, InteractiveCanvasAppState, diff --git a/packages/excalidraw/components/Actions.tsx b/packages/excalidraw/components/Actions.tsx index 9da667848..3246707eb 100644 --- a/packages/excalidraw/components/Actions.tsx +++ b/packages/excalidraw/components/Actions.tsx @@ -44,7 +44,7 @@ import { hasBackground, hasStrokeStyle, hasStrokeWidth, -} from "../scene"; +} from "../src/scene"; import { SHAPES } from "./shapes"; diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx index 05bc88ebf..04a1535d1 100644 --- a/packages/excalidraw/components/App.tsx +++ b/packages/excalidraw/components/App.tsx @@ -406,9 +406,9 @@ import { getSelectedElements, hasBackground, isSomeElementSelected, -} from "../scene"; -import Scene from "../scene/Scene"; -import { getStateForZoom } from "../scene/zoom"; +} from "../src/scene"; +import Scene from "../src/scene/Scene"; +import { getStateForZoom } from "../src/scene/zoom"; import { dataURLToFile, dataURLToString, @@ -449,7 +449,7 @@ import { isGridModeEnabled, } from "../snapping"; import { convertToExcalidrawElements } from "../src/data/transform"; -import { Renderer } from "../scene/Renderer"; +import { Renderer } from "../src/scene/Renderer"; import { setEraserCursor, setCursor, @@ -463,7 +463,7 @@ import { AnimatedTrail } from "../animated-trail"; import { LaserTrails } from "../laser-trails"; import { withBatchedUpdates, withBatchedUpdatesThrottled } from "../reactUtils"; import { textWysiwyg } from "../wysiwyg/textWysiwyg"; -import { isOverScrollBars } from "../scene/scrollbars"; +import { isOverScrollBars } from "../src/scene/scrollbars"; import { isMaybeMermaidDefinition } from "../mermaid"; @@ -493,7 +493,7 @@ import { findShapeByKey } from "./shapes"; import type { RenderInteractiveSceneCallback, ScrollBars, -} from "../scene/types"; +} from "../src/scene/types"; import type { PastedMixedContent } from "../clipboard"; import type { ExportedElements } from "../src/data"; diff --git a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx b/packages/excalidraw/components/CommandPalette/CommandPalette.tsx index 73264d0a7..926b5e4b5 100644 --- a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx +++ b/packages/excalidraw/components/CommandPalette/CommandPalette.tsx @@ -37,7 +37,7 @@ import { import { Dialog } from "../Dialog"; import { InlineIcon } from "../InlineIcon"; import { TextField } from "../TextField"; -import { getSelectedElements } from "../../scene"; +import { getSelectedElements } from "../../src/scene"; import { LockedIcon, UnlockedIcon, diff --git a/packages/excalidraw/components/ElementLinkDialog.tsx b/packages/excalidraw/components/ElementLinkDialog.tsx index 5a0b9107b..488539f6f 100644 --- a/packages/excalidraw/components/ElementLinkDialog.tsx +++ b/packages/excalidraw/components/ElementLinkDialog.tsx @@ -11,7 +11,7 @@ import { mutateElement } from "@excalidraw/element/mutateElement"; import type { ElementsMap, ExcalidrawElement } from "@excalidraw/element/types"; import { t } from "../i18n"; -import { getSelectedElements } from "../scene"; +import { getSelectedElements } from "../src/scene"; import DialogActionButton from "./DialogActionButton"; import { TextField } from "./TextField"; diff --git a/packages/excalidraw/components/EyeDropper.tsx b/packages/excalidraw/components/EyeDropper.tsx index 31d1d0781..06c691b21 100644 --- a/packages/excalidraw/components/EyeDropper.tsx +++ b/packages/excalidraw/components/EyeDropper.tsx @@ -10,7 +10,7 @@ import { atom } from "../editor-jotai"; import { useCreatePortalContainer } from "../hooks/useCreatePortalContainer"; import { useOutsideClick } from "../hooks/useOutsideClick"; import { useStable } from "../hooks/useStable"; -import { getSelectedElements } from "../scene"; +import { getSelectedElements } from "../src/scene"; import { useApp, useExcalidrawContainer, useExcalidrawElements } from "./App"; diff --git a/packages/excalidraw/components/ImageExportDialog.tsx b/packages/excalidraw/components/ImageExportDialog.tsx index c60a661d9..dc7a115bd 100644 --- a/packages/excalidraw/components/ImageExportDialog.tsx +++ b/packages/excalidraw/components/ImageExportDialog.tsx @@ -25,7 +25,7 @@ import { nativeFileSystemSupported } from "../src/data/filesystem"; import { useCopyStatus } from "../hooks/useCopiedIndicator"; import { t } from "../i18n"; -import { isSomeElementSelected } from "../scene"; +import { isSomeElementSelected } from "../src/scene"; import { copyIcon, downloadIcon, helpIcon } from "./icons"; import { Dialog } from "./Dialog"; diff --git a/packages/excalidraw/components/LayerUI.tsx b/packages/excalidraw/components/LayerUI.tsx index 581c15917..29ca5dd81 100644 --- a/packages/excalidraw/components/LayerUI.tsx +++ b/packages/excalidraw/components/LayerUI.tsx @@ -17,7 +17,7 @@ import { ShapeCache } from "@excalidraw/element/ShapeCache"; import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types"; -import Scene from "../scene/Scene"; +import Scene from "../src/scene/Scene"; import { actionToggleStats } from "../src/actions"; import { trackEvent } from "../analytics"; import { isHandToolActive } from "../appState"; @@ -26,7 +26,7 @@ import { UIAppStateContext } from "../src/context/ui-appState"; import { useAtom, useAtomValue } from "../editor-jotai"; import { t } from "../i18n"; -import { calculateScrollCenter } from "../scene"; +import { calculateScrollCenter } from "../src/scene"; import { SelectedShapeActions, ShapesSwitcher } from "./Actions"; import { LoadingMessage } from "./LoadingMessage"; diff --git a/packages/excalidraw/components/LibraryMenu.tsx b/packages/excalidraw/components/LibraryMenu.tsx index 4cd5c7a33..823938ecc 100644 --- a/packages/excalidraw/components/LibraryMenu.tsx +++ b/packages/excalidraw/components/LibraryMenu.tsx @@ -27,7 +27,7 @@ import { import { atom, useAtom } from "../editor-jotai"; import { t } from "../i18n"; -import { getSelectedElements } from "../scene"; +import { getSelectedElements } from "../src/scene"; import { useApp, diff --git a/packages/excalidraw/components/MobileMenu.tsx b/packages/excalidraw/components/MobileMenu.tsx index 9dc157cd9..705b69f09 100644 --- a/packages/excalidraw/components/MobileMenu.tsx +++ b/packages/excalidraw/components/MobileMenu.tsx @@ -7,8 +7,8 @@ import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types"; import { isHandToolActive } from "../appState"; import { useTunnels } from "../src/context/tunnels"; import { t } from "../i18n"; -import { calculateScrollCenter } from "../scene"; -import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../scene/scrollbars"; +import { calculateScrollCenter } from "../src/scene"; +import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../src/scene/scrollbars"; import { SelectedShapeActions, ShapesSwitcher } from "./Actions"; import { FixedSideContainer } from "./FixedSideContainer"; diff --git a/packages/excalidraw/components/PasteChartDialog.tsx b/packages/excalidraw/components/PasteChartDialog.tsx index 2566017ac..226936677 100644 --- a/packages/excalidraw/components/PasteChartDialog.tsx +++ b/packages/excalidraw/components/PasteChartDialog.tsx @@ -6,7 +6,7 @@ import type { ChartType } from "@excalidraw/element/types"; import { trackEvent } from "../analytics"; import { renderSpreadsheet } from "../charts"; import { t } from "../i18n"; -import { exportToSvg } from "../scene/export"; +import { exportToSvg } from "../src/scene/export"; import { useApp } from "./App"; import { Dialog } from "./Dialog"; diff --git a/packages/excalidraw/components/Stats/Angle.tsx b/packages/excalidraw/components/Stats/Angle.tsx index 67693551f..77e840561 100644 --- a/packages/excalidraw/components/Stats/Angle.tsx +++ b/packages/excalidraw/components/Stats/Angle.tsx @@ -15,7 +15,7 @@ import DragInput from "./DragInput"; import { getStepSizedValue, isPropertyEditable, updateBindings } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; -import type Scene from "../../scene/Scene"; +import type Scene from "../../src/scene/Scene"; import type { AppState } from "../../types"; interface AngleProps { diff --git a/packages/excalidraw/components/Stats/CanvasGrid.tsx b/packages/excalidraw/components/Stats/CanvasGrid.tsx index 4611365f4..8c1dbe4a8 100644 --- a/packages/excalidraw/components/Stats/CanvasGrid.tsx +++ b/packages/excalidraw/components/Stats/CanvasGrid.tsx @@ -1,9 +1,9 @@ -import { getNormalizedGridStep } from "../../scene"; +import { getNormalizedGridStep } from "../../src/scene"; import StatsDragInput from "./DragInput"; import { getStepSizedValue } from "./utils"; -import type Scene from "../../scene/Scene"; +import type Scene from "../../src/scene/Scene"; import type { AppState } from "../../types"; interface PositionProps { diff --git a/packages/excalidraw/components/Stats/Dimension.tsx b/packages/excalidraw/components/Stats/Dimension.tsx index 142abc407..d181b0732 100644 --- a/packages/excalidraw/components/Stats/Dimension.tsx +++ b/packages/excalidraw/components/Stats/Dimension.tsx @@ -15,7 +15,7 @@ import DragInput from "./DragInput"; import { getStepSizedValue, isPropertyEditable } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; -import type Scene from "../../scene/Scene"; +import type Scene from "../../src/scene/Scene"; import type { AppState } from "../../types"; interface DimensionDragInputProps { diff --git a/packages/excalidraw/components/Stats/DragInput.tsx b/packages/excalidraw/components/Stats/DragInput.tsx index b4795308d..7bd4bed19 100644 --- a/packages/excalidraw/components/Stats/DragInput.tsx +++ b/packages/excalidraw/components/Stats/DragInput.tsx @@ -16,7 +16,7 @@ import { SMALLEST_DELTA } from "./utils"; import "./DragInput.scss"; import type { StatsInputProperty } from "./utils"; -import type Scene from "../../scene/Scene"; +import type Scene from "../../src/scene/Scene"; import type { AppState } from "../../types"; export type DragInputCallbackType< diff --git a/packages/excalidraw/components/Stats/FontSize.tsx b/packages/excalidraw/components/Stats/FontSize.tsx index 90bdee564..ed2ba5ba0 100644 --- a/packages/excalidraw/components/Stats/FontSize.tsx +++ b/packages/excalidraw/components/Stats/FontSize.tsx @@ -19,7 +19,7 @@ import StatsDragInput from "./DragInput"; import { getStepSizedValue } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; -import type Scene from "../../scene/Scene"; +import type Scene from "../../src/scene/Scene"; import type { AppState } from "../../types"; interface FontSizeProps { diff --git a/packages/excalidraw/components/Stats/MultiAngle.tsx b/packages/excalidraw/components/Stats/MultiAngle.tsx index 3cabd19c0..3bb91d131 100644 --- a/packages/excalidraw/components/Stats/MultiAngle.tsx +++ b/packages/excalidraw/components/Stats/MultiAngle.tsx @@ -17,7 +17,7 @@ import DragInput from "./DragInput"; import { getStepSizedValue, isPropertyEditable } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; -import type Scene from "../../scene/Scene"; +import type Scene from "../../src/scene/Scene"; import type { AppState } from "../../types"; interface MultiAngleProps { diff --git a/packages/excalidraw/components/Stats/MultiDimension.tsx b/packages/excalidraw/components/Stats/MultiDimension.tsx index b482611af..4a3a183f8 100644 --- a/packages/excalidraw/components/Stats/MultiDimension.tsx +++ b/packages/excalidraw/components/Stats/MultiDimension.tsx @@ -29,7 +29,7 @@ import { getElementsInAtomicUnit } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; import type { AtomicUnit } from "./utils"; -import type Scene from "../../scene/Scene"; +import type Scene from "../../src/scene/Scene"; import type { AppState } from "../../types"; interface MultiDimensionProps { diff --git a/packages/excalidraw/components/Stats/MultiFontSize.tsx b/packages/excalidraw/components/Stats/MultiFontSize.tsx index 6bac4bd3c..20dc5fe00 100644 --- a/packages/excalidraw/components/Stats/MultiFontSize.tsx +++ b/packages/excalidraw/components/Stats/MultiFontSize.tsx @@ -22,7 +22,7 @@ import StatsDragInput from "./DragInput"; import { getStepSizedValue } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; -import type Scene from "../../scene/Scene"; +import type Scene from "../../src/scene/Scene"; import type { AppState } from "../../types"; interface MultiFontSizeProps { diff --git a/packages/excalidraw/components/Stats/MultiPosition.tsx b/packages/excalidraw/components/Stats/MultiPosition.tsx index 98058efec..bf62576ce 100644 --- a/packages/excalidraw/components/Stats/MultiPosition.tsx +++ b/packages/excalidraw/components/Stats/MultiPosition.tsx @@ -18,7 +18,7 @@ import { getElementsInAtomicUnit, moveElement } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; import type { AtomicUnit } from "./utils"; -import type Scene from "../../scene/Scene"; +import type Scene from "../../src/scene/Scene"; import type { AppState } from "../../types"; interface MultiPositionProps { diff --git a/packages/excalidraw/components/Stats/Position.tsx b/packages/excalidraw/components/Stats/Position.tsx index bf6dfd161..a107adc56 100644 --- a/packages/excalidraw/components/Stats/Position.tsx +++ b/packages/excalidraw/components/Stats/Position.tsx @@ -13,7 +13,7 @@ import StatsDragInput from "./DragInput"; import { getStepSizedValue, moveElement } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; -import type Scene from "../../scene/Scene"; +import type Scene from "../../src/scene/Scene"; import type { AppState } from "../../types"; interface PositionProps { diff --git a/packages/excalidraw/components/Stats/utils.ts b/packages/excalidraw/components/Stats/utils.ts index dbb47a234..3ed8869f5 100644 --- a/packages/excalidraw/components/Stats/utils.ts +++ b/packages/excalidraw/components/Stats/utils.ts @@ -27,7 +27,7 @@ import type { NonDeletedSceneElementsMap, } from "@excalidraw/element/types"; -import type Scene from "../../scene/Scene"; +import type Scene from "../../src/scene/Scene"; import type { AppState } from "../../types"; export type StatsInputProperty = diff --git a/packages/excalidraw/components/canvases/InteractiveCanvas.tsx b/packages/excalidraw/components/canvases/InteractiveCanvas.tsx index 1f4f57433..4c12777ef 100644 --- a/packages/excalidraw/components/canvases/InteractiveCanvas.tsx +++ b/packages/excalidraw/components/canvases/InteractiveCanvas.tsx @@ -19,7 +19,7 @@ import type { InteractiveCanvasRenderConfig, RenderableElementsMap, RenderInteractiveSceneCallback, -} from "../../scene/types"; +} from "../../src/scene/types"; import type { AppState, Device, InteractiveCanvasAppState } from "../../types"; import type { DOMAttributes } from "react"; diff --git a/packages/excalidraw/components/canvases/NewElementCanvas.tsx b/packages/excalidraw/components/canvases/NewElementCanvas.tsx index 4310f1bd1..ee3972527 100644 --- a/packages/excalidraw/components/canvases/NewElementCanvas.tsx +++ b/packages/excalidraw/components/canvases/NewElementCanvas.tsx @@ -8,7 +8,7 @@ import { renderNewElementScene } from "../../renderer/renderNewElementScene"; import type { RenderableElementsMap, StaticCanvasRenderConfig, -} from "../../scene/types"; +} from "../../src/scene/types"; import type { AppState } from "../../types"; import type { RoughCanvas } from "roughjs/bin/canvas"; diff --git a/packages/excalidraw/components/canvases/StaticCanvas.tsx b/packages/excalidraw/components/canvases/StaticCanvas.tsx index 5a498ebac..9d4501893 100644 --- a/packages/excalidraw/components/canvases/StaticCanvas.tsx +++ b/packages/excalidraw/components/canvases/StaticCanvas.tsx @@ -13,7 +13,7 @@ import { renderStaticScene } from "../../renderer/staticScene"; import type { RenderableElementsMap, StaticCanvasRenderConfig, -} from "../../scene/types"; +} from "../../src/scene/types"; import type { AppState, StaticCanvasAppState } from "../../types"; import type { RoughCanvas } from "roughjs/bin/canvas"; diff --git a/packages/excalidraw/components/hyperlink/Hyperlink.tsx b/packages/excalidraw/components/hyperlink/Hyperlink.tsx index 9a386a163..f12f97afd 100644 --- a/packages/excalidraw/components/hyperlink/Hyperlink.tsx +++ b/packages/excalidraw/components/hyperlink/Hyperlink.tsx @@ -47,7 +47,7 @@ import { t } from "../../i18n"; import { useAppProps, useDevice, useExcalidrawAppState } from "../App"; import { ToolButton } from "../ToolButton"; import { FreedrawIcon, TrashIcon, elementLinkIcon } from "../icons"; -import { getSelectedElements } from "../../scene"; +import { getSelectedElements } from "../../src/scene"; import { getLinkHandleFromCoords } from "./helpers"; diff --git a/packages/excalidraw/fonts/Fonts.ts b/packages/excalidraw/fonts/Fonts.ts index 79b5ea1af..2ae3821ea 100644 --- a/packages/excalidraw/fonts/Fonts.ts +++ b/packages/excalidraw/fonts/Fonts.ts @@ -40,7 +40,7 @@ import { NunitoFontFaces } from "./Nunito"; import { VirgilFontFaces } from "./Virgil"; import { XiaolaiFontFaces } from "./Xiaolai"; -import type Scene from "../scene/Scene"; +import type Scene from "../src/scene/Scene"; export class Fonts { // it's ok to track fonts across multiple instances only once, so let's use diff --git a/packages/excalidraw/index-node.ts b/packages/excalidraw/index-node.ts index 3b9499149..1608dc293 100644 --- a/packages/excalidraw/index-node.ts +++ b/packages/excalidraw/index-node.ts @@ -1,5 +1,5 @@ import { getDefaultAppState } from "./appState"; -import { exportToCanvas } from "./scene/export"; +import { exportToCanvas } from "./src/scene/export"; const fs = require("fs"); diff --git a/packages/excalidraw/renderer/helpers.ts b/packages/excalidraw/renderer/helpers.ts index 765ef4294..e1fee07e9 100644 --- a/packages/excalidraw/renderer/helpers.ts +++ b/packages/excalidraw/renderer/helpers.ts @@ -1,6 +1,6 @@ import { THEME, THEME_FILTER } from "@excalidraw/common"; -import type { StaticCanvasRenderConfig } from "../scene/types"; +import type { StaticCanvasRenderConfig } from "../src/scene/types"; import type { StaticCanvasAppState, AppState } from "../types"; export const fillCircle = ( diff --git a/packages/excalidraw/renderer/interactiveScene.ts b/packages/excalidraw/renderer/interactiveScene.ts index 3000c206c..385d34d90 100644 --- a/packages/excalidraw/renderer/interactiveScene.ts +++ b/packages/excalidraw/renderer/interactiveScene.ts @@ -79,7 +79,7 @@ import { getScrollBars, SCROLLBAR_COLOR, SCROLLBAR_WIDTH, -} from "../scene/scrollbars"; +} from "../src/scene/scrollbars"; import { type InteractiveCanvasAppState } from "../types"; import { getClientColor, renderRemoteCursors } from "../clients"; @@ -94,7 +94,7 @@ import type { InteractiveCanvasRenderConfig, InteractiveSceneRenderConfig, RenderableElementsMap, -} from "../scene/types"; +} from "../src/scene/types"; const renderElbowArrowMidPointHighlight = ( context: CanvasRenderingContext2D, diff --git a/packages/excalidraw/renderer/renderNewElementScene.ts b/packages/excalidraw/renderer/renderNewElementScene.ts index bbc14654a..d0ade99cf 100644 --- a/packages/excalidraw/renderer/renderNewElementScene.ts +++ b/packages/excalidraw/renderer/renderNewElementScene.ts @@ -4,7 +4,7 @@ import { renderElement } from "@excalidraw/element/renderElement"; import { bootstrapCanvas, getNormalizedCanvasDimensions } from "./helpers"; -import type { NewElementSceneRenderConfig } from "../scene/types"; +import type { NewElementSceneRenderConfig } from "../src/scene/types"; const _renderNewElementScene = ({ canvas, diff --git a/packages/excalidraw/renderer/staticScene.ts b/packages/excalidraw/renderer/staticScene.ts index 16743ff91..a46e02542 100644 --- a/packages/excalidraw/renderer/staticScene.ts +++ b/packages/excalidraw/renderer/staticScene.ts @@ -34,7 +34,7 @@ import { bootstrapCanvas, getNormalizedCanvasDimensions } from "./helpers"; import type { StaticCanvasRenderConfig, StaticSceneRenderConfig, -} from "../scene/types"; +} from "../src/scene/types"; import type { StaticCanvasAppState, Zoom } from "../types"; const GridLineColor = { diff --git a/packages/excalidraw/renderer/staticSvgScene.ts b/packages/excalidraw/renderer/staticSvgScene.ts index 0d3f5bad9..6912f0fb9 100644 --- a/packages/excalidraw/renderer/staticSvgScene.ts +++ b/packages/excalidraw/renderer/staticSvgScene.ts @@ -47,7 +47,10 @@ import type { NonDeletedExcalidrawElement, } from "@excalidraw/element/types"; -import type { RenderableElementsMap, SVGRenderConfig } from "../scene/types"; +import type { + RenderableElementsMap, + SVGRenderConfig, +} from "../src/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/actions/actionAlign.tsx b/packages/excalidraw/src/actions/actionAlign.tsx index f1960f62e..4ef561a19 100644 --- a/packages/excalidraw/src/actions/actionAlign.tsx +++ b/packages/excalidraw/src/actions/actionAlign.tsx @@ -24,7 +24,7 @@ import { import { t } from "../../i18n"; -import { isSomeElementSelected } from "../../scene"; +import { isSomeElementSelected } from "../scene"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionCanvas.tsx b/packages/excalidraw/src/actions/actionCanvas.tsx index 72b8bae7b..38d9b4dfb 100644 --- a/packages/excalidraw/src/actions/actionCanvas.tsx +++ b/packages/excalidraw/src/actions/actionCanvas.tsx @@ -41,9 +41,9 @@ import { import { setCursor } from "../../cursor"; import { t } from "../../i18n"; -import { getNormalizedZoom } from "../../scene"; -import { centerScrollOn } from "../../scene/scroll"; -import { getStateForZoom } from "../../scene/zoom"; +import { getNormalizedZoom } from "../scene"; +import { centerScrollOn } from "../scene/scroll"; +import { getStateForZoom } from "../scene/zoom"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionDeleteSelected.tsx b/packages/excalidraw/src/actions/actionDeleteSelected.tsx index 347e53201..adf2a8ccd 100644 --- a/packages/excalidraw/src/actions/actionDeleteSelected.tsx +++ b/packages/excalidraw/src/actions/actionDeleteSelected.tsx @@ -23,7 +23,7 @@ import { import type { ExcalidrawElement } from "@excalidraw/element/types"; import { t } from "../../i18n"; -import { getSelectedElements, isSomeElementSelected } from "../../scene"; +import { getSelectedElements, isSomeElementSelected } from "../scene"; import { CaptureUpdateAction } from "../../store"; import { TrashIcon } from "../../components/icons"; import { ToolButton } from "../../components/ToolButton"; diff --git a/packages/excalidraw/src/actions/actionDistribute.tsx b/packages/excalidraw/src/actions/actionDistribute.tsx index 1c52f4330..a3ad4336f 100644 --- a/packages/excalidraw/src/actions/actionDistribute.tsx +++ b/packages/excalidraw/src/actions/actionDistribute.tsx @@ -20,7 +20,7 @@ import { import { t } from "../../i18n"; -import { isSomeElementSelected } from "../../scene"; +import { isSomeElementSelected } from "../scene"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionDuplicateSelection.tsx b/packages/excalidraw/src/actions/actionDuplicateSelection.tsx index 34457a444..6bd2466ff 100644 --- a/packages/excalidraw/src/actions/actionDuplicateSelection.tsx +++ b/packages/excalidraw/src/actions/actionDuplicateSelection.tsx @@ -31,7 +31,7 @@ import { ToolButton } from "../../components/ToolButton"; import { DuplicateIcon } from "../../components/icons"; import { t } from "../../i18n"; -import { isSomeElementSelected } from "../../scene"; +import { isSomeElementSelected } from "../scene"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionElementLink.ts b/packages/excalidraw/src/actions/actionElementLink.ts index e6a7a276a..0d6b61810 100644 --- a/packages/excalidraw/src/actions/actionElementLink.ts +++ b/packages/excalidraw/src/actions/actionElementLink.ts @@ -7,7 +7,7 @@ import { import { copyTextToSystemClipboard } from "../../clipboard"; import { copyIcon, elementLinkIcon } from "../../components/icons"; import { t } from "../../i18n"; -import { getSelectedElements } from "../../scene"; +import { getSelectedElements } from "../scene"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionElementLock.ts b/packages/excalidraw/src/actions/actionElementLock.ts index 22bbbd4cd..7c81cdb4a 100644 --- a/packages/excalidraw/src/actions/actionElementLock.ts +++ b/packages/excalidraw/src/actions/actionElementLock.ts @@ -8,7 +8,7 @@ import type { ExcalidrawElement } from "@excalidraw/element/types"; import { LockedIcon, UnlockedIcon } from "../../components/icons"; -import { getSelectedElements } from "../../scene"; +import { getSelectedElements } from "../scene"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionExport.tsx b/packages/excalidraw/src/actions/actionExport.tsx index d49020106..f1bbc6d8e 100644 --- a/packages/excalidraw/src/actions/actionExport.tsx +++ b/packages/excalidraw/src/actions/actionExport.tsx @@ -22,8 +22,8 @@ import { nativeFileSystemSupported } from "../data/filesystem"; import { resaveAsImageWithScene } from "../data/resave"; import { t } from "../../i18n"; -import { getSelectedElements, isSomeElementSelected } from "../../scene"; -import { getExportSize } from "../../scene/export"; +import { getSelectedElements, isSomeElementSelected } from "../scene"; +import { getExportSize } from "../scene/export"; import { CaptureUpdateAction } from "../../store"; import "../components/ToolIcon.scss"; diff --git a/packages/excalidraw/src/actions/actionFlip.ts b/packages/excalidraw/src/actions/actionFlip.ts index 4ef6866ee..e3e289189 100644 --- a/packages/excalidraw/src/actions/actionFlip.ts +++ b/packages/excalidraw/src/actions/actionFlip.ts @@ -26,7 +26,7 @@ import type { NonDeletedSceneElementsMap, } from "@excalidraw/element/types"; -import { getSelectedElements } from "../../scene"; +import { getSelectedElements } from "../scene"; import { CaptureUpdateAction } from "../../store"; import { flipHorizontal, flipVertical } from "../../components/icons"; diff --git a/packages/excalidraw/src/actions/actionFrame.ts b/packages/excalidraw/src/actions/actionFrame.ts index b3c1b9c47..017df3e64 100644 --- a/packages/excalidraw/src/actions/actionFrame.ts +++ b/packages/excalidraw/src/actions/actionFrame.ts @@ -18,7 +18,7 @@ import type { ExcalidrawElement } from "@excalidraw/element/types"; import { setCursorForShape } from "../../cursor"; import { frameToolIcon } from "../../components/icons"; -import { getSelectedElements } from "../../scene"; +import { getSelectedElements } from "../scene"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionGroup.tsx b/packages/excalidraw/src/actions/actionGroup.tsx index ff1bb9dc2..36a38c25f 100644 --- a/packages/excalidraw/src/actions/actionGroup.tsx +++ b/packages/excalidraw/src/actions/actionGroup.tsx @@ -39,7 +39,7 @@ import { UngroupIcon, GroupIcon } from "../../components/icons"; import { t } from "../../i18n"; -import { isSomeElementSelected } from "../../scene"; +import { isSomeElementSelected } from "../scene"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionLink.tsx b/packages/excalidraw/src/actions/actionLink.tsx index 410b13e75..d16a861e9 100644 --- a/packages/excalidraw/src/actions/actionLink.tsx +++ b/packages/excalidraw/src/actions/actionLink.tsx @@ -7,7 +7,7 @@ import { getContextMenuLabel } from "../../components/hyperlink/Hyperlink"; import { LinkIcon } from "../../components/icons"; import { t } from "../../i18n"; -import { getSelectedElements } from "../../scene"; +import { getSelectedElements } from "../scene"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionProperties.tsx b/packages/excalidraw/src/actions/actionProperties.tsx index dad2089f5..12f44b550 100644 --- a/packages/excalidraw/src/actions/actionProperties.tsx +++ b/packages/excalidraw/src/actions/actionProperties.tsx @@ -131,7 +131,7 @@ import { getSelectedElements, getTargetElements, isSomeElementSelected, -} from "../../scene"; +} from "../scene"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionStyles.ts b/packages/excalidraw/src/actions/actionStyles.ts index b3a46e382..96c133536 100644 --- a/packages/excalidraw/src/actions/actionStyles.ts +++ b/packages/excalidraw/src/actions/actionStyles.ts @@ -29,7 +29,7 @@ import type { ExcalidrawTextElement } from "@excalidraw/element/types"; import { paintIcon } from "../../components/icons"; import { t } from "../../i18n"; -import { getSelectedElements } from "../../scene"; +import { getSelectedElements } from "../scene"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionTextAutoResize.ts b/packages/excalidraw/src/actions/actionTextAutoResize.ts index 587ac0e8d..8f3891f92 100644 --- a/packages/excalidraw/src/actions/actionTextAutoResize.ts +++ b/packages/excalidraw/src/actions/actionTextAutoResize.ts @@ -5,7 +5,7 @@ import { measureText } from "@excalidraw/element/textMeasurements"; import { isTextElement } from "@excalidraw/element/typeChecks"; -import { getSelectedElements } from "../../scene"; +import { getSelectedElements } from "../scene"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/data/blob.ts b/packages/excalidraw/src/data/blob.ts index 2627695ee..a396d7c57 100644 --- a/packages/excalidraw/src/data/blob.ts +++ b/packages/excalidraw/src/data/blob.ts @@ -15,8 +15,8 @@ import type { ExcalidrawElement, FileId } from "@excalidraw/element/types"; import { cleanAppStateForExport } from "../../appState"; import { CanvasError, ImageSceneDataError } from "../../errors"; -import { calculateScrollCenter } from "../../scene"; -import { decodeSvgBase64Payload } from "../../scene/export"; +import { calculateScrollCenter } from "../scene"; +import { decodeSvgBase64Payload } from "../scene/export"; import { base64ToString, stringToBase64, toByteString } from "./encode"; import { nativeFileSystemSupported } from "./filesystem"; diff --git a/packages/excalidraw/src/data/index.ts b/packages/excalidraw/src/data/index.ts index 8a2f14ecf..b9d071823 100644 --- a/packages/excalidraw/src/data/index.ts +++ b/packages/excalidraw/src/data/index.ts @@ -25,8 +25,8 @@ import { } from "../../clipboard"; import { t } from "../../i18n"; -import { getSelectedElements, isSomeElementSelected } from "../../scene"; -import { exportToCanvas, exportToSvg } from "../../scene/export"; +import { getSelectedElements, isSomeElementSelected } from "../scene"; +import { exportToCanvas, exportToSvg } from "../scene/export"; import { canvasToBlob } from "./blob"; import { fileSave } from "./filesystem"; @@ -34,7 +34,7 @@ import { serializeAsJSON } from "./json"; import type { FileSystemHandle } from "./filesystem"; -import type { ExportType } from "../../scene/types"; +import type { ExportType } from "../scene/types"; import type { AppState, BinaryFiles } from "../../types"; export { loadFromBlob } from "./blob"; diff --git a/packages/excalidraw/src/data/restore.ts b/packages/excalidraw/src/data/restore.ts index 831428f0c..b929d03dc 100644 --- a/packages/excalidraw/src/data/restore.ts +++ b/packages/excalidraw/src/data/restore.ts @@ -71,7 +71,7 @@ import { getNormalizedGridSize, getNormalizedGridStep, getNormalizedZoom, -} from "../../scene"; +} from "../scene"; import type { AppState, BinaryFiles, LibraryItem } from "../../types"; import type { ImportedDataState, LegacyAppState } from "./types"; diff --git a/packages/excalidraw/scene/Renderer.ts b/packages/excalidraw/src/scene/Renderer.ts similarity index 95% rename from packages/excalidraw/scene/Renderer.ts rename to packages/excalidraw/src/scene/Renderer.ts index e22c997ed..86fb7b2e7 100644 --- a/packages/excalidraw/scene/Renderer.ts +++ b/packages/excalidraw/src/scene/Renderer.ts @@ -9,13 +9,13 @@ 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"; -import type { AppState } from "../types"; +import type { AppState } from "../../types"; export class Renderer { private scene: Scene; diff --git a/packages/excalidraw/scene/Scene.ts b/packages/excalidraw/src/scene/Scene.ts similarity index 99% rename from packages/excalidraw/scene/Scene.ts rename to packages/excalidraw/src/scene/Scene.ts index dc66837fb..e705ece90 100644 --- a/packages/excalidraw/scene/Scene.ts +++ b/packages/excalidraw/src/scene/Scene.ts @@ -34,7 +34,7 @@ import type { import type { Assert, SameType } from "@excalidraw/common/utility-types"; -import type { AppState } from "../types"; +import type { AppState } from "../../types"; type ElementIdKey = InstanceType["elementId"]; type ElementKey = ExcalidrawElement | ElementIdKey; diff --git a/packages/excalidraw/scene/export.ts b/packages/excalidraw/src/scene/export.ts similarity index 97% rename from packages/excalidraw/scene/export.ts rename to packages/excalidraw/src/scene/export.ts index bcbf97ff5..5f8fa335d 100644 --- a/packages/excalidraw/scene/export.ts +++ b/packages/excalidraw/src/scene/export.ts @@ -52,23 +52,18 @@ import type { NonDeletedSceneElementsMap, } from "@excalidraw/element/types"; -import { getDefaultAppState } from "../appState"; -import { - base64ToString, - decode, - encode, - stringToBase64, -} from "../src/data/encode"; -import { serializeAsJSON } from "../src/data/json"; +import { getDefaultAppState } from "../../appState"; +import { base64ToString, decode, encode, stringToBase64 } from "../data/encode"; +import { serializeAsJSON } from "../data/json"; -import { Fonts } from "../fonts"; +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"; -import type { AppState, BinaryFiles } from "../types"; +import type { AppState, BinaryFiles } from "../../types"; const truncateText = (element: ExcalidrawTextElement, maxWidth: number) => { if (element.width <= maxWidth) { diff --git a/packages/excalidraw/scene/index.ts b/packages/excalidraw/src/scene/index.ts similarity index 100% rename from packages/excalidraw/scene/index.ts rename to packages/excalidraw/src/scene/index.ts diff --git a/packages/excalidraw/scene/normalize.ts b/packages/excalidraw/src/scene/normalize.ts similarity index 89% rename from packages/excalidraw/scene/normalize.ts rename to packages/excalidraw/src/scene/normalize.ts index 605ae2fa6..55df61651 100644 --- a/packages/excalidraw/scene/normalize.ts +++ b/packages/excalidraw/src/scene/normalize.ts @@ -2,7 +2,7 @@ import { MAX_ZOOM, MIN_ZOOM } from "@excalidraw/common"; import { clamp, round } from "@excalidraw/math"; -import type { NormalizedZoomValue } from "../types"; +import type { NormalizedZoomValue } from "../../types"; export const getNormalizedZoom = (zoom: number): NormalizedZoomValue => { return clamp(round(zoom, 6), MIN_ZOOM, MAX_ZOOM) as NormalizedZoomValue; diff --git a/packages/excalidraw/scene/scroll.ts b/packages/excalidraw/src/scene/scroll.ts similarity index 99% rename from packages/excalidraw/scene/scroll.ts rename to packages/excalidraw/src/scene/scroll.ts index a99ad075f..597f96746 100644 --- a/packages/excalidraw/scene/scroll.ts +++ b/packages/excalidraw/src/scene/scroll.ts @@ -10,7 +10,7 @@ import { getCommonBounds } from "@excalidraw/element/bounds"; import type { ExcalidrawElement } from "@excalidraw/element/types"; -import type { AppState, Offsets, PointerCoords, Zoom } from "../types"; +import type { AppState, Offsets, PointerCoords, Zoom } from "../../types"; const isOutsideViewPort = (appState: AppState, cords: Array) => { const [x1, y1, x2, y2] = cords; diff --git a/packages/excalidraw/scene/scrollbars.ts b/packages/excalidraw/src/scene/scrollbars.ts similarity index 97% rename from packages/excalidraw/scene/scrollbars.ts rename to packages/excalidraw/src/scene/scrollbars.ts index 4fa4349f2..4a17ceee5 100644 --- a/packages/excalidraw/scene/scrollbars.ts +++ b/packages/excalidraw/src/scene/scrollbars.ts @@ -4,9 +4,9 @@ import { getCommonBounds } from "@excalidraw/element/bounds"; import type { ExcalidrawElement } from "@excalidraw/element/types"; -import { getLanguage } from "../i18n"; +import { getLanguage } from "../../i18n"; -import type { InteractiveCanvasAppState } from "../types"; +import type { InteractiveCanvasAppState } from "../../types"; import type { ScrollBars } from "./types"; export const SCROLLBAR_MARGIN = 4; diff --git a/packages/excalidraw/scene/types.ts b/packages/excalidraw/src/scene/types.ts similarity index 99% rename from packages/excalidraw/scene/types.ts rename to packages/excalidraw/src/scene/types.ts index 08b05a57d..ee3ddc4d4 100644 --- a/packages/excalidraw/scene/types.ts +++ b/packages/excalidraw/src/scene/types.ts @@ -18,7 +18,7 @@ import type { SocketId, Device, PendingExcalidrawElements, -} from "../types"; +} from "../../types"; import type { RoughCanvas } from "roughjs/bin/canvas"; import type { Drawable } from "roughjs/bin/core"; diff --git a/packages/excalidraw/scene/zoom.ts b/packages/excalidraw/src/scene/zoom.ts similarity index 93% rename from packages/excalidraw/scene/zoom.ts rename to packages/excalidraw/src/scene/zoom.ts index 5decf1149..e6a5ada60 100644 --- a/packages/excalidraw/scene/zoom.ts +++ b/packages/excalidraw/src/scene/zoom.ts @@ -1,4 +1,4 @@ -import type { AppState, NormalizedZoomValue } from "../types"; +import type { AppState, NormalizedZoomValue } from "../../types"; export const getStateForZoom = ( { diff --git a/packages/excalidraw/types.ts b/packages/excalidraw/types.ts index 524e9625f..35cae7409 100644 --- a/packages/excalidraw/types.ts +++ b/packages/excalidraw/types.ts @@ -55,7 +55,7 @@ import type { CaptureUpdateActionType } from "./store"; import type { ImportedDataState } from "./src/data/types"; import type { Language } from "./i18n"; -import type { isOverScrollBars } from "./scene/scrollbars"; +import type { isOverScrollBars } from "./src/scene/scrollbars"; import type React from "react"; import type { JSX } from "react"; diff --git a/packages/excalidraw/wysiwyg/textWysiwyg.tsx b/packages/excalidraw/wysiwyg/textWysiwyg.tsx index 61b479a94..1d867c3e3 100644 --- a/packages/excalidraw/wysiwyg/textWysiwyg.tsx +++ b/packages/excalidraw/wysiwyg/textWysiwyg.tsx @@ -45,7 +45,7 @@ import type { import { actionSaveToActiveFile } from "../src/actions"; -import Scene from "../scene/Scene"; +import Scene from "../src/scene/Scene"; import { parseClipboard } from "../clipboard"; import { actionDecreaseFontSize, diff --git a/packages/utils/src/export.ts b/packages/utils/src/export.ts index 8c43b3d78..777a1fcf9 100644 --- a/packages/utils/src/export.ts +++ b/packages/utils/src/export.ts @@ -11,7 +11,7 @@ import { restore } from "@excalidraw/excalidraw/src/data/restore"; import { exportToCanvas as _exportToCanvas, exportToSvg as _exportToSvg, -} from "@excalidraw/excalidraw/scene/export"; +} from "@excalidraw/excalidraw/src/scene/export"; import type { ExcalidrawElement,