diff --git a/packages/editor/src/index.ts b/packages/editor/src/index.ts index 79004bb6b..0b3e6501b 100644 --- a/packages/editor/src/index.ts +++ b/packages/editor/src/index.ts @@ -12,95 +12,6 @@ export { TldrawEditor, type TldrawEditorProps, } from './lib/TldrawEditor' -export { Editor, type TLAnimationOptions, type TLEditorOptions } from './lib/app/Editor' -export { ArrowShapeUtil } from './lib/app/shapeutils/ArrowShapeUtil/ArrowShapeUtil' -export { BaseBoxShapeUtil, type TLBaseBoxShape } from './lib/app/shapeutils/BaseBoxShapeUtil' -export { BookmarkShapeUtil } from './lib/app/shapeutils/BookmarkShapeUtil/BookmarkShapeUtil' -export { DrawShapeUtil } from './lib/app/shapeutils/DrawShapeUtil/DrawShapeUtil' -export { EmbedShapeUtil } from './lib/app/shapeutils/EmbedShapeUtil/EmbedShapeUtil' -export { FrameShapeUtil } from './lib/app/shapeutils/FrameShapeUtil/FrameShapeUtil' -export { GeoShapeUtil } from './lib/app/shapeutils/GeoShapeUtil/GeoShapeUtil' -export { GroupShapeUtil } from './lib/app/shapeutils/GroupShapeUtil/GroupShapeUtil' -export { HighlightShapeUtil } from './lib/app/shapeutils/HighlightShapeUtil/HighlightShapeUtil' -export { ImageShapeUtil } from './lib/app/shapeutils/ImageShapeUtil/ImageShapeUtil' -export { - LineShapeUtil, - getSplineForLineShape, -} from './lib/app/shapeutils/LineShapeUtil/LineShapeUtil' -export { NoteShapeUtil } from './lib/app/shapeutils/NoteShapeUtil/NoteShapeUtil' -export { - ShapeUtil, - type TLOnBeforeCreateHandler, - type TLOnBeforeUpdateHandler, - type TLOnBindingChangeHandler, - type TLOnChildrenChangeHandler, - type TLOnClickHandler, - type TLOnDoubleClickHandleHandler, - type TLOnDoubleClickHandler, - type TLOnDragHandler, - type TLOnEditEndHandler, - type TLOnHandleChangeHandler, - type TLOnResizeEndHandler, - type TLOnResizeHandler, - type TLOnResizeStartHandler, - type TLOnRotateEndHandler, - type TLOnRotateHandler, - type TLOnRotateStartHandler, - type TLOnTranslateEndHandler, - type TLOnTranslateHandler, - type TLOnTranslateStartHandler, - type TLResizeInfo, - type TLResizeMode, - type TLShapeUtilConstructor, - type TLShapeUtilFlag, -} from './lib/app/shapeutils/ShapeUtil' -export { INDENT, TextShapeUtil } from './lib/app/shapeutils/TextShapeUtil/TextShapeUtil' -export { VideoShapeUtil } from './lib/app/shapeutils/VideoShapeUtil/VideoShapeUtil' -export { BaseBoxShapeTool } from './lib/app/tools/BaseBoxShapeTool/BaseBoxShapeTool' -export { StateNode, type TLStateNodeConstructor } from './lib/app/tools/StateNode' -export { type TLContent } from './lib/app/types/clipboard-types' -export { type TLEventMap, type TLEventMapHandler } from './lib/app/types/emit-types' -export { - EVENT_NAME_MAP, - type TLBaseEventInfo, - type TLCLickEventName, - type TLCancelEvent, - type TLCancelEventInfo, - type TLClickEvent, - type TLClickEventInfo, - type TLCompleteEvent, - type TLCompleteEventInfo, - type TLEnterEventHandler, - type TLEventHandlers, - type TLEventInfo, - type TLEventName, - type TLExitEventHandler, - type TLInterruptEvent, - type TLInterruptEventInfo, - type TLKeyboardEvent, - type TLKeyboardEventInfo, - type TLKeyboardEventName, - type TLPinchEvent, - type TLPinchEventInfo, - type TLPinchEventName, - type TLPointerEvent, - type TLPointerEventInfo, - type TLPointerEventName, - type TLPointerEventTarget, - type TLTickEvent, - type TLWheelEvent, - type TLWheelEventInfo, - type UiEvent, - type UiEventType, -} from './lib/app/types/event-types' -export { - type TLCommand, - type TLCommandHandler, - type TLHistoryEntry, - type TLHistoryMark, -} from './lib/app/types/history-types' -export { type RequiredKeys } from './lib/app/types/misc-types' -export { type TLResizeHandle, type TLSelectionHandle } from './lib/app/types/selection-types' export { defaultEditorAssetUrls, setDefaultEditorAssetUrls, @@ -169,6 +80,95 @@ export { WAY_TOO_BIG_ARROW_BEND_FACTOR, ZOOMS, } from './lib/constants' +export { Editor, type TLAnimationOptions, type TLEditorOptions } from './lib/editor/Editor' +export { ArrowShapeUtil } from './lib/editor/shapeutils/ArrowShapeUtil/ArrowShapeUtil' +export { BaseBoxShapeUtil, type TLBaseBoxShape } from './lib/editor/shapeutils/BaseBoxShapeUtil' +export { BookmarkShapeUtil } from './lib/editor/shapeutils/BookmarkShapeUtil/BookmarkShapeUtil' +export { DrawShapeUtil } from './lib/editor/shapeutils/DrawShapeUtil/DrawShapeUtil' +export { EmbedShapeUtil } from './lib/editor/shapeutils/EmbedShapeUtil/EmbedShapeUtil' +export { FrameShapeUtil } from './lib/editor/shapeutils/FrameShapeUtil/FrameShapeUtil' +export { GeoShapeUtil } from './lib/editor/shapeutils/GeoShapeUtil/GeoShapeUtil' +export { GroupShapeUtil } from './lib/editor/shapeutils/GroupShapeUtil/GroupShapeUtil' +export { HighlightShapeUtil } from './lib/editor/shapeutils/HighlightShapeUtil/HighlightShapeUtil' +export { ImageShapeUtil } from './lib/editor/shapeutils/ImageShapeUtil/ImageShapeUtil' +export { + LineShapeUtil, + getSplineForLineShape, +} from './lib/editor/shapeutils/LineShapeUtil/LineShapeUtil' +export { NoteShapeUtil } from './lib/editor/shapeutils/NoteShapeUtil/NoteShapeUtil' +export { + ShapeUtil, + type TLOnBeforeCreateHandler, + type TLOnBeforeUpdateHandler, + type TLOnBindingChangeHandler, + type TLOnChildrenChangeHandler, + type TLOnClickHandler, + type TLOnDoubleClickHandleHandler, + type TLOnDoubleClickHandler, + type TLOnDragHandler, + type TLOnEditEndHandler, + type TLOnHandleChangeHandler, + type TLOnResizeEndHandler, + type TLOnResizeHandler, + type TLOnResizeStartHandler, + type TLOnRotateEndHandler, + type TLOnRotateHandler, + type TLOnRotateStartHandler, + type TLOnTranslateEndHandler, + type TLOnTranslateHandler, + type TLOnTranslateStartHandler, + type TLResizeInfo, + type TLResizeMode, + type TLShapeUtilConstructor, + type TLShapeUtilFlag, +} from './lib/editor/shapeutils/ShapeUtil' +export { INDENT, TextShapeUtil } from './lib/editor/shapeutils/TextShapeUtil/TextShapeUtil' +export { VideoShapeUtil } from './lib/editor/shapeutils/VideoShapeUtil/VideoShapeUtil' +export { BaseBoxShapeTool } from './lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool' +export { StateNode, type TLStateNodeConstructor } from './lib/editor/tools/StateNode' +export { type TLContent } from './lib/editor/types/clipboard-types' +export { type TLEventMap, type TLEventMapHandler } from './lib/editor/types/emit-types' +export { + EVENT_NAME_MAP, + type TLBaseEventInfo, + type TLCLickEventName, + type TLCancelEvent, + type TLCancelEventInfo, + type TLClickEvent, + type TLClickEventInfo, + type TLCompleteEvent, + type TLCompleteEventInfo, + type TLEnterEventHandler, + type TLEventHandlers, + type TLEventInfo, + type TLEventName, + type TLExitEventHandler, + type TLInterruptEvent, + type TLInterruptEventInfo, + type TLKeyboardEvent, + type TLKeyboardEventInfo, + type TLKeyboardEventName, + type TLPinchEvent, + type TLPinchEventInfo, + type TLPinchEventName, + type TLPointerEvent, + type TLPointerEventInfo, + type TLPointerEventName, + type TLPointerEventTarget, + type TLTickEvent, + type TLWheelEvent, + type TLWheelEventInfo, + type UiEvent, + type UiEventType, +} from './lib/editor/types/event-types' +export { + type TLCommand, + type TLCommandHandler, + type TLHistoryEntry, + type TLHistoryMark, +} from './lib/editor/types/history-types' +export { type RequiredKeys } from './lib/editor/types/misc-types' +export { type TLResizeHandle, type TLSelectionHandle } from './lib/editor/types/selection-types' export { normalizeWheel } from './lib/hooks/shared' export { useContainer } from './lib/hooks/useContainer' export { useEditor } from './lib/hooks/useEditor' diff --git a/packages/editor/src/lib/TldrawEditor.tsx b/packages/editor/src/lib/TldrawEditor.tsx index 50cdfae1e..0df29b534 100644 --- a/packages/editor/src/lib/TldrawEditor.tsx +++ b/packages/editor/src/lib/TldrawEditor.tsx @@ -2,12 +2,12 @@ import { Store, StoreSnapshot } from '@tldraw/store' import { TLAsset, TLRecord, TLStore } from '@tldraw/tlschema' import { annotateError } from '@tldraw/utils' import React, { memo, useCallback, useLayoutEffect, useState, useSyncExternalStore } from 'react' -import { Editor } from './app/Editor' -import { TLStateNodeConstructor } from './app/tools/StateNode' import { TLEditorAssetUrls, defaultEditorAssetUrls } from './assetUrls' import { DefaultErrorFallback } from './components/DefaultErrorFallback' import { OptionalErrorBoundary } from './components/ErrorBoundary' import { TLShapeInfo } from './config/createTLStore' +import { Editor } from './editor/Editor' +import { TLStateNodeConstructor } from './editor/tools/StateNode' import { ContainerProvider, useContainer } from './hooks/useContainer' import { useCursor } from './hooks/useCursor' import { useDarkMode } from './hooks/useDarkMode' diff --git a/packages/editor/src/lib/components/DefaultErrorFallback.tsx b/packages/editor/src/lib/components/DefaultErrorFallback.tsx index cbdde730f..005795aa9 100644 --- a/packages/editor/src/lib/components/DefaultErrorFallback.tsx +++ b/packages/editor/src/lib/components/DefaultErrorFallback.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import { useEffect, useLayoutEffect, useRef, useState } from 'react' import { useValue } from 'signia-react' -import { Editor } from '../app/Editor' +import { Editor } from '../editor/Editor' import { EditorContext } from '../hooks/useEditor' import { hardResetEditor } from '../utils/hard-reset' import { refreshPage } from '../utils/refresh-page' diff --git a/packages/editor/src/lib/components/DefaultSnapLine.tsx b/packages/editor/src/lib/components/DefaultSnapLine.tsx index 96a00a6c1..b7110bbc0 100644 --- a/packages/editor/src/lib/components/DefaultSnapLine.tsx +++ b/packages/editor/src/lib/components/DefaultSnapLine.tsx @@ -1,7 +1,11 @@ import { rangeIntersection } from '@tldraw/primitives' import classNames from 'classnames' import * as React from 'react' -import { type GapsSnapLine, type PointsSnapLine, type SnapLine } from '../app/managers/SnapManager' +import { + type GapsSnapLine, + type PointsSnapLine, + type SnapLine, +} from '../editor/managers/SnapManager' function PointsSnapLine({ points, zoom }: { zoom: number } & PointsSnapLine) { const l = 2.5 / zoom diff --git a/packages/editor/src/lib/components/SelectionBg.tsx b/packages/editor/src/lib/components/SelectionBg.tsx index 48d20cdec..edcb814cb 100644 --- a/packages/editor/src/lib/components/SelectionBg.tsx +++ b/packages/editor/src/lib/components/SelectionBg.tsx @@ -1,7 +1,7 @@ import { Matrix2d, toDomPrecision } from '@tldraw/primitives' import * as React from 'react' import { track } from 'signia-react' -import { TLPointerEventInfo } from '../app/types/event-types' +import { TLPointerEventInfo } from '../editor/types/event-types' import { useEditor } from '../hooks/useEditor' import { releasePointerCapture, setPointerCapture } from '../utils/dom' import { getPointerInfo } from '../utils/svg' diff --git a/packages/editor/src/lib/components/Shape.tsx b/packages/editor/src/lib/components/Shape.tsx index 70142d056..971df9606 100644 --- a/packages/editor/src/lib/components/Shape.tsx +++ b/packages/editor/src/lib/components/Shape.tsx @@ -7,7 +7,7 @@ import { useStateTracking, } from 'signia-react' import { useEditor } from '../..' -import { ShapeUtil } from '../app/shapeutils/ShapeUtil' +import { ShapeUtil } from '../editor/shapeutils/ShapeUtil' import { useEditorComponents } from '../hooks/useEditorComponents' import { useQuickReactor } from '../hooks/useQuickReactor' import { useShapeEvents } from '../hooks/useShapeEvents' diff --git a/packages/editor/src/lib/components/ShapeIndicator.tsx b/packages/editor/src/lib/components/ShapeIndicator.tsx index 122f651eb..f8b7ed0db 100644 --- a/packages/editor/src/lib/components/ShapeIndicator.tsx +++ b/packages/editor/src/lib/components/ShapeIndicator.tsx @@ -7,8 +7,8 @@ import { useValue, } from 'signia-react' import { useEditor } from '../..' -import type { Editor } from '../app/Editor' -import { ShapeUtil } from '../app/shapeutils/ShapeUtil' +import type { Editor } from '../editor/Editor' +import { ShapeUtil } from '../editor/shapeutils/ShapeUtil' import { useEditorComponents } from '../hooks/useEditorComponents' import { OptionalErrorBoundary } from './ErrorBoundary' diff --git a/packages/editor/src/lib/config/createTLStore.ts b/packages/editor/src/lib/config/createTLStore.ts index af7366deb..0e132fb43 100644 --- a/packages/editor/src/lib/config/createTLStore.ts +++ b/packages/editor/src/lib/config/createTLStore.ts @@ -1,6 +1,6 @@ import { Migrations, Store, StoreSnapshot } from '@tldraw/store' import { TLRecord, TLStore, createTLSchema } from '@tldraw/tlschema' -import { TLShapeUtilConstructor } from '../app/shapeutils/ShapeUtil' +import { TLShapeUtilConstructor } from '../editor/shapeutils/ShapeUtil' /** @public */ export type TLShapeInfo = { diff --git a/packages/editor/src/lib/config/defaultShapes.ts b/packages/editor/src/lib/config/defaultShapes.ts index ef2eb226e..780500193 100644 --- a/packages/editor/src/lib/config/defaultShapes.ts +++ b/packages/editor/src/lib/config/defaultShapes.ts @@ -1,16 +1,16 @@ -import { ArrowShapeUtil } from '../app/shapeutils/ArrowShapeUtil/ArrowShapeUtil' -import { BookmarkShapeUtil } from '../app/shapeutils/BookmarkShapeUtil/BookmarkShapeUtil' -import { DrawShapeUtil } from '../app/shapeutils/DrawShapeUtil/DrawShapeUtil' -import { EmbedShapeUtil } from '../app/shapeutils/EmbedShapeUtil/EmbedShapeUtil' -import { FrameShapeUtil } from '../app/shapeutils/FrameShapeUtil/FrameShapeUtil' -import { GeoShapeUtil } from '../app/shapeutils/GeoShapeUtil/GeoShapeUtil' -import { GroupShapeUtil } from '../app/shapeutils/GroupShapeUtil/GroupShapeUtil' -import { HighlightShapeUtil } from '../app/shapeutils/HighlightShapeUtil/HighlightShapeUtil' -import { ImageShapeUtil } from '../app/shapeutils/ImageShapeUtil/ImageShapeUtil' -import { LineShapeUtil } from '../app/shapeutils/LineShapeUtil/LineShapeUtil' -import { NoteShapeUtil } from '../app/shapeutils/NoteShapeUtil/NoteShapeUtil' -import { TextShapeUtil } from '../app/shapeutils/TextShapeUtil/TextShapeUtil' -import { VideoShapeUtil } from '../app/shapeutils/VideoShapeUtil/VideoShapeUtil' +import { ArrowShapeUtil } from '../editor/shapeutils/ArrowShapeUtil/ArrowShapeUtil' +import { BookmarkShapeUtil } from '../editor/shapeutils/BookmarkShapeUtil/BookmarkShapeUtil' +import { DrawShapeUtil } from '../editor/shapeutils/DrawShapeUtil/DrawShapeUtil' +import { EmbedShapeUtil } from '../editor/shapeutils/EmbedShapeUtil/EmbedShapeUtil' +import { FrameShapeUtil } from '../editor/shapeutils/FrameShapeUtil/FrameShapeUtil' +import { GeoShapeUtil } from '../editor/shapeutils/GeoShapeUtil/GeoShapeUtil' +import { GroupShapeUtil } from '../editor/shapeutils/GroupShapeUtil/GroupShapeUtil' +import { HighlightShapeUtil } from '../editor/shapeutils/HighlightShapeUtil/HighlightShapeUtil' +import { ImageShapeUtil } from '../editor/shapeutils/ImageShapeUtil/ImageShapeUtil' +import { LineShapeUtil } from '../editor/shapeutils/LineShapeUtil/LineShapeUtil' +import { NoteShapeUtil } from '../editor/shapeutils/NoteShapeUtil/NoteShapeUtil' +import { TextShapeUtil } from '../editor/shapeutils/TextShapeUtil/TextShapeUtil' +import { VideoShapeUtil } from '../editor/shapeutils/VideoShapeUtil/VideoShapeUtil' import { TLShapeInfo } from './createTLStore' /** @public */ diff --git a/packages/editor/src/lib/config/defaultTools.ts b/packages/editor/src/lib/config/defaultTools.ts index 806e144cd..f2fa1ffcf 100644 --- a/packages/editor/src/lib/config/defaultTools.ts +++ b/packages/editor/src/lib/config/defaultTools.ts @@ -1,15 +1,15 @@ -import { ArrowShapeTool } from '../app/tools/ArrowShapeTool/ArrowShapeTool' -import { DrawShapeTool } from '../app/tools/DrawShapeTool/DrawShapeTool' -import { EraserShapeTool } from '../app/tools/EraserShapeTool/EraserShapeTool' -import { FrameShapeTool } from '../app/tools/FrameShapeTool/FrameShapeTool' -import { GeoShapeTool } from '../app/tools/GeoShapeTool/GeoShapeTool' -import { HandTool } from '../app/tools/HandTool/HandTool' -import { HighlightShapeTool } from '../app/tools/HighlightShapeTool/HighlightShapeTool' -import { LaserTool } from '../app/tools/LaserTool/LaserTool' -import { LineShapeTool } from '../app/tools/LineShapeTool/LineShapeTool' -import { NoteShapeTool } from '../app/tools/NoteShapeTool/NoteShapeTool' -import { TLStateNodeConstructor } from '../app/tools/StateNode' -import { TextShapeTool } from '../app/tools/TextShapeTool/TextShapeTool' +import { ArrowShapeTool } from '../editor/tools/ArrowShapeTool/ArrowShapeTool' +import { DrawShapeTool } from '../editor/tools/DrawShapeTool/DrawShapeTool' +import { EraserShapeTool } from '../editor/tools/EraserShapeTool/EraserShapeTool' +import { FrameShapeTool } from '../editor/tools/FrameShapeTool/FrameShapeTool' +import { GeoShapeTool } from '../editor/tools/GeoShapeTool/GeoShapeTool' +import { HandTool } from '../editor/tools/HandTool/HandTool' +import { HighlightShapeTool } from '../editor/tools/HighlightShapeTool/HighlightShapeTool' +import { LaserTool } from '../editor/tools/LaserTool/LaserTool' +import { LineShapeTool } from '../editor/tools/LineShapeTool/LineShapeTool' +import { NoteShapeTool } from '../editor/tools/NoteShapeTool/NoteShapeTool' +import { TLStateNodeConstructor } from '../editor/tools/StateNode' +import { TextShapeTool } from '../editor/tools/TextShapeTool/TextShapeTool' /** @public */ export const defaultTools: TLStateNodeConstructor[] = [ diff --git a/packages/editor/src/lib/app/Editor.ts b/packages/editor/src/lib/editor/Editor.ts similarity index 100% rename from packages/editor/src/lib/app/Editor.ts rename to packages/editor/src/lib/editor/Editor.ts diff --git a/packages/editor/src/lib/app/derivations/arrowBindingsIndex.test.tsx b/packages/editor/src/lib/editor/derivations/arrowBindingsIndex.test.tsx similarity index 100% rename from packages/editor/src/lib/app/derivations/arrowBindingsIndex.test.tsx rename to packages/editor/src/lib/editor/derivations/arrowBindingsIndex.test.tsx diff --git a/packages/editor/src/lib/app/derivations/arrowBindingsIndex.ts b/packages/editor/src/lib/editor/derivations/arrowBindingsIndex.ts similarity index 100% rename from packages/editor/src/lib/app/derivations/arrowBindingsIndex.ts rename to packages/editor/src/lib/editor/derivations/arrowBindingsIndex.ts diff --git a/packages/editor/src/lib/app/derivations/parentsToChildrenWithIndexes.test.ts b/packages/editor/src/lib/editor/derivations/parentsToChildrenWithIndexes.test.ts similarity index 100% rename from packages/editor/src/lib/app/derivations/parentsToChildrenWithIndexes.test.ts rename to packages/editor/src/lib/editor/derivations/parentsToChildrenWithIndexes.test.ts diff --git a/packages/editor/src/lib/app/derivations/parentsToChildrenWithIndexes.ts b/packages/editor/src/lib/editor/derivations/parentsToChildrenWithIndexes.ts similarity index 100% rename from packages/editor/src/lib/app/derivations/parentsToChildrenWithIndexes.ts rename to packages/editor/src/lib/editor/derivations/parentsToChildrenWithIndexes.ts diff --git a/packages/editor/src/lib/app/derivations/shapeIdsInCurrentPage.test.ts b/packages/editor/src/lib/editor/derivations/shapeIdsInCurrentPage.test.ts similarity index 100% rename from packages/editor/src/lib/app/derivations/shapeIdsInCurrentPage.test.ts rename to packages/editor/src/lib/editor/derivations/shapeIdsInCurrentPage.test.ts diff --git a/packages/editor/src/lib/app/derivations/shapeIdsInCurrentPage.ts b/packages/editor/src/lib/editor/derivations/shapeIdsInCurrentPage.ts similarity index 100% rename from packages/editor/src/lib/app/derivations/shapeIdsInCurrentPage.ts rename to packages/editor/src/lib/editor/derivations/shapeIdsInCurrentPage.ts diff --git a/packages/editor/src/lib/app/managers/ActiveAreaManager.ts b/packages/editor/src/lib/editor/managers/ActiveAreaManager.ts similarity index 100% rename from packages/editor/src/lib/app/managers/ActiveAreaManager.ts rename to packages/editor/src/lib/editor/managers/ActiveAreaManager.ts diff --git a/packages/editor/src/lib/app/managers/CameraManager.ts b/packages/editor/src/lib/editor/managers/CameraManager.ts similarity index 100% rename from packages/editor/src/lib/app/managers/CameraManager.ts rename to packages/editor/src/lib/editor/managers/CameraManager.ts diff --git a/packages/editor/src/lib/app/managers/ClickManager.test.ts b/packages/editor/src/lib/editor/managers/ClickManager.test.ts similarity index 100% rename from packages/editor/src/lib/app/managers/ClickManager.test.ts rename to packages/editor/src/lib/editor/managers/ClickManager.test.ts diff --git a/packages/editor/src/lib/app/managers/ClickManager.ts b/packages/editor/src/lib/editor/managers/ClickManager.ts similarity index 100% rename from packages/editor/src/lib/app/managers/ClickManager.ts rename to packages/editor/src/lib/editor/managers/ClickManager.ts diff --git a/packages/editor/src/lib/app/managers/DprManager.ts b/packages/editor/src/lib/editor/managers/DprManager.ts similarity index 100% rename from packages/editor/src/lib/app/managers/DprManager.ts rename to packages/editor/src/lib/editor/managers/DprManager.ts diff --git a/packages/editor/src/lib/app/managers/DragAndDropManager.ts b/packages/editor/src/lib/editor/managers/DragAndDropManager.ts similarity index 100% rename from packages/editor/src/lib/app/managers/DragAndDropManager.ts rename to packages/editor/src/lib/editor/managers/DragAndDropManager.ts diff --git a/packages/editor/src/lib/app/managers/HistoryManager.test.ts b/packages/editor/src/lib/editor/managers/HistoryManager.test.ts similarity index 100% rename from packages/editor/src/lib/app/managers/HistoryManager.test.ts rename to packages/editor/src/lib/editor/managers/HistoryManager.test.ts diff --git a/packages/editor/src/lib/app/managers/HistoryManager.ts b/packages/editor/src/lib/editor/managers/HistoryManager.ts similarity index 100% rename from packages/editor/src/lib/app/managers/HistoryManager.ts rename to packages/editor/src/lib/editor/managers/HistoryManager.ts diff --git a/packages/editor/src/lib/app/managers/ScribbleManager.ts b/packages/editor/src/lib/editor/managers/ScribbleManager.ts similarity index 100% rename from packages/editor/src/lib/app/managers/ScribbleManager.ts rename to packages/editor/src/lib/editor/managers/ScribbleManager.ts diff --git a/packages/editor/src/lib/app/managers/SnapManager.ts b/packages/editor/src/lib/editor/managers/SnapManager.ts similarity index 100% rename from packages/editor/src/lib/app/managers/SnapManager.ts rename to packages/editor/src/lib/editor/managers/SnapManager.ts diff --git a/packages/editor/src/lib/app/managers/Stack.ts b/packages/editor/src/lib/editor/managers/Stack.ts similarity index 100% rename from packages/editor/src/lib/app/managers/Stack.ts rename to packages/editor/src/lib/editor/managers/Stack.ts diff --git a/packages/editor/src/lib/app/managers/TextManager.ts b/packages/editor/src/lib/editor/managers/TextManager.ts similarity index 100% rename from packages/editor/src/lib/app/managers/TextManager.ts rename to packages/editor/src/lib/editor/managers/TextManager.ts diff --git a/packages/editor/src/lib/app/managers/TickManager.ts b/packages/editor/src/lib/editor/managers/TickManager.ts similarity index 100% rename from packages/editor/src/lib/app/managers/TickManager.ts rename to packages/editor/src/lib/editor/managers/TickManager.ts diff --git a/packages/editor/src/lib/app/managers/UserPreferencesManager.ts b/packages/editor/src/lib/editor/managers/UserPreferencesManager.ts similarity index 100% rename from packages/editor/src/lib/app/managers/UserPreferencesManager.ts rename to packages/editor/src/lib/editor/managers/UserPreferencesManager.ts diff --git a/packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/ArrowShapeUtil.test.ts b/packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/ArrowShapeUtil.test.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/ArrowShapeUtil.test.ts rename to packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/ArrowShapeUtil.test.ts diff --git a/packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/ArrowShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/ArrowShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/ArrowShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/ArrowShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/arrow/arrow-types.ts b/packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/arrow/arrow-types.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/arrow/arrow-types.ts rename to packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/arrow/arrow-types.ts diff --git a/packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/arrow/arrowheads.ts b/packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/arrow/arrowheads.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/arrow/arrowheads.ts rename to packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/arrow/arrowheads.ts diff --git a/packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/arrow/curved-arrow.ts b/packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/arrow/curved-arrow.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/arrow/curved-arrow.ts rename to packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/arrow/curved-arrow.ts diff --git a/packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/arrow/shared.ts b/packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/arrow/shared.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/arrow/shared.ts rename to packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/arrow/shared.ts diff --git a/packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/arrow/straight-arrow.ts b/packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/arrow/straight-arrow.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/arrow/straight-arrow.ts rename to packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/arrow/straight-arrow.ts diff --git a/packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/components/ArrowTextLabel.tsx b/packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/components/ArrowTextLabel.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/components/ArrowTextLabel.tsx rename to packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/components/ArrowTextLabel.tsx diff --git a/packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/components/DashedArrowComponent.tsx b/packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/components/DashedArrowComponent.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/components/DashedArrowComponent.tsx rename to packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/components/DashedArrowComponent.tsx diff --git a/packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/components/DrawArrowComponent.tsx b/packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/components/DrawArrowComponent.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/components/DrawArrowComponent.tsx rename to packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/components/DrawArrowComponent.tsx diff --git a/packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/components/Segment.tsx b/packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/components/Segment.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ArrowShapeUtil/components/Segment.tsx rename to packages/editor/src/lib/editor/shapeutils/ArrowShapeUtil/components/Segment.tsx diff --git a/packages/editor/src/lib/app/shapeutils/BaseBoxShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/BaseBoxShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/BaseBoxShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/BaseBoxShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/BookmarkShapeUtil/BookmarkShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/BookmarkShapeUtil/BookmarkShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/BookmarkShapeUtil/BookmarkShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/BookmarkShapeUtil/BookmarkShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/DrawShapeUtil/DrawShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/DrawShapeUtil/DrawShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/DrawShapeUtil/DrawShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/DrawShapeUtil/DrawShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/DrawShapeUtil/getPath.ts b/packages/editor/src/lib/editor/shapeutils/DrawShapeUtil/getPath.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/DrawShapeUtil/getPath.ts rename to packages/editor/src/lib/editor/shapeutils/DrawShapeUtil/getPath.ts diff --git a/packages/editor/src/lib/app/shapeutils/EmbedShapeUtil/EmbedShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/EmbedShapeUtil/EmbedShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/EmbedShapeUtil/EmbedShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/EmbedShapeUtil/EmbedShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/FrameShapeUtil/FrameShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/FrameShapeUtil/FrameShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/FrameShapeUtil/FrameShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/FrameShapeUtil/FrameShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/FrameShapeUtil/components/FrameHeading.tsx b/packages/editor/src/lib/editor/shapeutils/FrameShapeUtil/components/FrameHeading.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/FrameShapeUtil/components/FrameHeading.tsx rename to packages/editor/src/lib/editor/shapeutils/FrameShapeUtil/components/FrameHeading.tsx diff --git a/packages/editor/src/lib/app/shapeutils/FrameShapeUtil/components/FrameLabelInput.tsx b/packages/editor/src/lib/editor/shapeutils/FrameShapeUtil/components/FrameLabelInput.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/FrameShapeUtil/components/FrameLabelInput.tsx rename to packages/editor/src/lib/editor/shapeutils/FrameShapeUtil/components/FrameLabelInput.tsx diff --git a/packages/editor/src/lib/app/shapeutils/GeoShapeUtil/GeoShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/GeoShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/GeoShapeUtil/GeoShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/GeoShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/DashStyleEllipse.tsx b/packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/DashStyleEllipse.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/DashStyleEllipse.tsx rename to packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/DashStyleEllipse.tsx diff --git a/packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/DashStyleOval.tsx b/packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/DashStyleOval.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/DashStyleOval.tsx rename to packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/DashStyleOval.tsx diff --git a/packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/DashStylePolygon.tsx b/packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/DashStylePolygon.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/DashStylePolygon.tsx rename to packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/DashStylePolygon.tsx diff --git a/packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/DrawStyleEllipse.tsx b/packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/DrawStyleEllipse.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/DrawStyleEllipse.tsx rename to packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/DrawStyleEllipse.tsx diff --git a/packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/DrawStylePolygon.tsx b/packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/DrawStylePolygon.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/DrawStylePolygon.tsx rename to packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/DrawStylePolygon.tsx diff --git a/packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/SolidStyleEllipse.tsx b/packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/SolidStyleEllipse.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/SolidStyleEllipse.tsx rename to packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/SolidStyleEllipse.tsx diff --git a/packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/SolidStyleOval.tsx b/packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/SolidStyleOval.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/SolidStyleOval.tsx rename to packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/SolidStyleOval.tsx diff --git a/packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/SolidStylePolygon.tsx b/packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/SolidStylePolygon.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/GeoShapeUtil/components/SolidStylePolygon.tsx rename to packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/components/SolidStylePolygon.tsx diff --git a/packages/editor/src/lib/app/shapeutils/GeoShapeUtil/helpers.ts b/packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/helpers.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/GeoShapeUtil/helpers.ts rename to packages/editor/src/lib/editor/shapeutils/GeoShapeUtil/helpers.ts diff --git a/packages/editor/src/lib/app/shapeutils/GroupShapeUtil/GroupShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/GroupShapeUtil/GroupShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/GroupShapeUtil/GroupShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/GroupShapeUtil/GroupShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/HighlightShapeUtil/HighlightShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/HighlightShapeUtil/HighlightShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/HighlightShapeUtil/HighlightShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/HighlightShapeUtil/HighlightShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/IconShapeUtil/IconShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/IconShapeUtil/IconShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/IconShapeUtil/IconShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/IconShapeUtil/IconShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/ImageShapeUtil/ImageShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/ImageShapeUtil/ImageShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ImageShapeUtil/ImageShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/ImageShapeUtil/ImageShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/LineShapeUtil/LineShapeUtil.test.ts b/packages/editor/src/lib/editor/shapeutils/LineShapeUtil/LineShapeUtil.test.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/LineShapeUtil/LineShapeUtil.test.ts rename to packages/editor/src/lib/editor/shapeutils/LineShapeUtil/LineShapeUtil.test.ts diff --git a/packages/editor/src/lib/app/shapeutils/LineShapeUtil/LineShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/LineShapeUtil/LineShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/LineShapeUtil/LineShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/LineShapeUtil/LineShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/LineShapeUtil/__snapshots__/LineShapeUtil.test.ts.snap b/packages/editor/src/lib/editor/shapeutils/LineShapeUtil/__snapshots__/LineShapeUtil.test.ts.snap similarity index 100% rename from packages/editor/src/lib/app/shapeutils/LineShapeUtil/__snapshots__/LineShapeUtil.test.ts.snap rename to packages/editor/src/lib/editor/shapeutils/LineShapeUtil/__snapshots__/LineShapeUtil.test.ts.snap diff --git a/packages/editor/src/lib/app/shapeutils/LineShapeUtil/components/getLinePath.ts b/packages/editor/src/lib/editor/shapeutils/LineShapeUtil/components/getLinePath.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/LineShapeUtil/components/getLinePath.ts rename to packages/editor/src/lib/editor/shapeutils/LineShapeUtil/components/getLinePath.ts diff --git a/packages/editor/src/lib/app/shapeutils/LineShapeUtil/components/getLineSvg.ts b/packages/editor/src/lib/editor/shapeutils/LineShapeUtil/components/getLineSvg.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/LineShapeUtil/components/getLineSvg.ts rename to packages/editor/src/lib/editor/shapeutils/LineShapeUtil/components/getLineSvg.ts diff --git a/packages/editor/src/lib/app/shapeutils/NoteShapeUtil/NoteShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/NoteShapeUtil/NoteShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/NoteShapeUtil/NoteShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/NoteShapeUtil/NoteShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/ShapeUtil.ts b/packages/editor/src/lib/editor/shapeutils/ShapeUtil.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/ShapeUtil.ts rename to packages/editor/src/lib/editor/shapeutils/ShapeUtil.ts diff --git a/packages/editor/src/lib/app/shapeutils/TextShapeUtil/TextHelpers.ts b/packages/editor/src/lib/editor/shapeutils/TextShapeUtil/TextHelpers.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/TextShapeUtil/TextHelpers.ts rename to packages/editor/src/lib/editor/shapeutils/TextShapeUtil/TextHelpers.ts diff --git a/packages/editor/src/lib/app/shapeutils/TextShapeUtil/TextShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/TextShapeUtil/TextShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/TextShapeUtil/TextShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/TextShapeUtil/TextShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/VideoShapeUtil/VideoShapeUtil.tsx b/packages/editor/src/lib/editor/shapeutils/VideoShapeUtil/VideoShapeUtil.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/VideoShapeUtil/VideoShapeUtil.tsx rename to packages/editor/src/lib/editor/shapeutils/VideoShapeUtil/VideoShapeUtil.tsx diff --git a/packages/editor/src/lib/app/shapeutils/shared/DashedOutlineBox.tsx b/packages/editor/src/lib/editor/shapeutils/shared/DashedOutlineBox.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/DashedOutlineBox.tsx rename to packages/editor/src/lib/editor/shapeutils/shared/DashedOutlineBox.tsx diff --git a/packages/editor/src/lib/app/shapeutils/shared/HyperlinkButton.tsx b/packages/editor/src/lib/editor/shapeutils/shared/HyperlinkButton.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/HyperlinkButton.tsx rename to packages/editor/src/lib/editor/shapeutils/shared/HyperlinkButton.tsx diff --git a/packages/editor/src/lib/app/shapeutils/shared/ShapeFill.tsx b/packages/editor/src/lib/editor/shapeutils/shared/ShapeFill.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/ShapeFill.tsx rename to packages/editor/src/lib/editor/shapeutils/shared/ShapeFill.tsx diff --git a/packages/editor/src/lib/app/shapeutils/shared/TLExportColors.ts b/packages/editor/src/lib/editor/shapeutils/shared/TLExportColors.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/TLExportColors.ts rename to packages/editor/src/lib/editor/shapeutils/shared/TLExportColors.ts diff --git a/packages/editor/src/lib/app/shapeutils/shared/TextLabel.tsx b/packages/editor/src/lib/editor/shapeutils/shared/TextLabel.tsx similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/TextLabel.tsx rename to packages/editor/src/lib/editor/shapeutils/shared/TextLabel.tsx diff --git a/packages/editor/src/lib/app/shapeutils/shared/createTextSvgElementFromSpans.ts b/packages/editor/src/lib/editor/shapeutils/shared/createTextSvgElementFromSpans.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/createTextSvgElementFromSpans.ts rename to packages/editor/src/lib/editor/shapeutils/shared/createTextSvgElementFromSpans.ts diff --git a/packages/editor/src/lib/app/shapeutils/shared/getDrawStrokeInfo.ts b/packages/editor/src/lib/editor/shapeutils/shared/getDrawStrokeInfo.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/getDrawStrokeInfo.ts rename to packages/editor/src/lib/editor/shapeutils/shared/getDrawStrokeInfo.ts diff --git a/packages/editor/src/lib/app/shapeutils/shared/getPerfectDashProps.ts b/packages/editor/src/lib/editor/shapeutils/shared/getPerfectDashProps.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/getPerfectDashProps.ts rename to packages/editor/src/lib/editor/shapeutils/shared/getPerfectDashProps.ts diff --git a/packages/editor/src/lib/app/shapeutils/shared/getStrokeDashArray.ts b/packages/editor/src/lib/editor/shapeutils/shared/getStrokeDashArray.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/getStrokeDashArray.ts rename to packages/editor/src/lib/editor/shapeutils/shared/getStrokeDashArray.ts diff --git a/packages/editor/src/lib/app/shapeutils/shared/getTextLabelSvgElement.ts b/packages/editor/src/lib/editor/shapeutils/shared/getTextLabelSvgElement.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/getTextLabelSvgElement.ts rename to packages/editor/src/lib/editor/shapeutils/shared/getTextLabelSvgElement.ts diff --git a/packages/editor/src/lib/app/shapeutils/shared/isBlackColor.ts b/packages/editor/src/lib/editor/shapeutils/shared/isBlackColor.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/isBlackColor.ts rename to packages/editor/src/lib/editor/shapeutils/shared/isBlackColor.ts diff --git a/packages/editor/src/lib/app/shapeutils/shared/resizeBox.ts b/packages/editor/src/lib/editor/shapeutils/shared/resizeBox.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/resizeBox.ts rename to packages/editor/src/lib/editor/shapeutils/shared/resizeBox.ts diff --git a/packages/editor/src/lib/app/shapeutils/shared/resizeScaled.ts b/packages/editor/src/lib/editor/shapeutils/shared/resizeScaled.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/resizeScaled.ts rename to packages/editor/src/lib/editor/shapeutils/shared/resizeScaled.ts diff --git a/packages/editor/src/lib/app/shapeutils/shared/useEditableText.ts b/packages/editor/src/lib/editor/shapeutils/shared/useEditableText.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/useEditableText.ts rename to packages/editor/src/lib/editor/shapeutils/shared/useEditableText.ts diff --git a/packages/editor/src/lib/app/shapeutils/shared/useForceSolid.ts b/packages/editor/src/lib/editor/shapeutils/shared/useForceSolid.ts similarity index 100% rename from packages/editor/src/lib/app/shapeutils/shared/useForceSolid.ts rename to packages/editor/src/lib/editor/shapeutils/shared/useForceSolid.ts diff --git a/packages/editor/src/lib/app/tools/ArrowShapeTool/ArrowShapeTool.ts b/packages/editor/src/lib/editor/tools/ArrowShapeTool/ArrowShapeTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/ArrowShapeTool/ArrowShapeTool.ts rename to packages/editor/src/lib/editor/tools/ArrowShapeTool/ArrowShapeTool.ts diff --git a/packages/editor/src/lib/app/tools/ArrowShapeTool/children/Idle.ts b/packages/editor/src/lib/editor/tools/ArrowShapeTool/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/ArrowShapeTool/children/Idle.ts rename to packages/editor/src/lib/editor/tools/ArrowShapeTool/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/ArrowShapeTool/children/Pointing.ts b/packages/editor/src/lib/editor/tools/ArrowShapeTool/children/Pointing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/ArrowShapeTool/children/Pointing.ts rename to packages/editor/src/lib/editor/tools/ArrowShapeTool/children/Pointing.ts diff --git a/packages/editor/src/lib/app/tools/BaseBoxShapeTool/BaseBoxShapeTool.ts b/packages/editor/src/lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/BaseBoxShapeTool/BaseBoxShapeTool.ts rename to packages/editor/src/lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool.ts diff --git a/packages/editor/src/lib/app/tools/BaseBoxShapeTool/children/Idle.ts b/packages/editor/src/lib/editor/tools/BaseBoxShapeTool/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/BaseBoxShapeTool/children/Idle.ts rename to packages/editor/src/lib/editor/tools/BaseBoxShapeTool/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/BaseBoxShapeTool/children/Pointing.ts b/packages/editor/src/lib/editor/tools/BaseBoxShapeTool/children/Pointing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/BaseBoxShapeTool/children/Pointing.ts rename to packages/editor/src/lib/editor/tools/BaseBoxShapeTool/children/Pointing.ts diff --git a/packages/editor/src/lib/app/tools/DrawShapeTool/DrawShapeTool.ts b/packages/editor/src/lib/editor/tools/DrawShapeTool/DrawShapeTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/DrawShapeTool/DrawShapeTool.ts rename to packages/editor/src/lib/editor/tools/DrawShapeTool/DrawShapeTool.ts diff --git a/packages/editor/src/lib/app/tools/DrawShapeTool/children/Drawing.ts b/packages/editor/src/lib/editor/tools/DrawShapeTool/children/Drawing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/DrawShapeTool/children/Drawing.ts rename to packages/editor/src/lib/editor/tools/DrawShapeTool/children/Drawing.ts diff --git a/packages/editor/src/lib/app/tools/DrawShapeTool/children/Idle.ts b/packages/editor/src/lib/editor/tools/DrawShapeTool/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/DrawShapeTool/children/Idle.ts rename to packages/editor/src/lib/editor/tools/DrawShapeTool/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/EraserShapeTool/EraserShapeTool.ts b/packages/editor/src/lib/editor/tools/EraserShapeTool/EraserShapeTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/EraserShapeTool/EraserShapeTool.ts rename to packages/editor/src/lib/editor/tools/EraserShapeTool/EraserShapeTool.ts diff --git a/packages/editor/src/lib/app/tools/EraserShapeTool/children/Erasing.ts b/packages/editor/src/lib/editor/tools/EraserShapeTool/children/Erasing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/EraserShapeTool/children/Erasing.ts rename to packages/editor/src/lib/editor/tools/EraserShapeTool/children/Erasing.ts diff --git a/packages/editor/src/lib/app/tools/EraserShapeTool/children/Idle.ts b/packages/editor/src/lib/editor/tools/EraserShapeTool/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/EraserShapeTool/children/Idle.ts rename to packages/editor/src/lib/editor/tools/EraserShapeTool/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/EraserShapeTool/children/Pointing.ts b/packages/editor/src/lib/editor/tools/EraserShapeTool/children/Pointing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/EraserShapeTool/children/Pointing.ts rename to packages/editor/src/lib/editor/tools/EraserShapeTool/children/Pointing.ts diff --git a/packages/editor/src/lib/app/tools/FrameShapeTool/FrameShapeTool.ts b/packages/editor/src/lib/editor/tools/FrameShapeTool/FrameShapeTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/FrameShapeTool/FrameShapeTool.ts rename to packages/editor/src/lib/editor/tools/FrameShapeTool/FrameShapeTool.ts diff --git a/packages/editor/src/lib/app/tools/GeoShapeTool/GeoShapeTool.ts b/packages/editor/src/lib/editor/tools/GeoShapeTool/GeoShapeTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/GeoShapeTool/GeoShapeTool.ts rename to packages/editor/src/lib/editor/tools/GeoShapeTool/GeoShapeTool.ts diff --git a/packages/editor/src/lib/app/tools/GeoShapeTool/children/Idle.ts b/packages/editor/src/lib/editor/tools/GeoShapeTool/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/GeoShapeTool/children/Idle.ts rename to packages/editor/src/lib/editor/tools/GeoShapeTool/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/GeoShapeTool/children/Pointing.ts b/packages/editor/src/lib/editor/tools/GeoShapeTool/children/Pointing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/GeoShapeTool/children/Pointing.ts rename to packages/editor/src/lib/editor/tools/GeoShapeTool/children/Pointing.ts diff --git a/packages/editor/src/lib/app/tools/HandTool/HandTool.ts b/packages/editor/src/lib/editor/tools/HandTool/HandTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/HandTool/HandTool.ts rename to packages/editor/src/lib/editor/tools/HandTool/HandTool.ts diff --git a/packages/editor/src/lib/app/tools/HandTool/children/Dragging.ts b/packages/editor/src/lib/editor/tools/HandTool/children/Dragging.ts similarity index 100% rename from packages/editor/src/lib/app/tools/HandTool/children/Dragging.ts rename to packages/editor/src/lib/editor/tools/HandTool/children/Dragging.ts diff --git a/packages/editor/src/lib/app/tools/HandTool/children/Idle.ts b/packages/editor/src/lib/editor/tools/HandTool/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/HandTool/children/Idle.ts rename to packages/editor/src/lib/editor/tools/HandTool/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/HandTool/children/Pointing.ts b/packages/editor/src/lib/editor/tools/HandTool/children/Pointing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/HandTool/children/Pointing.ts rename to packages/editor/src/lib/editor/tools/HandTool/children/Pointing.ts diff --git a/packages/editor/src/lib/app/tools/HighlightShapeTool/HighlightShapeTool.ts b/packages/editor/src/lib/editor/tools/HighlightShapeTool/HighlightShapeTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/HighlightShapeTool/HighlightShapeTool.ts rename to packages/editor/src/lib/editor/tools/HighlightShapeTool/HighlightShapeTool.ts diff --git a/packages/editor/src/lib/app/tools/LaserTool/LaserTool.ts b/packages/editor/src/lib/editor/tools/LaserTool/LaserTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/LaserTool/LaserTool.ts rename to packages/editor/src/lib/editor/tools/LaserTool/LaserTool.ts diff --git a/packages/editor/src/lib/app/tools/LaserTool/children/Idle.ts b/packages/editor/src/lib/editor/tools/LaserTool/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/LaserTool/children/Idle.ts rename to packages/editor/src/lib/editor/tools/LaserTool/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/LaserTool/children/Lasering.ts b/packages/editor/src/lib/editor/tools/LaserTool/children/Lasering.ts similarity index 100% rename from packages/editor/src/lib/app/tools/LaserTool/children/Lasering.ts rename to packages/editor/src/lib/editor/tools/LaserTool/children/Lasering.ts diff --git a/packages/editor/src/lib/app/tools/LineShapeTool/LineShapeTool.ts b/packages/editor/src/lib/editor/tools/LineShapeTool/LineShapeTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/LineShapeTool/LineShapeTool.ts rename to packages/editor/src/lib/editor/tools/LineShapeTool/LineShapeTool.ts diff --git a/packages/editor/src/lib/app/tools/LineShapeTool/children/Idle.ts b/packages/editor/src/lib/editor/tools/LineShapeTool/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/LineShapeTool/children/Idle.ts rename to packages/editor/src/lib/editor/tools/LineShapeTool/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/LineShapeTool/children/Pointing.ts b/packages/editor/src/lib/editor/tools/LineShapeTool/children/Pointing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/LineShapeTool/children/Pointing.ts rename to packages/editor/src/lib/editor/tools/LineShapeTool/children/Pointing.ts diff --git a/packages/editor/src/lib/app/tools/LineShapeTool/shared.ts b/packages/editor/src/lib/editor/tools/LineShapeTool/shared.ts similarity index 100% rename from packages/editor/src/lib/app/tools/LineShapeTool/shared.ts rename to packages/editor/src/lib/editor/tools/LineShapeTool/shared.ts diff --git a/packages/editor/src/lib/app/tools/NoteShapeTool/NoteShapeTool.ts b/packages/editor/src/lib/editor/tools/NoteShapeTool/NoteShapeTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/NoteShapeTool/NoteShapeTool.ts rename to packages/editor/src/lib/editor/tools/NoteShapeTool/NoteShapeTool.ts diff --git a/packages/editor/src/lib/app/tools/NoteShapeTool/children/Idle.ts b/packages/editor/src/lib/editor/tools/NoteShapeTool/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/NoteShapeTool/children/Idle.ts rename to packages/editor/src/lib/editor/tools/NoteShapeTool/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/NoteShapeTool/children/Pointing.ts b/packages/editor/src/lib/editor/tools/NoteShapeTool/children/Pointing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/NoteShapeTool/children/Pointing.ts rename to packages/editor/src/lib/editor/tools/NoteShapeTool/children/Pointing.ts diff --git a/packages/editor/src/lib/app/tools/RootState.ts b/packages/editor/src/lib/editor/tools/RootState.ts similarity index 100% rename from packages/editor/src/lib/app/tools/RootState.ts rename to packages/editor/src/lib/editor/tools/RootState.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/SelectTool.ts b/packages/editor/src/lib/editor/tools/SelectTool/SelectTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/SelectTool.ts rename to packages/editor/src/lib/editor/tools/SelectTool/SelectTool.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/Brushing.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/Brushing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/Brushing.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/Brushing.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/Crop/Crop.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/Crop/Crop.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/Crop/Crop.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/Crop/Crop.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/Crop/children/Idle.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/Crop/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/Crop/children/Idle.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/Crop/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/Crop/children/PointingCrop.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/Crop/children/PointingCrop.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/Crop/children/PointingCrop.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/Crop/children/PointingCrop.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/Crop/children/TranslatingCrop.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/Crop/children/TranslatingCrop.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/Crop/children/TranslatingCrop.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/Crop/children/TranslatingCrop.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/Crop/children/crop_helpers.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/Crop/children/crop_helpers.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/Crop/children/crop_helpers.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/Crop/children/crop_helpers.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/Cropping.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/Cropping.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/Cropping.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/Cropping.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/DraggingHandle.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/DraggingHandle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/DraggingHandle.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/DraggingHandle.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/EditingShape.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/EditingShape.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/EditingShape.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/EditingShape.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/Idle.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/Idle.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/PointingCanvas.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/PointingCanvas.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/PointingCanvas.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/PointingCanvas.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/PointingCropHandle.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/PointingCropHandle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/PointingCropHandle.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/PointingCropHandle.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/PointingHandle.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/PointingHandle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/PointingHandle.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/PointingHandle.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/PointingResizeHandle.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/PointingResizeHandle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/PointingResizeHandle.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/PointingResizeHandle.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/PointingRotateHandle.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/PointingRotateHandle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/PointingRotateHandle.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/PointingRotateHandle.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/PointingSelection.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/PointingSelection.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/PointingSelection.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/PointingSelection.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/PointingShape.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/PointingShape.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/PointingShape.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/PointingShape.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/Resizing.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/Resizing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/Resizing.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/Resizing.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/Rotating.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/Rotating.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/Rotating.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/Rotating.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/ScribbleBrushing.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/ScribbleBrushing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/ScribbleBrushing.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/ScribbleBrushing.ts diff --git a/packages/editor/src/lib/app/tools/SelectTool/children/Translating.ts b/packages/editor/src/lib/editor/tools/SelectTool/children/Translating.ts similarity index 100% rename from packages/editor/src/lib/app/tools/SelectTool/children/Translating.ts rename to packages/editor/src/lib/editor/tools/SelectTool/children/Translating.ts diff --git a/packages/editor/src/lib/app/tools/StateNode.ts b/packages/editor/src/lib/editor/tools/StateNode.ts similarity index 100% rename from packages/editor/src/lib/app/tools/StateNode.ts rename to packages/editor/src/lib/editor/tools/StateNode.ts diff --git a/packages/editor/src/lib/app/tools/TextShapeTool/TextShapeTool.ts b/packages/editor/src/lib/editor/tools/TextShapeTool/TextShapeTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/TextShapeTool/TextShapeTool.ts rename to packages/editor/src/lib/editor/tools/TextShapeTool/TextShapeTool.ts diff --git a/packages/editor/src/lib/app/tools/TextShapeTool/children/Idle.ts b/packages/editor/src/lib/editor/tools/TextShapeTool/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/TextShapeTool/children/Idle.ts rename to packages/editor/src/lib/editor/tools/TextShapeTool/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/TextShapeTool/children/Pointing.ts b/packages/editor/src/lib/editor/tools/TextShapeTool/children/Pointing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/TextShapeTool/children/Pointing.ts rename to packages/editor/src/lib/editor/tools/TextShapeTool/children/Pointing.ts diff --git a/packages/editor/src/lib/app/tools/ZoomTool/ZoomTool.ts b/packages/editor/src/lib/editor/tools/ZoomTool/ZoomTool.ts similarity index 100% rename from packages/editor/src/lib/app/tools/ZoomTool/ZoomTool.ts rename to packages/editor/src/lib/editor/tools/ZoomTool/ZoomTool.ts diff --git a/packages/editor/src/lib/app/tools/ZoomTool/children/Idle.ts b/packages/editor/src/lib/editor/tools/ZoomTool/children/Idle.ts similarity index 100% rename from packages/editor/src/lib/app/tools/ZoomTool/children/Idle.ts rename to packages/editor/src/lib/editor/tools/ZoomTool/children/Idle.ts diff --git a/packages/editor/src/lib/app/tools/ZoomTool/children/Pointing.ts b/packages/editor/src/lib/editor/tools/ZoomTool/children/Pointing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/ZoomTool/children/Pointing.ts rename to packages/editor/src/lib/editor/tools/ZoomTool/children/Pointing.ts diff --git a/packages/editor/src/lib/app/tools/ZoomTool/children/ZoomBrushing.ts b/packages/editor/src/lib/editor/tools/ZoomTool/children/ZoomBrushing.ts similarity index 100% rename from packages/editor/src/lib/app/tools/ZoomTool/children/ZoomBrushing.ts rename to packages/editor/src/lib/editor/tools/ZoomTool/children/ZoomBrushing.ts diff --git a/packages/editor/src/lib/app/types/clipboard-types.ts b/packages/editor/src/lib/editor/types/clipboard-types.ts similarity index 100% rename from packages/editor/src/lib/app/types/clipboard-types.ts rename to packages/editor/src/lib/editor/types/clipboard-types.ts diff --git a/packages/editor/src/lib/app/types/emit-types.ts b/packages/editor/src/lib/editor/types/emit-types.ts similarity index 100% rename from packages/editor/src/lib/app/types/emit-types.ts rename to packages/editor/src/lib/editor/types/emit-types.ts diff --git a/packages/editor/src/lib/app/types/event-types.ts b/packages/editor/src/lib/editor/types/event-types.ts similarity index 100% rename from packages/editor/src/lib/app/types/event-types.ts rename to packages/editor/src/lib/editor/types/event-types.ts diff --git a/packages/editor/src/lib/app/types/history-types.ts b/packages/editor/src/lib/editor/types/history-types.ts similarity index 100% rename from packages/editor/src/lib/app/types/history-types.ts rename to packages/editor/src/lib/editor/types/history-types.ts diff --git a/packages/editor/src/lib/app/types/misc-types.ts b/packages/editor/src/lib/editor/types/misc-types.ts similarity index 100% rename from packages/editor/src/lib/app/types/misc-types.ts rename to packages/editor/src/lib/editor/types/misc-types.ts diff --git a/packages/editor/src/lib/app/types/selection-types.ts b/packages/editor/src/lib/editor/types/selection-types.ts similarity index 100% rename from packages/editor/src/lib/app/types/selection-types.ts rename to packages/editor/src/lib/editor/types/selection-types.ts diff --git a/packages/editor/src/lib/hooks/useDocumentEvents.ts b/packages/editor/src/lib/hooks/useDocumentEvents.ts index 69e9928ee..515309119 100644 --- a/packages/editor/src/lib/hooks/useDocumentEvents.ts +++ b/packages/editor/src/lib/hooks/useDocumentEvents.ts @@ -1,6 +1,6 @@ import { useEffect } from 'react' import { useValue } from 'signia-react' -import { TLKeyboardEventInfo, TLPointerEventInfo } from '../app/types/event-types' +import { TLKeyboardEventInfo, TLPointerEventInfo } from '../editor/types/event-types' import { preventDefault } from '../utils/dom' import { useContainer } from './useContainer' import { useEditor } from './useEditor' diff --git a/packages/editor/src/lib/hooks/useEditor.ts b/packages/editor/src/lib/hooks/useEditor.ts index 76e1ede5b..49f5d3a59 100644 --- a/packages/editor/src/lib/hooks/useEditor.ts +++ b/packages/editor/src/lib/hooks/useEditor.ts @@ -1,5 +1,5 @@ import React from 'react' -import { Editor } from '../app/Editor' +import { Editor } from '../editor/Editor' export const EditorContext = React.createContext({} as Editor) diff --git a/packages/editor/src/lib/hooks/useGestureEvents.ts b/packages/editor/src/lib/hooks/useGestureEvents.ts index 1e4ed56df..b8715cc2f 100644 --- a/packages/editor/src/lib/hooks/useGestureEvents.ts +++ b/packages/editor/src/lib/hooks/useGestureEvents.ts @@ -3,7 +3,7 @@ import type { AnyHandlerEventTypes, EventTypes, GestureKey, Handler } from '@use import { createUseGesture, pinchAction, wheelAction } from '@use-gesture/react' import throttle from 'lodash.throttle' import * as React from 'react' -import { TLWheelEventInfo } from '../app/types/event-types' +import { TLWheelEventInfo } from '../editor/types/event-types' import { preventDefault } from '../utils/dom' import { normalizeWheel } from './shared' import { useEditor } from './useEditor' diff --git a/packages/editor/src/lib/hooks/useHandleEvents.ts b/packages/editor/src/lib/hooks/useHandleEvents.ts index 8671912b1..44ba47dd7 100644 --- a/packages/editor/src/lib/hooks/useHandleEvents.ts +++ b/packages/editor/src/lib/hooks/useHandleEvents.ts @@ -1,6 +1,6 @@ import { TLArrowShape, TLLineShape, TLShapeId } from '@tldraw/tlschema' import * as React from 'react' -import { Editor } from '../app/Editor' +import { Editor } from '../editor/Editor' import { loopToHtmlElement, releasePointerCapture, setPointerCapture } from '../utils/dom' import { getPointerInfo } from '../utils/svg' import { useEditor } from './useEditor' diff --git a/packages/editor/src/lib/hooks/useSelectionEvents.ts b/packages/editor/src/lib/hooks/useSelectionEvents.ts index 0ab73a941..fd92fee9e 100644 --- a/packages/editor/src/lib/hooks/useSelectionEvents.ts +++ b/packages/editor/src/lib/hooks/useSelectionEvents.ts @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import { TLSelectionHandle } from '../app/types/selection-types' +import { TLSelectionHandle } from '../editor/types/selection-types' import { loopToHtmlElement, releasePointerCapture, setPointerCapture } from '../utils/dom' import { getPointerInfo } from '../utils/svg' import { useEditor } from './useEditor' diff --git a/packages/editor/src/lib/hooks/useShapeEvents.ts b/packages/editor/src/lib/hooks/useShapeEvents.ts index b24d648c0..eaae66a06 100644 --- a/packages/editor/src/lib/hooks/useShapeEvents.ts +++ b/packages/editor/src/lib/hooks/useShapeEvents.ts @@ -1,7 +1,7 @@ import { TLShapeId } from '@tldraw/tlschema' import React from 'react' -import { Editor } from '../app/Editor' -import { TLPointerEventName } from '../app/types/event-types' +import { Editor } from '../editor/Editor' +import { TLPointerEventName } from '../editor/types/event-types' import { preventDefault, releasePointerCapture, setPointerCapture } from '../utils/dom' import { getPointerInfo } from '../utils/svg' import { useEditor } from './useEditor' diff --git a/packages/editor/src/lib/test/TestEditor.ts b/packages/editor/src/lib/test/TestEditor.ts index 6b0541dfe..75d78fca7 100644 --- a/packages/editor/src/lib/test/TestEditor.ts +++ b/packages/editor/src/lib/test/TestEditor.ts @@ -15,19 +15,19 @@ import { TLShapePartial, createShapeId, } from '@tldraw/tlschema' -import { Editor, TLEditorOptions } from '../app/Editor' -import { TLContent } from '../app/types/clipboard-types' +import { createTLStore } from '../config/createTLStore' +import { defaultShapes } from '../config/defaultShapes' +import { defaultTools } from '../config/defaultTools' +import { Editor, TLEditorOptions } from '../editor/Editor' +import { TLContent } from '../editor/types/clipboard-types' import { TLEventInfo, TLKeyboardEventInfo, TLPinchEventInfo, TLPointerEventInfo, TLWheelEventInfo, -} from '../app/types/event-types' -import { RequiredKeys } from '../app/types/misc-types' -import { createTLStore } from '../config/createTLStore' -import { defaultShapes } from '../config/defaultShapes' -import { defaultTools } from '../config/defaultTools' +} from '../editor/types/event-types' +import { RequiredKeys } from '../editor/types/misc-types' import { shapesFromJsx } from './jsx' jest.useFakeTimers() diff --git a/packages/editor/src/lib/test/TldrawEditor.test.tsx b/packages/editor/src/lib/test/TldrawEditor.test.tsx index 68cee18dd..e42d2523e 100644 --- a/packages/editor/src/lib/test/TldrawEditor.test.tsx +++ b/packages/editor/src/lib/test/TldrawEditor.test.tsx @@ -1,12 +1,12 @@ import { act, render, screen } from '@testing-library/react' import { TLBaseShape, TLOpacityType, createShapeId } from '@tldraw/tlschema' import { TldrawEditor } from '../TldrawEditor' -import { Editor } from '../app/Editor' -import { BaseBoxShapeUtil } from '../app/shapeutils/BaseBoxShapeUtil' -import { BaseBoxShapeTool } from '../app/tools/BaseBoxShapeTool/BaseBoxShapeTool' import { Canvas } from '../components/Canvas' import { HTMLContainer } from '../components/HTMLContainer' import { createTLStore } from '../config/createTLStore' +import { Editor } from '../editor/Editor' +import { BaseBoxShapeUtil } from '../editor/shapeutils/BaseBoxShapeUtil' +import { BaseBoxShapeTool } from '../editor/tools/BaseBoxShapeTool/BaseBoxShapeTool' let originalFetch: typeof window.fetch beforeEach(() => { diff --git a/packages/editor/src/lib/test/commands/putContent.test.ts b/packages/editor/src/lib/test/commands/putContent.test.ts index 083bf73fc..8d3f1928d 100644 --- a/packages/editor/src/lib/test/commands/putContent.test.ts +++ b/packages/editor/src/lib/test/commands/putContent.test.ts @@ -1,5 +1,5 @@ import { structuredClone } from '@tldraw/utils' -import { TLContent } from '../../app/types/clipboard-types' +import { TLContent } from '../../editor/types/clipboard-types' import { TestEditor } from '../TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/commands/rotateShapes.test.ts b/packages/editor/src/lib/test/commands/rotateShapes.test.ts index 6e8e6d613..5766452b2 100644 --- a/packages/editor/src/lib/test/commands/rotateShapes.test.ts +++ b/packages/editor/src/lib/test/commands/rotateShapes.test.ts @@ -1,5 +1,5 @@ import { createShapeId } from '@tldraw/tlschema' -import { GeoShapeUtil } from '../../app/shapeutils/GeoShapeUtil/GeoShapeUtil' +import { GeoShapeUtil } from '../../editor/shapeutils/GeoShapeUtil/GeoShapeUtil' import { TestEditor } from '../TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/resizeBox.test.ts b/packages/editor/src/lib/test/resizeBox.test.ts index b09fbb61d..9a3d66c36 100644 --- a/packages/editor/src/lib/test/resizeBox.test.ts +++ b/packages/editor/src/lib/test/resizeBox.test.ts @@ -1,6 +1,6 @@ import { Box2d } from '@tldraw/primitives' import { TLGeoShape, createShapeId } from '@tldraw/tlschema' -import { resizeBox } from '../app/shapeutils/shared/resizeBox' +import { resizeBox } from '../editor/shapeutils/shared/resizeBox' import { TestEditor } from './TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/shapeutils.test.ts b/packages/editor/src/lib/test/shapeutils.test.ts index 5c2748880..3529295fa 100644 --- a/packages/editor/src/lib/test/shapeutils.test.ts +++ b/packages/editor/src/lib/test/shapeutils.test.ts @@ -1,6 +1,6 @@ import { createShapeId } from '@tldraw/tlschema' -import { FrameShapeUtil } from '../app/shapeutils/FrameShapeUtil/FrameShapeUtil' -import { GeoShapeUtil } from '../app/shapeutils/GeoShapeUtil/GeoShapeUtil' +import { FrameShapeUtil } from '../editor/shapeutils/FrameShapeUtil/FrameShapeUtil' +import { GeoShapeUtil } from '../editor/shapeutils/GeoShapeUtil/GeoShapeUtil' import { TestEditor } from './TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/testutils/getSnapLines.ts b/packages/editor/src/lib/test/testutils/getSnapLines.ts index fbb20769b..bcbe25e4f 100644 --- a/packages/editor/src/lib/test/testutils/getSnapLines.ts +++ b/packages/editor/src/lib/test/testutils/getSnapLines.ts @@ -1,4 +1,4 @@ -import type { Editor } from '../../app/Editor' +import type { Editor } from '../../editor/Editor' const simplifyNumber = (n: number) => { if (Math.abs(Math.round(n) - n) < 0.0001) { diff --git a/packages/editor/src/lib/test/tools/TLBookmarkUtil.test.ts b/packages/editor/src/lib/test/tools/TLBookmarkUtil.test.ts index da6027601..5a7c0e434 100644 --- a/packages/editor/src/lib/test/tools/TLBookmarkUtil.test.ts +++ b/packages/editor/src/lib/test/tools/TLBookmarkUtil.test.ts @@ -1,5 +1,5 @@ import { TLBookmarkShape, createShapeId } from '@tldraw/tlschema' -import { BookmarkShapeUtil } from '../../app/shapeutils/BookmarkShapeUtil/BookmarkShapeUtil' +import { BookmarkShapeUtil } from '../../editor/shapeutils/BookmarkShapeUtil/BookmarkShapeUtil' import { TestEditor } from '../TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/tools/TLDrawTool.test.ts b/packages/editor/src/lib/test/tools/TLDrawTool.test.ts index e76e0fde7..5d1aa00a9 100644 --- a/packages/editor/src/lib/test/tools/TLDrawTool.test.ts +++ b/packages/editor/src/lib/test/tools/TLDrawTool.test.ts @@ -1,4 +1,4 @@ -import { DrawShapeTool } from '../../app/tools/DrawShapeTool/DrawShapeTool' +import { DrawShapeTool } from '../../editor/tools/DrawShapeTool/DrawShapeTool' import { TestEditor } from '../TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/tools/TLFrameTool.test.ts b/packages/editor/src/lib/test/tools/TLFrameTool.test.ts index 6ab0bb27b..fa8148ffc 100644 --- a/packages/editor/src/lib/test/tools/TLFrameTool.test.ts +++ b/packages/editor/src/lib/test/tools/TLFrameTool.test.ts @@ -1,4 +1,4 @@ -import { BaseBoxShapeTool } from '../../app/tools/BaseBoxShapeTool/BaseBoxShapeTool' +import { BaseBoxShapeTool } from '../../editor/tools/BaseBoxShapeTool/BaseBoxShapeTool' import { TestEditor } from '../TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/tools/TLGeoTool.test.ts b/packages/editor/src/lib/test/tools/TLGeoTool.test.ts index 7bd4bfea6..8db9b353c 100644 --- a/packages/editor/src/lib/test/tools/TLGeoTool.test.ts +++ b/packages/editor/src/lib/test/tools/TLGeoTool.test.ts @@ -1,4 +1,4 @@ -import { GeoShapeTool } from '../../app/tools/GeoShapeTool/GeoShapeTool' +import { GeoShapeTool } from '../../editor/tools/GeoShapeTool/GeoShapeTool' import { TestEditor } from '../TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/tools/TLHandTool.test.ts b/packages/editor/src/lib/test/tools/TLHandTool.test.ts index 1634bab76..98a8d8608 100644 --- a/packages/editor/src/lib/test/tools/TLHandTool.test.ts +++ b/packages/editor/src/lib/test/tools/TLHandTool.test.ts @@ -1,4 +1,4 @@ -import { HandTool } from '../../app/tools/HandTool/HandTool' +import { HandTool } from '../../editor/tools/HandTool/HandTool' import { createDefaultShapes, TestEditor } from '../TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/tools/TLLineTool.test.ts b/packages/editor/src/lib/test/tools/TLLineTool.test.ts index 59c2fda05..2f87993cc 100644 --- a/packages/editor/src/lib/test/tools/TLLineTool.test.ts +++ b/packages/editor/src/lib/test/tools/TLLineTool.test.ts @@ -1,5 +1,5 @@ import { assert } from '@tldraw/utils' -import { LineShapeUtil } from '../../app/shapeutils/LineShapeUtil/LineShapeUtil' +import { LineShapeUtil } from '../../editor/shapeutils/LineShapeUtil/LineShapeUtil' import { TestEditor } from '../TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/tools/TLNoteTool.test.ts b/packages/editor/src/lib/test/tools/TLNoteTool.test.ts index 78e6a4a85..599314333 100644 --- a/packages/editor/src/lib/test/tools/TLNoteTool.test.ts +++ b/packages/editor/src/lib/test/tools/TLNoteTool.test.ts @@ -1,4 +1,4 @@ -import { NoteShapeTool } from '../../app/tools/NoteShapeTool/NoteShapeTool' +import { NoteShapeTool } from '../../editor/tools/NoteShapeTool/NoteShapeTool' import { TestEditor } from '../TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/tools/TLTextTool.test.ts b/packages/editor/src/lib/test/tools/TLTextTool.test.ts index ae885e767..5c64e4c88 100644 --- a/packages/editor/src/lib/test/tools/TLTextTool.test.ts +++ b/packages/editor/src/lib/test/tools/TLTextTool.test.ts @@ -1,4 +1,4 @@ -import { TextShapeTool } from '../../app/tools/TextShapeTool/TextShapeTool' +import { TextShapeTool } from '../../editor/tools/TextShapeTool/TextShapeTool' import { TestEditor } from '../TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/tools/frames.test.ts b/packages/editor/src/lib/test/tools/frames.test.ts index bbe403959..3ae8d1d41 100644 --- a/packages/editor/src/lib/test/tools/frames.test.ts +++ b/packages/editor/src/lib/test/tools/frames.test.ts @@ -1,5 +1,5 @@ import { TLArrowShape, createShapeId } from '@tldraw/tlschema' -import { FrameShapeUtil } from '../../app/shapeutils/FrameShapeUtil/FrameShapeUtil' +import { FrameShapeUtil } from '../../editor/shapeutils/FrameShapeUtil/FrameShapeUtil' import { TestEditor } from '../TestEditor' let editor: TestEditor diff --git a/packages/editor/src/lib/test/tools/groups.test.ts b/packages/editor/src/lib/test/tools/groups.test.ts index 0fc9d3119..964dd6f09 100644 --- a/packages/editor/src/lib/test/tools/groups.test.ts +++ b/packages/editor/src/lib/test/tools/groups.test.ts @@ -10,13 +10,13 @@ import { TLShapePartial, } from '@tldraw/tlschema' import { assert, compact } from '@tldraw/utils' -import { ArrowShapeUtil } from '../../app/shapeutils/ArrowShapeUtil/ArrowShapeUtil' -import { GroupShapeUtil } from '../../app/shapeutils/GroupShapeUtil/GroupShapeUtil' -import { ArrowShapeTool } from '../../app/tools/ArrowShapeTool/ArrowShapeTool' -import { DrawShapeTool } from '../../app/tools/DrawShapeTool/DrawShapeTool' -import { EraserShapeTool } from '../../app/tools/EraserShapeTool/EraserShapeTool' -import { LineShapeTool } from '../../app/tools/LineShapeTool/LineShapeTool' -import { NoteShapeTool } from '../../app/tools/NoteShapeTool/NoteShapeTool' +import { ArrowShapeUtil } from '../../editor/shapeutils/ArrowShapeUtil/ArrowShapeUtil' +import { GroupShapeUtil } from '../../editor/shapeutils/GroupShapeUtil/GroupShapeUtil' +import { ArrowShapeTool } from '../../editor/tools/ArrowShapeTool/ArrowShapeTool' +import { DrawShapeTool } from '../../editor/tools/DrawShapeTool/DrawShapeTool' +import { EraserShapeTool } from '../../editor/tools/EraserShapeTool/EraserShapeTool' +import { LineShapeTool } from '../../editor/tools/LineShapeTool/LineShapeTool' +import { NoteShapeTool } from '../../editor/tools/NoteShapeTool/NoteShapeTool' import { TestEditor } from '../TestEditor' jest.mock('nanoid', () => { diff --git a/packages/editor/src/lib/test/tools/resizing.test.ts b/packages/editor/src/lib/test/tools/resizing.test.ts index 2a7d8bebc..b6eb287ad 100644 --- a/packages/editor/src/lib/test/tools/resizing.test.ts +++ b/packages/editor/src/lib/test/tools/resizing.test.ts @@ -8,8 +8,8 @@ import { Vec2d, } from '@tldraw/primitives' import { createShapeId, TLShapeId, TLShapePartial } from '@tldraw/tlschema' -import { GapsSnapLine, PointsSnapLine } from '../../app/managers/SnapManager' -import { TLSelectionHandle } from '../../app/types/selection-types' +import { GapsSnapLine, PointsSnapLine } from '../../editor/managers/SnapManager' +import { TLSelectionHandle } from '../../editor/types/selection-types' import { TestEditor } from '../TestEditor' import { getSnapLines } from '../testutils/getSnapLines' import { roundedBox } from '../testutils/roundedBox' diff --git a/packages/editor/src/lib/test/tools/select.test.tsx b/packages/editor/src/lib/test/tools/select.test.tsx index cff399ed1..b0751027f 100644 --- a/packages/editor/src/lib/test/tools/select.test.tsx +++ b/packages/editor/src/lib/test/tools/select.test.tsx @@ -1,4 +1,4 @@ -import { SelectTool } from '../../app/tools/SelectTool/SelectTool' +import { SelectTool } from '../../editor/tools/SelectTool/SelectTool' import { TestEditor } from '../TestEditor' import { TL } from '../jsx' diff --git a/packages/editor/src/lib/test/tools/translating.test.ts b/packages/editor/src/lib/test/tools/translating.test.ts index d5c754419..87a38f8ec 100644 --- a/packages/editor/src/lib/test/tools/translating.test.ts +++ b/packages/editor/src/lib/test/tools/translating.test.ts @@ -1,7 +1,7 @@ import { Box2d, Vec2d, VecLike } from '@tldraw/primitives' import { TLShapeId, TLShapePartial, Vec2dModel, createShapeId } from '@tldraw/tlschema' -import { GapsSnapLine, PointsSnapLine, SnapLine } from '../../app/managers/SnapManager' -import { ShapeUtil } from '../../app/shapeutils/ShapeUtil' +import { GapsSnapLine, PointsSnapLine, SnapLine } from '../../editor/managers/SnapManager' +import { ShapeUtil } from '../../editor/shapeutils/ShapeUtil' import { TestEditor } from '../TestEditor' import { defaultShapes } from '../../config/defaultShapes' diff --git a/packages/editor/src/lib/utils/assets.ts b/packages/editor/src/lib/utils/assets.ts index d6541335f..38fd329ed 100644 --- a/packages/editor/src/lib/utils/assets.ts +++ b/packages/editor/src/lib/utils/assets.ts @@ -12,8 +12,8 @@ import { } from '@tldraw/tlschema' import { compact, getHashForString } from '@tldraw/utils' import uniq from 'lodash.uniq' -import { Editor } from '../app/Editor' import { MAX_ASSET_HEIGHT, MAX_ASSET_WIDTH } from '../constants' +import { Editor } from '../editor/Editor' import { isAnimated } from './is-gif-animated' import { findChunk, isPng, parsePhys } from './png' diff --git a/packages/editor/src/lib/utils/rotation.ts b/packages/editor/src/lib/utils/rotation.ts index 84a80b4df..2c4a50510 100644 --- a/packages/editor/src/lib/utils/rotation.ts +++ b/packages/editor/src/lib/utils/rotation.ts @@ -1,7 +1,7 @@ import { canolicalizeRotation, Matrix2d, Vec2d } from '@tldraw/primitives' import { isShapeId, TLShapePartial } from '@tldraw/tlschema' import { structuredClone } from '@tldraw/utils' -import { Editor } from '../app/Editor' +import { Editor } from '../editor/Editor' /** @internal */ export function getRotationSnapshot({ editor }: { editor: Editor }) {