@zsviczian/excalidraw 0.11.0-obsidian-6 → 0.11.0-obsidian-9

package/types/excalidraw-app/data/index.d.ts

@@ -1,8 +1,17 @@
 import { ImportedDataState } from "../../data/types";
 import { ExcalidrawElement } from "../../element/types";
-import { AppState, UserIdleState } from "../../types";
-export declare const generateEncryptionKey: () => Promise<string | undefined>;
-export declare const SOCKET_SERVER: string;
+import { AppState, BinaryFiles, UserIdleState } from "../../types";
+/**
+ * Right now the reason why we resolve connection params (url, polling...)
+ * from upstream is to allow changing the params immediately when needed without
+ * having to wait for clients to update the SW.
+ *
+ * If REACT_APP_WS_SERVER_URL env is set, we use that instead (useful for forks)
+ */
+export declare const getCollabServer: () => Promise<{
+    url: string;
+    polling: boolean;
+}>;
 export declare type EncryptedData = {
     data: ArrayBuffer;
     iv: Uint8Array;
@@ -48,9 +57,6 @@ export declare type SocketUpdateDataIncoming = SocketUpdateDataSource[keyof Sock
 export declare type SocketUpdateData = SocketUpdateDataSource[keyof SocketUpdateDataSource] & {
     _brand: "socketUpdateData";
 };
-export declare const createIV: () => Uint8Array;
-export declare const encryptAESGEM: (data: Uint8Array, key: string) => Promise<EncryptedData>;
-export declare const decryptAESGEM: (data: ArrayBuffer, key: string, iv: Uint8Array) => Promise<SocketUpdateDataIncoming>;
 export declare const getCollaborationLinkData: (link: string) => {
     roomId: string;
     roomKey: string;
@@ -63,22 +69,19 @@ export declare const getCollaborationLink: (data: {
     roomId: string;
     roomKey: string;
 }) => string;
-export declare const getImportedKey: (key: string, usage: KeyUsage) => Promise<CryptoKey>;
-export declare const decryptImported: (iv: ArrayBuffer, encrypted: ArrayBuffer, privateKey: string) => Promise<ArrayBuffer>;
 export declare const loadScene: (id: string | null, privateKey: string | null, localDataState: ImportedDataState | undefined | null) => Promise<{
     elements: ExcalidrawElement[];
     appState: {
-        theme: "light" | "dark";
+        elementType: "line" | "arrow" | "text" | "selection" | "rectangle" | "diamond" | "ellipse" | "image" | "freedraw" | "eraser";
+        scrollX: number;
+        scrollY: number;
+        viewBackgroundColor: string;
         zoom: Readonly<{
             value: import("../../types").NormalizedZoomValue;
-            translation: Readonly<{
-                x: number;
-                y: number;
-            }>;
         }>;
-        scrollX: number;
-        scrollY: number;
-        files: Record<string, import("../../types").BinaryFileData>;
+        shouldCacheIgnoreZoom: boolean;
+        theme: string;
+        name: string;
         isLoading: boolean;
         errorMessage: string | null;
         draggingElement: import("../../element/types").NonDeletedExcalidrawElement | null;
@@ -90,8 +93,9 @@ export declare const loadScene: (id: string | null, privateKey: string | null, l
         suggestedBindings: import("../../element/binding").SuggestedBinding[];
         editingElement: import("../../element/types").NonDeletedExcalidrawElement | null;
         editingLinearElement: import("../../element/linearElementEditor").LinearElementEditor | null;
-        elementType: "line" | "selection" | "rectangle" | "diamond" | "ellipse" | "image" | "text" | "arrow" | "freedraw";
         elementLocked: boolean;
+        penMode: boolean;
+        penDetected: boolean;
         exportBackground: boolean;
         exportEmbedScene: boolean;
         exportWithDarkMode: boolean;
@@ -110,10 +114,8 @@ export declare const loadScene: (id: string | null, privateKey: string | null, l
         currentItemStartArrowhead: import("../../element/types").Arrowhead | null;
         currentItemEndArrowhead: import("../../element/types").Arrowhead | null;
         currentItemLinearStrokeSharpness: import("../../element/types").StrokeSharpness;
-        viewBackgroundColor: string;
         cursorButton: "up" | "down";
         scrolledOutside: boolean;
-        name: string;
         isResizing: boolean;
         isRotating: boolean;
         openMenu: "canvas" | "shape" | null;
@@ -125,7 +127,6 @@ export declare const loadScene: (id: string | null, privateKey: string | null, l
         previousSelectedElementIds: {
             [id: string]: boolean;
         };
-        shouldCacheIgnoreZoom: boolean;
         showHelpDialog: boolean;
         toastMessage: string | null;
         zenModeEnabled: boolean;
@@ -136,7 +137,7 @@ export declare const loadScene: (id: string | null, privateKey: string | null, l
         };
         editingGroupId: string | null;
         isLibraryOpen: boolean;
-        fileHandle: import("@dwelle/browser-fs-access").FileSystemHandle | null;
+        fileHandle: import("browser-fs-access").FileSystemHandle | null;
         collaborators: Map<string, import("../../types").Collaborator>;
         showStats: boolean;
         currentChartType: import("../../element/types").ChartType;
@@ -148,12 +149,16 @@ export declare const loadScene: (id: string | null, privateKey: string | null, l
             data: import("../../charts").Spreadsheet;
         };
         pendingImageElement: import("../../element/types").NonDeleted<import("../../element/types").ExcalidrawImageElement> | null;
+        showHyperlinkPopup: false | "info" | "editor";
+        linkOpacity: number;
+        trayModeEnabled: boolean;
+        colorPalette: {
+            canvasBackground?: string[] | undefined;
+            elementBackground?: string[] | undefined;
+            elementStroke?: string[] | undefined;
+        };
     };
+    files: BinaryFiles;
     commitToHistory: boolean;
 }>;
-export declare const exportToBackend: (elements: readonly ExcalidrawElement[], appState: AppState) => Promise<void>;
-export declare const encryptData: (key: string, data: Uint8Array | Blob | File | string) => Promise<{
-    encryptedBuffer: ArrayBuffer;
-    iv: Uint8Array;
-}>;
-export declare const decryptData: (iv: ArrayBuffer, encrypted: ArrayBuffer, privateKey: string) => Promise<ArrayBuffer>;
+export declare const exportToBackend: (elements: readonly ExcalidrawElement[], appState: AppState, files: BinaryFiles) => Promise<void>;

package/types/excalidraw-app/data/localStorage.d.ts

@@ -1,29 +1,24 @@
 import { ExcalidrawElement } from "../../element/types";
 import { AppState } from "../../types";
-export declare const STORAGE_KEYS: {
-    LOCAL_STORAGE_ELEMENTS: string;
-    LOCAL_STORAGE_APP_STATE: string;
-    LOCAL_STORAGE_COLLAB: string;
-    LOCAL_STORAGE_KEY_COLLAB_FORCE_FLAG: string;
-};
 export declare const saveUsernameToLocalStorage: (username: string) => void;
 export declare const importUsernameFromLocalStorage: () => string | null;
 export declare const saveToLocalStorage: (elements: readonly ExcalidrawElement[], appState: AppState) => void;
 export declare const importFromLocalStorage: () => {
     elements: ExcalidrawElement[];
     appState: {
-        theme: "light" | "dark";
+        elementType: "line" | "arrow" | "text" | "selection" | "rectangle" | "diamond" | "ellipse" | "image" | "freedraw" | "eraser";
+        scrollX: number;
+        scrollY: number;
+        viewBackgroundColor: string;
         zoom: Readonly<{
             value: import("../../types").NormalizedZoomValue;
-            translation: Readonly<{
-                x: number;
-                y: number;
-            }>;
         }>;
-        scrollX: number;
-        scrollY: number;
-        elementType: "line" | "selection" | "rectangle" | "diamond" | "ellipse" | "image" | "text" | "arrow" | "freedraw";
+        shouldCacheIgnoreZoom: boolean;
+        theme: string;
+        name: string;
         elementLocked: boolean;
+        penMode: boolean;
+        penDetected: boolean;
         exportBackground: boolean;
         exportEmbedScene: boolean;
         exportWithDarkMode: boolean;
@@ -42,10 +37,8 @@ export declare const importFromLocalStorage: () => {
         currentItemStartArrowhead: import("../../element/types").Arrowhead | null;
         currentItemEndArrowhead: import("../../element/types").Arrowhead | null;
         currentItemLinearStrokeSharpness: import("../../element/types").StrokeSharpness;
-        viewBackgroundColor: string;
         cursorButton: "up" | "down";
         scrolledOutside: boolean;
-        name: string;
         openMenu: "canvas" | "shape" | null;
         lastPointerDownWith: import("../../element/types").PointerType;
         selectedElementIds: {
@@ -54,7 +47,6 @@ export declare const importFromLocalStorage: () => {
         previousSelectedElementIds: {
             [id: string]: boolean;
         };
-        shouldCacheIgnoreZoom: boolean;
         zenModeEnabled: boolean;
         gridSize: number | null;
         selectedGroupIds: {
@@ -63,7 +55,6 @@ export declare const importFromLocalStorage: () => {
         editingGroupId: string | null;
         showStats: boolean;
         currentChartType: import("../../element/types").ChartType;
-        files: Record<string, import("../../types").BinaryFileData>;
         isLoading: boolean;
         errorMessage: string | null;
         draggingElement: import("../../element/types").NonDeletedExcalidrawElement | null;
@@ -82,7 +73,7 @@ export declare const importFromLocalStorage: () => {
         toastMessage: string | null;
         viewModeEnabled: boolean;
         isLibraryOpen: boolean;
-        fileHandle: import("@dwelle/browser-fs-access").FileSystemHandle | null;
+        fileHandle: import("browser-fs-access").FileSystemHandle | null;
         collaborators: Map<string, import("../../types").Collaborator>;
         pasteDialog: {
             shown: false;
@@ -92,7 +83,16 @@ export declare const importFromLocalStorage: () => {
             data: import("../../charts").Spreadsheet;
         };
         pendingImageElement: import("../../element/types").NonDeleted<import("../../element/types").ExcalidrawImageElement> | null;
+        showHyperlinkPopup: false | "info" | "editor";
+        linkOpacity: number;
+        trayModeEnabled: boolean;
+        colorPalette: {
+            canvasBackground?: string[] | undefined;
+            elementBackground?: string[] | undefined;
+            elementStroke?: string[] | undefined;
+        };
     } | null;
 };
 export declare const getElementsStorageSize: () => number;
 export declare const getTotalStorageSize: () => number;
+export declare const getLibraryItemsFromStorage: () => any;

package/types/excalidraw-app/data/tabSync.d.ts

@@ -0,0 +1,9 @@
+declare const LOCAL_STATE_VERSIONS: {
+    "version-dataState": number;
+    "version-files": number;
+};
+declare type BrowserStateTypes = keyof typeof LOCAL_STATE_VERSIONS;
+export declare const isBrowserStorageStateNewer: (type: BrowserStateTypes) => boolean;
+export declare const updateBrowserStateVersion: (type: BrowserStateTypes) => void;
+export declare const resetBrowserStateVersions: () => void;
+export {};

package/types/packages/excalidraw/index.d.ts

@@ -9,7 +9,11 @@ export default _default;
 export { getSceneVersion, isInvisiblySmallElement, getNonDeletedElements, } from "../../element";
 export { defaultLang, languages } from "../../i18n";
 export { restore, restoreAppState, restoreElements } from "../../data/restore";
-export { exportToCanvas, exportToBlob, exportToSvg, serializeAsJSON, loadLibraryFromBlob, loadFromBlob, getFreeDrawSvgPath, getCommonBoundingBox, getMaximumGroups, intersectElementWithLine, determineFocusDistance, measureText, } from "../../packages/utils";
+export { exportToCanvas, exportToBlob, exportToSvg, serializeAsJSON, serializeLibraryAsJSON, loadLibraryFromBlob, loadFromBlob, getFreeDrawSvgPath, getCommonBoundingBox, //zsviczian
+getMaximumGroups, //zsviczian
+intersectElementWithLine, //zsviczian
+determineFocusDistance, //zsviczian
+measureText, } from "../../packages/utils";
 export { isLinearElement } from "../../element/typeChecks";
 export { FONT_FAMILY, THEME } from "../../constants";
 export { mutateElement, newElementWith, bumpVersion, } from "../../element/mutateElement";

package/types/packages/utils.d.ts

@@ -19,7 +19,7 @@ export declare const exportToBlob: (opts: ExportOpts & {
 export declare const exportToSvg: ({ elements, appState, files, exportPadding, }: Omit<ExportOpts, "getDimensions"> & {
     exportPadding?: number | undefined;
 }) => Promise<SVGSVGElement>;
-export { serializeAsJSON } from "../data/json";
+export { serializeAsJSON, serializeLibraryAsJSON } from "../data/json";
 export { loadFromBlob, loadLibraryFromBlob } from "../data/blob";
 export { getFreeDrawSvgPath } from "../renderer/renderElement";
 export { getCommonBoundingBox } from "../element/bounds";

package/types/scene/Scene.d.ts

@@ -15,7 +15,7 @@ declare class Scene {
     private elementsMap;
     getElementsIncludingDeleted(): readonly ExcalidrawElement[];
     getElements(): readonly NonDeletedExcalidrawElement[];
-    getElement(id: ExcalidrawElement["id"]): ExcalidrawElement | null;
+    getElement<T extends ExcalidrawElement>(id: T["id"]): T | null;
     getNonDeletedElement(id: ExcalidrawElement["id"]): NonDeleted<ExcalidrawElement> | null;
     getNonDeletedElements(ids: readonly ExcalidrawElement["id"][]): NonDeleted<ExcalidrawElement>[];
     replaceAllElements(nextElements: readonly ExcalidrawElement[]): void;

package/types/shapes.d.ts

@@ -14,7 +14,7 @@ export declare const SHAPES: readonly [{
 }, {
     readonly icon: JSX.Element;
     readonly value: "ellipse";
-    readonly key: "e";
+    readonly key: "o";
 }, {
     readonly icon: JSX.Element;
     readonly value: "arrow";

package/types/types.d.ts

@@ -53,8 +53,11 @@ export declare type AppState = {
     suggestedBindings: SuggestedBinding[];
     editingElement: NonDeletedExcalidrawElement | null;
     editingLinearElement: LinearElementEditor | null;
-    elementType: typeof SHAPES[number]["value"] | "eraser";
-    elementLocked: boolean;
+    activeTool: {
+        type: typeof SHAPES[number]["value"] | "eraser";
+        lastActiveToolBeforeEraser: typeof SHAPES[number]["value"] | null;
+        locked: boolean;
+    };
     penMode: boolean;
     penDetected: boolean;
     exportBackground: boolean;
@@ -268,6 +271,7 @@ export declare type AppClassProperties = {
         mimeType: typeof ALLOWED_IMAGE_MIME_TYPES[number];
     }>;
     files: BinaryFiles;
+    deviceType: App["deviceType"];
 };
 export declare type PointerDownState = Readonly<{
     origin: Readonly<{
@@ -323,7 +327,10 @@ export declare type PointerDownState = Readonly<{
         hasOccurred: boolean;
     };
     elementIdsToErase: {
-        [key: ExcalidrawElement["id"]]: boolean;
+        [key: ExcalidrawElement["id"]]: {
+            opacity: ExcalidrawElement["opacity"];
+            erase: boolean;
+        };
     };
 }>;
 export declare type ExcalidrawImperativeAPI = {
@@ -354,4 +361,8 @@ export declare type ExcalidrawImperativeAPI = {
     bringToFront: (elements: readonly ExcalidrawElement[]) => void;
     restore: InstanceType<typeof App>["restore"];
 };
+export declare type DeviceType = {
+    isMobile: boolean;
+    isTouchScreen: boolean;
+};
 export {};

package/types/utils.d.ts

@@ -1,6 +1,6 @@
 import { EVENT } from "./constants";
 import { FontFamilyValues, FontString } from "./element/types";
-import { Zoom } from "./types";
+import { AppState, Zoom } from "./types";
 export declare const setDateTimeForTests: (dateTime: string) => void;
 export declare const getDateTime: () => string;
 export declare const capitalizeString: (str: string) => string;
@@ -31,7 +31,8 @@ export declare const removeSelection: () => void;
 export declare const distance: (x: number, y: number) => number;
 export declare const resetCursor: (canvas: HTMLCanvasElement | null) => void;
 export declare const setCursor: (canvas: HTMLCanvasElement | null, cursor: string) => void;
-export declare const setCursorForShape: (canvas: HTMLCanvasElement | null, shape: string) => void;
+export declare const setEraserCursor: (canvas: HTMLCanvasElement | null, theme: AppState["theme"]) => void;
+export declare const setCursorForShape: (canvas: HTMLCanvasElement | null, appState: AppState) => void;
 export declare const isFullScreen: () => boolean;
 export declare const allowFullScreen: () => Promise<void>;
 export declare const exitFullScreen: () => Promise<void>;
@@ -116,3 +117,7 @@ export declare const isTestEnv: () => boolean;
 export declare const wrapEvent: <T extends Event>(name: EVENT, nativeEvent: T) => CustomEvent<{
     nativeEvent: T;
 }>;
+export declare const updateObject: <T extends Record<string, any>>(obj: T, updates: Partial<T>) => T;
+export declare const isPrimitive: (val: any) => boolean;
+export declare const getFrame: () => "top" | "iframe";
+export declare const isPromiseLike: (value: any) => value is Promise<any>;