diff --git a/src/excalidraw-app/CustomStats.tsx b/excalidraw-app/CustomStats.tsx similarity index 86% rename from src/excalidraw-app/CustomStats.tsx rename to excalidraw-app/CustomStats.tsx index addea4cd9..b34c1f7d7 100644 --- a/src/excalidraw-app/CustomStats.tsx +++ b/excalidraw-app/CustomStats.tsx @@ -1,14 +1,14 @@ import { useEffect, useState } from "react"; -import { debounce, getVersion, nFormatter } from "../utils"; +import { debounce, getVersion, nFormatter } from "../src/utils"; import { getElementsStorageSize, getTotalStorageSize, } from "./data/localStorage"; -import { DEFAULT_VERSION } from "../constants"; -import { t } from "../i18n"; -import { copyTextToSystemClipboard } from "../clipboard"; -import { NonDeletedExcalidrawElement } from "../element/types"; -import { UIAppState } from "../types"; +import { DEFAULT_VERSION } from "../src/constants"; +import { t } from "../src/i18n"; +import { copyTextToSystemClipboard } from "../src/clipboard"; +import { NonDeletedExcalidrawElement } from "../src/element/types"; +import { UIAppState } from "../src/types"; type StorageSizes = { scene: number; total: number }; diff --git a/src/excalidraw-app/app-jotai.ts b/excalidraw-app/app-jotai.ts similarity index 100% rename from src/excalidraw-app/app-jotai.ts rename to excalidraw-app/app-jotai.ts diff --git a/src/excalidraw-app/app_constants.ts b/excalidraw-app/app_constants.ts similarity index 100% rename from src/excalidraw-app/app_constants.ts rename to excalidraw-app/app_constants.ts diff --git a/src/excalidraw-app/collab/Collab.tsx b/excalidraw-app/collab/Collab.tsx similarity index 97% rename from src/excalidraw-app/collab/Collab.tsx rename to excalidraw-app/collab/Collab.tsx index 673d89e8b..0d57a8906 100644 --- a/src/excalidraw-app/collab/Collab.tsx +++ b/excalidraw-app/collab/Collab.tsx @@ -1,23 +1,23 @@ import throttle from "lodash.throttle"; import { PureComponent } from "react"; -import { ExcalidrawImperativeAPI } from "../../types"; -import { ErrorDialog } from "../../components/ErrorDialog"; -import { APP_NAME, ENV, EVENT } from "../../constants"; -import { ImportedDataState } from "../../data/types"; +import { ExcalidrawImperativeAPI } from "../../src/types"; +import { ErrorDialog } from "../../src/components/ErrorDialog"; +import { APP_NAME, ENV, EVENT } from "../../src/constants"; +import { ImportedDataState } from "../../src/data/types"; import { ExcalidrawElement, InitializedExcalidrawImageElement, -} from "../../element/types"; +} from "../../src/element/types"; import { getSceneVersion, restoreElements, -} from "../../packages/excalidraw/index"; -import { Collaborator, Gesture } from "../../types"; +} from "../../src/packages/excalidraw/index"; +import { Collaborator, Gesture } from "../../src/types"; import { preventUnload, resolvablePromise, withBatchedUpdates, -} from "../../utils"; +} from "../../src/utils"; import { CURSOR_SYNC_TIMEOUT, FILE_UPLOAD_MAX_BYTES, @@ -48,25 +48,25 @@ import { } from "../data/localStorage"; import Portal from "./Portal"; import RoomDialog from "./RoomDialog"; -import { t } from "../../i18n"; -import { UserIdleState } from "../../types"; -import { IDLE_THRESHOLD, ACTIVE_THRESHOLD } from "../../constants"; +import { t } from "../../src/i18n"; +import { UserIdleState } from "../../src/types"; +import { IDLE_THRESHOLD, ACTIVE_THRESHOLD } from "../../src/constants"; import { encodeFilesForUpload, FileManager, updateStaleImageStatuses, } from "../data/FileManager"; -import { AbortError } from "../../errors"; +import { AbortError } from "../../src/errors"; import { isImageElement, isInitializedImageElement, -} from "../../element/typeChecks"; -import { newElementWith } from "../../element/mutateElement"; +} from "../../src/element/typeChecks"; +import { newElementWith } from "../../src/element/mutateElement"; import { ReconciledElements, reconcileElements as _reconcileElements, } from "./reconciliation"; -import { decryptData } from "../../data/encryption"; +import { decryptData } from "../../src/data/encryption"; import { resetBrowserStateVersions } from "../data/tabSync"; import { LocalData } from "../data/LocalData"; import { atom, useAtom } from "jotai"; diff --git a/src/excalidraw-app/collab/Portal.tsx b/excalidraw-app/collab/Portal.tsx similarity index 94% rename from src/excalidraw-app/collab/Portal.tsx rename to excalidraw-app/collab/Portal.tsx index 1d4db3c0c..401b83ec5 100644 --- a/src/excalidraw-app/collab/Portal.tsx +++ b/excalidraw-app/collab/Portal.tsx @@ -6,19 +6,19 @@ import { import { TCollabClass } from "./Collab"; -import { ExcalidrawElement } from "../../element/types"; +import { ExcalidrawElement } from "../../src/element/types"; import { WS_EVENTS, FILE_UPLOAD_TIMEOUT, WS_SCENE_EVENT_TYPES, } from "../app_constants"; -import { UserIdleState } from "../../types"; -import { trackEvent } from "../../analytics"; +import { UserIdleState } from "../../src/types"; +import { trackEvent } from "../../src/analytics"; import throttle from "lodash.throttle"; -import { newElementWith } from "../../element/mutateElement"; +import { newElementWith } from "../../src/element/mutateElement"; import { BroadcastedExcalidrawElement } from "./reconciliation"; -import { encryptData } from "../../data/encryption"; -import { PRECEDING_ELEMENT_KEY } from "../../constants"; +import { encryptData } from "../../src/data/encryption"; +import { PRECEDING_ELEMENT_KEY } from "../../src/constants"; class Portal { collab: TCollabClass; diff --git a/src/excalidraw-app/collab/RoomDialog.scss b/excalidraw-app/collab/RoomDialog.scss similarity index 98% rename from src/excalidraw-app/collab/RoomDialog.scss rename to excalidraw-app/collab/RoomDialog.scss index 0d1bcad6c..b5f62330e 100644 --- a/src/excalidraw-app/collab/RoomDialog.scss +++ b/excalidraw-app/collab/RoomDialog.scss @@ -1,4 +1,4 @@ -@import "../../css/variables.module"; +@import "../../src/css/variables.module"; .excalidraw { .RoomDialog { diff --git a/src/excalidraw-app/collab/RoomDialog.tsx b/excalidraw-app/collab/RoomDialog.tsx similarity index 90% rename from src/excalidraw-app/collab/RoomDialog.tsx rename to excalidraw-app/collab/RoomDialog.tsx index 6b0706270..3f2a9e7bc 100644 --- a/src/excalidraw-app/collab/RoomDialog.tsx +++ b/excalidraw-app/collab/RoomDialog.tsx @@ -1,13 +1,13 @@ import { useRef, useState } from "react"; import * as Popover from "@radix-ui/react-popover"; -import { copyTextToSystemClipboard } from "../../clipboard"; -import { trackEvent } from "../../analytics"; -import { getFrame } from "../../utils"; -import { useI18n } from "../../i18n"; -import { KEYS } from "../../keys"; +import { copyTextToSystemClipboard } from "../../src/clipboard"; +import { trackEvent } from "../../src/analytics"; +import { getFrame } from "../../src/utils"; +import { useI18n } from "../../src/i18n"; +import { KEYS } from "../../src/keys"; -import { Dialog } from "../../components/Dialog"; +import { Dialog } from "../../src/components/Dialog"; import { copyIcon, playerPlayIcon, @@ -16,11 +16,11 @@ import { shareIOS, shareWindows, tablerCheckIcon, -} from "../../components/icons"; -import { TextField } from "../../components/TextField"; -import { FilledButton } from "../../components/FilledButton"; +} from "../../src/components/icons"; +import { TextField } from "../../src/components/TextField"; +import { FilledButton } from "../../src/components/FilledButton"; -import { ReactComponent as CollabImage } from "../../assets/lock.svg"; +import { ReactComponent as CollabImage } from "../../src/assets/lock.svg"; import "./RoomDialog.scss"; const getShareIcon = () => { diff --git a/src/excalidraw-app/collab/reconciliation.ts b/excalidraw-app/collab/reconciliation.ts similarity index 95% rename from src/excalidraw-app/collab/reconciliation.ts rename to excalidraw-app/collab/reconciliation.ts index 3f50bc358..1efc5db46 100644 --- a/src/excalidraw-app/collab/reconciliation.ts +++ b/excalidraw-app/collab/reconciliation.ts @@ -1,7 +1,7 @@ -import { PRECEDING_ELEMENT_KEY } from "../../constants"; -import { ExcalidrawElement } from "../../element/types"; -import { AppState } from "../../types"; -import { arrayToMapWithIndex } from "../../utils"; +import { PRECEDING_ELEMENT_KEY } from "../../src/constants"; +import { ExcalidrawElement } from "../../src/element/types"; +import { AppState } from "../../src/types"; +import { arrayToMapWithIndex } from "../../src/utils"; export type ReconciledElements = readonly ExcalidrawElement[] & { _brand: "reconciledElements"; diff --git a/src/excalidraw-app/components/AppFooter.tsx b/excalidraw-app/components/AppFooter.tsx similarity index 90% rename from src/excalidraw-app/components/AppFooter.tsx rename to excalidraw-app/components/AppFooter.tsx index 624873218..81846f0d3 100644 --- a/src/excalidraw-app/components/AppFooter.tsx +++ b/excalidraw-app/components/AppFooter.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Footer } from "../../packages/excalidraw/index"; +import { Footer } from "../../src/packages/excalidraw/index"; import { EncryptedIcon } from "./EncryptedIcon"; import { ExcalidrawPlusAppLink } from "./ExcalidrawPlusAppLink"; import { isExcalidrawPlusSignedUser } from "../app_constants"; diff --git a/src/excalidraw-app/components/AppMainMenu.tsx b/excalidraw-app/components/AppMainMenu.tsx similarity index 91% rename from src/excalidraw-app/components/AppMainMenu.tsx rename to excalidraw-app/components/AppMainMenu.tsx index 6e12d7811..7a984a8f5 100644 --- a/src/excalidraw-app/components/AppMainMenu.tsx +++ b/excalidraw-app/components/AppMainMenu.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { PlusPromoIcon } from "../../components/icons"; -import { MainMenu } from "../../packages/excalidraw/index"; +import { PlusPromoIcon } from "../../src/components/icons"; +import { MainMenu } from "../../src/packages/excalidraw/index"; import { LanguageList } from "./LanguageList"; export const AppMainMenu: React.FC<{ diff --git a/src/excalidraw-app/components/AppWelcomeScreen.tsx b/excalidraw-app/components/AppWelcomeScreen.tsx similarity index 90% rename from src/excalidraw-app/components/AppWelcomeScreen.tsx rename to excalidraw-app/components/AppWelcomeScreen.tsx index 72b688d9b..cdefd1fe4 100644 --- a/src/excalidraw-app/components/AppWelcomeScreen.tsx +++ b/excalidraw-app/components/AppWelcomeScreen.tsx @@ -1,9 +1,9 @@ import React from "react"; -import { PlusPromoIcon } from "../../components/icons"; -import { useI18n } from "../../i18n"; -import { WelcomeScreen } from "../../packages/excalidraw/index"; +import { PlusPromoIcon } from "../../src/components/icons"; +import { useI18n } from "../../src/i18n"; +import { WelcomeScreen } from "../../src/packages/excalidraw/index"; import { isExcalidrawPlusSignedUser } from "../app_constants"; -import { POINTER_EVENTS } from "../../constants"; +import { POINTER_EVENTS } from "../../src/constants"; export const AppWelcomeScreen: React.FC<{ setCollabDialogShown: (toggle: boolean) => any; diff --git a/src/excalidraw-app/components/EncryptedIcon.tsx b/excalidraw-app/components/EncryptedIcon.tsx similarity index 72% rename from src/excalidraw-app/components/EncryptedIcon.tsx rename to excalidraw-app/components/EncryptedIcon.tsx index a91768917..84b2f1a0c 100644 --- a/src/excalidraw-app/components/EncryptedIcon.tsx +++ b/excalidraw-app/components/EncryptedIcon.tsx @@ -1,6 +1,6 @@ -import { shield } from "../../components/icons"; -import { Tooltip } from "../../components/Tooltip"; -import { useI18n } from "../../i18n"; +import { shield } from "../../src/components/icons"; +import { Tooltip } from "../../src/components/Tooltip"; +import { useI18n } from "../../src/i18n"; export const EncryptedIcon = () => { const { t } = useI18n(); diff --git a/src/excalidraw-app/components/ExcalidrawPlusAppLink.tsx b/excalidraw-app/components/ExcalidrawPlusAppLink.tsx similarity index 100% rename from src/excalidraw-app/components/ExcalidrawPlusAppLink.tsx rename to excalidraw-app/components/ExcalidrawPlusAppLink.tsx diff --git a/src/excalidraw-app/components/ExportToExcalidrawPlus.tsx b/excalidraw-app/components/ExportToExcalidrawPlus.tsx similarity index 80% rename from src/excalidraw-app/components/ExportToExcalidrawPlus.tsx rename to excalidraw-app/components/ExportToExcalidrawPlus.tsx index 42b7a7d4f..0b577ad7d 100644 --- a/src/excalidraw-app/components/ExportToExcalidrawPlus.tsx +++ b/excalidraw-app/components/ExportToExcalidrawPlus.tsx @@ -1,20 +1,20 @@ import React from "react"; -import { Card } from "../../components/Card"; -import { ToolButton } from "../../components/ToolButton"; -import { serializeAsJSON } from "../../data/json"; +import { Card } from "../../src/components/Card"; +import { ToolButton } from "../../src/components/ToolButton"; +import { serializeAsJSON } from "../../src/data/json"; import { loadFirebaseStorage, saveFilesToFirebase } from "../data/firebase"; -import { FileId, NonDeletedExcalidrawElement } from "../../element/types"; -import { AppState, BinaryFileData, BinaryFiles } from "../../types"; +import { FileId, NonDeletedExcalidrawElement } from "../../src/element/types"; +import { AppState, BinaryFileData, BinaryFiles } from "../../src/types"; import { nanoid } from "nanoid"; -import { useI18n } from "../../i18n"; -import { encryptData, generateEncryptionKey } from "../../data/encryption"; -import { isInitializedImageElement } from "../../element/typeChecks"; +import { useI18n } from "../../src/i18n"; +import { encryptData, generateEncryptionKey } from "../../src/data/encryption"; +import { isInitializedImageElement } from "../../src/element/typeChecks"; import { FILE_UPLOAD_MAX_BYTES } from "../app_constants"; import { encodeFilesForUpload } from "../data/FileManager"; -import { MIME_TYPES } from "../../constants"; -import { trackEvent } from "../../analytics"; -import { getFrame } from "../../utils"; -import { ExcalidrawLogo } from "../../components/ExcalidrawLogo"; +import { MIME_TYPES } from "../../src/constants"; +import { trackEvent } from "../../src/analytics"; +import { getFrame } from "../../src/utils"; +import { ExcalidrawLogo } from "../../src/components/ExcalidrawLogo"; export const exportToExcalidrawPlus = async ( elements: readonly NonDeletedExcalidrawElement[], diff --git a/src/excalidraw-app/components/GitHubCorner.tsx b/excalidraw-app/components/GitHubCorner.tsx similarity index 94% rename from src/excalidraw-app/components/GitHubCorner.tsx rename to excalidraw-app/components/GitHubCorner.tsx index 34e8d29ab..e0575433d 100644 --- a/src/excalidraw-app/components/GitHubCorner.tsx +++ b/excalidraw-app/components/GitHubCorner.tsx @@ -1,7 +1,7 @@ import oc from "open-color"; import React from "react"; -import { THEME } from "../../constants"; -import { Theme } from "../../element/types"; +import { THEME } from "../../src/constants"; +import { Theme } from "../../src/element/types"; // https://github.com/tholman/github-corners export const GitHubCorner = React.memo( diff --git a/src/excalidraw-app/components/LanguageList.tsx b/excalidraw-app/components/LanguageList.tsx similarity index 88% rename from src/excalidraw-app/components/LanguageList.tsx rename to excalidraw-app/components/LanguageList.tsx index c80acc9b6..11d4b6d00 100644 --- a/src/excalidraw-app/components/LanguageList.tsx +++ b/excalidraw-app/components/LanguageList.tsx @@ -1,8 +1,8 @@ import { useSetAtom } from "jotai"; import React from "react"; import { appLangCodeAtom } from ".."; -import { useI18n } from "../../i18n"; -import { languages } from "../../i18n"; +import { useI18n } from "../../src/i18n"; +import { languages } from "../../src/i18n"; export const LanguageList = ({ style }: { style?: React.CSSProperties }) => { const { t, langCode } = useI18n(); diff --git a/src/excalidraw-app/data/FileManager.ts b/excalidraw-app/data/FileManager.ts similarity index 95% rename from src/excalidraw-app/data/FileManager.ts rename to excalidraw-app/data/FileManager.ts index 419407a6b..426afc4d3 100644 --- a/src/excalidraw-app/data/FileManager.ts +++ b/excalidraw-app/data/FileManager.ts @@ -1,19 +1,19 @@ -import { compressData } from "../../data/encode"; -import { newElementWith } from "../../element/mutateElement"; -import { isInitializedImageElement } from "../../element/typeChecks"; +import { compressData } from "../../src/data/encode"; +import { newElementWith } from "../../src/element/mutateElement"; +import { isInitializedImageElement } from "../../src/element/typeChecks"; import { ExcalidrawElement, ExcalidrawImageElement, FileId, InitializedExcalidrawImageElement, -} from "../../element/types"; -import { t } from "../../i18n"; +} from "../../src/element/types"; +import { t } from "../../src/i18n"; import { BinaryFileData, BinaryFileMetadata, ExcalidrawImperativeAPI, BinaryFiles, -} from "../../types"; +} from "../../src/types"; export class FileManager { /** files being fetched */ diff --git a/src/excalidraw-app/data/LocalData.ts b/excalidraw-app/data/LocalData.ts similarity index 94% rename from src/excalidraw-app/data/LocalData.ts rename to excalidraw-app/data/LocalData.ts index 08f91d8d6..5d9ba0e14 100644 --- a/src/excalidraw-app/data/LocalData.ts +++ b/excalidraw-app/data/LocalData.ts @@ -11,11 +11,11 @@ */ import { createStore, entries, del, getMany, set, setMany } from "idb-keyval"; -import { clearAppStateForLocalStorage } from "../../appState"; -import { clearElementsForLocalStorage } from "../../element"; -import { ExcalidrawElement, FileId } from "../../element/types"; -import { AppState, BinaryFileData, BinaryFiles } from "../../types"; -import { debounce } from "../../utils"; +import { clearAppStateForLocalStorage } from "../../src/appState"; +import { clearElementsForLocalStorage } from "../../src/element"; +import { ExcalidrawElement, FileId } from "../../src/element/types"; +import { AppState, BinaryFileData, BinaryFiles } from "../../src/types"; +import { debounce } from "../../src/utils"; import { SAVE_TO_LOCAL_STORAGE_TIMEOUT, STORAGE_KEYS } from "../app_constants"; import { FileManager } from "./FileManager"; import { Locker } from "./Locker"; diff --git a/src/excalidraw-app/data/Locker.ts b/excalidraw-app/data/Locker.ts similarity index 100% rename from src/excalidraw-app/data/Locker.ts rename to excalidraw-app/data/Locker.ts diff --git a/src/excalidraw-app/data/firebase.ts b/excalidraw-app/data/firebase.ts similarity index 95% rename from src/excalidraw-app/data/firebase.ts rename to excalidraw-app/data/firebase.ts index bb914de12..831213d60 100644 --- a/src/excalidraw-app/data/firebase.ts +++ b/excalidraw-app/data/firebase.ts @@ -1,20 +1,20 @@ -import { ExcalidrawElement, FileId } from "../../element/types"; -import { getSceneVersion } from "../../element"; +import { ExcalidrawElement, FileId } from "../../src/element/types"; +import { getSceneVersion } from "../../src/element"; import Portal from "../collab/Portal"; -import { restoreElements } from "../../data/restore"; +import { restoreElements } from "../../src/data/restore"; import { AppState, BinaryFileData, BinaryFileMetadata, DataURL, -} from "../../types"; +} from "../../src/types"; import { FILE_CACHE_MAX_AGE_SEC } from "../app_constants"; -import { decompressData } from "../../data/encode"; -import { encryptData, decryptData } from "../../data/encryption"; -import { MIME_TYPES } from "../../constants"; +import { decompressData } from "../../src/data/encode"; +import { encryptData, decryptData } from "../../src/data/encryption"; +import { MIME_TYPES } from "../../src/constants"; import { reconcileElements } from "../collab/reconciliation"; import { getSyncableElements, SyncableExcalidrawElement } from "."; -import { ResolutionType } from "../../utility-types"; +import { ResolutionType } from "../../src/utility-types"; // private // ----------------------------------------------------------------------------- diff --git a/src/excalidraw-app/data/index.ts b/excalidraw-app/data/index.ts similarity index 93% rename from src/excalidraw-app/data/index.ts rename to excalidraw-app/data/index.ts index d3108c761..3870ca37c 100644 --- a/src/excalidraw-app/data/index.ts +++ b/excalidraw-app/data/index.ts @@ -1,23 +1,23 @@ -import { compressData, decompressData } from "../../data/encode"; +import { compressData, decompressData } from "../../src/data/encode"; import { decryptData, generateEncryptionKey, IV_LENGTH_BYTES, -} from "../../data/encryption"; -import { serializeAsJSON } from "../../data/json"; -import { restore } from "../../data/restore"; -import { ImportedDataState } from "../../data/types"; -import { isInvisiblySmallElement } from "../../element/sizeHelpers"; -import { isInitializedImageElement } from "../../element/typeChecks"; -import { ExcalidrawElement, FileId } from "../../element/types"; -import { t } from "../../i18n"; +} from "../../src/data/encryption"; +import { serializeAsJSON } from "../../src/data/json"; +import { restore } from "../../src/data/restore"; +import { ImportedDataState } from "../../src/data/types"; +import { isInvisiblySmallElement } from "../../src/element/sizeHelpers"; +import { isInitializedImageElement } from "../../src/element/typeChecks"; +import { ExcalidrawElement, FileId } from "../../src/element/types"; +import { t } from "../../src/i18n"; import { AppState, BinaryFileData, BinaryFiles, UserIdleState, -} from "../../types"; -import { bytesToHexString } from "../../utils"; +} from "../../src/types"; +import { bytesToHexString } from "../../src/utils"; import { DELETED_ELEMENT_TIMEOUT, FILE_UPLOAD_MAX_BYTES, diff --git a/src/excalidraw-app/data/localStorage.ts b/excalidraw-app/data/localStorage.ts similarity index 91% rename from src/excalidraw-app/data/localStorage.ts rename to excalidraw-app/data/localStorage.ts index 6902052bd..2a1b93ebf 100644 --- a/src/excalidraw-app/data/localStorage.ts +++ b/excalidraw-app/data/localStorage.ts @@ -1,12 +1,12 @@ -import { ExcalidrawElement } from "../../element/types"; -import { AppState } from "../../types"; +import { ExcalidrawElement } from "../../src/element/types"; +import { AppState } from "../../src/types"; import { clearAppStateForLocalStorage, getDefaultAppState, -} from "../../appState"; -import { clearElementsForLocalStorage } from "../../element"; +} from "../../src/appState"; +import { clearElementsForLocalStorage } from "../../src/element"; import { STORAGE_KEYS } from "../app_constants"; -import { ImportedDataState } from "../../data/types"; +import { ImportedDataState } from "../../src/data/types"; export const saveUsernameToLocalStorage = (username: string) => { try { diff --git a/src/excalidraw-app/data/tabSync.ts b/excalidraw-app/data/tabSync.ts similarity index 100% rename from src/excalidraw-app/data/tabSync.ts rename to excalidraw-app/data/tabSync.ts diff --git a/src/excalidraw-app/debug.ts b/excalidraw-app/debug.ts similarity index 100% rename from src/excalidraw-app/debug.ts rename to excalidraw-app/debug.ts diff --git a/src/excalidraw-app/index.scss b/excalidraw-app/index.scss similarity index 100% rename from src/excalidraw-app/index.scss rename to excalidraw-app/index.scss diff --git a/src/excalidraw-app/index.tsx b/excalidraw-app/index.tsx similarity index 94% rename from src/excalidraw-app/index.tsx rename to excalidraw-app/index.tsx index 00bcd0cb3..9156d5010 100644 --- a/src/excalidraw-app/index.tsx +++ b/excalidraw-app/index.tsx @@ -1,31 +1,31 @@ -import polyfill from "../polyfill"; +import polyfill from "../src/polyfill"; import LanguageDetector from "i18next-browser-languagedetector"; import { useEffect, useRef, useState } from "react"; -import { trackEvent } from "../analytics"; -import { getDefaultAppState } from "../appState"; -import { ErrorDialog } from "../components/ErrorDialog"; -import { TopErrorBoundary } from "../components/TopErrorBoundary"; +import { trackEvent } from "../src/analytics"; +import { getDefaultAppState } from "../src/appState"; +import { ErrorDialog } from "../src/components/ErrorDialog"; +import { TopErrorBoundary } from "../src/components/TopErrorBoundary"; import { APP_NAME, EVENT, THEME, TITLE_TIMEOUT, VERSION_TIMEOUT, -} from "../constants"; -import { loadFromBlob } from "../data/blob"; +} from "../src/constants"; +import { loadFromBlob } from "../src/data/blob"; import { ExcalidrawElement, FileId, NonDeletedExcalidrawElement, Theme, -} from "../element/types"; -import { useCallbackRefState } from "../hooks/useCallbackRefState"; -import { t } from "../i18n"; +} from "../src/element/types"; +import { useCallbackRefState } from "../src/hooks/useCallbackRefState"; +import { t } from "../src/i18n"; import { Excalidraw, defaultLang, LiveCollaborationTrigger, -} from "../packages/excalidraw/index"; +} from "../src/packages/excalidraw/index"; import { AppState, LibraryItems, @@ -33,7 +33,7 @@ import { BinaryFiles, ExcalidrawInitialDataState, UIAppState, -} from "../types"; +} from "../src/types"; import { debounce, getVersion, @@ -43,7 +43,7 @@ import { ResolvablePromise, resolvablePromise, isRunningInIframe, -} from "../utils"; +} from "../src/utils"; import { FIREBASE_STORAGE_PREFIXES, STORAGE_KEYS, @@ -68,33 +68,40 @@ import { importUsernameFromLocalStorage, } from "./data/localStorage"; import CustomStats from "./CustomStats"; -import { restore, restoreAppState, RestoredDataState } from "../data/restore"; +import { + restore, + restoreAppState, + RestoredDataState, +} from "../src/data/restore"; import { ExportToExcalidrawPlus, exportToExcalidrawPlus, } from "./components/ExportToExcalidrawPlus"; import { updateStaleImageStatuses } from "./data/FileManager"; -import { newElementWith } from "../element/mutateElement"; -import { isInitializedImageElement } from "../element/typeChecks"; +import { newElementWith } from "../src/element/mutateElement"; +import { isInitializedImageElement } from "../src/element/typeChecks"; import { loadFilesFromFirebase } from "./data/firebase"; import { LocalData } from "./data/LocalData"; import { isBrowserStorageStateNewer } from "./data/tabSync"; import clsx from "clsx"; import { reconcileElements } from "./collab/reconciliation"; -import { parseLibraryTokensFromUrl, useHandleLibrary } from "../data/library"; +import { + parseLibraryTokensFromUrl, + useHandleLibrary, +} from "../src/data/library"; import { AppMainMenu } from "./components/AppMainMenu"; import { AppWelcomeScreen } from "./components/AppWelcomeScreen"; import { AppFooter } from "./components/AppFooter"; import { atom, Provider, useAtom, useAtomValue } from "jotai"; -import { useAtomWithInitialValue } from "../jotai"; +import { useAtomWithInitialValue } from "../src/jotai"; import { appJotaiStore } from "./app-jotai"; import "./index.scss"; -import { ResolutionType } from "../utility-types"; -import { ShareableLinkDialog } from "../components/ShareableLinkDialog"; -import { openConfirmModal } from "../components/OverwriteConfirm/OverwriteConfirmState"; -import { OverwriteConfirmDialog } from "../components/OverwriteConfirm/OverwriteConfirm"; -import Trans from "../components/Trans"; +import { ResolutionType } from "../src/utility-types"; +import { ShareableLinkDialog } from "../src/components/ShareableLinkDialog"; +import { openConfirmModal } from "../src/components/OverwriteConfirm/OverwriteConfirmState"; +import { OverwriteConfirmDialog } from "../src/components/OverwriteConfirm/OverwriteConfirm"; +import Trans from "../src/components/Trans"; polyfill(); diff --git a/src/excalidraw-app/sentry.ts b/excalidraw-app/sentry.ts similarity index 100% rename from src/excalidraw-app/sentry.ts rename to excalidraw-app/sentry.ts diff --git a/excalidraw-app/tests/LanguageList.test.tsx b/excalidraw-app/tests/LanguageList.test.tsx new file mode 100644 index 000000000..49a70a14c --- /dev/null +++ b/excalidraw-app/tests/LanguageList.test.tsx @@ -0,0 +1,29 @@ +import { defaultLang } from "../../src/i18n"; +import { UI } from "../../src/tests/helpers/ui"; +import { screen, fireEvent, waitFor, render } from "../../src/tests/test-utils"; + +import ExcalidrawApp from "../../excalidraw-app"; + +describe("Test LanguageList", () => { + it("rerenders UI on language change", async () => { + await render(); + + // select rectangle tool to show properties menu + UI.clickTool("rectangle"); + // english lang should display `thin` label + expect(screen.queryByTitle(/thin/i)).not.toBeNull(); + fireEvent.click(document.querySelector(".dropdown-menu-button")!); + + fireEvent.change(document.querySelector(".dropdown-select__language")!, { + target: { value: "de-DE" }, + }); + // switching to german, `thin` label should no longer exist + await waitFor(() => expect(screen.queryByTitle(/thin/i)).toBeNull()); + // reset language + fireEvent.change(document.querySelector(".dropdown-select__language")!, { + target: { value: defaultLang.code }, + }); + // switching back to English + await waitFor(() => expect(screen.queryByTitle(/thin/i)).not.toBeNull()); + }); +}); diff --git a/src/tests/MobileMenu.test.tsx b/excalidraw-app/tests/MobileMenu.test.tsx similarity index 88% rename from src/tests/MobileMenu.test.tsx rename to excalidraw-app/tests/MobileMenu.test.tsx index a5014062d..2aec60b17 100644 --- a/src/tests/MobileMenu.test.tsx +++ b/excalidraw-app/tests/MobileMenu.test.tsx @@ -1,11 +1,11 @@ -import ExcalidrawApp from "../excalidraw-app"; +import ExcalidrawApp from "../../excalidraw-app"; import { mockBoundingClientRect, render, restoreOriginalGetBoundingClientRect, -} from "./test-utils"; +} from "../../src/tests/test-utils"; -import { UI } from "./helpers/ui"; +import { UI } from "../../src/tests/helpers/ui"; describe("Test MobileMenu", () => { const { h } = window; diff --git a/excalidraw-app/tests/__snapshots__/MobileMenu.test.tsx.snap b/excalidraw-app/tests/__snapshots__/MobileMenu.test.tsx.snap new file mode 100644 index 000000000..ad0c9f0f1 --- /dev/null +++ b/excalidraw-app/tests/__snapshots__/MobileMenu.test.tsx.snap @@ -0,0 +1,257 @@ +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`Test MobileMenu > should initialize with welcome screen and hide once user interacts 1`] = ` +
+ +
+ All your data is saved locally in your browser. +
+
+ + + + +
+ +
+
+ Try Excalidraw Plus! +
+ +
+
+`; diff --git a/src/tests/collab.test.tsx b/excalidraw-app/tests/collab.test.tsx similarity index 86% rename from src/tests/collab.test.tsx rename to excalidraw-app/tests/collab.test.tsx index c5d4f6c44..343a67ac4 100644 --- a/src/tests/collab.test.tsx +++ b/excalidraw-app/tests/collab.test.tsx @@ -1,8 +1,8 @@ import { vi } from "vitest"; -import { render, updateSceneData, waitFor } from "./test-utils"; -import ExcalidrawApp from "../excalidraw-app"; -import { API } from "./helpers/api"; -import { createUndoAction } from "../actions/actionHistory"; +import { render, updateSceneData, waitFor } from "../../src/tests/test-utils"; +import ExcalidrawApp from "../../excalidraw-app"; +import { API } from "../../src/tests/helpers/api"; +import { createUndoAction } from "../../src/actions/actionHistory"; const { h } = window; Object.defineProperty(window, "crypto", { @@ -16,7 +16,7 @@ Object.defineProperty(window, "crypto", { }, }); -vi.mock("../excalidraw-app/data/index.ts", async (importActual) => { +vi.mock("../../excalidraw-app/data/index.ts", async (importActual) => { const module = (await importActual()) as any; return { __esmodule: true, @@ -27,7 +27,7 @@ vi.mock("../excalidraw-app/data/index.ts", async (importActual) => { }; }); -vi.mock("../excalidraw-app/data/firebase.ts", () => { +vi.mock("../../excalidraw-app/data/firebase.ts", () => { const loadFromFirebase = async () => null; const saveToFirebase = () => {}; const isSavedToFirebase = () => true; diff --git a/src/tests/reconciliation.test.ts b/excalidraw-app/tests/reconciliation.test.ts similarity index 97% rename from src/tests/reconciliation.test.ts rename to excalidraw-app/tests/reconciliation.test.ts index f050ed659..c3e247406 100644 --- a/src/tests/reconciliation.test.ts +++ b/excalidraw-app/tests/reconciliation.test.ts @@ -1,13 +1,13 @@ import { expect } from "chai"; -import { PRECEDING_ELEMENT_KEY } from "../constants"; -import { ExcalidrawElement } from "../element/types"; +import { PRECEDING_ELEMENT_KEY } from "../../src/constants"; +import { ExcalidrawElement } from "../../src/element/types"; import { BroadcastedExcalidrawElement, ReconciledElements, reconcileElements, -} from "../excalidraw-app/collab/reconciliation"; -import { randomInteger } from "../random"; -import { AppState } from "../types"; +} from "../../excalidraw-app/collab/reconciliation"; +import { randomInteger } from "../../src/random"; +import { AppState } from "../../src/types"; type Id = string; type ElementLike = { diff --git a/src/element/newElement.test.ts b/src/element/newElement.test.ts index ba7c63ee2..19761231b 100644 --- a/src/element/newElement.test.ts +++ b/src/element/newElement.test.ts @@ -203,7 +203,6 @@ describe("duplicating multiple elements", () => { ); clonedArrows.forEach((arrow) => { - // console.log(arrow); expect( clonedRectangle.boundElements!.find((e) => e.id === arrow.id), ).toEqual( diff --git a/src/element/textWysiwyg.test.tsx b/src/element/textWysiwyg.test.tsx index c855de357..fc1e8cf2e 100644 --- a/src/element/textWysiwyg.test.tsx +++ b/src/element/textWysiwyg.test.tsx @@ -1,5 +1,5 @@ import ReactDOM from "react-dom"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { GlobalTestState, render, screen } from "../tests/test-utils"; import { Keyboard, Pointer, UI } from "../tests/helpers/ui"; import { CODES, KEYS } from "../keys"; @@ -41,7 +41,7 @@ describe("textWysiwyg", () => { describe("start text editing", () => { const { h } = window; beforeEach(async () => { - await render(); + await render(); h.elements = []; }); @@ -243,7 +243,7 @@ describe("textWysiwyg", () => { }); beforeEach(async () => { - await render(); + await render(); //@ts-ignore h.app.refreshDeviceState(h.app.excalidrawContainerRef.current!); @@ -477,7 +477,7 @@ describe("textWysiwyg", () => { const { h } = window; beforeEach(async () => { - await render(); + await render(); h.elements = []; rectangle = UI.createElement("rectangle", { @@ -1511,7 +1511,7 @@ describe("textWysiwyg", () => { }); it("should bump the version of labelled arrow when label updated", async () => { - await render(); + await render(); const arrow = UI.createElement("arrow", { width: 300, height: 0, diff --git a/src/index.tsx b/src/index.tsx index ea8c39cb1..2165ded77 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,9 +1,9 @@ import { StrictMode } from "react"; import { createRoot } from "react-dom/client"; -import ExcalidrawApp from "./excalidraw-app"; +import ExcalidrawApp from "../excalidraw-app"; import { registerSW } from "virtual:pwa-register"; -import "./excalidraw-app/sentry"; +import "../excalidraw-app/sentry"; window.__EXCALIDRAW_SHA__ = import.meta.env.VITE_APP_GIT_SHA; const rootElement = document.getElementById("root")!; const root = createRoot(rootElement); diff --git a/src/components/App.test.tsx b/src/tests/App.test.tsx similarity index 92% rename from src/components/App.test.tsx rename to src/tests/App.test.tsx index 19f987308..af576dcb0 100644 --- a/src/components/App.test.tsx +++ b/src/tests/App.test.tsx @@ -3,7 +3,7 @@ import * as Renderer from "../renderer/renderScene"; import { reseed } from "../random"; import { render, queryByTestId } from "../tests/test-utils"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { vi } from "vitest"; const renderStaticScene = vi.spyOn(Renderer, "renderStaticScene"); @@ -35,7 +35,7 @@ describe("Test ", () => { }; }; - await render(); + await render(); expect( queryByTestId( document.querySelector(".excalidraw-modal-container")!, diff --git a/src/tests/__snapshots__/App.test.tsx.snap b/src/tests/__snapshots__/App.test.tsx.snap new file mode 100644 index 000000000..49c2fd0fc --- /dev/null +++ b/src/tests/__snapshots__/App.test.tsx.snap @@ -0,0 +1,50 @@ +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`Test > should show error modal when using brave and measureText API is not working 1`] = ` +
+

+ Looks like you are using Brave browser with the + + Aggressively Block Fingerprinting + + setting enabled. +

+

+ This could result in breaking the + + Text Elements + + in your drawings. +

+

+ We strongly recommend disabling this setting. You can follow + + these steps + + on how to do so. +

+

+ If disabling this setting doesn't fix the display of text elements, please open an + + issue + + on our GitHub, or write us on + + Discord + . + +

+
+`; diff --git a/src/tests/__snapshots__/regressionTests.test.tsx.snap b/src/tests/__snapshots__/regressionTests.test.tsx.snap index 832f1652a..98e461a66 100644 --- a/src/tests/__snapshots__/regressionTests.test.tsx.snap +++ b/src/tests/__snapshots__/regressionTests.test.tsx.snap @@ -13089,126 +13089,6 @@ exports[`regression tests > pinch-to-zoom works > [end of test] number of elemen exports[`regression tests > pinch-to-zoom works > [end of test] number of renders 1`] = `7`; -exports[`regression tests > rerenders UI on language change > [end of test] appState 1`] = ` -{ - "activeEmbeddable": null, - "activeTool": { - "customType": null, - "lastActiveTool": null, - "locked": false, - "type": "rectangle", - }, - "collaborators": Map {}, - "contextMenu": null, - "currentChartType": "bar", - "currentItemBackgroundColor": "transparent", - "currentItemEndArrowhead": "arrow", - "currentItemFillStyle": "hachure", - "currentItemFontFamily": 1, - "currentItemFontSize": 20, - "currentItemOpacity": 100, - "currentItemRoughness": 1, - "currentItemRoundness": "round", - "currentItemStartArrowhead": null, - "currentItemStrokeColor": "#1e1e1e", - "currentItemStrokeStyle": "solid", - "currentItemStrokeWidth": 1, - "currentItemTextAlign": "left", - "cursorButton": "up", - "defaultSidebarDockedPreference": false, - "draggingElement": null, - "editingElement": null, - "editingFrame": null, - "editingGroupId": null, - "editingLinearElement": null, - "elementsToHighlight": null, - "errorMessage": null, - "exportBackground": true, - "exportEmbedScene": false, - "exportScale": 1, - "exportWithDarkMode": false, - "fileHandle": null, - "frameRendering": { - "clip": true, - "enabled": true, - "name": true, - "outline": true, - }, - "frameToHighlight": null, - "gridSize": null, - "height": 768, - "isBindingEnabled": true, - "isLoading": false, - "isResizing": false, - "isRotating": false, - "lastPointerDownWith": "mouse", - "multiElement": null, - "name": "Untitled-201933152653", - "offsetLeft": 0, - "offsetTop": 0, - "openDialog": null, - "openMenu": "canvas", - "openPopup": null, - "openSidebar": null, - "pasteDialog": { - "data": null, - "shown": false, - }, - "penDetected": false, - "penMode": false, - "pendingImageElementId": null, - "previousSelectedElementIds": {}, - "resizingElement": null, - "scrollX": 0, - "scrollY": 0, - "scrolledOutside": false, - "selectedElementIds": {}, - "selectedElementsAreBeingDragged": false, - "selectedGroupIds": {}, - "selectedLinearElement": null, - "selectionElement": null, - "shouldCacheIgnoreZoom": false, - "showHyperlinkPopup": false, - "showStats": false, - "showWelcomeScreen": true, - "startBoundElement": null, - "suggestedBindings": [], - "theme": "light", - "toast": null, - "viewBackgroundColor": "#ffffff", - "viewModeEnabled": false, - "width": 1024, - "zenModeEnabled": false, - "zoom": { - "value": 1, - }, -} -`; - -exports[`regression tests > rerenders UI on language change > [end of test] history 1`] = ` -{ - "recording": false, - "redoStack": [], - "stateHistory": [ - { - "appState": { - "editingGroupId": null, - "editingLinearElement": null, - "name": "Untitled-201933152653", - "selectedElementIds": {}, - "selectedGroupIds": {}, - "viewBackgroundColor": "#ffffff", - }, - "elements": [], - }, - ], -} -`; - -exports[`regression tests > rerenders UI on language change > [end of test] number of elements 1`] = `0`; - -exports[`regression tests > rerenders UI on language change > [end of test] number of renders 1`] = `5`; - exports[`regression tests > shift click on selected element should deselect it on pointer up > [end of test] appState 1`] = ` { "activeEmbeddable": null, diff --git a/src/actions/actionStyles.test.tsx b/src/tests/actionStyles.test.tsx similarity index 92% rename from src/actions/actionStyles.test.tsx rename to src/tests/actionStyles.test.tsx index 238196dfc..832650427 100644 --- a/src/actions/actionStyles.test.tsx +++ b/src/tests/actionStyles.test.tsx @@ -1,4 +1,4 @@ -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { CODES } from "../keys"; import { API } from "../tests/helpers/api"; import { Keyboard, Pointer, UI } from "../tests/helpers/ui"; @@ -9,7 +9,7 @@ import { screen, togglePopover, } from "../tests/test-utils"; -import { copiedStyles } from "./actionStyles"; +import { copiedStyles } from "../actions/actionStyles"; const { h } = window; @@ -17,7 +17,7 @@ const mouse = new Pointer("mouse"); describe("actionStyles", () => { beforeEach(async () => { - await render(); + await render(); }); afterEach(async () => { diff --git a/src/tests/align.test.tsx b/src/tests/align.test.tsx index 33e3e33fc..ade5510b3 100644 --- a/src/tests/align.test.tsx +++ b/src/tests/align.test.tsx @@ -1,6 +1,6 @@ import ReactDOM from "react-dom"; import { render } from "./test-utils"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../../src/packages/excalidraw/index"; import { defaultLang, setLanguage } from "../i18n"; import { UI, Pointer, Keyboard } from "./helpers/ui"; import { API } from "./helpers/api"; @@ -60,7 +60,7 @@ describe("aligning", () => { mouse.reset(); await setLanguage(defaultLang); - await render(); + await render(); }); it("aligns two objects correctly to the top", () => { diff --git a/src/tests/appState.test.tsx b/src/tests/appState.test.tsx index 2572d2545..1b3077d3e 100644 --- a/src/tests/appState.test.tsx +++ b/src/tests/appState.test.tsx @@ -1,6 +1,6 @@ import { queryByTestId, render, waitFor } from "./test-utils"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { API } from "./helpers/api"; import { getDefaultAppState } from "../appState"; import { EXPORT_DATA_TYPES, MIME_TYPES } from "../constants"; @@ -14,14 +14,17 @@ describe("appState", () => { const defaultAppState = getDefaultAppState(); const exportBackground = !defaultAppState.exportBackground; - await render(, { - localStorageData: { - appState: { - exportBackground, - viewBackgroundColor: "#F00", - }, - }, - }); + await render( + , + {}, + ); await waitFor(() => { expect(h.state.exportBackground).toBe(exportBackground); @@ -53,13 +56,15 @@ describe("appState", () => { }); it("changing fontSize with text tool selected (no element created yet)", async () => { - const { container } = await render(, { - localStorageData: { - appState: { - currentItemFontSize: 30, - }, - }, - }); + const { container } = await render( + , + ); UI.clickTool("text"); diff --git a/src/tests/binding.test.tsx b/src/tests/binding.test.tsx index 5a5663286..e80136127 100644 --- a/src/tests/binding.test.tsx +++ b/src/tests/binding.test.tsx @@ -1,5 +1,5 @@ import { fireEvent, render } from "./test-utils"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../../src/packages/excalidraw/index"; import { UI, Pointer, Keyboard } from "./helpers/ui"; import { getTransformHandles } from "../element/transformHandles"; import { API } from "./helpers/api"; @@ -12,7 +12,7 @@ const mouse = new Pointer("mouse"); describe("element binding", () => { beforeEach(async () => { - await render(); + await render(); }); it("should create valid binding if duplicate start/end points", async () => { diff --git a/src/tests/clipboard.test.tsx b/src/tests/clipboard.test.tsx index 67a081013..4a55e0689 100644 --- a/src/tests/clipboard.test.tsx +++ b/src/tests/clipboard.test.tsx @@ -7,7 +7,7 @@ import { createPasteEvent, } from "./test-utils"; import { Pointer, Keyboard } from "./helpers/ui"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { KEYS } from "../keys"; import { getDefaultLineHeight, @@ -79,8 +79,13 @@ beforeEach(async () => { mouse.reset(); - await render(); - h.app.setAppState({ zoom: { value: 1 as NormalizedZoomValue } }); + await render( + , + ); setClipboardText(""); Object.assign(document, { elementFromPoint: () => GlobalTestState.canvas, @@ -91,7 +96,6 @@ describe("general paste behavior", () => { it("should randomize seed on paste", async () => { const rectangle = API.createElement({ type: "rectangle" }); const clipboardJSON = (await copyToClipboard([rectangle], null))!; - pasteWithCtrlCmdV(clipboardJSON); await waitFor(() => { diff --git a/src/tests/contextmenu.test.tsx b/src/tests/contextmenu.test.tsx index 1474c5224..92969faaf 100644 --- a/src/tests/contextmenu.test.tsx +++ b/src/tests/contextmenu.test.tsx @@ -11,7 +11,7 @@ import { waitFor, togglePopover, } from "./test-utils"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import * as Renderer from "../renderer/renderScene"; import { reseed } from "../random"; import { UI, Pointer, Keyboard } from "./helpers/ui"; @@ -20,7 +20,6 @@ import { ShortcutName } from "../actions/shortcuts"; import { copiedStyles } from "../actions/actionStyles"; import { API } from "./helpers/api"; import { setDateTimeForTests } from "../utils"; -import { LibraryItem } from "../types"; import { vi } from "vitest"; const checkpoint = (name: string) => { @@ -56,7 +55,7 @@ describe("contextMenu element", () => { reseed(7); setDateTimeForTests("201933152653"); - await render(); + await render(); }); beforeAll(() => { @@ -394,11 +393,9 @@ describe("contextMenu element", () => { const contextMenu = UI.queryContextMenu(); fireEvent.click(queryByText(contextMenu!, "Add to library")!); - await waitFor(() => { - const library = localStorage.getItem("excalidraw-library"); - expect(library).not.toBeNull(); - const addedElement = JSON.parse(library!)[0] as LibraryItem; - expect(addedElement.elements[0]).toEqual(h.elements[0]); + await waitFor(async () => { + const libraryItems = await h.app.library.getLatestLibrary(); + expect(libraryItems[0].elements[0]).toEqual(h.elements[0]); }); }); diff --git a/src/tests/dragCreate.test.tsx b/src/tests/dragCreate.test.tsx index 71dc63eb5..6e6c1dbe4 100644 --- a/src/tests/dragCreate.test.tsx +++ b/src/tests/dragCreate.test.tsx @@ -1,5 +1,5 @@ import ReactDOM from "react-dom"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import * as Renderer from "../renderer/renderScene"; import { KEYS } from "../keys"; import { @@ -30,7 +30,7 @@ const { h } = window; describe("Test dragCreate", () => { describe("add element to the scene when pointer dragging long enough", () => { it("rectangle", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("rectangle"); fireEvent.click(tool); @@ -62,7 +62,7 @@ describe("Test dragCreate", () => { }); it("ellipse", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("ellipse"); fireEvent.click(tool); @@ -95,7 +95,7 @@ describe("Test dragCreate", () => { }); it("diamond", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("diamond"); fireEvent.click(tool); @@ -127,7 +127,7 @@ describe("Test dragCreate", () => { }); it("arrow", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("arrow"); fireEvent.click(tool); @@ -163,7 +163,7 @@ describe("Test dragCreate", () => { }); it("line", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("line"); fireEvent.click(tool); @@ -207,7 +207,7 @@ describe("Test dragCreate", () => { }); it("rectangle", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("rectangle"); fireEvent.click(tool); @@ -227,7 +227,7 @@ describe("Test dragCreate", () => { }); it("ellipse", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("ellipse"); fireEvent.click(tool); @@ -247,7 +247,7 @@ describe("Test dragCreate", () => { }); it("diamond", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("diamond"); fireEvent.click(tool); @@ -267,7 +267,9 @@ describe("Test dragCreate", () => { }); it("arrow", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render( + , + ); // select tool const tool = getByToolName("arrow"); fireEvent.click(tool); @@ -292,7 +294,9 @@ describe("Test dragCreate", () => { }); it("line", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render( + , + ); // select tool const tool = getByToolName("line"); fireEvent.click(tool); diff --git a/src/tests/elementLocking.test.tsx b/src/tests/elementLocking.test.tsx index a2f6eb11d..e3a2fb445 100644 --- a/src/tests/elementLocking.test.tsx +++ b/src/tests/elementLocking.test.tsx @@ -1,5 +1,5 @@ import ReactDOM from "react-dom"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { render } from "../tests/test-utils"; import { Keyboard, Pointer, UI } from "../tests/helpers/ui"; import { KEYS } from "../keys"; @@ -15,7 +15,7 @@ const h = window.h; describe("element locking", () => { beforeEach(async () => { - await render(); + await render(); h.elements = []; }); diff --git a/src/tests/export.test.tsx b/src/tests/export.test.tsx index da496dea3..5ce16abe5 100644 --- a/src/tests/export.test.tsx +++ b/src/tests/export.test.tsx @@ -1,5 +1,5 @@ import { render, waitFor } from "./test-utils"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { API } from "./helpers/api"; import { encodePngMetadata, @@ -42,7 +42,7 @@ Object.defineProperty(window, "TextDecoder", { describe("export", () => { beforeEach(async () => { - await render(); + await render(); }); it("export embedded png and reimport", async () => { diff --git a/src/tests/fitToContent.test.tsx b/src/tests/fitToContent.test.tsx index 580467dde..386883b66 100644 --- a/src/tests/fitToContent.test.tsx +++ b/src/tests/fitToContent.test.tsx @@ -1,14 +1,14 @@ import { render } from "./test-utils"; import { API } from "./helpers/api"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { vi } from "vitest"; const { h } = window; describe("fitToContent", () => { it("should zoom to fit the selected element", async () => { - await render(); + await render(); h.state.width = 10; h.state.height = 10; @@ -30,7 +30,7 @@ describe("fitToContent", () => { }); it("should zoom to fit multiple elements", async () => { - await render(); + await render(); const topLeft = API.createElement({ width: 20, @@ -61,7 +61,7 @@ describe("fitToContent", () => { }); it("should scroll the viewport to the selected element", async () => { - await render(); + await render(); h.state.width = 10; h.state.height = 10; @@ -106,7 +106,7 @@ describe("fitToContent animated", () => { }); it("should ease scroll the viewport to the selected element", async () => { - await render(); + await render(); h.state.width = 10; h.state.height = 10; @@ -142,7 +142,7 @@ describe("fitToContent animated", () => { }); it("should animate the scroll but not the zoom", async () => { - await render(); + await render(); h.state.width = 50; h.state.height = 50; diff --git a/src/tests/flip.test.tsx b/src/tests/flip.test.tsx index 04f3e88b0..b80b25f2d 100644 --- a/src/tests/flip.test.tsx +++ b/src/tests/flip.test.tsx @@ -19,7 +19,7 @@ import { FileId, } from "../element/types"; import { newLinearElement } from "../element"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { mutateElement } from "../element/mutateElement"; import { NormalizedZoomValue } from "../types"; import { ROUNDNESS } from "../constants"; @@ -52,7 +52,7 @@ beforeEach(async () => { Object.assign(document, { elementFromPoint: () => GlobalTestState.canvas, }); - await render(); + await render(); h.setState({ zoom: { value: 1 as NormalizedZoomValue, diff --git a/src/tests/history.test.tsx b/src/tests/history.test.tsx index 4cf5f8440..aabfc7a77 100644 --- a/src/tests/history.test.tsx +++ b/src/tests/history.test.tsx @@ -1,5 +1,5 @@ import { assertSelectedElements, render } from "./test-utils"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { Keyboard, Pointer, UI } from "./helpers/ui"; import { API } from "./helpers/api"; import { getDefaultAppState } from "../appState"; @@ -13,14 +13,16 @@ const mouse = new Pointer("mouse"); describe("history", () => { it("initializing scene should end up with single history entry", async () => { - await render(, { - localStorageData: { - elements: [API.createElement({ type: "rectangle", id: "A" })], - appState: { - zenModeEnabled: true, - }, - }, - }); + await render( + , + ); await waitFor(() => expect(h.state.zenModeEnabled).toBe(true)); await waitFor(() => @@ -60,14 +62,16 @@ describe("history", () => { }); it("scene import via drag&drop should create new history entry", async () => { - await render(, { - localStorageData: { - elements: [API.createElement({ type: "rectangle", id: "A" })], - appState: { - viewBackgroundColor: "#FFF", - }, - }, - }); + await render( + , + ); await waitFor(() => expect(h.state.viewBackgroundColor).toBe("#FFF")); await waitFor(() => @@ -113,7 +117,7 @@ describe("history", () => { }); it("undo/redo works properly with groups", async () => { - await render(); + await render(); const rect1 = API.createElement({ type: "rectangle", groupIds: ["A"] }); const rect2 = API.createElement({ type: "rectangle", groupIds: ["A"] }); diff --git a/src/tests/library.test.tsx b/src/tests/library.test.tsx index 512d1b564..a87c87f7b 100644 --- a/src/tests/library.test.tsx +++ b/src/tests/library.test.tsx @@ -2,7 +2,7 @@ import { vi } from "vitest"; import { fireEvent, render, waitFor } from "./test-utils"; import { queryByTestId } from "@testing-library/react"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { API } from "./helpers/api"; import { MIME_TYPES } from "../constants"; import { LibraryItem, LibraryItems } from "../types"; @@ -42,7 +42,7 @@ vi.mock("../data/filesystem.ts", async (importOriginal) => { describe("library", () => { beforeEach(async () => { - await render(); + await render(); h.app.library.resetLibrary(); }); @@ -189,7 +189,7 @@ describe("library", () => { describe("library menu", () => { it("should load library from file picker", async () => { - const { container } = await render(); + const { container } = await render(); const latestLibrary = await h.app.library.getLatestLibrary(); expect(latestLibrary.length).toBe(0); diff --git a/src/tests/linearElementEditor.test.tsx b/src/tests/linearElementEditor.test.tsx index 7c14b6ef7..93ee8758f 100644 --- a/src/tests/linearElementEditor.test.tsx +++ b/src/tests/linearElementEditor.test.tsx @@ -5,7 +5,7 @@ import { ExcalidrawTextElementWithContainer, FontString, } from "../element/types"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { centerPoint } from "../math"; import { reseed } from "../random"; import * as Renderer from "../renderer/renderScene"; @@ -43,7 +43,7 @@ describe("Test Linear Elements", () => { renderInteractiveScene.mockClear(); renderStaticScene.mockClear(); reseed(7); - const comp = await render(); + const comp = await render(); h.state.width = 1000; h.state.height = 1000; container = comp.container; diff --git a/src/tests/move.test.tsx b/src/tests/move.test.tsx index 4fe7ab0a6..5435d7927 100644 --- a/src/tests/move.test.tsx +++ b/src/tests/move.test.tsx @@ -1,7 +1,7 @@ import React from "react"; import ReactDOM from "react-dom"; import { render, fireEvent } from "./test-utils"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import * as Renderer from "../renderer/renderScene"; import { reseed } from "../random"; import { bindOrUnbindLinearElement } from "../element/binding"; @@ -31,7 +31,7 @@ const { h } = window; describe("move element", () => { it("rectangle", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); const canvas = container.querySelector("canvas.interactive")!; { @@ -67,7 +67,7 @@ describe("move element", () => { }); it("rectangles with binding arrow", async () => { - await render(); + await render(); // create elements const rectA = UI.createElement("rectangle", { size: 100 }); @@ -119,7 +119,7 @@ describe("move element", () => { describe("duplicate element on move when ALT is clicked", () => { it("rectangle", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); const canvas = container.querySelector("canvas.interactive")!; { diff --git a/src/tests/multiPointCreate.test.tsx b/src/tests/multiPointCreate.test.tsx index d26207eea..e198b2588 100644 --- a/src/tests/multiPointCreate.test.tsx +++ b/src/tests/multiPointCreate.test.tsx @@ -5,7 +5,7 @@ import { mockBoundingClientRect, restoreOriginalGetBoundingClientRect, } from "./test-utils"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import * as Renderer from "../renderer/renderScene"; import { KEYS } from "../keys"; import { ExcalidrawLinearElement } from "../element/types"; @@ -29,7 +29,7 @@ const { h } = window; describe("remove shape in non linear elements", () => { beforeAll(() => { - mockBoundingClientRect(); + mockBoundingClientRect({ width: 1000, height: 1000 }); }); afterAll(() => { @@ -37,12 +37,13 @@ describe("remove shape in non linear elements", () => { }); it("rectangle", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("rectangle"); fireEvent.click(tool); const canvas = container.querySelector("canvas.interactive")!; + fireEvent.pointerDown(canvas, { clientX: 30, clientY: 20 }); fireEvent.pointerUp(canvas, { clientX: 30, clientY: 30 }); @@ -52,7 +53,7 @@ describe("remove shape in non linear elements", () => { }); it("ellipse", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("ellipse"); fireEvent.click(tool); @@ -67,7 +68,7 @@ describe("remove shape in non linear elements", () => { }); it("diamond", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("diamond"); fireEvent.click(tool); @@ -84,7 +85,7 @@ describe("remove shape in non linear elements", () => { describe("multi point mode in linear elements", () => { it("arrow", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("arrow"); fireEvent.click(tool); @@ -109,8 +110,8 @@ describe("multi point mode in linear elements", () => { key: KEYS.ENTER, }); - expect(renderInteractiveScene).toHaveBeenCalledTimes(10); - expect(renderStaticScene).toHaveBeenCalledTimes(11); + expect(renderInteractiveScene).toHaveBeenCalledTimes(9); + expect(renderStaticScene).toHaveBeenCalledTimes(10); expect(h.elements.length).toEqual(1); const element = h.elements[0] as ExcalidrawLinearElement; @@ -128,7 +129,7 @@ describe("multi point mode in linear elements", () => { }); it("line", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("line"); fireEvent.click(tool); @@ -153,8 +154,8 @@ describe("multi point mode in linear elements", () => { key: KEYS.ENTER, }); - expect(renderInteractiveScene).toHaveBeenCalledTimes(10); - expect(renderStaticScene).toHaveBeenCalledTimes(11); + expect(renderInteractiveScene).toHaveBeenCalledTimes(9); + expect(renderStaticScene).toHaveBeenCalledTimes(10); expect(h.elements.length).toEqual(1); const element = h.elements[0] as ExcalidrawLinearElement; diff --git a/src/tests/regressionTests.test.tsx b/src/tests/regressionTests.test.tsx index 47fa9208b..8389dd42e 100644 --- a/src/tests/regressionTests.test.tsx +++ b/src/tests/regressionTests.test.tsx @@ -1,7 +1,7 @@ import ReactDOM from "react-dom"; import { ExcalidrawElement } from "../element/types"; import { CODES, KEYS } from "../keys"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { reseed } from "../random"; import * as Renderer from "../renderer/renderScene"; import { setDateTimeForTests } from "../utils"; @@ -13,9 +13,7 @@ import { render, screen, togglePopover, - waitFor, } from "./test-utils"; -import { defaultLang } from "../i18n"; import { FONT_FAMILY } from "../constants"; import { vi } from "vitest"; @@ -56,7 +54,7 @@ beforeEach(async () => { finger1.reset(); finger2.reset(); - await render(); + await render(); h.setState({ height: 768, width: 1024 }); }); @@ -443,26 +441,6 @@ describe("regression tests", () => { expect(h.state.zoom.value).toBe(1); }); - it("rerenders UI on language change", async () => { - // select rectangle tool to show properties menu - UI.clickTool("rectangle"); - // english lang should display `thin` label - expect(screen.queryByTitle(/thin/i)).not.toBeNull(); - fireEvent.click(document.querySelector(".dropdown-menu-button")!); - - fireEvent.change(document.querySelector(".dropdown-select__language")!, { - target: { value: "de-DE" }, - }); - // switching to german, `thin` label should no longer exist - await waitFor(() => expect(screen.queryByTitle(/thin/i)).toBeNull()); - // reset language - fireEvent.change(document.querySelector(".dropdown-select__language")!, { - target: { value: defaultLang.code }, - }); - // switching back to English - await waitFor(() => expect(screen.queryByTitle(/thin/i)).not.toBeNull()); - }); - it("make a group and duplicate it", () => { UI.clickTool("rectangle"); mouse.down(10, 10); diff --git a/src/tests/resize.test.tsx b/src/tests/resize.test.tsx index fdecf8fb6..60ce3765d 100644 --- a/src/tests/resize.test.tsx +++ b/src/tests/resize.test.tsx @@ -6,7 +6,7 @@ import { reseed } from "../random"; import { UI, Keyboard } from "./helpers/ui"; import { resize } from "./utils"; import { ExcalidrawTextElement } from "../element/types"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { API } from "./helpers/api"; import { KEYS } from "../keys"; import { vi } from "vitest"; @@ -126,7 +126,7 @@ describe("resize rectangle ellipses and diamond elements", () => { describe("Test text element", () => { it("should update font size via keyboard", async () => { - await render(); + await render(); const textElement = API.createElement({ type: "text", diff --git a/src/tests/scroll.test.tsx b/src/tests/scroll.test.tsx index e8aa074e0..f2e812ca8 100644 --- a/src/tests/scroll.test.tsx +++ b/src/tests/scroll.test.tsx @@ -8,7 +8,6 @@ import { Excalidraw } from "../packages/excalidraw/index"; import { API } from "./helpers/api"; import { Keyboard } from "./helpers/ui"; import { KEYS } from "../keys"; -import ExcalidrawApp from "../excalidraw-app"; const { h } = window; @@ -56,7 +55,7 @@ describe("appState", () => { it("moving by page up/down/left/right", async () => { mockBoundingClientRect(); - await render(, {}); + await render(, {}); const scrollTest = () => { const initialScrollY = h.state.scrollY; diff --git a/src/tests/selection.test.tsx b/src/tests/selection.test.tsx index acae9dd8c..f6c83fc7a 100644 --- a/src/tests/selection.test.tsx +++ b/src/tests/selection.test.tsx @@ -6,7 +6,7 @@ import { restoreOriginalGetBoundingClientRect, assertSelectedElements, } from "./test-utils"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import * as Renderer from "../renderer/renderScene"; import { KEYS } from "../keys"; import { reseed } from "../random"; @@ -34,7 +34,7 @@ const mouse = new Pointer("mouse"); describe("box-selection", () => { beforeEach(async () => { - await render(); + await render(); }); it("should allow adding to selection via box-select when holding shift", async () => { @@ -102,7 +102,7 @@ describe("box-selection", () => { describe("inner box-selection", () => { beforeEach(async () => { - await render(); + await render(); }); it("selecting elements visually nested inside another", async () => { const rect1 = API.createElement({ @@ -218,7 +218,7 @@ describe("inner box-selection", () => { describe("selection element", () => { it("create selection element on pointer down", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("selection"); fireEvent.click(tool); @@ -239,7 +239,7 @@ describe("selection element", () => { }); it("resize selection element on pointer move", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("selection"); fireEvent.click(tool); @@ -261,7 +261,7 @@ describe("selection element", () => { }); it("remove selection element on pointer up", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render(); // select tool const tool = getByToolName("selection"); fireEvent.click(tool); @@ -287,7 +287,9 @@ describe("select single element on the scene", () => { }); it("rectangle", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render( + , + ); const canvas = container.querySelector("canvas.interactive")!; { // create element @@ -317,7 +319,9 @@ describe("select single element on the scene", () => { }); it("diamond", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render( + , + ); const canvas = container.querySelector("canvas.interactive")!; { // create element @@ -347,7 +351,9 @@ describe("select single element on the scene", () => { }); it("ellipse", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render( + , + ); const canvas = container.querySelector("canvas.interactive")!; { // create element @@ -377,7 +383,9 @@ describe("select single element on the scene", () => { }); it("arrow", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render( + , + ); const canvas = container.querySelector("canvas.interactive")!; { // create element @@ -419,7 +427,9 @@ describe("select single element on the scene", () => { }); it("arrow escape", async () => { - const { getByToolName, container } = await render(); + const { getByToolName, container } = await render( + , + ); const canvas = container.querySelector("canvas.interactive")!; { // create element @@ -464,7 +474,7 @@ describe("select single element on the scene", () => { describe("tool locking & selection", () => { it("should not select newly created element while tool is locked", async () => { - await render(); + await render(); UI.clickTool("lock"); expect(h.state.activeTool.locked).toBe(true); @@ -480,7 +490,7 @@ describe("tool locking & selection", () => { describe("selectedElementIds stability", () => { beforeEach(async () => { - await render(); + await render(); }); it("box-selection should be stable when not changing selection", () => { diff --git a/src/tests/test-utils.ts b/src/tests/test-utils.ts index 4a8a9f1f1..fed6b4897 100644 --- a/src/tests/test-utils.ts +++ b/src/tests/test-utils.ts @@ -11,7 +11,7 @@ import { import * as toolQueries from "./queries/toolQueries"; import { ImportedDataState } from "../data/types"; -import { STORAGE_KEYS } from "../excalidraw-app/app_constants"; +import { STORAGE_KEYS } from "../../excalidraw-app/app_constants"; import { SceneData } from "../types"; import { getSelectedElements } from "../scene/selection"; diff --git a/src/tests/viewMode.test.tsx b/src/tests/viewMode.test.tsx index bc29f81c3..1ba0c2caf 100644 --- a/src/tests/viewMode.test.tsx +++ b/src/tests/viewMode.test.tsx @@ -1,5 +1,5 @@ import { render, GlobalTestState } from "./test-utils"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { KEYS } from "../keys"; import { Keyboard, Pointer, UI } from "./helpers/ui"; import { CURSOR_TYPE } from "../constants"; @@ -12,7 +12,7 @@ const pointerTypes = [mouse, touch, pen]; describe("view mode", () => { beforeEach(async () => { - await render(); + await render(); }); it("after switching to view mode – cursor type should be pointer", async () => { diff --git a/src/tests/zindex.test.tsx b/src/tests/zindex.test.tsx index 2047c032e..543b2931b 100644 --- a/src/tests/zindex.test.tsx +++ b/src/tests/zindex.test.tsx @@ -1,6 +1,6 @@ import ReactDOM from "react-dom"; import { render } from "./test-utils"; -import ExcalidrawApp from "../excalidraw-app"; +import { Excalidraw } from "../packages/excalidraw/index"; import { reseed } from "../random"; import { actionSendBackward, @@ -121,7 +121,6 @@ const assertZindex = ({ operations: [Actions, string[]][]; }) => { const selectedElementIds = populateElements(elements, appState); - operations.forEach(([action, expected]) => { h.app.actionManager.executeAction(action); expect(h.elements.map((element) => element.id)).toEqual(expected); @@ -131,7 +130,7 @@ const assertZindex = ({ describe("z-index manipulation", () => { beforeEach(async () => { - await render(); + await render(); }); it("send back", () => { diff --git a/src/zindex.ts b/src/zindex.ts index a1f051c54..ed9c7a2e9 100644 --- a/src/zindex.ts +++ b/src/zindex.ts @@ -96,9 +96,9 @@ const getTargetIndexAccountingForBinding = ( if (direction === "left") { return elements.indexOf(nextElement); } + const boundTextElement = Scene.getScene(nextElement)!.getElement(boundElementId); - if (boundTextElement) { return elements.indexOf(boundTextElement); } diff --git a/tsconfig.json b/tsconfig.json index d75d3656a..28c79d8b0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,6 +16,6 @@ "noEmit": true, "jsx": "react-jsx" }, - "include": ["src"], + "include": ["src", "excalidraw-app"], "exclude": ["src/packages/excalidraw/types"] }