diff --git a/packages/excalidraw/animated-trail.ts b/packages/excalidraw/animated-trail.ts index af6162e99..f128e8176 100644 --- a/packages/excalidraw/animated-trail.ts +++ b/packages/excalidraw/animated-trail.ts @@ -9,7 +9,7 @@ import { import type { LaserPointerOptions } from "@excalidraw/laser-pointer"; import type { AnimationFrameHandler } from "./animation-frame-handler"; -import type App from "./components/App"; +import type App from "./src/components/App"; import type { AppState } from "./types"; export interface Trail { diff --git a/packages/excalidraw/index.tsx b/packages/excalidraw/index.tsx index dd26ef9e4..664444aff 100644 --- a/packages/excalidraw/index.tsx +++ b/packages/excalidraw/index.tsx @@ -2,12 +2,12 @@ import React, { useEffect } from "react"; import { DEFAULT_UI_OPTIONS, isShallowEqual } from "@excalidraw/common"; -import App from "./components/App"; -import { InitializeApp } from "./components/InitializeApp"; -import Footer from "./components/footer/FooterCenter"; -import LiveCollaborationTrigger from "./components/live-collaboration/LiveCollaborationTrigger"; -import MainMenu from "./components/main-menu/MainMenu"; -import WelcomeScreen from "./components/welcome-screen/WelcomeScreen"; +import App from "./src/components/App"; +import { InitializeApp } from "./src/components/InitializeApp"; +import Footer from "./src/components/footer/FooterCenter"; +import LiveCollaborationTrigger from "./src/components/live-collaboration/LiveCollaborationTrigger"; +import MainMenu from "./src/components/main-menu/MainMenu"; +import WelcomeScreen from "./src/components/welcome-screen/WelcomeScreen"; import { defaultLang } from "./i18n"; import { EditorJotaiProvider, editorJotaiStore } from "./editor-jotai"; import polyfill from "./polyfill"; @@ -276,18 +276,18 @@ export { viewportCoordsToSceneCoords, } from "@excalidraw/common"; -export { Sidebar } from "./components/Sidebar/Sidebar"; -export { Button } from "./components/Button"; +export { Sidebar } from "./src/components/Sidebar/Sidebar"; +export { Button } from "./src/components/Button"; export { Footer }; export { MainMenu }; -export { useDevice } from "./components/App"; +export { useDevice } from "./src/components/App"; export { WelcomeScreen }; export { LiveCollaborationTrigger }; -export { Stats } from "./components/Stats"; +export { Stats } from "./src/components/Stats"; -export { DefaultSidebar } from "./components/DefaultSidebar"; -export { TTDDialog } from "./components/TTDDialog/TTDDialog"; -export { TTDDialogTrigger } from "./components/TTDDialog/TTDDialogTrigger"; +export { DefaultSidebar } from "./src/components/DefaultSidebar"; +export { TTDDialog } from "./src/components/TTDDialog/TTDDialog"; +export { TTDDialogTrigger } from "./src/components/TTDDialog/TTDDialogTrigger"; export { zoomToFitBounds } from "./src/actions/actionCanvas"; export { convertToExcalidrawElements } from "./src/data/transform"; @@ -302,7 +302,7 @@ export { elementPartiallyOverlapsWithOrContainsBBox, } from "@excalidraw/utils/withinBounds"; -export { DiagramToCodePlugin } from "./components/DiagramToCodePlugin/DiagramToCodePlugin"; +export { DiagramToCodePlugin } from "./src/components/DiagramToCodePlugin/DiagramToCodePlugin"; export { getDataURL } from "./src/data/blob"; export { isElementLink } from "@excalidraw/element/elementLink"; diff --git a/packages/excalidraw/laser-trails.ts b/packages/excalidraw/laser-trails.ts index 7956ae5d2..1fb3d3cc4 100644 --- a/packages/excalidraw/laser-trails.ts +++ b/packages/excalidraw/laser-trails.ts @@ -7,7 +7,7 @@ import { getClientColor } from "./clients"; import type { Trail } from "./animated-trail"; import type { AnimationFrameHandler } from "./animation-frame-handler"; -import type App from "./components/App"; +import type App from "./src/components/App"; import type { SocketId } from "./types"; export class LaserTrails implements Trail { diff --git a/packages/excalidraw/src/actions/actionAlign.tsx b/packages/excalidraw/src/actions/actionAlign.tsx index 4ef561a19..22a59c729 100644 --- a/packages/excalidraw/src/actions/actionAlign.tsx +++ b/packages/excalidraw/src/actions/actionAlign.tsx @@ -12,7 +12,7 @@ import type { ExcalidrawElement } from "@excalidraw/element/types"; import type { Alignment } from "@excalidraw/element/align"; -import { ToolButton } from "../../components/ToolButton"; +import { ToolButton } from "../components/ToolButton"; import { AlignBottomIcon, AlignLeftIcon, @@ -20,7 +20,7 @@ import { AlignTopIcon, CenterHorizontallyIcon, CenterVerticallyIcon, -} from "../../components/icons"; +} from "../components/icons"; import { t } from "../../i18n"; diff --git a/packages/excalidraw/src/actions/actionCanvas.tsx b/packages/excalidraw/src/actions/actionCanvas.tsx index 38d9b4dfb..95c62c293 100644 --- a/packages/excalidraw/src/actions/actionCanvas.tsx +++ b/packages/excalidraw/src/actions/actionCanvas.tsx @@ -24,9 +24,9 @@ import { isEraserActive, isHandToolActive, } from "../../appState"; -import { ColorPicker } from "../../components/ColorPicker/ColorPicker"; -import { ToolButton } from "../../components/ToolButton"; -import { Tooltip } from "../../components/Tooltip"; +import { ColorPicker } from "../components/ColorPicker/ColorPicker"; +import { ToolButton } from "../components/ToolButton"; +import { Tooltip } from "../components/Tooltip"; import { handIcon, LassoIcon, @@ -37,7 +37,7 @@ import { ZoomInIcon, ZoomOutIcon, ZoomResetIcon, -} from "../../components/icons"; +} from "../components/icons"; import { setCursor } from "../../cursor"; import { t } from "../../i18n"; diff --git a/packages/excalidraw/src/actions/actionClipboard.tsx b/packages/excalidraw/src/actions/actionClipboard.tsx index bd58eea32..55a78c580 100644 --- a/packages/excalidraw/src/actions/actionClipboard.tsx +++ b/packages/excalidraw/src/actions/actionClipboard.tsx @@ -11,12 +11,7 @@ import { probablySupportsClipboardWriteText, readSystemClipboard, } from "../../clipboard"; -import { - DuplicateIcon, - cutIcon, - pngIcon, - svgIcon, -} from "../../components/icons"; +import { DuplicateIcon, cutIcon, pngIcon, svgIcon } from "../components/icons"; import { exportCanvas, prepareElementsForExport } from "../data/index"; import { t } from "../../i18n"; diff --git a/packages/excalidraw/src/actions/actionCropEditor.tsx b/packages/excalidraw/src/actions/actionCropEditor.tsx index 802618876..dd99f641d 100644 --- a/packages/excalidraw/src/actions/actionCropEditor.tsx +++ b/packages/excalidraw/src/actions/actionCropEditor.tsx @@ -2,8 +2,8 @@ import { isImageElement } from "@excalidraw/element/typeChecks"; import type { ExcalidrawImageElement } from "@excalidraw/element/types"; -import { ToolButton } from "../../components/ToolButton"; -import { cropIcon } from "../../components/icons"; +import { ToolButton } from "../components/ToolButton"; +import { cropIcon } from "../components/icons"; import { t } from "../../i18n"; import { CaptureUpdateAction } from "../../store"; diff --git a/packages/excalidraw/src/actions/actionDeleteSelected.tsx b/packages/excalidraw/src/actions/actionDeleteSelected.tsx index adf2a8ccd..d559f858c 100644 --- a/packages/excalidraw/src/actions/actionDeleteSelected.tsx +++ b/packages/excalidraw/src/actions/actionDeleteSelected.tsx @@ -25,8 +25,8 @@ import type { ExcalidrawElement } from "@excalidraw/element/types"; import { t } from "../../i18n"; import { getSelectedElements, isSomeElementSelected } from "../scene"; import { CaptureUpdateAction } from "../../store"; -import { TrashIcon } from "../../components/icons"; -import { ToolButton } from "../../components/ToolButton"; +import { TrashIcon } from "../components/icons"; +import { ToolButton } from "../components/ToolButton"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionDistribute.tsx b/packages/excalidraw/src/actions/actionDistribute.tsx index a3ad4336f..64723b53d 100644 --- a/packages/excalidraw/src/actions/actionDistribute.tsx +++ b/packages/excalidraw/src/actions/actionDistribute.tsx @@ -12,11 +12,11 @@ import type { ExcalidrawElement } from "@excalidraw/element/types"; import type { Distribution } from "@excalidraw/element/distribute"; -import { ToolButton } from "../../components/ToolButton"; +import { ToolButton } from "../components/ToolButton"; import { DistributeHorizontallyIcon, DistributeVerticallyIcon, -} from "../../components/icons"; +} from "../components/icons"; import { t } from "../../i18n"; diff --git a/packages/excalidraw/src/actions/actionDuplicateSelection.tsx b/packages/excalidraw/src/actions/actionDuplicateSelection.tsx index 6bd2466ff..d73a3c0fd 100644 --- a/packages/excalidraw/src/actions/actionDuplicateSelection.tsx +++ b/packages/excalidraw/src/actions/actionDuplicateSelection.tsx @@ -27,8 +27,8 @@ import { duplicateElements } from "@excalidraw/element/duplicate"; import type { ExcalidrawElement } from "@excalidraw/element/types"; -import { ToolButton } from "../../components/ToolButton"; -import { DuplicateIcon } from "../../components/icons"; +import { ToolButton } from "../components/ToolButton"; +import { DuplicateIcon } from "../components/icons"; import { t } from "../../i18n"; import { isSomeElementSelected } from "../scene"; diff --git a/packages/excalidraw/src/actions/actionElementLink.ts b/packages/excalidraw/src/actions/actionElementLink.ts index 0d6b61810..6321fb8d4 100644 --- a/packages/excalidraw/src/actions/actionElementLink.ts +++ b/packages/excalidraw/src/actions/actionElementLink.ts @@ -5,7 +5,7 @@ import { } from "@excalidraw/element/elementLink"; import { copyTextToSystemClipboard } from "../../clipboard"; -import { copyIcon, elementLinkIcon } from "../../components/icons"; +import { copyIcon, elementLinkIcon } from "../components/icons"; import { t } from "../../i18n"; import { getSelectedElements } from "../scene"; import { CaptureUpdateAction } from "../../store"; diff --git a/packages/excalidraw/src/actions/actionElementLock.ts b/packages/excalidraw/src/actions/actionElementLock.ts index 7c81cdb4a..f7a81e730 100644 --- a/packages/excalidraw/src/actions/actionElementLock.ts +++ b/packages/excalidraw/src/actions/actionElementLock.ts @@ -6,7 +6,7 @@ import { isFrameLikeElement } from "@excalidraw/element/typeChecks"; import type { ExcalidrawElement } from "@excalidraw/element/types"; -import { LockedIcon, UnlockedIcon } from "../../components/icons"; +import { LockedIcon, UnlockedIcon } from "../components/icons"; import { getSelectedElements } from "../scene"; import { CaptureUpdateAction } from "../../store"; diff --git a/packages/excalidraw/src/actions/actionExport.tsx b/packages/excalidraw/src/actions/actionExport.tsx index f1bbc6d8e..7355925e5 100644 --- a/packages/excalidraw/src/actions/actionExport.tsx +++ b/packages/excalidraw/src/actions/actionExport.tsx @@ -9,13 +9,13 @@ import { getNonDeletedElements } from "@excalidraw/element"; import type { Theme } from "@excalidraw/element/types"; -import { useDevice } from "../../components/App"; -import { CheckboxItem } from "../../components/CheckboxItem"; -import { DarkModeToggle } from "../../components/DarkModeToggle"; -import { ProjectName } from "../../components/ProjectName"; -import { ToolButton } from "../../components/ToolButton"; -import { Tooltip } from "../../components/Tooltip"; -import { ExportIcon, questionCircle, saveAs } from "../../components/icons"; +import { useDevice } from "../components/App"; +import { CheckboxItem } from "../components/CheckboxItem"; +import { DarkModeToggle } from "../components/DarkModeToggle"; +import { ProjectName } from "../components/ProjectName"; +import { ToolButton } from "../components/ToolButton"; +import { Tooltip } from "../components/Tooltip"; +import { ExportIcon, questionCircle, saveAs } from "../components/icons"; import { loadFromJSON, saveAsJSON } from "../data"; import { isImageFileHandle } from "../data/blob"; import { nativeFileSystemSupported } from "../data/filesystem"; diff --git a/packages/excalidraw/src/actions/actionFinalize.tsx b/packages/excalidraw/src/actions/actionFinalize.tsx index 9f9659d42..9dd142721 100644 --- a/packages/excalidraw/src/actions/actionFinalize.tsx +++ b/packages/excalidraw/src/actions/actionFinalize.tsx @@ -18,8 +18,8 @@ import { isInvisiblySmallElement } from "@excalidraw/element/sizeHelpers"; import { t } from "../../i18n"; import { resetCursor } from "../../cursor"; -import { done } from "../../components/icons"; -import { ToolButton } from "../../components/ToolButton"; +import { done } from "../components/icons"; +import { ToolButton } from "../components/ToolButton"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionFlip.ts b/packages/excalidraw/src/actions/actionFlip.ts index e3e289189..1c8e09c38 100644 --- a/packages/excalidraw/src/actions/actionFlip.ts +++ b/packages/excalidraw/src/actions/actionFlip.ts @@ -29,7 +29,7 @@ import type { import { getSelectedElements } from "../scene"; import { CaptureUpdateAction } from "../../store"; -import { flipHorizontal, flipVertical } from "../../components/icons"; +import { flipHorizontal, flipVertical } from "../components/icons"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionFrame.ts b/packages/excalidraw/src/actions/actionFrame.ts index 017df3e64..dccf074c2 100644 --- a/packages/excalidraw/src/actions/actionFrame.ts +++ b/packages/excalidraw/src/actions/actionFrame.ts @@ -17,7 +17,7 @@ import { getCommonBounds } from "@excalidraw/element/bounds"; import type { ExcalidrawElement } from "@excalidraw/element/types"; import { setCursorForShape } from "../../cursor"; -import { frameToolIcon } from "../../components/icons"; +import { frameToolIcon } from "../components/icons"; import { getSelectedElements } from "../scene"; import { CaptureUpdateAction } from "../../store"; diff --git a/packages/excalidraw/src/actions/actionGroup.tsx b/packages/excalidraw/src/actions/actionGroup.tsx index 36a38c25f..64bfd21e0 100644 --- a/packages/excalidraw/src/actions/actionGroup.tsx +++ b/packages/excalidraw/src/actions/actionGroup.tsx @@ -34,8 +34,8 @@ import type { OrderedExcalidrawElement, } from "@excalidraw/element/types"; -import { ToolButton } from "../../components/ToolButton"; -import { UngroupIcon, GroupIcon } from "../../components/icons"; +import { ToolButton } from "../components/ToolButton"; +import { UngroupIcon, GroupIcon } from "../components/icons"; import { t } from "../../i18n"; diff --git a/packages/excalidraw/src/actions/actionHistory.tsx b/packages/excalidraw/src/actions/actionHistory.tsx index b30291b6c..a3680669f 100644 --- a/packages/excalidraw/src/actions/actionHistory.tsx +++ b/packages/excalidraw/src/actions/actionHistory.tsx @@ -2,8 +2,8 @@ import { isWindows, KEYS, matchKey, arrayToMap } from "@excalidraw/common"; import type { SceneElementsMap } from "@excalidraw/element/types"; -import { ToolButton } from "../../components/ToolButton"; -import { UndoIcon, RedoIcon } from "../../components/icons"; +import { ToolButton } from "../components/ToolButton"; +import { UndoIcon, RedoIcon } from "../components/icons"; import { HistoryChangedEvent } from "../../history"; import { useEmitter } from "../../hooks/useEmitter"; import { t } from "../../i18n"; diff --git a/packages/excalidraw/src/actions/actionLinearEditor.tsx b/packages/excalidraw/src/actions/actionLinearEditor.tsx index d52878f09..f850ce954 100644 --- a/packages/excalidraw/src/actions/actionLinearEditor.tsx +++ b/packages/excalidraw/src/actions/actionLinearEditor.tsx @@ -4,9 +4,9 @@ import { isElbowArrow, isLinearElement } from "@excalidraw/element/typeChecks"; import type { ExcalidrawLinearElement } from "@excalidraw/element/types"; -import { DEFAULT_CATEGORIES } from "../../components/CommandPalette/CommandPalette"; -import { ToolButton } from "../../components/ToolButton"; -import { lineEditorIcon } from "../../components/icons"; +import { DEFAULT_CATEGORIES } from "../components/CommandPalette/CommandPalette"; +import { ToolButton } from "../components/ToolButton"; +import { lineEditorIcon } from "../components/icons"; import { t } from "../../i18n"; import { CaptureUpdateAction } from "../../store"; diff --git a/packages/excalidraw/src/actions/actionLink.tsx b/packages/excalidraw/src/actions/actionLink.tsx index d16a861e9..0319ad7de 100644 --- a/packages/excalidraw/src/actions/actionLink.tsx +++ b/packages/excalidraw/src/actions/actionLink.tsx @@ -2,9 +2,9 @@ import { isEmbeddableElement } from "@excalidraw/element/typeChecks"; import { KEYS, getShortcutKey } from "@excalidraw/common"; -import { ToolButton } from "../../components/ToolButton"; -import { getContextMenuLabel } from "../../components/hyperlink/Hyperlink"; -import { LinkIcon } from "../../components/icons"; +import { ToolButton } from "../components/ToolButton"; +import { getContextMenuLabel } from "../components/hyperlink/Hyperlink"; +import { LinkIcon } from "../components/icons"; import { t } from "../../i18n"; import { getSelectedElements } from "../scene"; diff --git a/packages/excalidraw/src/actions/actionMenu.tsx b/packages/excalidraw/src/actions/actionMenu.tsx index afb114262..dc96b576d 100644 --- a/packages/excalidraw/src/actions/actionMenu.tsx +++ b/packages/excalidraw/src/actions/actionMenu.tsx @@ -4,12 +4,8 @@ import { getNonDeletedElements } from "@excalidraw/element"; import { showSelectedShapeActions } from "@excalidraw/element/showSelectedShapeActions"; -import { ToolButton } from "../../components/ToolButton"; -import { - HamburgerMenuIcon, - HelpIconThin, - palette, -} from "../../components/icons"; +import { ToolButton } from "../components/ToolButton"; +import { HamburgerMenuIcon, HelpIconThin, palette } from "../components/icons"; import { t } from "../../i18n"; import { CaptureUpdateAction } from "../../store"; diff --git a/packages/excalidraw/src/actions/actionNavigate.tsx b/packages/excalidraw/src/actions/actionNavigate.tsx index 6ee14dc3b..70e958d56 100644 --- a/packages/excalidraw/src/actions/actionNavigate.tsx +++ b/packages/excalidraw/src/actions/actionNavigate.tsx @@ -1,18 +1,18 @@ import clsx from "clsx"; import { getClientColor } from "../../clients"; -import { Avatar } from "../../components/Avatar"; +import { Avatar } from "../components/Avatar"; import { eyeIcon, microphoneIcon, microphoneMutedIcon, -} from "../../components/icons"; +} from "../components/icons"; import { t } from "../../i18n"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; -import type { GoToCollaboratorComponentProps } from "../../components/UserList"; +import type { GoToCollaboratorComponentProps } from "../components/UserList"; import type { Collaborator } from "../../types"; export const actionGoToCollaborator = register({ diff --git a/packages/excalidraw/src/actions/actionProperties.tsx b/packages/excalidraw/src/actions/actionProperties.tsx index 12f44b550..4f325a0c3 100644 --- a/packages/excalidraw/src/actions/actionProperties.tsx +++ b/packages/excalidraw/src/actions/actionProperties.tsx @@ -72,14 +72,14 @@ import type { } from "@excalidraw/element/types"; import { trackEvent } from "../../analytics"; -import { ButtonIconSelect } from "../../components/ButtonIconSelect"; -import { ColorPicker } from "../../components/ColorPicker/ColorPicker"; -import { FontPicker } from "../../components/FontPicker/FontPicker"; -import { IconPicker } from "../../components/IconPicker"; +import { ButtonIconSelect } from "../components/ButtonIconSelect"; +import { ColorPicker } from "../components/ColorPicker/ColorPicker"; +import { FontPicker } from "../components/FontPicker/FontPicker"; +import { IconPicker } from "../components/IconPicker"; // TODO barnabasmolnar/editor-redesign // TextAlignTopIcon, TextAlignBottomIcon,TextAlignMiddleIcon, // ArrowHead icons -import { Range } from "../../components/Range"; +import { Range } from "../components/Range"; import { ArrowheadArrowIcon, ArrowheadBarIcon, @@ -121,7 +121,7 @@ import { ArrowheadCrowfootIcon, ArrowheadCrowfootOneIcon, ArrowheadCrowfootOneOrManyIcon, -} from "../../components/icons"; +} from "../components/icons"; import { Fonts } from "../../fonts"; import { getLanguage, t } from "../../i18n"; diff --git a/packages/excalidraw/src/actions/actionSelectAll.ts b/packages/excalidraw/src/actions/actionSelectAll.ts index 7e09ff90f..0d3181b6c 100644 --- a/packages/excalidraw/src/actions/actionSelectAll.ts +++ b/packages/excalidraw/src/actions/actionSelectAll.ts @@ -10,7 +10,7 @@ import type { ExcalidrawElement } from "@excalidraw/element/types"; import { CaptureUpdateAction } from "../../store"; -import { selectAllIcon } from "../../components/icons"; +import { selectAllIcon } from "../components/icons"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionStyles.ts b/packages/excalidraw/src/actions/actionStyles.ts index 96c133536..02c65c8a8 100644 --- a/packages/excalidraw/src/actions/actionStyles.ts +++ b/packages/excalidraw/src/actions/actionStyles.ts @@ -26,7 +26,7 @@ import { import type { ExcalidrawTextElement } from "@excalidraw/element/types"; -import { paintIcon } from "../../components/icons"; +import { paintIcon } from "../components/icons"; import { t } from "../../i18n"; import { getSelectedElements } from "../scene"; diff --git a/packages/excalidraw/src/actions/actionToggleGridMode.tsx b/packages/excalidraw/src/actions/actionToggleGridMode.tsx index ca1efa34d..bdbb878de 100644 --- a/packages/excalidraw/src/actions/actionToggleGridMode.tsx +++ b/packages/excalidraw/src/actions/actionToggleGridMode.tsx @@ -1,6 +1,6 @@ import { CODES, KEYS } from "@excalidraw/common"; -import { gridIcon } from "../../components/icons"; +import { gridIcon } from "../components/icons"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionToggleObjectsSnapMode.tsx b/packages/excalidraw/src/actions/actionToggleObjectsSnapMode.tsx index bf2c65744..759dde59b 100644 --- a/packages/excalidraw/src/actions/actionToggleObjectsSnapMode.tsx +++ b/packages/excalidraw/src/actions/actionToggleObjectsSnapMode.tsx @@ -1,6 +1,6 @@ import { CODES, KEYS } from "@excalidraw/common"; -import { magnetIcon } from "../../components/icons"; +import { magnetIcon } from "../components/icons"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionToggleSearchMenu.ts b/packages/excalidraw/src/actions/actionToggleSearchMenu.ts index 86450df46..475f3a2d0 100644 --- a/packages/excalidraw/src/actions/actionToggleSearchMenu.ts +++ b/packages/excalidraw/src/actions/actionToggleSearchMenu.ts @@ -5,7 +5,7 @@ import { DEFAULT_SIDEBAR, } from "@excalidraw/common"; -import { searchIcon } from "../../components/icons"; +import { searchIcon } from "../components/icons"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionToggleStats.tsx b/packages/excalidraw/src/actions/actionToggleStats.tsx index f897702d3..ac2100999 100644 --- a/packages/excalidraw/src/actions/actionToggleStats.tsx +++ b/packages/excalidraw/src/actions/actionToggleStats.tsx @@ -1,6 +1,6 @@ import { CODES, KEYS } from "@excalidraw/common"; -import { abacusIcon } from "../../components/icons"; +import { abacusIcon } from "../components/icons"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionToggleViewMode.tsx b/packages/excalidraw/src/actions/actionToggleViewMode.tsx index 9234ab836..eeef01e42 100644 --- a/packages/excalidraw/src/actions/actionToggleViewMode.tsx +++ b/packages/excalidraw/src/actions/actionToggleViewMode.tsx @@ -1,6 +1,6 @@ import { CODES, KEYS } from "@excalidraw/common"; -import { eyeIcon } from "../../components/icons"; +import { eyeIcon } from "../components/icons"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionToggleZenMode.tsx b/packages/excalidraw/src/actions/actionToggleZenMode.tsx index 81cd2dfcf..982ec8640 100644 --- a/packages/excalidraw/src/actions/actionToggleZenMode.tsx +++ b/packages/excalidraw/src/actions/actionToggleZenMode.tsx @@ -1,6 +1,6 @@ import { CODES, KEYS } from "@excalidraw/common"; -import { coffeeIcon } from "../../components/icons"; +import { coffeeIcon } from "../components/icons"; import { CaptureUpdateAction } from "../../store"; import { register } from "./register"; diff --git a/packages/excalidraw/src/actions/actionZindex.tsx b/packages/excalidraw/src/actions/actionZindex.tsx index 5ae1f0c25..9baff038b 100644 --- a/packages/excalidraw/src/actions/actionZindex.tsx +++ b/packages/excalidraw/src/actions/actionZindex.tsx @@ -12,7 +12,7 @@ import { BringToFrontIcon, SendBackwardIcon, SendToBackIcon, -} from "../../components/icons"; +} from "../components/icons"; import { t } from "../../i18n"; import { CaptureUpdateAction } from "../../store"; diff --git a/packages/excalidraw/components/Actions.scss b/packages/excalidraw/src/components/Actions.scss similarity index 100% rename from packages/excalidraw/components/Actions.scss rename to packages/excalidraw/src/components/Actions.scss diff --git a/packages/excalidraw/components/Actions.tsx b/packages/excalidraw/src/components/Actions.tsx similarity index 97% rename from packages/excalidraw/components/Actions.tsx rename to packages/excalidraw/src/components/Actions.tsx index 3246707eb..1f1acdcd4 100644 --- a/packages/excalidraw/components/Actions.tsx +++ b/packages/excalidraw/src/components/Actions.tsx @@ -30,13 +30,13 @@ import type { NonDeletedSceneElementsMap, } from "@excalidraw/element/types"; -import { actionToggleZenMode } from "../src/actions"; +import { actionToggleZenMode } from "../actions"; -import { alignActionsPredicate } from "../src/actions/actionAlign"; -import { trackEvent } from "../analytics"; -import { useTunnels } from "../src/context/tunnels"; +import { alignActionsPredicate } from "../actions/actionAlign"; +import { trackEvent } from "../../analytics"; +import { useTunnels } from "../context/tunnels"; -import { t } from "../i18n"; +import { t } from "../../i18n"; import { canChangeRoundness, canHaveArrowheads, @@ -44,7 +44,7 @@ import { hasBackground, hasStrokeStyle, hasStrokeWidth, -} from "../src/scene"; +} from "../scene"; import { SHAPES } from "./shapes"; @@ -65,8 +65,13 @@ import { LassoIcon, } from "./icons"; -import type { AppClassProperties, AppProps, UIAppState, Zoom } from "../types"; -import type { ActionManager } from "../src/actions/manager"; +import type { + AppClassProperties, + AppProps, + UIAppState, + Zoom, +} from "../../types"; +import type { ActionManager } from "../actions/manager"; export const canChangeStrokeColor = ( appState: UIAppState, diff --git a/packages/excalidraw/components/ActiveConfirmDialog.tsx b/packages/excalidraw/src/components/ActiveConfirmDialog.tsx similarity index 86% rename from packages/excalidraw/components/ActiveConfirmDialog.tsx rename to packages/excalidraw/src/components/ActiveConfirmDialog.tsx index 5d66365ac..b61d9fe0a 100644 --- a/packages/excalidraw/components/ActiveConfirmDialog.tsx +++ b/packages/excalidraw/src/components/ActiveConfirmDialog.tsx @@ -1,6 +1,6 @@ -import { actionClearCanvas } from "../src/actions"; -import { atom, useAtom } from "../editor-jotai"; -import { t } from "../i18n"; +import { actionClearCanvas } from "../actions"; +import { atom, useAtom } from "../../editor-jotai"; +import { t } from "../../i18n"; import { useExcalidrawActionManager } from "./App"; import ConfirmDialog from "./ConfirmDialog"; diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/src/components/App.tsx similarity index 99% rename from packages/excalidraw/components/App.tsx rename to packages/excalidraw/src/components/App.tsx index 04a1535d1..4f666e8e4 100644 --- a/packages/excalidraw/components/App.tsx +++ b/packages/excalidraw/src/components/App.tsx @@ -362,42 +362,43 @@ import { actionToggleLinearEditor, actionToggleObjectsSnapMode, actionToggleCropEditor, -} from "../src/actions"; -import { actionWrapTextInContainer } from "../src/actions/actionBoundText"; -import { actionToggleHandTool, zoomToFit } from "../src/actions/actionCanvas"; -import { actionPaste } from "../src/actions/actionClipboard"; -import { actionCopyElementLink } from "../src/actions/actionElementLink"; -import { actionUnlockAllElements } from "../src/actions/actionElementLock"; +} from "../actions"; +import { actionWrapTextInContainer } from "../actions/actionBoundText"; +import { actionToggleHandTool, zoomToFit } from "../actions/actionCanvas"; +import { actionPaste } from "../actions/actionClipboard"; +import { actionCopyElementLink } from "../actions/actionElementLink"; +import { actionUnlockAllElements } from "../actions/actionElementLock"; import { actionRemoveAllElementsFromFrame, actionSelectAllElementsInFrame, actionWrapSelectionInFrame, -} from "../src/actions/actionFrame"; -import { - createRedoAction, - createUndoAction, -} from "../src/actions/actionHistory"; -import { actionTextAutoResize } from "../src/actions/actionTextAutoResize"; -import { actionToggleViewMode } from "../src/actions/actionToggleViewMode"; -import { ActionManager } from "../src/actions/manager"; -import { actions } from "../src/actions/register"; -import { getShortcutFromShortcutName } from "../src/actions/shortcuts"; -import { trackEvent } from "../analytics"; -import { AnimationFrameHandler } from "../animation-frame-handler"; +} from "../actions/actionFrame"; +import { createRedoAction, createUndoAction } from "../actions/actionHistory"; +import { actionTextAutoResize } from "../actions/actionTextAutoResize"; +import { actionToggleViewMode } from "../actions/actionToggleViewMode"; +import { ActionManager } from "../actions/manager"; +import { actions } from "../actions/register"; +import { getShortcutFromShortcutName } from "../actions/shortcuts"; +import { trackEvent } from "../../analytics"; +import { AnimationFrameHandler } from "../../animation-frame-handler"; import { getDefaultAppState, isEraserActive, isHandToolActive, -} from "../appState"; -import { copyTextToSystemClipboard, parseClipboard } from "../clipboard"; -import { exportCanvas, loadFromBlob } from "../src/data"; -import Library, { - distributeLibraryItemsOnSquareGrid, -} from "../src/data/library"; -import { restore, restoreElements } from "../src/data/restore"; -import { getCenter, getDistance } from "../gesture"; -import { History } from "../history"; -import { defaultLang, getLanguage, languages, setLanguage, t } from "../i18n"; +} from "../../appState"; +import { copyTextToSystemClipboard, parseClipboard } from "../../clipboard"; +import { exportCanvas, loadFromBlob } from "../data"; +import Library, { distributeLibraryItemsOnSquareGrid } from "../data/library"; +import { restore, restoreElements } from "../data/restore"; +import { getCenter, getDistance } from "../../gesture"; +import { History } from "../../history"; +import { + defaultLang, + getLanguage, + languages, + setLanguage, + t, +} from "../../i18n"; import { calculateScrollCenter, @@ -406,9 +407,9 @@ import { getSelectedElements, hasBackground, isSomeElementSelected, -} from "../src/scene"; -import Scene from "../src/scene/Scene"; -import { getStateForZoom } from "../src/scene/zoom"; +} from "../scene"; +import Scene from "../scene/Scene"; +import { getStateForZoom } from "../scene/zoom"; import { dataURLToFile, dataURLToString, @@ -424,18 +425,18 @@ import { parseLibraryJSON, resizeImageFile, SVGStringToFile, -} from "../src/data/blob"; +} from "../data/blob"; -import { fileOpen } from "../src/data/filesystem"; +import { fileOpen } from "../data/filesystem"; import { showHyperlinkTooltip, hideHyperlinkToolip, Hyperlink, -} from "../components/hyperlink/Hyperlink"; +} from "./hyperlink/Hyperlink"; -import { Fonts } from "../fonts"; -import { editorJotaiStore } from "../editor-jotai"; -import { ImageSceneDataError } from "../errors"; +import { Fonts } from "../../fonts"; +import { editorJotaiStore } from "../../editor-jotai"; +import { ImageSceneDataError } from "../../errors"; import { getSnapLinesAtPointer, snapDraggedElements, @@ -447,25 +448,28 @@ import { getReferenceSnapPoints, SnapCache, isGridModeEnabled, -} from "../snapping"; -import { convertToExcalidrawElements } from "../src/data/transform"; -import { Renderer } from "../src/scene/Renderer"; +} from "../../snapping"; +import { convertToExcalidrawElements } from "../data/transform"; +import { Renderer } from "../scene/Renderer"; import { setEraserCursor, setCursor, resetCursor, setCursorForShape, -} from "../cursor"; -import { Emitter } from "../emitter"; -import { ElementCanvasButtons } from "../components/ElementCanvasButtons"; -import { Store, CaptureUpdateAction } from "../store"; -import { AnimatedTrail } from "../animated-trail"; -import { LaserTrails } from "../laser-trails"; -import { withBatchedUpdates, withBatchedUpdatesThrottled } from "../reactUtils"; -import { textWysiwyg } from "../wysiwyg/textWysiwyg"; -import { isOverScrollBars } from "../src/scene/scrollbars"; +} from "../../cursor"; +import { Emitter } from "../../emitter"; +import { ElementCanvasButtons } from "./ElementCanvasButtons"; +import { Store, CaptureUpdateAction } from "../../store"; +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 { isMaybeMermaidDefinition } from "../mermaid"; +import { isMaybeMermaidDefinition } from "../../mermaid"; import { LassoTrail } from "../lasso"; @@ -493,13 +497,13 @@ import { findShapeByKey } from "./shapes"; import type { RenderInteractiveSceneCallback, ScrollBars, -} from "../src/scene/types"; +} from "../scene/types"; -import type { PastedMixedContent } from "../clipboard"; -import type { ExportedElements } from "../src/data"; +import type { PastedMixedContent } from "../../clipboard"; +import type { ExportedElements } from "../data"; import type { ContextMenuItems } from "./ContextMenu"; -import type { FileSystemHandle } from "../src/data/filesystem"; -import type { ExcalidrawElementSkeleton } from "../src/data/transform"; +import type { FileSystemHandle } from "../data/filesystem"; +import type { ExcalidrawElementSkeleton } from "../data/transform"; import type { AppClassProperties, @@ -528,9 +532,9 @@ import type { GenerateDiagramToCode, NullableGridSize, Offsets, -} from "../types"; +} from "../../types"; import type { RoughCanvas } from "roughjs/bin/canvas"; -import type { Action, ActionResult } from "../src/actions/types"; +import type { Action, ActionResult } from "../actions/types"; const AppContext = React.createContext(null!); const AppPropsContext = React.createContext(null!); diff --git a/packages/excalidraw/components/Avatar.scss b/packages/excalidraw/src/components/Avatar.scss similarity index 100% rename from packages/excalidraw/components/Avatar.scss rename to packages/excalidraw/src/components/Avatar.scss diff --git a/packages/excalidraw/components/Avatar.tsx b/packages/excalidraw/src/components/Avatar.tsx similarity index 94% rename from packages/excalidraw/components/Avatar.tsx rename to packages/excalidraw/src/components/Avatar.tsx index 648fb5fce..46cca2fd3 100644 --- a/packages/excalidraw/components/Avatar.tsx +++ b/packages/excalidraw/src/components/Avatar.tsx @@ -1,7 +1,7 @@ import clsx from "clsx"; import React, { useState } from "react"; -import { getNameInitial } from "../clients"; +import { getNameInitial } from "../../clients"; import "./Avatar.scss"; diff --git a/packages/excalidraw/components/BraveMeasureTextError.tsx b/packages/excalidraw/src/components/BraveMeasureTextError.tsx similarity index 100% rename from packages/excalidraw/components/BraveMeasureTextError.tsx rename to packages/excalidraw/src/components/BraveMeasureTextError.tsx diff --git a/packages/excalidraw/components/Button.scss b/packages/excalidraw/src/components/Button.scss similarity index 100% rename from packages/excalidraw/components/Button.scss rename to packages/excalidraw/src/components/Button.scss diff --git a/packages/excalidraw/components/Button.tsx b/packages/excalidraw/src/components/Button.tsx similarity index 100% rename from packages/excalidraw/components/Button.tsx rename to packages/excalidraw/src/components/Button.tsx diff --git a/packages/excalidraw/components/ButtonIcon.scss b/packages/excalidraw/src/components/ButtonIcon.scss similarity index 100% rename from packages/excalidraw/components/ButtonIcon.scss rename to packages/excalidraw/src/components/ButtonIcon.scss diff --git a/packages/excalidraw/components/ButtonIcon.tsx b/packages/excalidraw/src/components/ButtonIcon.tsx similarity index 100% rename from packages/excalidraw/components/ButtonIcon.tsx rename to packages/excalidraw/src/components/ButtonIcon.tsx diff --git a/packages/excalidraw/components/ButtonIconCycle.tsx b/packages/excalidraw/src/components/ButtonIconCycle.tsx similarity index 100% rename from packages/excalidraw/components/ButtonIconCycle.tsx rename to packages/excalidraw/src/components/ButtonIconCycle.tsx diff --git a/packages/excalidraw/components/ButtonIconSelect.tsx b/packages/excalidraw/src/components/ButtonIconSelect.tsx similarity index 100% rename from packages/excalidraw/components/ButtonIconSelect.tsx rename to packages/excalidraw/src/components/ButtonIconSelect.tsx diff --git a/packages/excalidraw/components/ButtonSelect.tsx b/packages/excalidraw/src/components/ButtonSelect.tsx similarity index 100% rename from packages/excalidraw/components/ButtonSelect.tsx rename to packages/excalidraw/src/components/ButtonSelect.tsx diff --git a/packages/excalidraw/components/ButtonSeparator.tsx b/packages/excalidraw/src/components/ButtonSeparator.tsx similarity index 100% rename from packages/excalidraw/components/ButtonSeparator.tsx rename to packages/excalidraw/src/components/ButtonSeparator.tsx diff --git a/packages/excalidraw/components/Card.scss b/packages/excalidraw/src/components/Card.scss similarity index 100% rename from packages/excalidraw/components/Card.scss rename to packages/excalidraw/src/components/Card.scss diff --git a/packages/excalidraw/components/Card.tsx b/packages/excalidraw/src/components/Card.tsx similarity index 100% rename from packages/excalidraw/components/Card.tsx rename to packages/excalidraw/src/components/Card.tsx diff --git a/packages/excalidraw/components/CheckboxItem.scss b/packages/excalidraw/src/components/CheckboxItem.scss similarity index 100% rename from packages/excalidraw/components/CheckboxItem.scss rename to packages/excalidraw/src/components/CheckboxItem.scss diff --git a/packages/excalidraw/components/CheckboxItem.tsx b/packages/excalidraw/src/components/CheckboxItem.tsx similarity index 100% rename from packages/excalidraw/components/CheckboxItem.tsx rename to packages/excalidraw/src/components/CheckboxItem.tsx diff --git a/packages/excalidraw/components/ColorPicker/ColorInput.tsx b/packages/excalidraw/src/components/ColorPicker/ColorInput.tsx similarity index 97% rename from packages/excalidraw/components/ColorPicker/ColorInput.tsx rename to packages/excalidraw/src/components/ColorPicker/ColorInput.tsx index a3f6722eb..59d633360 100644 --- a/packages/excalidraw/components/ColorPicker/ColorInput.tsx +++ b/packages/excalidraw/src/components/ColorPicker/ColorInput.tsx @@ -3,8 +3,8 @@ import { useCallback, useEffect, useRef, useState } from "react"; import { KEYS, getShortcutKey } from "@excalidraw/common"; -import { useAtom } from "../../editor-jotai"; -import { t } from "../../i18n"; +import { useAtom } from "../../../editor-jotai"; +import { t } from "../../../i18n"; import { useDevice } from "../App"; import { activeEyeDropperAtom } from "../EyeDropper"; import { eyeDropperIcon } from "../icons"; diff --git a/packages/excalidraw/components/ColorPicker/ColorPicker.scss b/packages/excalidraw/src/components/ColorPicker/ColorPicker.scss similarity index 100% rename from packages/excalidraw/components/ColorPicker/ColorPicker.scss rename to packages/excalidraw/src/components/ColorPicker/ColorPicker.scss diff --git a/packages/excalidraw/components/ColorPicker/ColorPicker.tsx b/packages/excalidraw/src/components/ColorPicker/ColorPicker.tsx similarity index 98% rename from packages/excalidraw/components/ColorPicker/ColorPicker.tsx rename to packages/excalidraw/src/components/ColorPicker/ColorPicker.tsx index eb6d82d9e..6c73a53d1 100644 --- a/packages/excalidraw/components/ColorPicker/ColorPicker.tsx +++ b/packages/excalidraw/src/components/ColorPicker/ColorPicker.tsx @@ -12,8 +12,8 @@ import type { ColorTuple, ColorPaletteCustom } from "@excalidraw/common"; import type { ExcalidrawElement } from "@excalidraw/element/types"; -import { useAtom } from "../../editor-jotai"; -import { t } from "../../i18n"; +import { useAtom } from "../../../editor-jotai"; +import { t } from "../../../i18n"; import { useExcalidrawContainer } from "../App"; import { ButtonSeparator } from "../ButtonSeparator"; import { activeEyeDropperAtom } from "../EyeDropper"; @@ -29,7 +29,7 @@ import "./ColorPicker.scss"; import type { ColorPickerType } from "./colorPickerUtils"; -import type { AppState } from "../../types"; +import type { AppState } from "../../../types"; const isValidColor = (color: string) => { const style = new Option().style; diff --git a/packages/excalidraw/components/ColorPicker/CustomColorList.tsx b/packages/excalidraw/src/components/ColorPicker/CustomColorList.tsx similarity index 97% rename from packages/excalidraw/components/ColorPicker/CustomColorList.tsx rename to packages/excalidraw/src/components/ColorPicker/CustomColorList.tsx index 45d5db84c..a7b7e81d6 100644 --- a/packages/excalidraw/components/ColorPicker/CustomColorList.tsx +++ b/packages/excalidraw/src/components/ColorPicker/CustomColorList.tsx @@ -1,7 +1,7 @@ import clsx from "clsx"; import { useEffect, useRef } from "react"; -import { useAtom } from "../../editor-jotai"; +import { useAtom } from "../../../editor-jotai"; import HotkeyLabel from "./HotkeyLabel"; import { activeColorPickerSectionAtom } from "./colorPickerUtils"; diff --git a/packages/excalidraw/components/ColorPicker/HotkeyLabel.tsx b/packages/excalidraw/src/components/ColorPicker/HotkeyLabel.tsx similarity index 100% rename from packages/excalidraw/components/ColorPicker/HotkeyLabel.tsx rename to packages/excalidraw/src/components/ColorPicker/HotkeyLabel.tsx diff --git a/packages/excalidraw/components/ColorPicker/Picker.tsx b/packages/excalidraw/src/components/ColorPicker/Picker.tsx similarity index 98% rename from packages/excalidraw/components/ColorPicker/Picker.tsx rename to packages/excalidraw/src/components/ColorPicker/Picker.tsx index 3c54c6769..95513f3c2 100644 --- a/packages/excalidraw/components/ColorPicker/Picker.tsx +++ b/packages/excalidraw/src/components/ColorPicker/Picker.tsx @@ -12,8 +12,8 @@ import type { ExcalidrawElement } from "@excalidraw/element/types"; import type { ColorPaletteCustom } from "@excalidraw/common"; -import { useAtom } from "../../editor-jotai"; -import { t } from "../../i18n"; +import { useAtom } from "../../../editor-jotai"; +import { t } from "../../../i18n"; import { CustomColorList } from "./CustomColorList"; import PickerColorList from "./PickerColorList"; diff --git a/packages/excalidraw/components/ColorPicker/PickerColorList.tsx b/packages/excalidraw/src/components/ColorPicker/PickerColorList.tsx similarity index 94% rename from packages/excalidraw/components/ColorPicker/PickerColorList.tsx rename to packages/excalidraw/src/components/ColorPicker/PickerColorList.tsx index 38e5cf8c5..d657e3f03 100644 --- a/packages/excalidraw/components/ColorPicker/PickerColorList.tsx +++ b/packages/excalidraw/src/components/ColorPicker/PickerColorList.tsx @@ -3,8 +3,8 @@ import { useEffect, useRef } from "react"; import type { ColorPaletteCustom } from "@excalidraw/common"; -import { useAtom } from "../../editor-jotai"; -import { t } from "../../i18n"; +import { useAtom } from "../../../editor-jotai"; +import { t } from "../../../i18n"; import HotkeyLabel from "./HotkeyLabel"; import { @@ -13,7 +13,7 @@ import { getColorNameAndShadeFromColor, } from "./colorPickerUtils"; -import type { TranslationKeys } from "../../i18n"; +import type { TranslationKeys } from "../../../i18n"; interface PickerColorListProps { palette: ColorPaletteCustom; diff --git a/packages/excalidraw/components/ColorPicker/PickerHeading.tsx b/packages/excalidraw/src/components/ColorPicker/PickerHeading.tsx similarity index 100% rename from packages/excalidraw/components/ColorPicker/PickerHeading.tsx rename to packages/excalidraw/src/components/ColorPicker/PickerHeading.tsx diff --git a/packages/excalidraw/components/ColorPicker/ShadeList.tsx b/packages/excalidraw/src/components/ColorPicker/ShadeList.tsx similarity index 97% rename from packages/excalidraw/components/ColorPicker/ShadeList.tsx rename to packages/excalidraw/src/components/ColorPicker/ShadeList.tsx index 1c8e4c4eb..392f358c5 100644 --- a/packages/excalidraw/components/ColorPicker/ShadeList.tsx +++ b/packages/excalidraw/src/components/ColorPicker/ShadeList.tsx @@ -3,8 +3,8 @@ import { useEffect, useRef } from "react"; import type { ColorPaletteCustom } from "@excalidraw/common"; -import { useAtom } from "../../editor-jotai"; -import { t } from "../../i18n"; +import { useAtom } from "../../../editor-jotai"; +import { t } from "../../../i18n"; import HotkeyLabel from "./HotkeyLabel"; import { diff --git a/packages/excalidraw/components/ColorPicker/TopPicks.tsx b/packages/excalidraw/src/components/ColorPicker/TopPicks.tsx similarity index 100% rename from packages/excalidraw/components/ColorPicker/TopPicks.tsx rename to packages/excalidraw/src/components/ColorPicker/TopPicks.tsx diff --git a/packages/excalidraw/components/ColorPicker/colorPickerUtils.ts b/packages/excalidraw/src/components/ColorPicker/colorPickerUtils.ts similarity index 98% rename from packages/excalidraw/components/ColorPicker/colorPickerUtils.ts rename to packages/excalidraw/src/components/ColorPicker/colorPickerUtils.ts index f572bd49f..ed2a277c7 100644 --- a/packages/excalidraw/components/ColorPicker/colorPickerUtils.ts +++ b/packages/excalidraw/src/components/ColorPicker/colorPickerUtils.ts @@ -4,7 +4,7 @@ import type { ExcalidrawElement } from "@excalidraw/element/types"; import type { ColorPickerColor, ColorPaletteCustom } from "@excalidraw/common"; -import { atom } from "../../editor-jotai"; +import { atom } from "../../../editor-jotai"; export const getColorNameAndShadeFromColor = ({ palette, diff --git a/packages/excalidraw/components/ColorPicker/keyboardNavHandlers.ts b/packages/excalidraw/src/components/ColorPicker/keyboardNavHandlers.ts similarity index 100% rename from packages/excalidraw/components/ColorPicker/keyboardNavHandlers.ts rename to packages/excalidraw/src/components/ColorPicker/keyboardNavHandlers.ts diff --git a/packages/excalidraw/components/CommandPalette/CommandPalette.scss b/packages/excalidraw/src/components/CommandPalette/CommandPalette.scss similarity index 100% rename from packages/excalidraw/components/CommandPalette/CommandPalette.scss rename to packages/excalidraw/src/components/CommandPalette/CommandPalette.scss diff --git a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx b/packages/excalidraw/src/components/CommandPalette/CommandPalette.tsx similarity index 97% rename from packages/excalidraw/components/CommandPalette/CommandPalette.tsx rename to packages/excalidraw/src/components/CommandPalette/CommandPalette.tsx index 926b5e4b5..fa5db1fbe 100644 --- a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx +++ b/packages/excalidraw/src/components/CommandPalette/CommandPalette.tsx @@ -17,17 +17,17 @@ import { actionClearCanvas, actionLink, actionToggleSearchMenu, -} from "../../src/actions"; +} from "../../actions"; import { actionCopyElementLink, actionLinkToElement, -} from "../../src/actions/actionElementLink"; -import { getShortcutFromShortcutName } from "../../src/actions/shortcuts"; -import { trackEvent } from "../../analytics"; -import { useUIAppState } from "../../src/context/ui-appState"; -import { deburr } from "../../deburr"; -import { atom, useAtom, editorJotaiStore } from "../../editor-jotai"; -import { t } from "../../i18n"; +} from "../../actions/actionElementLink"; +import { getShortcutFromShortcutName } from "../../actions/shortcuts"; +import { trackEvent } from "../../../analytics"; +import { useUIAppState } from "../../context/ui-appState"; +import { deburr } from "../../../deburr"; +import { atom, useAtom, editorJotaiStore } from "../../../editor-jotai"; +import { t } from "../../../i18n"; import { useApp, useAppProps, @@ -37,7 +37,7 @@ import { import { Dialog } from "../Dialog"; import { InlineIcon } from "../InlineIcon"; import { TextField } from "../TextField"; -import { getSelectedElements } from "../../src/scene"; +import { getSelectedElements } from "../../scene"; import { LockedIcon, UnlockedIcon, @@ -62,10 +62,10 @@ import * as defaultItems from "./defaultCommandPaletteItems"; import "./CommandPalette.scss"; import type { CommandPaletteItem } from "./types"; -import type { AppProps, AppState, UIAppState } from "../../types"; -import type { ShortcutName } from "../../src/actions/shortcuts"; -import type { TranslationKeys } from "../../i18n"; -import type { Action } from "../../src/actions/types"; +import type { AppProps, AppState, UIAppState } from "../../../types"; +import type { ShortcutName } from "../../actions/shortcuts"; +import type { TranslationKeys } from "../../../i18n"; +import type { Action } from "../../actions/types"; const lastUsedPaletteItem = atom(null); diff --git a/packages/excalidraw/components/CommandPalette/defaultCommandPaletteItems.ts b/packages/excalidraw/src/components/CommandPalette/defaultCommandPaletteItems.ts similarity index 83% rename from packages/excalidraw/components/CommandPalette/defaultCommandPaletteItems.ts rename to packages/excalidraw/src/components/CommandPalette/defaultCommandPaletteItems.ts index 7e8a2d12f..485e1767c 100644 --- a/packages/excalidraw/components/CommandPalette/defaultCommandPaletteItems.ts +++ b/packages/excalidraw/src/components/CommandPalette/defaultCommandPaletteItems.ts @@ -1,4 +1,4 @@ -import { actionToggleTheme } from "../../src/actions"; +import { actionToggleTheme } from "../../actions"; import type { CommandPaletteItem } from "./types"; diff --git a/packages/excalidraw/components/CommandPalette/types.ts b/packages/excalidraw/src/components/CommandPalette/types.ts similarity index 80% rename from packages/excalidraw/components/CommandPalette/types.ts rename to packages/excalidraw/src/components/CommandPalette/types.ts index b2c89b98e..9ddc356b5 100644 --- a/packages/excalidraw/components/CommandPalette/types.ts +++ b/packages/excalidraw/src/components/CommandPalette/types.ts @@ -1,6 +1,6 @@ -import type { ActionManager } from "../../src/actions/manager"; -import type { Action } from "../../src/actions/types"; -import type { UIAppState } from "../../types"; +import type { ActionManager } from "../../actions/manager"; +import type { Action } from "../../actions/types"; +import type { UIAppState } from "../../../types"; export type CommandPaletteItem = { label: string; diff --git a/packages/excalidraw/components/ConfirmDialog.scss b/packages/excalidraw/src/components/ConfirmDialog.scss similarity index 100% rename from packages/excalidraw/components/ConfirmDialog.scss rename to packages/excalidraw/src/components/ConfirmDialog.scss diff --git a/packages/excalidraw/components/ConfirmDialog.tsx b/packages/excalidraw/src/components/ConfirmDialog.tsx similarity index 96% rename from packages/excalidraw/components/ConfirmDialog.tsx rename to packages/excalidraw/src/components/ConfirmDialog.tsx index cb402dd97..b27246e6e 100644 --- a/packages/excalidraw/components/ConfirmDialog.tsx +++ b/packages/excalidraw/src/components/ConfirmDialog.tsx @@ -1,7 +1,7 @@ import { flushSync } from "react-dom"; -import { useSetAtom } from "../editor-jotai"; -import { t } from "../i18n"; +import { useSetAtom } from "../../editor-jotai"; +import { t } from "../../i18n"; import { Dialog } from "./Dialog"; import DialogActionButton from "./DialogActionButton"; diff --git a/packages/excalidraw/components/ContextMenu.scss b/packages/excalidraw/src/components/ContextMenu.scss similarity index 100% rename from packages/excalidraw/components/ContextMenu.scss rename to packages/excalidraw/src/components/ContextMenu.scss diff --git a/packages/excalidraw/components/ContextMenu.tsx b/packages/excalidraw/src/components/ContextMenu.tsx similarity index 92% rename from packages/excalidraw/components/ContextMenu.tsx rename to packages/excalidraw/src/components/ContextMenu.tsx index 45f3c1330..fdc3fb7f0 100644 --- a/packages/excalidraw/components/ContextMenu.tsx +++ b/packages/excalidraw/src/components/ContextMenu.tsx @@ -1,8 +1,8 @@ import clsx from "clsx"; import React from "react"; -import { getShortcutFromShortcutName } from "../src/actions/shortcuts"; -import { t } from "../i18n"; +import { getShortcutFromShortcutName } from "../actions/shortcuts"; +import { t } from "../../i18n"; import { useExcalidrawAppState, useExcalidrawElements } from "./App"; @@ -10,11 +10,11 @@ import { Popover } from "./Popover"; import "./ContextMenu.scss"; -import type { ActionManager } from "../src/actions/manager"; -import type { ShortcutName } from "../src/actions/shortcuts"; -import type { Action } from "../src/actions/types"; +import type { ActionManager } from "../actions/manager"; +import type { ShortcutName } from "../actions/shortcuts"; +import type { Action } from "../actions/types"; -import type { TranslationKeys } from "../i18n"; +import type { TranslationKeys } from "../../i18n"; export type ContextMenuItem = typeof CONTEXT_MENU_SEPARATOR | Action; diff --git a/packages/excalidraw/components/DarkModeToggle.tsx b/packages/excalidraw/src/components/DarkModeToggle.tsx similarity index 98% rename from packages/excalidraw/components/DarkModeToggle.tsx rename to packages/excalidraw/src/components/DarkModeToggle.tsx index 474181ba4..c81e6e060 100644 --- a/packages/excalidraw/components/DarkModeToggle.tsx +++ b/packages/excalidraw/src/components/DarkModeToggle.tsx @@ -2,7 +2,7 @@ import { THEME } from "@excalidraw/common"; import type { Theme } from "@excalidraw/element/types"; -import { t } from "../i18n"; +import { t } from "../../i18n"; import { ToolButton } from "./ToolButton"; diff --git a/packages/excalidraw/components/DefaultSidebar.test.tsx b/packages/excalidraw/src/components/DefaultSidebar.test.tsx similarity index 100% rename from packages/excalidraw/components/DefaultSidebar.test.tsx rename to packages/excalidraw/src/components/DefaultSidebar.test.tsx diff --git a/packages/excalidraw/components/DefaultSidebar.tsx b/packages/excalidraw/src/components/DefaultSidebar.tsx similarity index 97% rename from packages/excalidraw/components/DefaultSidebar.tsx rename to packages/excalidraw/src/components/DefaultSidebar.tsx index 156d90e45..4f1aa91e8 100644 --- a/packages/excalidraw/components/DefaultSidebar.tsx +++ b/packages/excalidraw/src/components/DefaultSidebar.tsx @@ -9,8 +9,8 @@ import { import type { MarkOptional, Merge } from "@excalidraw/common/utility-types"; -import { useTunnels } from "../src/context/tunnels"; -import { useUIAppState } from "../src/context/ui-appState"; +import { useTunnels } from "../context/tunnels"; +import { useUIAppState } from "../context/ui-appState"; import "../components/dropdownMenu/DropdownMenu.scss"; diff --git a/packages/excalidraw/components/DiagramToCodePlugin/DiagramToCodePlugin.tsx b/packages/excalidraw/src/components/DiagramToCodePlugin/DiagramToCodePlugin.tsx similarity index 84% rename from packages/excalidraw/components/DiagramToCodePlugin/DiagramToCodePlugin.tsx rename to packages/excalidraw/src/components/DiagramToCodePlugin/DiagramToCodePlugin.tsx index e225ca193..226f1f28d 100644 --- a/packages/excalidraw/components/DiagramToCodePlugin/DiagramToCodePlugin.tsx +++ b/packages/excalidraw/src/components/DiagramToCodePlugin/DiagramToCodePlugin.tsx @@ -2,7 +2,7 @@ import { useLayoutEffect } from "react"; import { useApp } from "../App"; -import type { GenerateDiagramToCode } from "../../types"; +import type { GenerateDiagramToCode } from "../../../types"; export const DiagramToCodePlugin = (props: { generate: GenerateDiagramToCode; diff --git a/packages/excalidraw/components/Dialog.scss b/packages/excalidraw/src/components/Dialog.scss similarity index 100% rename from packages/excalidraw/components/Dialog.scss rename to packages/excalidraw/src/components/Dialog.scss diff --git a/packages/excalidraw/components/Dialog.tsx b/packages/excalidraw/src/components/Dialog.tsx similarity index 97% rename from packages/excalidraw/components/Dialog.tsx rename to packages/excalidraw/src/components/Dialog.tsx index 00ae2be0c..6612fd886 100644 --- a/packages/excalidraw/components/Dialog.tsx +++ b/packages/excalidraw/src/components/Dialog.tsx @@ -3,9 +3,9 @@ import React, { useEffect, useState } from "react"; import { KEYS, queryFocusableElements } from "@excalidraw/common"; -import { useSetAtom } from "../editor-jotai"; +import { useSetAtom } from "../../editor-jotai"; import { useCallbackRefState } from "../hooks/useCallbackRefState"; -import { t } from "../i18n"; +import { t } from "../../i18n"; import { useExcalidrawContainer, diff --git a/packages/excalidraw/components/DialogActionButton.scss b/packages/excalidraw/src/components/DialogActionButton.scss similarity index 100% rename from packages/excalidraw/components/DialogActionButton.scss rename to packages/excalidraw/src/components/DialogActionButton.scss diff --git a/packages/excalidraw/components/DialogActionButton.tsx b/packages/excalidraw/src/components/DialogActionButton.tsx similarity index 100% rename from packages/excalidraw/components/DialogActionButton.tsx rename to packages/excalidraw/src/components/DialogActionButton.tsx diff --git a/packages/excalidraw/components/ElementCanvasButtons.scss b/packages/excalidraw/src/components/ElementCanvasButtons.scss similarity index 100% rename from packages/excalidraw/components/ElementCanvasButtons.scss rename to packages/excalidraw/src/components/ElementCanvasButtons.scss diff --git a/packages/excalidraw/components/ElementCanvasButtons.tsx b/packages/excalidraw/src/components/ElementCanvasButtons.tsx similarity index 93% rename from packages/excalidraw/components/ElementCanvasButtons.tsx rename to packages/excalidraw/src/components/ElementCanvasButtons.tsx index 424c4f3b4..ad6ade310 100644 --- a/packages/excalidraw/components/ElementCanvasButtons.tsx +++ b/packages/excalidraw/src/components/ElementCanvasButtons.tsx @@ -6,11 +6,11 @@ import type { NonDeletedExcalidrawElement, } from "@excalidraw/element/types"; -import { useExcalidrawAppState } from "../components/App"; +import { useExcalidrawAppState } from "./App"; import "./ElementCanvasButtons.scss"; -import type { AppState } from "../types"; +import type { AppState } from "../../types"; const CONTAINER_PADDING = 5; diff --git a/packages/excalidraw/components/ElementLinkDialog.scss b/packages/excalidraw/src/components/ElementLinkDialog.scss similarity index 100% rename from packages/excalidraw/components/ElementLinkDialog.scss rename to packages/excalidraw/src/components/ElementLinkDialog.scss diff --git a/packages/excalidraw/components/ElementLinkDialog.tsx b/packages/excalidraw/src/components/ElementLinkDialog.tsx similarity index 96% rename from packages/excalidraw/components/ElementLinkDialog.tsx rename to packages/excalidraw/src/components/ElementLinkDialog.tsx index 488539f6f..6cb220a83 100644 --- a/packages/excalidraw/components/ElementLinkDialog.tsx +++ b/packages/excalidraw/src/components/ElementLinkDialog.tsx @@ -10,8 +10,8 @@ import { mutateElement } from "@excalidraw/element/mutateElement"; import type { ElementsMap, ExcalidrawElement } from "@excalidraw/element/types"; -import { t } from "../i18n"; -import { getSelectedElements } from "../src/scene"; +import { t } from "../../i18n"; +import { getSelectedElements } from "../scene"; import DialogActionButton from "./DialogActionButton"; import { TextField } from "./TextField"; @@ -20,7 +20,7 @@ import { TrashIcon } from "./icons"; import "./ElementLinkDialog.scss"; -import type { AppProps, AppState, UIAppState } from "../types"; +import type { AppProps, AppState, UIAppState } from "../../types"; const ElementLinkDialog = ({ sourceElementId, diff --git a/packages/excalidraw/components/ErrorDialog.tsx b/packages/excalidraw/src/components/ErrorDialog.tsx similarity index 96% rename from packages/excalidraw/components/ErrorDialog.tsx rename to packages/excalidraw/src/components/ErrorDialog.tsx index 132b292b9..1a6c7e5f2 100644 --- a/packages/excalidraw/components/ErrorDialog.tsx +++ b/packages/excalidraw/src/components/ErrorDialog.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; -import { t } from "../i18n"; +import { t } from "../../i18n"; import { useExcalidrawContainer } from "./App"; import { Dialog } from "./Dialog"; diff --git a/packages/excalidraw/components/ExcalidrawLogo.scss b/packages/excalidraw/src/components/ExcalidrawLogo.scss similarity index 100% rename from packages/excalidraw/components/ExcalidrawLogo.scss rename to packages/excalidraw/src/components/ExcalidrawLogo.scss diff --git a/packages/excalidraw/components/ExcalidrawLogo.tsx b/packages/excalidraw/src/components/ExcalidrawLogo.tsx similarity index 100% rename from packages/excalidraw/components/ExcalidrawLogo.tsx rename to packages/excalidraw/src/components/ExcalidrawLogo.tsx diff --git a/packages/excalidraw/components/ExportDialog.scss b/packages/excalidraw/src/components/ExportDialog.scss similarity index 100% rename from packages/excalidraw/components/ExportDialog.scss rename to packages/excalidraw/src/components/ExportDialog.scss diff --git a/packages/excalidraw/components/EyeDropper.scss b/packages/excalidraw/src/components/EyeDropper.scss similarity index 100% rename from packages/excalidraw/components/EyeDropper.scss rename to packages/excalidraw/src/components/EyeDropper.scss diff --git a/packages/excalidraw/components/EyeDropper.tsx b/packages/excalidraw/src/components/EyeDropper.tsx similarity index 97% rename from packages/excalidraw/components/EyeDropper.tsx rename to packages/excalidraw/src/components/EyeDropper.tsx index 06c691b21..0f118ea0d 100644 --- a/packages/excalidraw/components/EyeDropper.tsx +++ b/packages/excalidraw/src/components/EyeDropper.tsx @@ -5,12 +5,12 @@ import { EVENT, KEYS, rgbToHex } from "@excalidraw/common"; import type { ExcalidrawElement } from "@excalidraw/element/types"; -import { useUIAppState } from "../src/context/ui-appState"; -import { atom } from "../editor-jotai"; +import { useUIAppState } from "../context/ui-appState"; +import { atom } from "../../editor-jotai"; import { useCreatePortalContainer } from "../hooks/useCreatePortalContainer"; import { useOutsideClick } from "../hooks/useOutsideClick"; import { useStable } from "../hooks/useStable"; -import { getSelectedElements } from "../src/scene"; +import { getSelectedElements } from "../scene"; import { useApp, useExcalidrawContainer, useExcalidrawElements } from "./App"; diff --git a/packages/excalidraw/components/FilledButton.scss b/packages/excalidraw/src/components/FilledButton.scss similarity index 100% rename from packages/excalidraw/components/FilledButton.scss rename to packages/excalidraw/src/components/FilledButton.scss diff --git a/packages/excalidraw/components/FilledButton.tsx b/packages/excalidraw/src/components/FilledButton.tsx similarity index 98% rename from packages/excalidraw/components/FilledButton.tsx rename to packages/excalidraw/src/components/FilledButton.tsx index 53b30a046..88d8411a1 100644 --- a/packages/excalidraw/components/FilledButton.tsx +++ b/packages/excalidraw/src/components/FilledButton.tsx @@ -3,7 +3,7 @@ import React, { forwardRef, useState } from "react"; import { isPromiseLike } from "@excalidraw/common"; -import { AbortError } from "../errors"; +import { AbortError } from "../../errors"; import Spinner from "./Spinner"; import { tablerCheckIcon } from "./icons"; diff --git a/packages/excalidraw/components/FixedSideContainer.scss b/packages/excalidraw/src/components/FixedSideContainer.scss similarity index 100% rename from packages/excalidraw/components/FixedSideContainer.scss rename to packages/excalidraw/src/components/FixedSideContainer.scss diff --git a/packages/excalidraw/components/FixedSideContainer.tsx b/packages/excalidraw/src/components/FixedSideContainer.tsx similarity index 100% rename from packages/excalidraw/components/FixedSideContainer.tsx rename to packages/excalidraw/src/components/FixedSideContainer.tsx diff --git a/packages/excalidraw/components/FollowMode/FollowMode.scss b/packages/excalidraw/src/components/FollowMode/FollowMode.scss similarity index 100% rename from packages/excalidraw/components/FollowMode/FollowMode.scss rename to packages/excalidraw/src/components/FollowMode/FollowMode.scss diff --git a/packages/excalidraw/components/FollowMode/FollowMode.tsx b/packages/excalidraw/src/components/FollowMode/FollowMode.tsx similarity index 94% rename from packages/excalidraw/components/FollowMode/FollowMode.tsx rename to packages/excalidraw/src/components/FollowMode/FollowMode.tsx index e862cb4ea..049261336 100644 --- a/packages/excalidraw/components/FollowMode/FollowMode.tsx +++ b/packages/excalidraw/src/components/FollowMode/FollowMode.tsx @@ -2,7 +2,7 @@ import { CloseIcon } from "../icons"; import "./FollowMode.scss"; -import type { UserToFollow } from "../../types"; +import type { UserToFollow } from "../../../types"; interface FollowModeProps { width: number; diff --git a/packages/excalidraw/components/FontPicker/FontPicker.scss b/packages/excalidraw/src/components/FontPicker/FontPicker.scss similarity index 100% rename from packages/excalidraw/components/FontPicker/FontPicker.scss rename to packages/excalidraw/src/components/FontPicker/FontPicker.scss diff --git a/packages/excalidraw/components/FontPicker/FontPicker.tsx b/packages/excalidraw/src/components/FontPicker/FontPicker.tsx similarity index 98% rename from packages/excalidraw/components/FontPicker/FontPicker.tsx rename to packages/excalidraw/src/components/FontPicker/FontPicker.tsx index 546e1fa34..17cb6bb28 100644 --- a/packages/excalidraw/components/FontPicker/FontPicker.tsx +++ b/packages/excalidraw/src/components/FontPicker/FontPicker.tsx @@ -5,7 +5,7 @@ import { FONT_FAMILY } from "@excalidraw/common"; import type { FontFamilyValues } from "@excalidraw/element/types"; -import { t } from "../../i18n"; +import { t } from "../../../i18n"; import { ButtonIconSelect } from "../ButtonIconSelect"; import { ButtonSeparator } from "../ButtonSeparator"; import { diff --git a/packages/excalidraw/components/FontPicker/FontPickerList.tsx b/packages/excalidraw/src/components/FontPicker/FontPickerList.tsx similarity index 99% rename from packages/excalidraw/components/FontPicker/FontPickerList.tsx rename to packages/excalidraw/src/components/FontPicker/FontPickerList.tsx index 2ec9e7d6d..37db582b1 100644 --- a/packages/excalidraw/components/FontPicker/FontPickerList.tsx +++ b/packages/excalidraw/src/components/FontPicker/FontPickerList.tsx @@ -18,8 +18,8 @@ import { import type { ValueOf } from "@excalidraw/common/utility-types"; -import { Fonts } from "../../fonts"; -import { t } from "../../i18n"; +import { Fonts } from "../../../fonts"; +import { t } from "../../../i18n"; import { useApp, useAppProps, useExcalidrawContainer } from "../App"; import { PropertiesPopover } from "../PropertiesPopover"; import { QuickSearch } from "../QuickSearch"; diff --git a/packages/excalidraw/components/FontPicker/FontPickerTrigger.tsx b/packages/excalidraw/src/components/FontPicker/FontPickerTrigger.tsx similarity index 96% rename from packages/excalidraw/components/FontPicker/FontPickerTrigger.tsx rename to packages/excalidraw/src/components/FontPicker/FontPickerTrigger.tsx index 6f3cc638a..8fa4b2299 100644 --- a/packages/excalidraw/components/FontPicker/FontPickerTrigger.tsx +++ b/packages/excalidraw/src/components/FontPicker/FontPickerTrigger.tsx @@ -3,7 +3,7 @@ import { useMemo } from "react"; import type { FontFamilyValues } from "@excalidraw/element/types"; -import { t } from "../../i18n"; +import { t } from "../../../i18n"; import { ButtonIcon } from "../ButtonIcon"; import { TextIcon } from "../icons"; diff --git a/packages/excalidraw/components/FontPicker/keyboardNavHandlers.ts b/packages/excalidraw/src/components/FontPicker/keyboardNavHandlers.ts similarity index 100% rename from packages/excalidraw/components/FontPicker/keyboardNavHandlers.ts rename to packages/excalidraw/src/components/FontPicker/keyboardNavHandlers.ts diff --git a/packages/excalidraw/components/HandButton.tsx b/packages/excalidraw/src/components/HandButton.tsx similarity index 100% rename from packages/excalidraw/components/HandButton.tsx rename to packages/excalidraw/src/components/HandButton.tsx diff --git a/packages/excalidraw/components/HelpButton.tsx b/packages/excalidraw/src/components/HelpButton.tsx similarity index 92% rename from packages/excalidraw/components/HelpButton.tsx rename to packages/excalidraw/src/components/HelpButton.tsx index 39c867cde..feca06e0e 100644 --- a/packages/excalidraw/components/HelpButton.tsx +++ b/packages/excalidraw/src/components/HelpButton.tsx @@ -1,4 +1,4 @@ -import { t } from "../i18n"; +import { t } from "../../i18n"; import { HelpIcon } from "./icons"; diff --git a/packages/excalidraw/components/HelpDialog.scss b/packages/excalidraw/src/components/HelpDialog.scss similarity index 100% rename from packages/excalidraw/components/HelpDialog.scss rename to packages/excalidraw/src/components/HelpDialog.scss diff --git a/packages/excalidraw/components/HelpDialog.tsx b/packages/excalidraw/src/components/HelpDialog.tsx similarity index 98% rename from packages/excalidraw/components/HelpDialog.tsx rename to packages/excalidraw/src/components/HelpDialog.tsx index f832e1345..7a05d6ebe 100644 --- a/packages/excalidraw/components/HelpDialog.tsx +++ b/packages/excalidraw/src/components/HelpDialog.tsx @@ -4,9 +4,9 @@ import { isDarwin, isFirefox, isWindows } from "@excalidraw/common"; import { KEYS, getShortcutKey } from "@excalidraw/common"; -import { getShortcutFromShortcutName } from "../src/actions/shortcuts"; -import { probablySupportsClipboardBlob } from "../clipboard"; -import { t } from "../i18n"; +import { getShortcutFromShortcutName } from "../actions/shortcuts"; +import { probablySupportsClipboardBlob } from "../../clipboard"; +import { t } from "../../i18n"; import { Dialog } from "./Dialog"; import { ExternalLinkIcon, GithubIcon, youtubeIcon } from "./icons"; diff --git a/packages/excalidraw/components/HintViewer.scss b/packages/excalidraw/src/components/HintViewer.scss similarity index 100% rename from packages/excalidraw/components/HintViewer.scss rename to packages/excalidraw/src/components/HintViewer.scss diff --git a/packages/excalidraw/components/HintViewer.tsx b/packages/excalidraw/src/components/HintViewer.tsx similarity index 97% rename from packages/excalidraw/components/HintViewer.tsx rename to packages/excalidraw/src/components/HintViewer.tsx index 5072e4471..d8103a017 100644 --- a/packages/excalidraw/components/HintViewer.tsx +++ b/packages/excalidraw/src/components/HintViewer.tsx @@ -12,13 +12,13 @@ import { getShortcutKey } from "@excalidraw/common"; import { isNodeInFlowchart } from "@excalidraw/element/flowchart"; -import { t } from "../i18n"; -import { isEraserActive } from "../appState"; -import { isGridModeEnabled } from "../snapping"; +import { t } from "../../i18n"; +import { isEraserActive } from "../../appState"; +import { isGridModeEnabled } from "../../snapping"; import "./HintViewer.scss"; -import type { AppClassProperties, Device, UIAppState } from "../types"; +import type { AppClassProperties, Device, UIAppState } from "../../types"; interface HintViewerProps { appState: UIAppState; diff --git a/packages/excalidraw/components/IconPicker.scss b/packages/excalidraw/src/components/IconPicker.scss similarity index 100% rename from packages/excalidraw/components/IconPicker.scss rename to packages/excalidraw/src/components/IconPicker.scss diff --git a/packages/excalidraw/components/IconPicker.tsx b/packages/excalidraw/src/components/IconPicker.tsx similarity index 98% rename from packages/excalidraw/components/IconPicker.tsx rename to packages/excalidraw/src/components/IconPicker.tsx index 5630ae8d7..696c2ebab 100644 --- a/packages/excalidraw/components/IconPicker.tsx +++ b/packages/excalidraw/src/components/IconPicker.tsx @@ -4,8 +4,8 @@ import React, { useEffect } from "react"; import { isArrowKey, KEYS } from "@excalidraw/common"; -import { atom, useAtom } from "../editor-jotai"; -import { getLanguage, t } from "../i18n"; +import { atom, useAtom } from "../../editor-jotai"; +import { getLanguage, t } from "../../i18n"; import Collapsible from "./Stats/Collapsible"; import { useDevice } from "./App"; diff --git a/packages/excalidraw/components/ImageExportDialog.scss b/packages/excalidraw/src/components/ImageExportDialog.scss similarity index 100% rename from packages/excalidraw/components/ImageExportDialog.scss rename to packages/excalidraw/src/components/ImageExportDialog.scss diff --git a/packages/excalidraw/components/ImageExportDialog.tsx b/packages/excalidraw/src/components/ImageExportDialog.tsx similarity index 96% rename from packages/excalidraw/components/ImageExportDialog.tsx rename to packages/excalidraw/src/components/ImageExportDialog.tsx index dc7a115bd..5bce6806c 100644 --- a/packages/excalidraw/components/ImageExportDialog.tsx +++ b/packages/excalidraw/src/components/ImageExportDialog.tsx @@ -17,15 +17,15 @@ import { actionChangeExportEmbedScene, actionChangeExportScale, actionChangeProjectName, -} from "../src/actions/actionExport"; -import { probablySupportsClipboardBlob } from "../clipboard"; -import { prepareElementsForExport } from "../src/data"; -import { canvasToBlob } from "../src/data/blob"; -import { nativeFileSystemSupported } from "../src/data/filesystem"; +} from "../actions/actionExport"; +import { probablySupportsClipboardBlob } from "../../clipboard"; +import { prepareElementsForExport } from "../data"; +import { canvasToBlob } from "../data/blob"; +import { nativeFileSystemSupported } from "../data/filesystem"; import { useCopyStatus } from "../hooks/useCopiedIndicator"; -import { t } from "../i18n"; -import { isSomeElementSelected } from "../src/scene"; +import { t } from "../../i18n"; +import { isSomeElementSelected } from "../scene"; import { copyIcon, downloadIcon, helpIcon } from "./icons"; import { Dialog } from "./Dialog"; @@ -36,9 +36,9 @@ import { FilledButton } from "./FilledButton"; import "./ImageExportDialog.scss"; -import type { ActionManager } from "../src/actions/manager"; +import type { ActionManager } from "../actions/manager"; -import type { AppClassProperties, BinaryFiles, UIAppState } from "../types"; +import type { AppClassProperties, BinaryFiles, UIAppState } from "../../types"; const supportsContextFilters = "filter" in document.createElement("canvas").getContext("2d")!; diff --git a/packages/excalidraw/components/InitializeApp.tsx b/packages/excalidraw/src/components/InitializeApp.tsx similarity index 86% rename from packages/excalidraw/components/InitializeApp.tsx rename to packages/excalidraw/src/components/InitializeApp.tsx index 1e5dda6dc..35b0846ec 100644 --- a/packages/excalidraw/components/InitializeApp.tsx +++ b/packages/excalidraw/src/components/InitializeApp.tsx @@ -2,11 +2,11 @@ import React, { useEffect, useState } from "react"; import type { Theme } from "@excalidraw/element/types"; -import { defaultLang, languages, setLanguage } from "../i18n"; +import { defaultLang, languages, setLanguage } from "../../i18n"; import { LoadingMessage } from "./LoadingMessage"; -import type { Language } from "../i18n"; +import type { Language } from "../../i18n"; interface Props { langCode: Language["code"]; diff --git a/packages/excalidraw/components/InlineIcon.tsx b/packages/excalidraw/src/components/InlineIcon.tsx similarity index 100% rename from packages/excalidraw/components/InlineIcon.tsx rename to packages/excalidraw/src/components/InlineIcon.tsx diff --git a/packages/excalidraw/components/Island.scss b/packages/excalidraw/src/components/Island.scss similarity index 100% rename from packages/excalidraw/components/Island.scss rename to packages/excalidraw/src/components/Island.scss diff --git a/packages/excalidraw/components/Island.tsx b/packages/excalidraw/src/components/Island.tsx similarity index 100% rename from packages/excalidraw/components/Island.tsx rename to packages/excalidraw/src/components/Island.tsx diff --git a/packages/excalidraw/components/JSONExportDialog.tsx b/packages/excalidraw/src/components/JSONExportDialog.tsx similarity index 91% rename from packages/excalidraw/components/JSONExportDialog.tsx rename to packages/excalidraw/src/components/JSONExportDialog.tsx index ed1a60e18..426720e66 100644 --- a/packages/excalidraw/components/JSONExportDialog.tsx +++ b/packages/excalidraw/src/components/JSONExportDialog.tsx @@ -4,11 +4,11 @@ import { getFrame } from "@excalidraw/common"; import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types"; -import { actionSaveFileToDisk } from "../src/actions/actionExport"; +import { actionSaveFileToDisk } from "../actions/actionExport"; -import { trackEvent } from "../analytics"; -import { nativeFileSystemSupported } from "../src/data/filesystem"; -import { t } from "../i18n"; +import { trackEvent } from "../../analytics"; +import { nativeFileSystemSupported } from "../data/filesystem"; +import { t } from "../../i18n"; import { Card } from "./Card"; import { Dialog } from "./Dialog"; @@ -17,9 +17,9 @@ import { exportToFileIcon, LinkIcon } from "./icons"; import "./ExportDialog.scss"; -import type { ActionManager } from "../src/actions/manager"; +import type { ActionManager } from "../actions/manager"; -import type { ExportOpts, BinaryFiles, UIAppState } from "../types"; +import type { ExportOpts, BinaryFiles, UIAppState } from "../../types"; export type ExportCB = ( elements: readonly NonDeletedExcalidrawElement[], diff --git a/packages/excalidraw/components/LaserPointerButton.tsx b/packages/excalidraw/src/components/LaserPointerButton.tsx similarity index 100% rename from packages/excalidraw/components/LaserPointerButton.tsx rename to packages/excalidraw/src/components/LaserPointerButton.tsx diff --git a/packages/excalidraw/components/LayerUI.scss b/packages/excalidraw/src/components/LayerUI.scss similarity index 100% rename from packages/excalidraw/components/LayerUI.scss rename to packages/excalidraw/src/components/LayerUI.scss diff --git a/packages/excalidraw/components/LayerUI.tsx b/packages/excalidraw/src/components/LayerUI.tsx similarity index 97% rename from packages/excalidraw/components/LayerUI.tsx rename to packages/excalidraw/src/components/LayerUI.tsx index 29ca5dd81..5e33c0554 100644 --- a/packages/excalidraw/components/LayerUI.tsx +++ b/packages/excalidraw/src/components/LayerUI.tsx @@ -17,16 +17,16 @@ import { ShapeCache } from "@excalidraw/element/ShapeCache"; import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types"; -import Scene from "../src/scene/Scene"; -import { actionToggleStats } from "../src/actions"; -import { trackEvent } from "../analytics"; -import { isHandToolActive } from "../appState"; -import { TunnelsContext, useInitializeTunnels } from "../src/context/tunnels"; -import { UIAppStateContext } from "../src/context/ui-appState"; -import { useAtom, useAtomValue } from "../editor-jotai"; +import Scene from "../scene/Scene"; +import { actionToggleStats } from "../actions"; +import { trackEvent } from "../../analytics"; +import { isHandToolActive } from "../../appState"; +import { TunnelsContext, useInitializeTunnels } from "../context/tunnels"; +import { UIAppStateContext } from "../context/ui-appState"; +import { useAtom, useAtomValue } from "../../editor-jotai"; -import { t } from "../i18n"; -import { calculateScrollCenter } from "../src/scene"; +import { t } from "../../i18n"; +import { calculateScrollCenter } from "../scene"; import { SelectedShapeActions, ShapesSwitcher } from "./Actions"; import { LoadingMessage } from "./LoadingMessage"; @@ -62,9 +62,9 @@ import { LaserPointerButton } from "./LaserPointerButton"; import "./LayerUI.scss"; import "./Toolbar.scss"; -import type { ActionManager } from "../src/actions/manager"; +import type { ActionManager } from "../actions/manager"; -import type { Language } from "../i18n"; +import type { Language } from "../../i18n"; import type { AppProps, AppState, @@ -72,7 +72,7 @@ import type { BinaryFiles, UIAppState, AppClassProperties, -} from "../types"; +} from "../../types"; interface LayerUIProps { actionManager: ActionManager; diff --git a/packages/excalidraw/components/LibraryMenu.scss b/packages/excalidraw/src/components/LibraryMenu.scss similarity index 100% rename from packages/excalidraw/components/LibraryMenu.scss rename to packages/excalidraw/src/components/LibraryMenu.scss diff --git a/packages/excalidraw/components/LibraryMenu.tsx b/packages/excalidraw/src/components/LibraryMenu.tsx similarity index 96% rename from packages/excalidraw/components/LibraryMenu.tsx rename to packages/excalidraw/src/components/LibraryMenu.tsx index 823938ecc..32c0fd68e 100644 --- a/packages/excalidraw/components/LibraryMenu.tsx +++ b/packages/excalidraw/src/components/LibraryMenu.tsx @@ -18,16 +18,16 @@ import type { NonDeletedExcalidrawElement, } from "@excalidraw/element/types"; -import { trackEvent } from "../analytics"; -import { useUIAppState } from "../src/context/ui-appState"; +import { trackEvent } from "../../analytics"; +import { useUIAppState } from "../context/ui-appState"; import { distributeLibraryItemsOnSquareGrid, libraryItemsAtom, -} from "../src/data/library"; -import { atom, useAtom } from "../editor-jotai"; -import { t } from "../i18n"; +} from "../data/library"; +import { atom, useAtom } from "../../editor-jotai"; +import { t } from "../../i18n"; -import { getSelectedElements } from "../src/scene"; +import { getSelectedElements } from "../scene"; import { useApp, @@ -47,8 +47,8 @@ import type { ExcalidrawProps, UIAppState, AppClassProperties, -} from "../types"; -import type Library from "../src/data/library"; +} from "../../types"; +import type Library from "../data/library"; export const isLibraryMenuOpenAtom = atom(false); diff --git a/packages/excalidraw/components/LibraryMenuBrowseButton.tsx b/packages/excalidraw/src/components/LibraryMenuBrowseButton.tsx similarity index 88% rename from packages/excalidraw/components/LibraryMenuBrowseButton.tsx rename to packages/excalidraw/src/components/LibraryMenuBrowseButton.tsx index 86bd4e2ad..273570e40 100644 --- a/packages/excalidraw/components/LibraryMenuBrowseButton.tsx +++ b/packages/excalidraw/src/components/LibraryMenuBrowseButton.tsx @@ -1,8 +1,8 @@ import { VERSIONS } from "@excalidraw/common"; -import { t } from "../i18n"; +import { t } from "../../i18n"; -import type { ExcalidrawProps, UIAppState } from "../types"; +import type { ExcalidrawProps, UIAppState } from "../../types"; const LibraryMenuBrowseButton = ({ theme, diff --git a/packages/excalidraw/components/LibraryMenuControlButtons.tsx b/packages/excalidraw/src/components/LibraryMenuControlButtons.tsx similarity index 91% rename from packages/excalidraw/components/LibraryMenuControlButtons.tsx rename to packages/excalidraw/src/components/LibraryMenuControlButtons.tsx index 1ea722168..e04a8bcff 100644 --- a/packages/excalidraw/components/LibraryMenuControlButtons.tsx +++ b/packages/excalidraw/src/components/LibraryMenuControlButtons.tsx @@ -2,7 +2,7 @@ import clsx from "clsx"; import LibraryMenuBrowseButton from "./LibraryMenuBrowseButton"; -import type { ExcalidrawProps, UIAppState } from "../types"; +import type { ExcalidrawProps, UIAppState } from "../../types"; export const LibraryMenuControlButtons = ({ libraryReturnUrl, diff --git a/packages/excalidraw/components/LibraryMenuHeaderContent.tsx b/packages/excalidraw/src/components/LibraryMenuHeaderContent.tsx similarity index 95% rename from packages/excalidraw/components/LibraryMenuHeaderContent.tsx rename to packages/excalidraw/src/components/LibraryMenuHeaderContent.tsx index 2e8630a58..3b07eb094 100644 --- a/packages/excalidraw/components/LibraryMenuHeaderContent.tsx +++ b/packages/excalidraw/src/components/LibraryMenuHeaderContent.tsx @@ -3,13 +3,13 @@ import { useCallback, useState } from "react"; import { muteFSAbortError } from "@excalidraw/common"; -import { useUIAppState } from "../src/context/ui-appState"; -import { fileOpen } from "../src/data/filesystem"; -import { saveLibraryAsJSON } from "../src/data/json"; -import { libraryItemsAtom } from "../src/data/library"; -import { useAtom } from "../editor-jotai"; +import { useUIAppState } from "../context/ui-appState"; +import { fileOpen } from "../data/filesystem"; +import { saveLibraryAsJSON } from "../data/json"; +import { libraryItemsAtom } from "../data/library"; +import { useAtom } from "../../editor-jotai"; import { useLibraryCache } from "../hooks/useLibraryItemSvg"; -import { t } from "../i18n"; +import { t } from "../../i18n"; import { useApp, useExcalidrawSetAppState } from "./App"; import ConfirmDialog from "./ConfirmDialog"; @@ -27,8 +27,8 @@ import { TrashIcon, } from "./icons"; -import type Library from "../src/data/library"; -import type { LibraryItem, LibraryItems, UIAppState } from "../types"; +import type Library from "../data/library"; +import type { LibraryItem, LibraryItems, UIAppState } from "../../types"; const getSelectedItems = ( libraryItems: LibraryItems, diff --git a/packages/excalidraw/components/LibraryMenuItems.scss b/packages/excalidraw/src/components/LibraryMenuItems.scss similarity index 100% rename from packages/excalidraw/components/LibraryMenuItems.scss rename to packages/excalidraw/src/components/LibraryMenuItems.scss diff --git a/packages/excalidraw/components/LibraryMenuItems.tsx b/packages/excalidraw/src/components/LibraryMenuItems.tsx similarity index 98% rename from packages/excalidraw/components/LibraryMenuItems.tsx rename to packages/excalidraw/src/components/LibraryMenuItems.tsx index 2110ba39a..41fad7b53 100644 --- a/packages/excalidraw/components/LibraryMenuItems.tsx +++ b/packages/excalidraw/src/components/LibraryMenuItems.tsx @@ -10,10 +10,10 @@ import { MIME_TYPES, arrayToMap } from "@excalidraw/common"; import { duplicateElements } from "@excalidraw/element/duplicate"; -import { serializeLibraryAsJSON } from "../src/data/json"; +import { serializeLibraryAsJSON } from "../data/json"; import { useLibraryCache } from "../hooks/useLibraryItemSvg"; import { useScrollPosition } from "../hooks/useScrollPosition"; -import { t } from "../i18n"; +import { t } from "../../i18n"; import { LibraryMenuControlButtons } from "./LibraryMenuControlButtons"; import { LibraryDropdownMenu } from "./LibraryMenuHeaderContent"; @@ -32,7 +32,7 @@ import type { LibraryItem, LibraryItems, UIAppState, -} from "../types"; +} from "../../types"; // using an odd number of items per batch so the rendering creates an irregular // pattern which looks more organic diff --git a/packages/excalidraw/components/LibraryMenuSection.tsx b/packages/excalidraw/src/components/LibraryMenuSection.tsx similarity index 97% rename from packages/excalidraw/components/LibraryMenuSection.tsx rename to packages/excalidraw/src/components/LibraryMenuSection.tsx index d98b413fb..16d2eb501 100644 --- a/packages/excalidraw/components/LibraryMenuSection.tsx +++ b/packages/excalidraw/src/components/LibraryMenuSection.tsx @@ -7,7 +7,7 @@ import { useTransition } from "../hooks/useTransition"; import { EmptyLibraryUnit, LibraryUnit } from "./LibraryUnit"; import type { SvgCache } from "../hooks/useLibraryItemSvg"; -import type { LibraryItem } from "../types"; +import type { LibraryItem } from "../../types"; import type { ReactNode } from "react"; type LibraryOrPendingItem = ( diff --git a/packages/excalidraw/components/LibraryUnit.scss b/packages/excalidraw/src/components/LibraryUnit.scss similarity index 100% rename from packages/excalidraw/components/LibraryUnit.scss rename to packages/excalidraw/src/components/LibraryUnit.scss diff --git a/packages/excalidraw/components/LibraryUnit.tsx b/packages/excalidraw/src/components/LibraryUnit.tsx similarity index 98% rename from packages/excalidraw/components/LibraryUnit.tsx rename to packages/excalidraw/src/components/LibraryUnit.tsx index 9cd891715..b1d8ac3c0 100644 --- a/packages/excalidraw/components/LibraryUnit.tsx +++ b/packages/excalidraw/src/components/LibraryUnit.tsx @@ -9,7 +9,7 @@ import { PlusIcon } from "./icons"; import "./LibraryUnit.scss"; -import type { LibraryItem } from "../types"; +import type { LibraryItem } from "../../types"; import type { SvgCache } from "../hooks/useLibraryItemSvg"; export const LibraryUnit = memo( diff --git a/packages/excalidraw/components/LoadingMessage.tsx b/packages/excalidraw/src/components/LoadingMessage.tsx similarity index 96% rename from packages/excalidraw/components/LoadingMessage.tsx rename to packages/excalidraw/src/components/LoadingMessage.tsx index c971b37ee..a2b2855cf 100644 --- a/packages/excalidraw/components/LoadingMessage.tsx +++ b/packages/excalidraw/src/components/LoadingMessage.tsx @@ -5,7 +5,7 @@ import { THEME } from "@excalidraw/common"; import type { Theme } from "@excalidraw/element/types"; -import { t } from "../i18n"; +import { t } from "../../i18n"; import Spinner from "./Spinner"; diff --git a/packages/excalidraw/components/LockButton.tsx b/packages/excalidraw/src/components/LockButton.tsx similarity index 100% rename from packages/excalidraw/components/LockButton.tsx rename to packages/excalidraw/src/components/LockButton.tsx diff --git a/packages/excalidraw/components/MagicButton.tsx b/packages/excalidraw/src/components/MagicButton.tsx similarity index 100% rename from packages/excalidraw/components/MagicButton.tsx rename to packages/excalidraw/src/components/MagicButton.tsx diff --git a/packages/excalidraw/components/MobileMenu.tsx b/packages/excalidraw/src/components/MobileMenu.tsx similarity index 95% rename from packages/excalidraw/components/MobileMenu.tsx rename to packages/excalidraw/src/components/MobileMenu.tsx index 705b69f09..76c56083d 100644 --- a/packages/excalidraw/components/MobileMenu.tsx +++ b/packages/excalidraw/src/components/MobileMenu.tsx @@ -4,11 +4,11 @@ import { showSelectedShapeActions } from "@excalidraw/element/showSelectedShapeA import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types"; -import { isHandToolActive } from "../appState"; -import { useTunnels } from "../src/context/tunnels"; -import { t } from "../i18n"; -import { calculateScrollCenter } from "../src/scene"; -import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../src/scene/scrollbars"; +import { isHandToolActive } from "../../appState"; +import { useTunnels } from "../context/tunnels"; +import { t } from "../../i18n"; +import { calculateScrollCenter } from "../scene"; +import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../scene/scrollbars"; import { SelectedShapeActions, ShapesSwitcher } from "./Actions"; import { FixedSideContainer } from "./FixedSideContainer"; @@ -20,7 +20,7 @@ import { PenModeButton } from "./PenModeButton"; import { Section } from "./Section"; import Stack from "./Stack"; -import type { ActionManager } from "../src/actions/manager"; +import type { ActionManager } from "../actions/manager"; import type { AppClassProperties, AppProps, @@ -28,7 +28,7 @@ import type { Device, ExcalidrawProps, UIAppState, -} from "../types"; +} from "../../types"; import type { JSX } from "react"; type MobileMenuProps = { diff --git a/packages/excalidraw/components/Modal.scss b/packages/excalidraw/src/components/Modal.scss similarity index 100% rename from packages/excalidraw/components/Modal.scss rename to packages/excalidraw/src/components/Modal.scss diff --git a/packages/excalidraw/components/Modal.tsx b/packages/excalidraw/src/components/Modal.tsx similarity index 97% rename from packages/excalidraw/components/Modal.tsx rename to packages/excalidraw/src/components/Modal.tsx index 32f42986f..ef82885d5 100644 --- a/packages/excalidraw/components/Modal.tsx +++ b/packages/excalidraw/src/components/Modal.tsx @@ -8,7 +8,7 @@ import { useCreatePortalContainer } from "../hooks/useCreatePortalContainer"; import "./Modal.scss"; -import type { AppState } from "../types"; +import type { AppState } from "../../types"; export const Modal: React.FC<{ className?: string; diff --git a/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.scss b/packages/excalidraw/src/components/OverwriteConfirm/OverwriteConfirm.scss similarity index 100% rename from packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.scss rename to packages/excalidraw/src/components/OverwriteConfirm/OverwriteConfirm.scss diff --git a/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.tsx b/packages/excalidraw/src/components/OverwriteConfirm/OverwriteConfirm.tsx similarity index 95% rename from packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.tsx rename to packages/excalidraw/src/components/OverwriteConfirm/OverwriteConfirm.tsx index 6f870cb1c..8fef7cdf9 100644 --- a/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.tsx +++ b/packages/excalidraw/src/components/OverwriteConfirm/OverwriteConfirm.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { useTunnels } from "../../src/context/tunnels"; -import { useAtom } from "../../editor-jotai"; +import { useTunnels } from "../../context/tunnels"; +import { useAtom } from "../../../editor-jotai"; import { Dialog } from "../Dialog"; import { FilledButton } from "../FilledButton"; import { withInternalFallback } from "../hoc/withInternalFallback"; diff --git a/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirmActions.tsx b/packages/excalidraw/src/components/OverwriteConfirm/OverwriteConfirmActions.tsx similarity index 92% rename from packages/excalidraw/components/OverwriteConfirm/OverwriteConfirmActions.tsx rename to packages/excalidraw/src/components/OverwriteConfirm/OverwriteConfirmActions.tsx index 754320c4c..70066df08 100644 --- a/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirmActions.tsx +++ b/packages/excalidraw/src/components/OverwriteConfirm/OverwriteConfirmActions.tsx @@ -1,8 +1,8 @@ import React from "react"; -import { actionSaveFileToDisk } from "../../src/actions"; -import { actionChangeExportEmbedScene } from "../../src/actions/actionExport"; -import { useI18n } from "../../i18n"; +import { actionSaveFileToDisk } from "../../actions"; +import { actionChangeExportEmbedScene } from "../../actions/actionExport"; +import { useI18n } from "../../../i18n"; import { useExcalidrawActionManager, useExcalidrawSetAppState } from "../App"; import { FilledButton } from "../FilledButton"; diff --git a/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirmState.ts b/packages/excalidraw/src/components/OverwriteConfirm/OverwriteConfirmState.ts similarity index 93% rename from packages/excalidraw/components/OverwriteConfirm/OverwriteConfirmState.ts rename to packages/excalidraw/src/components/OverwriteConfirm/OverwriteConfirmState.ts index cefb2153a..8a8010da1 100644 --- a/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirmState.ts +++ b/packages/excalidraw/src/components/OverwriteConfirm/OverwriteConfirmState.ts @@ -1,4 +1,4 @@ -import { atom, editorJotaiStore } from "../../editor-jotai"; +import { atom, editorJotaiStore } from "../../../editor-jotai"; import type React from "react"; diff --git a/packages/excalidraw/components/Paragraph.tsx b/packages/excalidraw/src/components/Paragraph.tsx similarity index 100% rename from packages/excalidraw/components/Paragraph.tsx rename to packages/excalidraw/src/components/Paragraph.tsx diff --git a/packages/excalidraw/components/PasteChartDialog.scss b/packages/excalidraw/src/components/PasteChartDialog.scss similarity index 100% rename from packages/excalidraw/components/PasteChartDialog.scss rename to packages/excalidraw/src/components/PasteChartDialog.scss diff --git a/packages/excalidraw/components/PasteChartDialog.tsx b/packages/excalidraw/src/components/PasteChartDialog.tsx similarity index 91% rename from packages/excalidraw/components/PasteChartDialog.tsx rename to packages/excalidraw/src/components/PasteChartDialog.tsx index 226936677..5716f16f9 100644 --- a/packages/excalidraw/components/PasteChartDialog.tsx +++ b/packages/excalidraw/src/components/PasteChartDialog.tsx @@ -3,18 +3,18 @@ import React, { useLayoutEffect, useRef, useState } from "react"; import type { ChartType } from "@excalidraw/element/types"; -import { trackEvent } from "../analytics"; -import { renderSpreadsheet } from "../charts"; -import { t } from "../i18n"; -import { exportToSvg } from "../src/scene/export"; +import { trackEvent } from "../../analytics"; +import { renderSpreadsheet } from "../../charts"; +import { t } from "../../i18n"; +import { exportToSvg } from "../scene/export"; import { useApp } from "./App"; import { Dialog } from "./Dialog"; import "./PasteChartDialog.scss"; -import type { ChartElements, Spreadsheet } from "../charts"; -import type { UIAppState } from "../types"; +import type { ChartElements, Spreadsheet } from "../../charts"; +import type { UIAppState } from "../../types"; type OnInsertChart = (chartType: ChartType, elements: ChartElements) => void; diff --git a/packages/excalidraw/components/PenModeButton.tsx b/packages/excalidraw/src/components/PenModeButton.tsx similarity index 100% rename from packages/excalidraw/components/PenModeButton.tsx rename to packages/excalidraw/src/components/PenModeButton.tsx diff --git a/packages/excalidraw/components/Popover.scss b/packages/excalidraw/src/components/Popover.scss similarity index 100% rename from packages/excalidraw/components/Popover.scss rename to packages/excalidraw/src/components/Popover.scss diff --git a/packages/excalidraw/components/Popover.tsx b/packages/excalidraw/src/components/Popover.tsx similarity index 100% rename from packages/excalidraw/components/Popover.tsx rename to packages/excalidraw/src/components/Popover.tsx diff --git a/packages/excalidraw/components/ProjectName.scss b/packages/excalidraw/src/components/ProjectName.scss similarity index 100% rename from packages/excalidraw/components/ProjectName.scss rename to packages/excalidraw/src/components/ProjectName.scss diff --git a/packages/excalidraw/components/ProjectName.tsx b/packages/excalidraw/src/components/ProjectName.tsx similarity index 100% rename from packages/excalidraw/components/ProjectName.tsx rename to packages/excalidraw/src/components/ProjectName.tsx diff --git a/packages/excalidraw/components/PropertiesPopover.tsx b/packages/excalidraw/src/components/PropertiesPopover.tsx similarity index 100% rename from packages/excalidraw/components/PropertiesPopover.tsx rename to packages/excalidraw/src/components/PropertiesPopover.tsx diff --git a/packages/excalidraw/components/PublishLibrary.scss b/packages/excalidraw/src/components/PublishLibrary.scss similarity index 100% rename from packages/excalidraw/components/PublishLibrary.scss rename to packages/excalidraw/src/components/PublishLibrary.scss diff --git a/packages/excalidraw/components/PublishLibrary.tsx b/packages/excalidraw/src/components/PublishLibrary.tsx similarity index 98% rename from packages/excalidraw/components/PublishLibrary.tsx rename to packages/excalidraw/src/components/PublishLibrary.tsx index dd77732c6..f9a3455b9 100644 --- a/packages/excalidraw/components/PublishLibrary.tsx +++ b/packages/excalidraw/src/components/PublishLibrary.tsx @@ -11,9 +11,9 @@ import { chunk, } from "@excalidraw/common"; -import { EditorLocalStorage } from "../src/data/EditorLocalStorage"; -import { canvasToBlob, resizeImageFile } from "../src/data/blob"; -import { t } from "../i18n"; +import { EditorLocalStorage } from "../data/EditorLocalStorage"; +import { canvasToBlob, resizeImageFile } from "../data/blob"; +import { t } from "../../i18n"; import { Dialog } from "./Dialog"; import DialogActionButton from "./DialogActionButton"; @@ -24,8 +24,8 @@ import { CloseIcon } from "./icons"; import "./PublishLibrary.scss"; import type { ReactNode } from "react"; -import type { ExportedLibraryData } from "../src/data/types"; -import type { LibraryItems, LibraryItem, UIAppState } from "../types"; +import type { ExportedLibraryData } from "../data/types"; +import type { LibraryItems, LibraryItem, UIAppState } from "../../types"; interface PublishLibraryDataParams { authorName: string; diff --git a/packages/excalidraw/components/QuickSearch.scss b/packages/excalidraw/src/components/QuickSearch.scss similarity index 100% rename from packages/excalidraw/components/QuickSearch.scss rename to packages/excalidraw/src/components/QuickSearch.scss diff --git a/packages/excalidraw/components/QuickSearch.tsx b/packages/excalidraw/src/components/QuickSearch.tsx similarity index 100% rename from packages/excalidraw/components/QuickSearch.tsx rename to packages/excalidraw/src/components/QuickSearch.tsx diff --git a/packages/excalidraw/components/RadioGroup.scss b/packages/excalidraw/src/components/RadioGroup.scss similarity index 100% rename from packages/excalidraw/components/RadioGroup.scss rename to packages/excalidraw/src/components/RadioGroup.scss diff --git a/packages/excalidraw/components/RadioGroup.tsx b/packages/excalidraw/src/components/RadioGroup.tsx similarity index 100% rename from packages/excalidraw/components/RadioGroup.tsx rename to packages/excalidraw/src/components/RadioGroup.tsx diff --git a/packages/excalidraw/components/Range.scss b/packages/excalidraw/src/components/Range.scss similarity index 100% rename from packages/excalidraw/components/Range.scss rename to packages/excalidraw/src/components/Range.scss diff --git a/packages/excalidraw/components/Range.tsx b/packages/excalidraw/src/components/Range.tsx similarity index 94% rename from packages/excalidraw/components/Range.tsx rename to packages/excalidraw/src/components/Range.tsx index 5304bcc0c..4a2c6b7ad 100644 --- a/packages/excalidraw/components/Range.tsx +++ b/packages/excalidraw/src/components/Range.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from "react"; -import { getFormValue } from "../src/actions/actionProperties"; -import { t } from "../i18n"; +import { getFormValue } from "../actions/actionProperties"; +import { t } from "../../i18n"; import "./Range.scss"; diff --git a/packages/excalidraw/components/SVGLayer.scss b/packages/excalidraw/src/components/SVGLayer.scss similarity index 100% rename from packages/excalidraw/components/SVGLayer.scss rename to packages/excalidraw/src/components/SVGLayer.scss diff --git a/packages/excalidraw/components/SVGLayer.tsx b/packages/excalidraw/src/components/SVGLayer.tsx similarity index 92% rename from packages/excalidraw/components/SVGLayer.tsx rename to packages/excalidraw/src/components/SVGLayer.tsx index 815d463a3..a0e867565 100644 --- a/packages/excalidraw/components/SVGLayer.tsx +++ b/packages/excalidraw/src/components/SVGLayer.tsx @@ -2,7 +2,7 @@ import { useEffect, useRef } from "react"; import "./SVGLayer.scss"; -import type { Trail } from "../animated-trail"; +import type { Trail } from "../../animated-trail"; type SVGLayerProps = { trails: Trail[]; diff --git a/packages/excalidraw/components/ScrollableList.scss b/packages/excalidraw/src/components/ScrollableList.scss similarity index 100% rename from packages/excalidraw/components/ScrollableList.scss rename to packages/excalidraw/src/components/ScrollableList.scss diff --git a/packages/excalidraw/components/ScrollableList.tsx b/packages/excalidraw/src/components/ScrollableList.tsx similarity index 100% rename from packages/excalidraw/components/ScrollableList.tsx rename to packages/excalidraw/src/components/ScrollableList.tsx diff --git a/packages/excalidraw/components/SearchMenu.scss b/packages/excalidraw/src/components/SearchMenu.scss similarity index 100% rename from packages/excalidraw/components/SearchMenu.scss rename to packages/excalidraw/src/components/SearchMenu.scss diff --git a/packages/excalidraw/components/SearchMenu.tsx b/packages/excalidraw/src/components/SearchMenu.tsx similarity index 99% rename from packages/excalidraw/components/SearchMenu.tsx rename to packages/excalidraw/src/components/SearchMenu.tsx index 3e0b31a69..e89350473 100644 --- a/packages/excalidraw/components/SearchMenu.tsx +++ b/packages/excalidraw/src/components/SearchMenu.tsx @@ -21,10 +21,10 @@ import { isTextElement } from "@excalidraw/element/typeChecks"; import type { ExcalidrawTextElement } from "@excalidraw/element/types"; -import { atom, useAtom } from "../editor-jotai"; +import { atom, useAtom } from "../../editor-jotai"; import { useStable } from "../hooks/useStable"; -import { t } from "../i18n"; +import { t } from "../../i18n"; import { useApp, useExcalidrawSetAppState } from "./App"; import { Button } from "./Button"; @@ -33,7 +33,7 @@ import { collapseDownIcon, upIcon, searchIcon } from "./icons"; import "./SearchMenu.scss"; -import type { AppClassProperties } from "../types"; +import type { AppClassProperties } from "../../types"; const searchQueryAtom = atom(""); export const searchItemInFocusAtom = atom(null); diff --git a/packages/excalidraw/components/Section.tsx b/packages/excalidraw/src/components/Section.tsx similarity index 95% rename from packages/excalidraw/components/Section.tsx rename to packages/excalidraw/src/components/Section.tsx index e7e357bb5..db2458414 100644 --- a/packages/excalidraw/components/Section.tsx +++ b/packages/excalidraw/src/components/Section.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { t } from "../i18n"; +import { t } from "../../i18n"; import { useExcalidrawContainer } from "./App"; diff --git a/packages/excalidraw/components/ShareableLinkDialog.scss b/packages/excalidraw/src/components/ShareableLinkDialog.scss similarity index 100% rename from packages/excalidraw/components/ShareableLinkDialog.scss rename to packages/excalidraw/src/components/ShareableLinkDialog.scss diff --git a/packages/excalidraw/components/ShareableLinkDialog.tsx b/packages/excalidraw/src/components/ShareableLinkDialog.tsx similarity index 95% rename from packages/excalidraw/components/ShareableLinkDialog.tsx rename to packages/excalidraw/src/components/ShareableLinkDialog.tsx index 514a77632..0b2540f5e 100644 --- a/packages/excalidraw/components/ShareableLinkDialog.tsx +++ b/packages/excalidraw/src/components/ShareableLinkDialog.tsx @@ -1,8 +1,8 @@ import { useRef, useState } from "react"; -import { copyTextToSystemClipboard } from "../clipboard"; +import { copyTextToSystemClipboard } from "../../clipboard"; import { useCopyStatus } from "../hooks/useCopiedIndicator"; -import { useI18n } from "../i18n"; +import { useI18n } from "../../i18n"; import { Dialog } from "./Dialog"; import { FilledButton } from "./FilledButton"; diff --git a/packages/excalidraw/components/Sidebar/Sidebar.scss b/packages/excalidraw/src/components/Sidebar/Sidebar.scss similarity index 100% rename from packages/excalidraw/components/Sidebar/Sidebar.scss rename to packages/excalidraw/src/components/Sidebar/Sidebar.scss diff --git a/packages/excalidraw/components/Sidebar/Sidebar.test.tsx b/packages/excalidraw/src/components/Sidebar/Sidebar.test.tsx similarity index 100% rename from packages/excalidraw/components/Sidebar/Sidebar.test.tsx rename to packages/excalidraw/src/components/Sidebar/Sidebar.test.tsx diff --git a/packages/excalidraw/components/Sidebar/Sidebar.tsx b/packages/excalidraw/src/components/Sidebar/Sidebar.tsx similarity index 98% rename from packages/excalidraw/components/Sidebar/Sidebar.tsx rename to packages/excalidraw/src/components/Sidebar/Sidebar.tsx index c4cfc6bc3..4f8e27d58 100644 --- a/packages/excalidraw/components/Sidebar/Sidebar.tsx +++ b/packages/excalidraw/src/components/Sidebar/Sidebar.tsx @@ -11,8 +11,8 @@ import React, { import { EVENT, isDevEnv, KEYS, updateObject } from "@excalidraw/common"; -import { useUIAppState } from "../../src/context/ui-appState"; -import { atom, useSetAtom } from "../../editor-jotai"; +import { useUIAppState } from "../../context/ui-appState"; +import { atom, useSetAtom } from "../../../editor-jotai"; import { useOutsideClick } from "../../hooks/useOutsideClick"; import { useDevice, useExcalidrawSetAppState } from "../App"; import { Island } from "../Island"; diff --git a/packages/excalidraw/components/Sidebar/SidebarHeader.tsx b/packages/excalidraw/src/components/Sidebar/SidebarHeader.tsx similarity index 97% rename from packages/excalidraw/components/Sidebar/SidebarHeader.tsx rename to packages/excalidraw/src/components/Sidebar/SidebarHeader.tsx index 9c9e51cf5..7c12a0533 100644 --- a/packages/excalidraw/components/Sidebar/SidebarHeader.tsx +++ b/packages/excalidraw/src/components/Sidebar/SidebarHeader.tsx @@ -1,7 +1,7 @@ import clsx from "clsx"; import { useContext } from "react"; -import { t } from "../../i18n"; +import { t } from "../../../i18n"; import { useDevice } from "../App"; import { Button } from "../Button"; import { Tooltip } from "../Tooltip"; diff --git a/packages/excalidraw/components/Sidebar/SidebarTab.tsx b/packages/excalidraw/src/components/Sidebar/SidebarTab.tsx similarity index 87% rename from packages/excalidraw/components/Sidebar/SidebarTab.tsx rename to packages/excalidraw/src/components/Sidebar/SidebarTab.tsx index 0525662f7..50623e186 100644 --- a/packages/excalidraw/components/Sidebar/SidebarTab.tsx +++ b/packages/excalidraw/src/components/Sidebar/SidebarTab.tsx @@ -1,6 +1,6 @@ import * as RadixTabs from "@radix-ui/react-tabs"; -import type { SidebarTabName } from "../../types"; +import type { SidebarTabName } from "../../../types"; export const SidebarTab = ({ tab, diff --git a/packages/excalidraw/components/Sidebar/SidebarTabTrigger.tsx b/packages/excalidraw/src/components/Sidebar/SidebarTabTrigger.tsx similarity index 92% rename from packages/excalidraw/components/Sidebar/SidebarTabTrigger.tsx rename to packages/excalidraw/src/components/Sidebar/SidebarTabTrigger.tsx index 9f2c09bcc..c800273e3 100644 --- a/packages/excalidraw/components/Sidebar/SidebarTabTrigger.tsx +++ b/packages/excalidraw/src/components/Sidebar/SidebarTabTrigger.tsx @@ -1,6 +1,6 @@ import * as RadixTabs from "@radix-ui/react-tabs"; -import type { SidebarTabName } from "../../types"; +import type { SidebarTabName } from "../../../types"; export const SidebarTabTrigger = ({ children, diff --git a/packages/excalidraw/components/Sidebar/SidebarTabTriggers.tsx b/packages/excalidraw/src/components/Sidebar/SidebarTabTriggers.tsx similarity index 100% rename from packages/excalidraw/components/Sidebar/SidebarTabTriggers.tsx rename to packages/excalidraw/src/components/Sidebar/SidebarTabTriggers.tsx diff --git a/packages/excalidraw/components/Sidebar/SidebarTabs.tsx b/packages/excalidraw/src/components/Sidebar/SidebarTabs.tsx similarity index 92% rename from packages/excalidraw/components/Sidebar/SidebarTabs.tsx rename to packages/excalidraw/src/components/Sidebar/SidebarTabs.tsx index 65d990a93..448840c4a 100644 --- a/packages/excalidraw/components/Sidebar/SidebarTabs.tsx +++ b/packages/excalidraw/src/components/Sidebar/SidebarTabs.tsx @@ -1,6 +1,6 @@ import * as RadixTabs from "@radix-ui/react-tabs"; -import { useUIAppState } from "../../src/context/ui-appState"; +import { useUIAppState } from "../../context/ui-appState"; import { useExcalidrawSetAppState } from "../App"; export const SidebarTabs = ({ diff --git a/packages/excalidraw/components/Sidebar/SidebarTrigger.scss b/packages/excalidraw/src/components/Sidebar/SidebarTrigger.scss similarity index 100% rename from packages/excalidraw/components/Sidebar/SidebarTrigger.scss rename to packages/excalidraw/src/components/Sidebar/SidebarTrigger.scss diff --git a/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx b/packages/excalidraw/src/components/Sidebar/SidebarTrigger.tsx similarity index 95% rename from packages/excalidraw/components/Sidebar/SidebarTrigger.tsx rename to packages/excalidraw/src/components/Sidebar/SidebarTrigger.tsx index 60ae08ae9..6e8bf374c 100644 --- a/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx +++ b/packages/excalidraw/src/components/Sidebar/SidebarTrigger.tsx @@ -1,6 +1,6 @@ import clsx from "clsx"; -import { useUIAppState } from "../../src/context/ui-appState"; +import { useUIAppState } from "../../context/ui-appState"; import { useExcalidrawSetAppState } from "../App"; import "./SidebarTrigger.scss"; diff --git a/packages/excalidraw/components/Sidebar/common.ts b/packages/excalidraw/src/components/Sidebar/common.ts similarity index 98% rename from packages/excalidraw/components/Sidebar/common.ts rename to packages/excalidraw/src/components/Sidebar/common.ts index 239b16fc9..58792f555 100644 --- a/packages/excalidraw/components/Sidebar/common.ts +++ b/packages/excalidraw/src/components/Sidebar/common.ts @@ -1,6 +1,6 @@ import React from "react"; -import type { AppState, SidebarName, SidebarTabName } from "../../types"; +import type { AppState, SidebarName, SidebarTabName } from "../../../types"; import type { JSX } from "react"; export type SidebarTriggerProps = { diff --git a/packages/excalidraw/components/Sidebar/siderbar.test.helpers.tsx b/packages/excalidraw/src/components/Sidebar/siderbar.test.helpers.tsx similarity index 100% rename from packages/excalidraw/components/Sidebar/siderbar.test.helpers.tsx rename to packages/excalidraw/src/components/Sidebar/siderbar.test.helpers.tsx diff --git a/packages/excalidraw/components/Spinner.scss b/packages/excalidraw/src/components/Spinner.scss similarity index 100% rename from packages/excalidraw/components/Spinner.scss rename to packages/excalidraw/src/components/Spinner.scss diff --git a/packages/excalidraw/components/Spinner.tsx b/packages/excalidraw/src/components/Spinner.tsx similarity index 100% rename from packages/excalidraw/components/Spinner.tsx rename to packages/excalidraw/src/components/Spinner.tsx diff --git a/packages/excalidraw/components/Stack.scss b/packages/excalidraw/src/components/Stack.scss similarity index 100% rename from packages/excalidraw/components/Stack.scss rename to packages/excalidraw/src/components/Stack.scss diff --git a/packages/excalidraw/components/Stack.tsx b/packages/excalidraw/src/components/Stack.tsx similarity index 100% rename from packages/excalidraw/components/Stack.tsx rename to packages/excalidraw/src/components/Stack.tsx diff --git a/packages/excalidraw/components/Stats/Angle.tsx b/packages/excalidraw/src/components/Stats/Angle.tsx similarity index 97% rename from packages/excalidraw/components/Stats/Angle.tsx rename to packages/excalidraw/src/components/Stats/Angle.tsx index 77e840561..974698029 100644 --- a/packages/excalidraw/components/Stats/Angle.tsx +++ b/packages/excalidraw/src/components/Stats/Angle.tsx @@ -15,8 +15,8 @@ import DragInput from "./DragInput"; import { getStepSizedValue, isPropertyEditable, updateBindings } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; -import type Scene from "../../src/scene/Scene"; -import type { AppState } from "../../types"; +import type Scene from "../../scene/Scene"; +import type { AppState } from "../../../types"; interface AngleProps { element: ExcalidrawElement; diff --git a/packages/excalidraw/components/Stats/CanvasGrid.tsx b/packages/excalidraw/src/components/Stats/CanvasGrid.tsx similarity index 90% rename from packages/excalidraw/components/Stats/CanvasGrid.tsx rename to packages/excalidraw/src/components/Stats/CanvasGrid.tsx index 8c1dbe4a8..cbbee4ead 100644 --- a/packages/excalidraw/components/Stats/CanvasGrid.tsx +++ b/packages/excalidraw/src/components/Stats/CanvasGrid.tsx @@ -1,10 +1,10 @@ -import { getNormalizedGridStep } from "../../src/scene"; +import { getNormalizedGridStep } from "../../scene"; import StatsDragInput from "./DragInput"; import { getStepSizedValue } from "./utils"; -import type Scene from "../../src/scene/Scene"; -import type { AppState } from "../../types"; +import type Scene from "../../scene/Scene"; +import type { AppState } from "../../../types"; interface PositionProps { property: "gridStep"; diff --git a/packages/excalidraw/components/Stats/Collapsible.tsx b/packages/excalidraw/src/components/Stats/Collapsible.tsx similarity index 100% rename from packages/excalidraw/components/Stats/Collapsible.tsx rename to packages/excalidraw/src/components/Stats/Collapsible.tsx diff --git a/packages/excalidraw/components/Stats/Dimension.tsx b/packages/excalidraw/src/components/Stats/Dimension.tsx similarity index 98% rename from packages/excalidraw/components/Stats/Dimension.tsx rename to packages/excalidraw/src/components/Stats/Dimension.tsx index d181b0732..5e36b5f08 100644 --- a/packages/excalidraw/components/Stats/Dimension.tsx +++ b/packages/excalidraw/src/components/Stats/Dimension.tsx @@ -15,8 +15,8 @@ import DragInput from "./DragInput"; import { getStepSizedValue, isPropertyEditable } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; -import type Scene from "../../src/scene/Scene"; -import type { AppState } from "../../types"; +import type Scene from "../../scene/Scene"; +import type { AppState } from "../../../types"; interface DimensionDragInputProps { property: "width" | "height"; diff --git a/packages/excalidraw/components/Stats/DragInput.scss b/packages/excalidraw/src/components/Stats/DragInput.scss similarity index 100% rename from packages/excalidraw/components/Stats/DragInput.scss rename to packages/excalidraw/src/components/Stats/DragInput.scss diff --git a/packages/excalidraw/components/Stats/DragInput.tsx b/packages/excalidraw/src/components/Stats/DragInput.tsx similarity index 98% rename from packages/excalidraw/components/Stats/DragInput.tsx rename to packages/excalidraw/src/components/Stats/DragInput.tsx index 7bd4bed19..fc35b8b17 100644 --- a/packages/excalidraw/components/Stats/DragInput.tsx +++ b/packages/excalidraw/src/components/Stats/DragInput.tsx @@ -7,7 +7,7 @@ import { deepCopyElement } from "@excalidraw/element/duplicate"; import type { ElementsMap, ExcalidrawElement } from "@excalidraw/element/types"; -import { CaptureUpdateAction } from "../../store"; +import { CaptureUpdateAction } from "../../../store"; import { useApp } from "../App"; import { InlineIcon } from "../InlineIcon"; @@ -16,8 +16,8 @@ import { SMALLEST_DELTA } from "./utils"; import "./DragInput.scss"; import type { StatsInputProperty } from "./utils"; -import type Scene from "../../src/scene/Scene"; -import type { AppState } from "../../types"; +import type Scene from "../../scene/Scene"; +import type { AppState } from "../../../types"; export type DragInputCallbackType< P extends StatsInputProperty, diff --git a/packages/excalidraw/components/Stats/FontSize.tsx b/packages/excalidraw/src/components/Stats/FontSize.tsx similarity index 96% rename from packages/excalidraw/components/Stats/FontSize.tsx rename to packages/excalidraw/src/components/Stats/FontSize.tsx index ed2ba5ba0..5f348b92b 100644 --- a/packages/excalidraw/components/Stats/FontSize.tsx +++ b/packages/excalidraw/src/components/Stats/FontSize.tsx @@ -19,8 +19,8 @@ import StatsDragInput from "./DragInput"; import { getStepSizedValue } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; -import type Scene from "../../src/scene/Scene"; -import type { AppState } from "../../types"; +import type Scene from "../../scene/Scene"; +import type { AppState } from "../../../types"; interface FontSizeProps { element: ExcalidrawElement; diff --git a/packages/excalidraw/components/Stats/MultiAngle.tsx b/packages/excalidraw/src/components/Stats/MultiAngle.tsx similarity index 97% rename from packages/excalidraw/components/Stats/MultiAngle.tsx rename to packages/excalidraw/src/components/Stats/MultiAngle.tsx index 3bb91d131..1b2aa0cc4 100644 --- a/packages/excalidraw/components/Stats/MultiAngle.tsx +++ b/packages/excalidraw/src/components/Stats/MultiAngle.tsx @@ -17,8 +17,8 @@ import DragInput from "./DragInput"; import { getStepSizedValue, isPropertyEditable } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; -import type Scene from "../../src/scene/Scene"; -import type { AppState } from "../../types"; +import type Scene from "../../scene/Scene"; +import type { AppState } from "../../../types"; interface MultiAngleProps { elements: readonly ExcalidrawElement[]; diff --git a/packages/excalidraw/components/Stats/MultiDimension.tsx b/packages/excalidraw/src/components/Stats/MultiDimension.tsx similarity index 99% rename from packages/excalidraw/components/Stats/MultiDimension.tsx rename to packages/excalidraw/src/components/Stats/MultiDimension.tsx index 4a3a183f8..b40ac475e 100644 --- a/packages/excalidraw/components/Stats/MultiDimension.tsx +++ b/packages/excalidraw/src/components/Stats/MultiDimension.tsx @@ -29,8 +29,8 @@ import { getElementsInAtomicUnit } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; import type { AtomicUnit } from "./utils"; -import type Scene from "../../src/scene/Scene"; -import type { AppState } from "../../types"; +import type Scene from "../../scene/Scene"; +import type { AppState } from "../../../types"; interface MultiDimensionProps { property: "width" | "height"; diff --git a/packages/excalidraw/components/Stats/MultiFontSize.tsx b/packages/excalidraw/src/components/Stats/MultiFontSize.tsx similarity index 97% rename from packages/excalidraw/components/Stats/MultiFontSize.tsx rename to packages/excalidraw/src/components/Stats/MultiFontSize.tsx index 20dc5fe00..d31960907 100644 --- a/packages/excalidraw/components/Stats/MultiFontSize.tsx +++ b/packages/excalidraw/src/components/Stats/MultiFontSize.tsx @@ -22,8 +22,8 @@ import StatsDragInput from "./DragInput"; import { getStepSizedValue } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; -import type Scene from "../../src/scene/Scene"; -import type { AppState } from "../../types"; +import type Scene from "../../scene/Scene"; +import type { AppState } from "../../../types"; interface MultiFontSizeProps { elements: readonly ExcalidrawElement[]; diff --git a/packages/excalidraw/components/Stats/MultiPosition.tsx b/packages/excalidraw/src/components/Stats/MultiPosition.tsx similarity index 98% rename from packages/excalidraw/components/Stats/MultiPosition.tsx rename to packages/excalidraw/src/components/Stats/MultiPosition.tsx index bf62576ce..7a14eeaed 100644 --- a/packages/excalidraw/components/Stats/MultiPosition.tsx +++ b/packages/excalidraw/src/components/Stats/MultiPosition.tsx @@ -18,8 +18,8 @@ import { getElementsInAtomicUnit, moveElement } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; import type { AtomicUnit } from "./utils"; -import type Scene from "../../src/scene/Scene"; -import type { AppState } from "../../types"; +import type Scene from "../../scene/Scene"; +import type { AppState } from "../../../types"; interface MultiPositionProps { property: "x" | "y"; diff --git a/packages/excalidraw/components/Stats/Position.tsx b/packages/excalidraw/src/components/Stats/Position.tsx similarity index 98% rename from packages/excalidraw/components/Stats/Position.tsx rename to packages/excalidraw/src/components/Stats/Position.tsx index a107adc56..b294fdd84 100644 --- a/packages/excalidraw/components/Stats/Position.tsx +++ b/packages/excalidraw/src/components/Stats/Position.tsx @@ -13,8 +13,8 @@ import StatsDragInput from "./DragInput"; import { getStepSizedValue, moveElement } from "./utils"; import type { DragInputCallbackType } from "./DragInput"; -import type Scene from "../../src/scene/Scene"; -import type { AppState } from "../../types"; +import type Scene from "../../scene/Scene"; +import type { AppState } from "../../../types"; interface PositionProps { property: "x" | "y"; diff --git a/packages/excalidraw/components/Stats/Stats.scss b/packages/excalidraw/src/components/Stats/Stats.scss similarity index 100% rename from packages/excalidraw/components/Stats/Stats.scss rename to packages/excalidraw/src/components/Stats/Stats.scss diff --git a/packages/excalidraw/components/Stats/index.tsx b/packages/excalidraw/src/components/Stats/index.tsx similarity index 99% rename from packages/excalidraw/components/Stats/index.tsx rename to packages/excalidraw/src/components/Stats/index.tsx index 11a5d6b5d..72d736cf2 100644 --- a/packages/excalidraw/components/Stats/index.tsx +++ b/packages/excalidraw/src/components/Stats/index.tsx @@ -14,8 +14,8 @@ import { elementsAreInSameGroup } from "@excalidraw/element/groups"; import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types"; -import { t } from "../../i18n"; -import { isGridModeEnabled } from "../../snapping"; +import { t } from "../../../i18n"; +import { isGridModeEnabled } from "../../../snapping"; import { useExcalidrawAppState, useExcalidrawSetAppState } from "../App"; import { Island } from "../Island"; import { CloseIcon } from "../icons"; @@ -38,7 +38,7 @@ import type { AppClassProperties, AppState, ExcalidrawProps, -} from "../../types"; +} from "../../../types"; interface StatsProps { app: AppClassProperties; diff --git a/packages/excalidraw/components/Stats/stats.test.tsx b/packages/excalidraw/src/components/Stats/stats.test.tsx similarity index 100% rename from packages/excalidraw/components/Stats/stats.test.tsx rename to packages/excalidraw/src/components/Stats/stats.test.tsx diff --git a/packages/excalidraw/components/Stats/utils.ts b/packages/excalidraw/src/components/Stats/utils.ts similarity index 98% rename from packages/excalidraw/components/Stats/utils.ts rename to packages/excalidraw/src/components/Stats/utils.ts index 3ed8869f5..4ae7428e7 100644 --- a/packages/excalidraw/components/Stats/utils.ts +++ b/packages/excalidraw/src/components/Stats/utils.ts @@ -27,8 +27,8 @@ import type { NonDeletedSceneElementsMap, } from "@excalidraw/element/types"; -import type Scene from "../../src/scene/Scene"; -import type { AppState } from "../../types"; +import type Scene from "../../scene/Scene"; +import type { AppState } from "../../../types"; export type StatsInputProperty = | "x" diff --git a/packages/excalidraw/components/Switch.scss b/packages/excalidraw/src/components/Switch.scss similarity index 100% rename from packages/excalidraw/components/Switch.scss rename to packages/excalidraw/src/components/Switch.scss diff --git a/packages/excalidraw/components/Switch.tsx b/packages/excalidraw/src/components/Switch.tsx similarity index 100% rename from packages/excalidraw/components/Switch.tsx rename to packages/excalidraw/src/components/Switch.tsx diff --git a/packages/excalidraw/components/TTDDialog/MermaidToExcalidraw.scss b/packages/excalidraw/src/components/TTDDialog/MermaidToExcalidraw.scss similarity index 100% rename from packages/excalidraw/components/TTDDialog/MermaidToExcalidraw.scss rename to packages/excalidraw/src/components/TTDDialog/MermaidToExcalidraw.scss diff --git a/packages/excalidraw/components/TTDDialog/MermaidToExcalidraw.tsx b/packages/excalidraw/src/components/TTDDialog/MermaidToExcalidraw.tsx similarity index 96% rename from packages/excalidraw/components/TTDDialog/MermaidToExcalidraw.tsx rename to packages/excalidraw/src/components/TTDDialog/MermaidToExcalidraw.tsx index 0f8d91969..f6cd393be 100644 --- a/packages/excalidraw/components/TTDDialog/MermaidToExcalidraw.tsx +++ b/packages/excalidraw/src/components/TTDDialog/MermaidToExcalidraw.tsx @@ -6,8 +6,8 @@ import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types"; import { useApp } from "../App"; import { ArrowRightIcon } from "../icons"; -import { EditorLocalStorage } from "../../src/data/EditorLocalStorage"; -import { t } from "../../i18n"; +import { EditorLocalStorage } from "../../data/EditorLocalStorage"; +import { t } from "../../../i18n"; import Trans from "../Trans"; import { TTDDialogInput } from "./TTDDialogInput"; @@ -23,7 +23,7 @@ import { import "./MermaidToExcalidraw.scss"; -import type { BinaryFiles } from "../../types"; +import type { BinaryFiles } from "../../../types"; import type { MermaidToExcalidrawLibProps } from "./common"; const MERMAID_EXAMPLE = diff --git a/packages/excalidraw/components/TTDDialog/TTDDialog.scss b/packages/excalidraw/src/components/TTDDialog/TTDDialog.scss similarity index 100% rename from packages/excalidraw/components/TTDDialog/TTDDialog.scss rename to packages/excalidraw/src/components/TTDDialog/TTDDialog.scss diff --git a/packages/excalidraw/components/TTDDialog/TTDDialog.tsx b/packages/excalidraw/src/components/TTDDialog/TTDDialog.tsx similarity index 98% rename from packages/excalidraw/components/TTDDialog/TTDDialog.tsx rename to packages/excalidraw/src/components/TTDDialog/TTDDialog.tsx index 6e73e52b2..96821a4ce 100644 --- a/packages/excalidraw/components/TTDDialog/TTDDialog.tsx +++ b/packages/excalidraw/src/components/TTDDialog/TTDDialog.tsx @@ -4,10 +4,10 @@ import { isFiniteNumber } from "@excalidraw/math"; import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types"; -import { trackEvent } from "../../analytics"; -import { useUIAppState } from "../../src/context/ui-appState"; -import { atom, useAtom } from "../../editor-jotai"; -import { t } from "../../i18n"; +import { trackEvent } from "../../../analytics"; +import { useUIAppState } from "../../context/ui-appState"; +import { atom, useAtom } from "../../../editor-jotai"; +import { t } from "../../../i18n"; import { useApp, useExcalidrawSetAppState } from "../App"; import { Dialog } from "../Dialog"; import { InlineIcon } from "../InlineIcon"; @@ -36,7 +36,7 @@ import "./TTDDialog.scss"; import type { ChangeEventHandler } from "react"; import type { MermaidToExcalidrawLibProps } from "./common"; -import type { BinaryFiles } from "../../types"; +import type { BinaryFiles } from "../../../types"; const MIN_PROMPT_LENGTH = 3; const MAX_PROMPT_LENGTH = 1000; diff --git a/packages/excalidraw/components/TTDDialog/TTDDialogInput.tsx b/packages/excalidraw/src/components/TTDDialog/TTDDialogInput.tsx similarity index 100% rename from packages/excalidraw/components/TTDDialog/TTDDialogInput.tsx rename to packages/excalidraw/src/components/TTDDialog/TTDDialogInput.tsx diff --git a/packages/excalidraw/components/TTDDialog/TTDDialogOutput.tsx b/packages/excalidraw/src/components/TTDDialog/TTDDialogOutput.tsx similarity index 100% rename from packages/excalidraw/components/TTDDialog/TTDDialogOutput.tsx rename to packages/excalidraw/src/components/TTDDialog/TTDDialogOutput.tsx diff --git a/packages/excalidraw/components/TTDDialog/TTDDialogPanel.tsx b/packages/excalidraw/src/components/TTDDialog/TTDDialogPanel.tsx similarity index 100% rename from packages/excalidraw/components/TTDDialog/TTDDialogPanel.tsx rename to packages/excalidraw/src/components/TTDDialog/TTDDialogPanel.tsx diff --git a/packages/excalidraw/components/TTDDialog/TTDDialogPanels.tsx b/packages/excalidraw/src/components/TTDDialog/TTDDialogPanels.tsx similarity index 100% rename from packages/excalidraw/components/TTDDialog/TTDDialogPanels.tsx rename to packages/excalidraw/src/components/TTDDialog/TTDDialogPanels.tsx diff --git a/packages/excalidraw/components/TTDDialog/TTDDialogSubmitShortcut.tsx b/packages/excalidraw/src/components/TTDDialog/TTDDialogSubmitShortcut.tsx similarity index 100% rename from packages/excalidraw/components/TTDDialog/TTDDialogSubmitShortcut.tsx rename to packages/excalidraw/src/components/TTDDialog/TTDDialogSubmitShortcut.tsx diff --git a/packages/excalidraw/components/TTDDialog/TTDDialogTab.tsx b/packages/excalidraw/src/components/TTDDialog/TTDDialogTab.tsx similarity index 100% rename from packages/excalidraw/components/TTDDialog/TTDDialogTab.tsx rename to packages/excalidraw/src/components/TTDDialog/TTDDialogTab.tsx diff --git a/packages/excalidraw/components/TTDDialog/TTDDialogTabTrigger.tsx b/packages/excalidraw/src/components/TTDDialog/TTDDialogTabTrigger.tsx similarity index 100% rename from packages/excalidraw/components/TTDDialog/TTDDialogTabTrigger.tsx rename to packages/excalidraw/src/components/TTDDialog/TTDDialogTabTrigger.tsx diff --git a/packages/excalidraw/components/TTDDialog/TTDDialogTabTriggers.tsx b/packages/excalidraw/src/components/TTDDialog/TTDDialogTabTriggers.tsx similarity index 100% rename from packages/excalidraw/components/TTDDialog/TTDDialogTabTriggers.tsx rename to packages/excalidraw/src/components/TTDDialog/TTDDialogTabTriggers.tsx diff --git a/packages/excalidraw/components/TTDDialog/TTDDialogTabs.tsx b/packages/excalidraw/src/components/TTDDialog/TTDDialogTabs.tsx similarity index 100% rename from packages/excalidraw/components/TTDDialog/TTDDialogTabs.tsx rename to packages/excalidraw/src/components/TTDDialog/TTDDialogTabs.tsx diff --git a/packages/excalidraw/components/TTDDialog/TTDDialogTrigger.tsx b/packages/excalidraw/src/components/TTDDialog/TTDDialogTrigger.tsx similarity index 87% rename from packages/excalidraw/components/TTDDialog/TTDDialogTrigger.tsx rename to packages/excalidraw/src/components/TTDDialog/TTDDialogTrigger.tsx index 55d7ca919..5f2881199 100644 --- a/packages/excalidraw/components/TTDDialog/TTDDialogTrigger.tsx +++ b/packages/excalidraw/src/components/TTDDialog/TTDDialogTrigger.tsx @@ -1,6 +1,6 @@ -import { trackEvent } from "../../analytics"; -import { useTunnels } from "../../src/context/tunnels"; -import { t } from "../../i18n"; +import { trackEvent } from "../../../analytics"; +import { useTunnels } from "../../context/tunnels"; +import { t } from "../../../i18n"; import { useExcalidrawSetAppState } from "../App"; import DropdownMenu from "../dropdownMenu/DropdownMenu"; import { brainIcon } from "../icons"; diff --git a/packages/excalidraw/components/TTDDialog/common.ts b/packages/excalidraw/src/components/TTDDialog/common.ts similarity index 94% rename from packages/excalidraw/components/TTDDialog/common.ts rename to packages/excalidraw/src/components/TTDDialog/common.ts index bfe52b25b..111c310fc 100644 --- a/packages/excalidraw/components/TTDDialog/common.ts +++ b/packages/excalidraw/src/components/TTDDialog/common.ts @@ -5,12 +5,12 @@ import type { MermaidToExcalidrawResult } from "@excalidraw/mermaid-to-excalidra import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types"; -import { EditorLocalStorage } from "../../src/data/EditorLocalStorage"; -import { canvasToBlob } from "../../src/data/blob"; -import { t } from "../../i18n"; -import { convertToExcalidrawElements, exportToCanvas } from "../../index"; +import { EditorLocalStorage } from "../../data/EditorLocalStorage"; +import { canvasToBlob } from "../../data/blob"; +import { t } from "../../../i18n"; +import { convertToExcalidrawElements, exportToCanvas } from "../../../index"; -import type { AppClassProperties, BinaryFiles } from "../../types"; +import type { AppClassProperties, BinaryFiles } from "../../../types"; const resetPreview = ({ canvasRef, diff --git a/packages/excalidraw/components/TextField.scss b/packages/excalidraw/src/components/TextField.scss similarity index 100% rename from packages/excalidraw/components/TextField.scss rename to packages/excalidraw/src/components/TextField.scss diff --git a/packages/excalidraw/components/TextField.tsx b/packages/excalidraw/src/components/TextField.tsx similarity index 100% rename from packages/excalidraw/components/TextField.tsx rename to packages/excalidraw/src/components/TextField.tsx diff --git a/packages/excalidraw/components/TextInput.scss b/packages/excalidraw/src/components/TextInput.scss similarity index 100% rename from packages/excalidraw/components/TextInput.scss rename to packages/excalidraw/src/components/TextInput.scss diff --git a/packages/excalidraw/components/Toast.scss b/packages/excalidraw/src/components/Toast.scss similarity index 100% rename from packages/excalidraw/components/Toast.scss rename to packages/excalidraw/src/components/Toast.scss diff --git a/packages/excalidraw/components/Toast.tsx b/packages/excalidraw/src/components/Toast.tsx similarity index 100% rename from packages/excalidraw/components/Toast.tsx rename to packages/excalidraw/src/components/Toast.tsx diff --git a/packages/excalidraw/components/ToolButton.tsx b/packages/excalidraw/src/components/ToolButton.tsx similarity index 99% rename from packages/excalidraw/components/ToolButton.tsx rename to packages/excalidraw/src/components/ToolButton.tsx index f833a6d1f..b9d56275b 100644 --- a/packages/excalidraw/components/ToolButton.tsx +++ b/packages/excalidraw/src/components/ToolButton.tsx @@ -5,7 +5,7 @@ import { isPromiseLike } from "@excalidraw/common"; import type { PointerType } from "@excalidraw/element/types"; -import { AbortError } from "../errors"; +import { AbortError } from "../../errors"; import "./ToolIcon.scss"; diff --git a/packages/excalidraw/components/ToolIcon.scss b/packages/excalidraw/src/components/ToolIcon.scss similarity index 100% rename from packages/excalidraw/components/ToolIcon.scss rename to packages/excalidraw/src/components/ToolIcon.scss diff --git a/packages/excalidraw/components/Toolbar.scss b/packages/excalidraw/src/components/Toolbar.scss similarity index 100% rename from packages/excalidraw/components/Toolbar.scss rename to packages/excalidraw/src/components/Toolbar.scss diff --git a/packages/excalidraw/components/Tooltip.scss b/packages/excalidraw/src/components/Tooltip.scss similarity index 100% rename from packages/excalidraw/components/Tooltip.scss rename to packages/excalidraw/src/components/Tooltip.scss diff --git a/packages/excalidraw/components/Tooltip.tsx b/packages/excalidraw/src/components/Tooltip.tsx similarity index 100% rename from packages/excalidraw/components/Tooltip.tsx rename to packages/excalidraw/src/components/Tooltip.tsx diff --git a/packages/excalidraw/components/Trans.test.tsx b/packages/excalidraw/src/components/Trans.test.tsx similarity index 100% rename from packages/excalidraw/components/Trans.test.tsx rename to packages/excalidraw/src/components/Trans.test.tsx diff --git a/packages/excalidraw/components/Trans.tsx b/packages/excalidraw/src/components/Trans.tsx similarity index 98% rename from packages/excalidraw/components/Trans.tsx rename to packages/excalidraw/src/components/Trans.tsx index 7a6215c89..d55b4d072 100644 --- a/packages/excalidraw/components/Trans.tsx +++ b/packages/excalidraw/src/components/Trans.tsx @@ -1,8 +1,8 @@ import React from "react"; -import { useI18n } from "../i18n"; +import { useI18n } from "../../i18n"; -import type { TranslationKeys } from "../i18n"; +import type { TranslationKeys } from "../../i18n"; // Used for splitting i18nKey into tokens in Trans component // Example: diff --git a/packages/excalidraw/components/UserList.scss b/packages/excalidraw/src/components/UserList.scss similarity index 100% rename from packages/excalidraw/components/UserList.scss rename to packages/excalidraw/src/components/UserList.scss diff --git a/packages/excalidraw/components/UserList.tsx b/packages/excalidraw/src/components/UserList.tsx similarity index 98% rename from packages/excalidraw/components/UserList.tsx rename to packages/excalidraw/src/components/UserList.tsx index 31f03e5b2..a347c8740 100644 --- a/packages/excalidraw/components/UserList.tsx +++ b/packages/excalidraw/src/components/UserList.tsx @@ -6,7 +6,7 @@ import { supportsResizeObserver, isShallowEqual } from "@excalidraw/common"; import type { MarkRequired } from "@excalidraw/common/utility-types"; -import { t } from "../i18n"; +import { t } from "../../i18n"; import { useExcalidrawActionManager } from "./App"; import { Island } from "./Island"; @@ -16,8 +16,8 @@ import { Tooltip } from "./Tooltip"; import "./UserList.scss"; -import type { ActionManager } from "../src/actions/manager"; -import type { Collaborator, SocketId } from "../types"; +import type { ActionManager } from "../actions/manager"; +import type { Collaborator, SocketId } from "../../types"; export type GoToCollaboratorComponentProps = { socketId: SocketId; diff --git a/packages/excalidraw/components/__snapshots__/App.test.tsx.snap b/packages/excalidraw/src/components/__snapshots__/App.test.tsx.snap similarity index 100% rename from packages/excalidraw/components/__snapshots__/App.test.tsx.snap rename to packages/excalidraw/src/components/__snapshots__/App.test.tsx.snap diff --git a/packages/excalidraw/components/canvases/InteractiveCanvas.tsx b/packages/excalidraw/src/components/canvases/InteractiveCanvas.tsx similarity index 97% rename from packages/excalidraw/components/canvases/InteractiveCanvas.tsx rename to packages/excalidraw/src/components/canvases/InteractiveCanvas.tsx index 4c12777ef..5a9e15f66 100644 --- a/packages/excalidraw/components/canvases/InteractiveCanvas.tsx +++ b/packages/excalidraw/src/components/canvases/InteractiveCanvas.tsx @@ -11,16 +11,20 @@ import type { NonDeletedSceneElementsMap, } from "@excalidraw/element/types"; -import { t } from "../../i18n"; -import { isRenderThrottlingEnabled } from "../../reactUtils"; +import { t } from "../../../i18n"; +import { isRenderThrottlingEnabled } from "../../../reactUtils"; import { renderInteractiveScene } from "../../renderer/interactiveScene"; import type { InteractiveCanvasRenderConfig, RenderableElementsMap, RenderInteractiveSceneCallback, -} from "../../src/scene/types"; -import type { AppState, Device, InteractiveCanvasAppState } from "../../types"; +} from "../../scene/types"; +import type { + AppState, + Device, + InteractiveCanvasAppState, +} from "../../../types"; import type { DOMAttributes } from "react"; type InteractiveCanvasProps = { diff --git a/packages/excalidraw/components/canvases/NewElementCanvas.tsx b/packages/excalidraw/src/components/canvases/NewElementCanvas.tsx similarity index 91% rename from packages/excalidraw/components/canvases/NewElementCanvas.tsx rename to packages/excalidraw/src/components/canvases/NewElementCanvas.tsx index ee3972527..48e452627 100644 --- a/packages/excalidraw/components/canvases/NewElementCanvas.tsx +++ b/packages/excalidraw/src/components/canvases/NewElementCanvas.tsx @@ -2,14 +2,14 @@ import { useEffect, useRef } from "react"; import type { NonDeletedSceneElementsMap } from "@excalidraw/element/types"; -import { isRenderThrottlingEnabled } from "../../reactUtils"; +import { isRenderThrottlingEnabled } from "../../../reactUtils"; import { renderNewElementScene } from "../../renderer/renderNewElementScene"; import type { RenderableElementsMap, StaticCanvasRenderConfig, -} from "../../src/scene/types"; -import type { AppState } from "../../types"; +} from "../../scene/types"; +import type { AppState } from "../../../types"; import type { RoughCanvas } from "roughjs/bin/canvas"; interface NewElementCanvasProps { diff --git a/packages/excalidraw/components/canvases/StaticCanvas.tsx b/packages/excalidraw/src/components/canvases/StaticCanvas.tsx similarity index 96% rename from packages/excalidraw/components/canvases/StaticCanvas.tsx rename to packages/excalidraw/src/components/canvases/StaticCanvas.tsx index 9d4501893..1ab13e96f 100644 --- a/packages/excalidraw/components/canvases/StaticCanvas.tsx +++ b/packages/excalidraw/src/components/canvases/StaticCanvas.tsx @@ -7,14 +7,14 @@ import type { NonDeletedSceneElementsMap, } from "@excalidraw/element/types"; -import { isRenderThrottlingEnabled } from "../../reactUtils"; +import { isRenderThrottlingEnabled } from "../../../reactUtils"; import { renderStaticScene } from "../../renderer/staticScene"; import type { RenderableElementsMap, StaticCanvasRenderConfig, -} from "../../src/scene/types"; -import type { AppState, StaticCanvasAppState } from "../../types"; +} from "../../scene/types"; +import type { AppState, StaticCanvasAppState } from "../../../types"; import type { RoughCanvas } from "roughjs/bin/canvas"; type StaticCanvasProps = { diff --git a/packages/excalidraw/components/canvases/index.tsx b/packages/excalidraw/src/components/canvases/index.tsx similarity index 100% rename from packages/excalidraw/components/canvases/index.tsx rename to packages/excalidraw/src/components/canvases/index.tsx diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenu.scss b/packages/excalidraw/src/components/dropdownMenu/DropdownMenu.scss similarity index 100% rename from packages/excalidraw/components/dropdownMenu/DropdownMenu.scss rename to packages/excalidraw/src/components/dropdownMenu/DropdownMenu.scss diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenu.test.tsx b/packages/excalidraw/src/components/dropdownMenu/DropdownMenu.test.tsx similarity index 100% rename from packages/excalidraw/components/dropdownMenu/DropdownMenu.test.tsx rename to packages/excalidraw/src/components/dropdownMenu/DropdownMenu.test.tsx diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenu.tsx b/packages/excalidraw/src/components/dropdownMenu/DropdownMenu.tsx similarity index 100% rename from packages/excalidraw/components/dropdownMenu/DropdownMenu.tsx rename to packages/excalidraw/src/components/dropdownMenu/DropdownMenu.tsx diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsx b/packages/excalidraw/src/components/dropdownMenu/DropdownMenuContent.tsx similarity index 100% rename from packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsx rename to packages/excalidraw/src/components/dropdownMenu/DropdownMenuContent.tsx diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuGroup.tsx b/packages/excalidraw/src/components/dropdownMenu/DropdownMenuGroup.tsx similarity index 100% rename from packages/excalidraw/components/dropdownMenu/DropdownMenuGroup.tsx rename to packages/excalidraw/src/components/dropdownMenu/DropdownMenuGroup.tsx diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuItem.tsx b/packages/excalidraw/src/components/dropdownMenu/DropdownMenuItem.tsx similarity index 100% rename from packages/excalidraw/components/dropdownMenu/DropdownMenuItem.tsx rename to packages/excalidraw/src/components/dropdownMenu/DropdownMenuItem.tsx diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContent.tsx b/packages/excalidraw/src/components/dropdownMenu/DropdownMenuItemContent.tsx similarity index 100% rename from packages/excalidraw/components/dropdownMenu/DropdownMenuItemContent.tsx rename to packages/excalidraw/src/components/dropdownMenu/DropdownMenuItemContent.tsx diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContentRadio.tsx b/packages/excalidraw/src/components/dropdownMenu/DropdownMenuItemContentRadio.tsx similarity index 100% rename from packages/excalidraw/components/dropdownMenu/DropdownMenuItemContentRadio.tsx rename to packages/excalidraw/src/components/dropdownMenu/DropdownMenuItemContentRadio.tsx diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuItemCustom.tsx b/packages/excalidraw/src/components/dropdownMenu/DropdownMenuItemCustom.tsx similarity index 100% rename from packages/excalidraw/components/dropdownMenu/DropdownMenuItemCustom.tsx rename to packages/excalidraw/src/components/dropdownMenu/DropdownMenuItemCustom.tsx diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuItemLink.tsx b/packages/excalidraw/src/components/dropdownMenu/DropdownMenuItemLink.tsx similarity index 100% rename from packages/excalidraw/components/dropdownMenu/DropdownMenuItemLink.tsx rename to packages/excalidraw/src/components/dropdownMenu/DropdownMenuItemLink.tsx diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuSeparator.tsx b/packages/excalidraw/src/components/dropdownMenu/DropdownMenuSeparator.tsx similarity index 100% rename from packages/excalidraw/components/dropdownMenu/DropdownMenuSeparator.tsx rename to packages/excalidraw/src/components/dropdownMenu/DropdownMenuSeparator.tsx diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuTrigger.tsx b/packages/excalidraw/src/components/dropdownMenu/DropdownMenuTrigger.tsx similarity index 100% rename from packages/excalidraw/components/dropdownMenu/DropdownMenuTrigger.tsx rename to packages/excalidraw/src/components/dropdownMenu/DropdownMenuTrigger.tsx diff --git a/packages/excalidraw/components/dropdownMenu/common.ts b/packages/excalidraw/src/components/dropdownMenu/common.ts similarity index 100% rename from packages/excalidraw/components/dropdownMenu/common.ts rename to packages/excalidraw/src/components/dropdownMenu/common.ts diff --git a/packages/excalidraw/components/dropdownMenu/dropdownMenuUtils.ts b/packages/excalidraw/src/components/dropdownMenu/dropdownMenuUtils.ts similarity index 100% rename from packages/excalidraw/components/dropdownMenu/dropdownMenuUtils.ts rename to packages/excalidraw/src/components/dropdownMenu/dropdownMenuUtils.ts diff --git a/packages/excalidraw/components/footer/Footer.tsx b/packages/excalidraw/src/components/footer/Footer.tsx similarity index 92% rename from packages/excalidraw/components/footer/Footer.tsx rename to packages/excalidraw/src/components/footer/Footer.tsx index 208bea916..234aa0a90 100644 --- a/packages/excalidraw/components/footer/Footer.tsx +++ b/packages/excalidraw/src/components/footer/Footer.tsx @@ -1,7 +1,7 @@ import clsx from "clsx"; -import { actionShortcuts } from "../../src/actions"; -import { useTunnels } from "../../src/context/tunnels"; +import { actionShortcuts } from "../../actions"; +import { useTunnels } from "../../context/tunnels"; import { ExitZenModeAction, FinalizeAction, @@ -13,8 +13,8 @@ import { HelpButton } from "../HelpButton"; import { Section } from "../Section"; import Stack from "../Stack"; -import type { ActionManager } from "../../src/actions/manager"; -import type { UIAppState } from "../../types"; +import type { ActionManager } from "../../actions/manager"; +import type { UIAppState } from "../../../types"; const Footer = ({ appState, diff --git a/packages/excalidraw/components/footer/FooterCenter.scss b/packages/excalidraw/src/components/footer/FooterCenter.scss similarity index 100% rename from packages/excalidraw/components/footer/FooterCenter.scss rename to packages/excalidraw/src/components/footer/FooterCenter.scss diff --git a/packages/excalidraw/components/footer/FooterCenter.tsx b/packages/excalidraw/src/components/footer/FooterCenter.tsx similarity index 83% rename from packages/excalidraw/components/footer/FooterCenter.tsx rename to packages/excalidraw/src/components/footer/FooterCenter.tsx index 51cdf7471..6a44581de 100644 --- a/packages/excalidraw/components/footer/FooterCenter.tsx +++ b/packages/excalidraw/src/components/footer/FooterCenter.tsx @@ -1,7 +1,7 @@ import clsx from "clsx"; -import { useTunnels } from "../../src/context/tunnels"; -import { useUIAppState } from "../../src/context/ui-appState"; +import { useTunnels } from "../../context/tunnels"; +import { useUIAppState } from "../../context/ui-appState"; import "./FooterCenter.scss"; diff --git a/packages/excalidraw/components/hoc/withInternalFallback.test.tsx b/packages/excalidraw/src/components/hoc/withInternalFallback.test.tsx similarity index 100% rename from packages/excalidraw/components/hoc/withInternalFallback.test.tsx rename to packages/excalidraw/src/components/hoc/withInternalFallback.test.tsx diff --git a/packages/excalidraw/components/hoc/withInternalFallback.tsx b/packages/excalidraw/src/components/hoc/withInternalFallback.tsx similarity index 95% rename from packages/excalidraw/components/hoc/withInternalFallback.tsx rename to packages/excalidraw/src/components/hoc/withInternalFallback.tsx index 9dfd65623..0cfb96054 100644 --- a/packages/excalidraw/components/hoc/withInternalFallback.tsx +++ b/packages/excalidraw/src/components/hoc/withInternalFallback.tsx @@ -1,7 +1,7 @@ import React, { useLayoutEffect, useRef } from "react"; -import { useTunnels } from "../../src/context/tunnels"; -import { atom } from "../../editor-jotai"; +import { useTunnels } from "../../context/tunnels"; +import { atom } from "../../../editor-jotai"; export const withInternalFallback = ( componentName: string, diff --git a/packages/excalidraw/components/hyperlink/Hyperlink.scss b/packages/excalidraw/src/components/hyperlink/Hyperlink.scss similarity index 100% rename from packages/excalidraw/components/hyperlink/Hyperlink.scss rename to packages/excalidraw/src/components/hyperlink/Hyperlink.scss diff --git a/packages/excalidraw/components/hyperlink/Hyperlink.tsx b/packages/excalidraw/src/components/hyperlink/Hyperlink.tsx similarity index 98% rename from packages/excalidraw/components/hyperlink/Hyperlink.tsx rename to packages/excalidraw/src/components/hyperlink/Hyperlink.tsx index f12f97afd..d90a277c9 100644 --- a/packages/excalidraw/components/hyperlink/Hyperlink.tsx +++ b/packages/excalidraw/src/components/hyperlink/Hyperlink.tsx @@ -39,21 +39,21 @@ import type { NonDeletedExcalidrawElement, } from "@excalidraw/element/types"; -import { trackEvent } from "../../analytics"; -import { getTooltipDiv, updateTooltipPosition } from "../../components/Tooltip"; +import { trackEvent } from "../../../analytics"; +import { getTooltipDiv, updateTooltipPosition } from "../Tooltip"; -import { t } from "../../i18n"; +import { t } from "../../../i18n"; import { useAppProps, useDevice, useExcalidrawAppState } from "../App"; import { ToolButton } from "../ToolButton"; import { FreedrawIcon, TrashIcon, elementLinkIcon } from "../icons"; -import { getSelectedElements } from "../../src/scene"; +import { getSelectedElements } from "../../scene"; import { getLinkHandleFromCoords } from "./helpers"; import "./Hyperlink.scss"; -import type { AppState, ExcalidrawProps, UIAppState } from "../../types"; +import type { AppState, ExcalidrawProps, UIAppState } from "../../../types"; const POPUP_WIDTH = 380; const POPUP_HEIGHT = 42; diff --git a/packages/excalidraw/components/hyperlink/helpers.ts b/packages/excalidraw/src/components/hyperlink/helpers.ts similarity index 98% rename from packages/excalidraw/components/hyperlink/helpers.ts rename to packages/excalidraw/src/components/hyperlink/helpers.ts index d1345db98..ef3bad044 100644 --- a/packages/excalidraw/components/hyperlink/helpers.ts +++ b/packages/excalidraw/src/components/hyperlink/helpers.ts @@ -14,7 +14,7 @@ import type { NonDeletedExcalidrawElement, } from "@excalidraw/element/types"; -import type { AppState, UIAppState } from "../../types"; +import type { AppState, UIAppState } from "../../../types"; export const EXTERNAL_LINK_IMG = document.createElement("img"); EXTERNAL_LINK_IMG.src = `data:${MIME_TYPES.svg}, ${encodeURIComponent( diff --git a/packages/excalidraw/components/icons.tsx b/packages/excalidraw/src/components/icons.tsx similarity index 100% rename from packages/excalidraw/components/icons.tsx rename to packages/excalidraw/src/components/icons.tsx diff --git a/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.scss b/packages/excalidraw/src/components/live-collaboration/LiveCollaborationTrigger.scss similarity index 100% rename from packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.scss rename to packages/excalidraw/src/components/live-collaboration/LiveCollaborationTrigger.scss diff --git a/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx b/packages/excalidraw/src/components/live-collaboration/LiveCollaborationTrigger.tsx similarity index 91% rename from packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx rename to packages/excalidraw/src/components/live-collaboration/LiveCollaborationTrigger.tsx index 701fca725..3dacef0fd 100644 --- a/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx +++ b/packages/excalidraw/src/components/live-collaboration/LiveCollaborationTrigger.tsx @@ -1,9 +1,9 @@ import clsx from "clsx"; -import { t } from "../../i18n"; +import { t } from "../../../i18n"; import { Button } from "../Button"; import { share } from "../icons"; -import { useUIAppState } from "../../src/context/ui-appState"; +import { useUIAppState } from "../../context/ui-appState"; import "./LiveCollaborationTrigger.scss"; diff --git a/packages/excalidraw/components/main-menu/DefaultItems.scss b/packages/excalidraw/src/components/main-menu/DefaultItems.scss similarity index 100% rename from packages/excalidraw/components/main-menu/DefaultItems.scss rename to packages/excalidraw/src/components/main-menu/DefaultItems.scss diff --git a/packages/excalidraw/components/main-menu/DefaultItems.tsx b/packages/excalidraw/src/components/main-menu/DefaultItems.tsx similarity index 97% rename from packages/excalidraw/components/main-menu/DefaultItems.tsx rename to packages/excalidraw/src/components/main-menu/DefaultItems.tsx index b74553367..5971c8bb4 100644 --- a/packages/excalidraw/components/main-menu/DefaultItems.tsx +++ b/packages/excalidraw/src/components/main-menu/DefaultItems.tsx @@ -11,12 +11,12 @@ import { actionShortcuts, actionToggleSearchMenu, actionToggleTheme, -} from "../../src/actions"; -import { getShortcutFromShortcutName } from "../../src/actions/shortcuts"; -import { trackEvent } from "../../analytics"; -import { useUIAppState } from "../../src/context/ui-appState"; -import { useSetAtom } from "../../editor-jotai"; -import { useI18n } from "../../i18n"; +} from "../../actions"; +import { getShortcutFromShortcutName } from "../../actions/shortcuts"; +import { trackEvent } from "../../../analytics"; +import { useUIAppState } from "../../context/ui-appState"; +import { useSetAtom } from "../../../editor-jotai"; +import { useI18n } from "../../../i18n"; import { activeConfirmDialogAtom } from "../ActiveConfirmDialog"; import { useExcalidrawSetAppState, diff --git a/packages/excalidraw/components/main-menu/MainMenu.tsx b/packages/excalidraw/src/components/main-menu/MainMenu.tsx similarity index 94% rename from packages/excalidraw/components/main-menu/MainMenu.tsx rename to packages/excalidraw/src/components/main-menu/MainMenu.tsx index 6faac8ad4..46b593a85 100644 --- a/packages/excalidraw/components/main-menu/MainMenu.tsx +++ b/packages/excalidraw/src/components/main-menu/MainMenu.tsx @@ -2,9 +2,9 @@ import React from "react"; import { composeEventHandlers } from "@excalidraw/common"; -import { useTunnels } from "../../src/context/tunnels"; -import { useUIAppState } from "../../src/context/ui-appState"; -import { t } from "../../i18n"; +import { useTunnels } from "../../context/tunnels"; +import { useUIAppState } from "../../context/ui-appState"; +import { t } from "../../../i18n"; import { useDevice, useExcalidrawSetAppState } from "../App"; import { UserList } from "../UserList"; import DropdownMenu from "../dropdownMenu/DropdownMenu"; diff --git a/packages/excalidraw/components/shapes.tsx b/packages/excalidraw/src/components/shapes.tsx similarity index 100% rename from packages/excalidraw/components/shapes.tsx rename to packages/excalidraw/src/components/shapes.tsx diff --git a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx b/packages/excalidraw/src/components/welcome-screen/WelcomeScreen.Center.tsx similarity index 94% rename from packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx rename to packages/excalidraw/src/components/welcome-screen/WelcomeScreen.Center.tsx index 644f94eee..d094c84b8 100644 --- a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx +++ b/packages/excalidraw/src/components/welcome-screen/WelcomeScreen.Center.tsx @@ -1,8 +1,8 @@ -import { actionLoadScene, actionShortcuts } from "../../src/actions"; -import { getShortcutFromShortcutName } from "../../src/actions/shortcuts"; -import { useTunnels } from "../../src/context/tunnels"; -import { useUIAppState } from "../../src/context/ui-appState"; -import { t, useI18n } from "../../i18n"; +import { actionLoadScene, actionShortcuts } from "../../actions"; +import { getShortcutFromShortcutName } from "../../actions/shortcuts"; +import { useTunnels } from "../../context/tunnels"; +import { useUIAppState } from "../../context/ui-appState"; +import { t, useI18n } from "../../../i18n"; import { useDevice, useExcalidrawActionManager } from "../App"; import { ExcalidrawLogo } from "../ExcalidrawLogo"; import { HelpIcon, LoadIcon, usersIcon } from "../icons"; diff --git a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Hints.tsx b/packages/excalidraw/src/components/welcome-screen/WelcomeScreen.Hints.tsx similarity index 95% rename from packages/excalidraw/components/welcome-screen/WelcomeScreen.Hints.tsx rename to packages/excalidraw/src/components/welcome-screen/WelcomeScreen.Hints.tsx index 70c31848c..2cca3ffdc 100644 --- a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Hints.tsx +++ b/packages/excalidraw/src/components/welcome-screen/WelcomeScreen.Hints.tsx @@ -1,5 +1,5 @@ -import { useTunnels } from "../../src/context/tunnels"; -import { t } from "../../i18n"; +import { useTunnels } from "../../context/tunnels"; +import { t } from "../../../i18n"; import { WelcomeScreenHelpArrow, WelcomeScreenMenuArrow, diff --git a/packages/excalidraw/components/welcome-screen/WelcomeScreen.scss b/packages/excalidraw/src/components/welcome-screen/WelcomeScreen.scss similarity index 100% rename from packages/excalidraw/components/welcome-screen/WelcomeScreen.scss rename to packages/excalidraw/src/components/welcome-screen/WelcomeScreen.scss diff --git a/packages/excalidraw/components/welcome-screen/WelcomeScreen.tsx b/packages/excalidraw/src/components/welcome-screen/WelcomeScreen.tsx similarity index 100% rename from packages/excalidraw/components/welcome-screen/WelcomeScreen.tsx rename to packages/excalidraw/src/components/welcome-screen/WelcomeScreen.tsx diff --git a/packages/excalidraw/src/data/library.ts b/packages/excalidraw/src/data/library.ts index 97bed589c..224c2793b 100644 --- a/packages/excalidraw/src/data/library.ts +++ b/packages/excalidraw/src/data/library.ts @@ -34,7 +34,7 @@ import { t } from "../../i18n"; import { loadLibraryFromBlob } from "./blob"; import { restoreLibraryItems } from "./restore"; -import type App from "../../components/App"; +import type App from "../components/App"; import type { LibraryItems, diff --git a/packages/excalidraw/types.ts b/packages/excalidraw/types.ts index 35cae7409..74c75aa94 100644 --- a/packages/excalidraw/types.ts +++ b/packages/excalidraw/types.ts @@ -46,10 +46,10 @@ import type { import type { Action } from "./src/actions/types"; import type { Spreadsheet } from "./charts"; import type { ClipboardData } from "./clipboard"; -import type App from "./components/App"; +import type App from "./src/components/App"; import type Library from "./src/data/library"; import type { FileSystemHandle } from "./src/data/filesystem"; -import type { ContextMenuItems } from "./components/ContextMenu"; +import type { ContextMenuItems } from "./src/components/ContextMenu"; import type { SnapLine } from "./snapping"; import type { CaptureUpdateActionType } from "./store"; import type { ImportedDataState } from "./src/data/types"; diff --git a/packages/excalidraw/wysiwyg/textWysiwyg.tsx b/packages/excalidraw/wysiwyg/textWysiwyg.tsx index 1d867c3e3..077f8db5a 100644 --- a/packages/excalidraw/wysiwyg/textWysiwyg.tsx +++ b/packages/excalidraw/wysiwyg/textWysiwyg.tsx @@ -57,7 +57,7 @@ import { actionZoomOut, } from "../src/actions/actionCanvas"; -import type App from "../components/App"; +import type App from "../src/components/App"; import type { AppState } from "../types"; const getTransform = (