@zsviczian/excalidraw 0.11.0-obsidian-17 → 0.11.0-obsidian-20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zsviczian/excalidraw",
-  "version": "0.11.0-obsidian-17",
+  "version": "0.11.0-obsidian-20",
   "main": "main.js",
   "types": "types/packages/excalidraw/index.d.ts",
   "files": [
@@ -49,11 +49,11 @@
     "@babel/plugin-transform-async-to-generator": "7.16.0",
     "@babel/plugin-transform-runtime": "7.17.10",
     "@babel/plugin-transform-typescript": "7.16.1",
-    "@babel/preset-env": "7.16.7",
+    "@babel/preset-env": "7.17.10",
     "@babel/preset-react": "7.16.7",
     "@babel/preset-typescript": "7.16.7",
-    "autoprefixer": "10.4.5",
-    "babel-loader": "8.2.3",
+    "autoprefixer": "10.4.7",
+    "babel-loader": "8.2.5",
     "babel-plugin-transform-class-properties": "6.24.1",
     "cross-env": "7.0.3",
     "css-loader": "6.7.1",
@@ -61,12 +61,12 @@
     "postcss-loader": "6.2.1",
     "sass-loader": "12.4.0",
     "terser-webpack-plugin": "5.3.1",
-    "ts-loader": "9.2.8",
-    "typescript": "4.5.4",
+    "ts-loader": "9.3.0",
+    "typescript": "4.6.4",
     "webpack": "5.72.0",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-cli": "4.9.2",
-    "webpack-dev-server": "4.7.4",
+    "webpack-dev-server": "4.9.0",
     "webpack-merge": "5.8.0"
   },
   "bugs": "https://github.com/excalidraw/excalidraw/issues",

package/types/appState.d.ts

@@ -3,7 +3,7 @@ export declare const getDefaultAppState: () => Omit<AppState, "offsetTop" | "off
 export declare const clearAppStateForLocalStorage: (appState: Partial<AppState>) => {
     activeTool?: {
         type: "line" | "arrow" | "text" | "selection" | "rectangle" | "diamond" | "ellipse" | "image" | "freedraw" | "eraser";
-        lastActiveToolBeforeEraser: import("./types").LastActiveToolBeforeEraser; /** whether to keep when exporting to file/database */
+        lastActiveToolBeforeEraser: import("./types").LastActiveToolBeforeEraser;
         locked: boolean;
         customType: null;
     } | {

package/types/charts.d.ts

@@ -14,6 +14,14 @@ declare type ParseSpreadsheetResult = {
     type: typeof VALID_SPREADSHEET;
     spreadsheet: Spreadsheet;
 };
+/**
+ * @private exported for testing
+ */
+export declare const tryParseNumber: (s: string) => number | null;
+/**
+ * @private exported for testing
+ */
+export declare const tryParseCells: (cells: string[][]) => ParseSpreadsheetResult;
 export declare const tryParseSpreadsheet: (text: string) => ParseSpreadsheetResult;
 export declare const renderSpreadsheet: (chartType: string, spreadsheet: Spreadsheet, x: number, y: number) => ChartElements;
 export {};

package/types/components/App.d.ts

@@ -5,6 +5,7 @@ import { RestoredDataState } from "../data/restore";
 import { ExcalidrawElement, NonDeletedExcalidrawElement } from "../element/types";
 import History from "../history";
 import { AppClassProperties, AppProps, AppState, ExcalidrawImperativeAPI, BinaryFiles, LibraryItems, SceneData, DeviceType } from "../types";
+import { FileSystemHandle } from "../data/filesystem";
 import { ImportedDataState } from "../data/types";
 export declare let showFourthFont: boolean;
 export declare const useDeviceType: () => DeviceType;
@@ -51,7 +52,6 @@ declare class App extends React.Component<AppProps, AppState> {
     private onUnload;
     private disableEvent;
     private onFontLoaded;
-    private importLibraryFromUrl;
     private resetHistory;
     /**
      * Resets scene & history.
@@ -103,7 +103,6 @@ declare class App extends React.Component<AppProps, AppState> {
         appState?: Pick<AppState, K> | null | undefined;
         collaborators?: SceneData["collaborators"];
         commitToHistory?: SceneData["commitToHistory"];
-        libraryItems?: LibraryItems | import("../types").LibraryItems_v1 | Promise<LibraryItems | import("../types").LibraryItems_v1> | ((currentLibraryItems: LibraryItems) => Required<SceneData>["libraryItems"] | Promise<Required<SceneData>["libraryItems"]>) | undefined;
     }) => void;
     private onSceneUpdated;
     private updateCurrentCursorPosition;
@@ -176,7 +175,7 @@ declare class App extends React.Component<AppProps, AppState> {
     private clearSelection;
     private handleCanvasRef;
     private handleAppOnDrop;
-    loadFileToCanvas: (file: Blob) => void;
+    loadFileToCanvas: (file: File, fileHandle: FileSystemHandle | null) => Promise<void>;
     private handleCanvasContextMenu;
     private maybeDragNewGenericElement;
     private maybeHandleResize;

package/types/components/LibraryMenu.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="react" />
 import Library from "../data/library";
-import { LibraryItem, AppState, BinaryFiles, ExcalidrawProps } from "../types";
+import { LibraryItems, LibraryItem, AppState, BinaryFiles, ExcalidrawProps } from "../types";
 import "./LibraryMenu.scss";
-export declare const LibraryMenu: ({ onClose, onInsertShape, pendingElements, onAddToLibrary, theme, setAppState, files, libraryReturnUrl, focusContainer, library, id, appState, }: {
+export declare const LibraryMenu: ({ onClose, onInsertLibraryItems, pendingElements, onAddToLibrary, theme, setAppState, files, libraryReturnUrl, focusContainer, library, id, appState, }: {
     pendingElements: LibraryItem["elements"];
     onClose: () => void;
-    onInsertShape: (elements: LibraryItem["elements"]) => void;
+    onInsertLibraryItems: (libraryItems: LibraryItems) => void;
     onAddToLibrary: () => void;
     theme: AppState["theme"];
     files: BinaryFiles;

package/types/components/LibraryMenuItems.d.ts

@@ -1,13 +1,13 @@
-/// <reference types="react" />
+import React from "react";
 import Library from "../data/library";
 import { AppState, BinaryFiles, ExcalidrawProps, LibraryItem, LibraryItems } from "../types";
 import "./LibraryMenuItems.scss";
-declare const LibraryMenuItems: ({ isLoading, libraryItems, onRemoveFromLibrary, onAddToLibrary, onInsertShape, pendingElements, theme, setAppState, libraryReturnUrl, library, files, id, selectedItems, onToggle, onPublish, resetLibrary, }: {
+declare const LibraryMenuItems: ({ isLoading, libraryItems, onRemoveFromLibrary, onAddToLibrary, onInsertLibraryItems, pendingElements, theme, setAppState, libraryReturnUrl, library, files, id, selectedItems, onSelectItems, onPublish, resetLibrary, }: {
     isLoading: boolean;
     libraryItems: LibraryItems;
     pendingElements: LibraryItem["elements"];
     onRemoveFromLibrary: () => void;
-    onInsertShape: (elements: LibraryItem["elements"]) => void;
+    onInsertLibraryItems: (libraryItems: LibraryItems) => void;
     onAddToLibrary: (elements: LibraryItem["elements"]) => void;
     theme: AppState["theme"];
     files: BinaryFiles;
@@ -16,7 +16,7 @@ declare const LibraryMenuItems: ({ isLoading, libraryItems, onRemoveFromLibrary,
     library: Library;
     id: string;
     selectedItems: LibraryItem["id"][];
-    onToggle: (id: LibraryItem["id"], event: React.MouseEvent) => void;
+    onSelectItems: (id: LibraryItem["id"][]) => void;
     onPublish: () => void;
     resetLibrary: () => void;
 }) => JSX.Element;

package/types/components/LibraryUnit.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { BinaryFiles, LibraryItem } from "../types";
 import "./LibraryUnit.scss";
-export declare const LibraryUnit: ({ id, elements, files, isPending, onClick, selected, onToggle, }: {
+export declare const LibraryUnit: ({ id, elements, files, isPending, onClick, selected, onToggle, onDrag, }: {
     id: LibraryItem["id"] | /** for pending item */ null;
     elements?: readonly import("../element/types").NonDeleted<import("../element/types").ExcalidrawElement>[] | undefined;
     files: BinaryFiles;
@@ -9,4 +9,5 @@ export declare const LibraryUnit: ({ id, elements, files, isPending, onClick, se
     onClick: () => void;
     selected: boolean;
     onToggle: (id: string, event: React.MouseEvent) => void;
+    onDrag: (id: string, event: React.DragEvent) => void;
 }) => JSX.Element;

package/types/data/blob.d.ts

@@ -2,6 +2,7 @@ import { ALLOWED_IMAGE_MIME_TYPES, MIME_TYPES } from "../constants";
 import { ExcalidrawElement, FileId } from "../element/types";
 import { AppState, DataURL, LibraryItem } from "../types";
 import { FileSystemHandle } from "./filesystem";
+import { ImportedLibraryData } from "./types";
 export declare const getMimeType: (blob: Blob | string) => string;
 export declare const getFileHandleType: (handle: FileSystemHandle | null) => string | null;
 export declare const isImageFileHandleType: (type: string | null) => type is "svg" | "png";
@@ -9,7 +10,15 @@ export declare const isImageFileHandle: (handle: FileSystemHandle | null) => boo
 export declare const isSupportedImageFile: (blob: Blob | null | undefined) => blob is Blob & {
     type: typeof ALLOWED_IMAGE_MIME_TYPES[number];
 };
-export declare const loadFromBlob: (blob: Blob, localAppState: AppState | null, localElements: readonly ExcalidrawElement[] | null) => Promise<import("./restore").RestoredDataState>;
+export declare const loadSceneOrLibraryFromBlob: (blob: Blob | File, localAppState: AppState | null, localElements: readonly ExcalidrawElement[] | null, fileHandle?: FileSystemHandle | null | undefined) => Promise<{
+    type: "application/vnd.excalidraw+json";
+    data: import("./restore").RestoredDataState;
+} | {
+    type: "application/vnd.excalidrawlib+json";
+    data: ImportedLibraryData;
+}>;
+export declare const loadFromBlob: (blob: Blob, localAppState: AppState | null, localElements: readonly ExcalidrawElement[] | null, fileHandle?: FileSystemHandle | null | undefined) => Promise<import("./restore").RestoredDataState>;
+export declare const parseLibraryJSON: (json: string, defaultStatus?: LibraryItem["status"]) => LibraryItem[];
 export declare const loadLibraryFromBlob: (blob: Blob, defaultStatus?: LibraryItem["status"]) => Promise<LibraryItem[]>;
 export declare const canvasToBlob: (canvas: HTMLCanvasElement) => Promise<Blob>;
 /** generates SHA-1 digest from supplied file (if not supported, falls back
@@ -25,3 +34,14 @@ export declare const resizeImageFile: (file: File, opts: {
 export declare const SVGStringToFile: (SVGString: string, filename?: string) => File & {
     type: typeof MIME_TYPES.svg;
 };
+export declare const getFileFromEvent: (event: React.DragEvent<HTMLDivElement>) => Promise<{
+    file: File | null;
+    fileHandle: FileSystemHandle | null;
+}>;
+export declare const getFileHandle: (event: React.DragEvent<HTMLDivElement>) => Promise<FileSystemHandle | null>;
+export declare const createFile: (blob: File | Blob | ArrayBuffer, mimeType: ValueOf<typeof MIME_TYPES>, name: string | undefined) => File;
+/** attemps to detect correct mimeType if none is set, or if an image
+ * has an incorrect extension.
+ * Note: doesn't handle missing .excalidraw/.excalidrawlib extension  */
+export declare const normalizeFile: (file: File) => Promise<File>;
+export declare const blobToArrayBuffer: (blob: Blob) => Promise<ArrayBuffer>;

package/types/data/json.d.ts

@@ -1,7 +1,6 @@
 import { ExcalidrawElement } from "../element/types";
 import { AppState, BinaryFiles, LibraryItems } from "../types";
 import { ImportedDataState, ImportedLibraryData } from "./types";
-import Library from "./library";
 export declare const serializeAsJSON: (elements: readonly ExcalidrawElement[], appState: Partial<AppState>, files: BinaryFiles, type: "local" | "database") => string;
 export declare const saveAsJSON: (elements: readonly ExcalidrawElement[], appState: AppState, files: BinaryFiles) => Promise<{
     fileHandle: import("browser-fs-access").FileSystemHandle | null;
@@ -15,4 +14,3 @@ export declare const isValidExcalidrawData: (data?: {
 export declare const isValidLibrary: (json: any) => json is ImportedLibraryData;
 export declare const serializeLibraryAsJSON: (libraryItems: LibraryItems) => string;
 export declare const saveLibraryAsJSON: (libraryItems: LibraryItems) => Promise<void>;
-export declare const importLibraryFromJSON: (library: Library) => Promise<void>;

package/types/data/library.d.ts

@@ -1,6 +1,6 @@
-import { LibraryItems, LibraryItem } from "../types";
+import { LibraryItems, ExcalidrawImperativeAPI, LibraryItemsSource } from "../types";
 import type App from "../components/App";
-import { ImportedDataState } from "./types";
+import { ExcalidrawElement } from "../element/types";
 export declare const libraryItemsAtom: import("jotai").Atom<{
     status: "loading" | "loaded";
     isInitialized: boolean;
@@ -71,15 +71,26 @@ declare class Library {
     private getLastUpdateTask;
     private notifyListeners;
     resetLibrary: () => Promise<LibraryItems>;
-    /**
-     * imports library (from blob or libraryItems), merging with current library
-     * (attempting to remove duplicates)
-     */
-    importLibrary(library: Blob | Required<ImportedDataState>["libraryItems"] | Promise<Required<ImportedDataState>["libraryItems"]>, defaultStatus?: LibraryItem["status"]): Promise<LibraryItems>;
     /**
      * @returns latest cloned libraryItems. Awaits all in-progress updates first.
      */
     getLatestLibrary: () => Promise<LibraryItems>;
+    updateLibrary: ({ libraryItems, prompt, merge, openLibraryMenu, defaultStatus, }: {
+        libraryItems: LibraryItemsSource;
+        merge?: boolean | undefined;
+        prompt?: boolean | undefined;
+        openLibraryMenu?: boolean | undefined;
+        defaultStatus?: "published" | "unpublished" | undefined;
+    }) => Promise<LibraryItems>;
     setLibrary: (libraryItems: LibraryItems | Promise<LibraryItems> | ((latestLibraryItems: LibraryItems) => LibraryItems | Promise<LibraryItems>)) => Promise<LibraryItems>;
 }
 export default Library;
+export declare const distributeLibraryItemsOnSquareGrid: (libraryItems: LibraryItems) => ExcalidrawElement[];
+export declare const parseLibraryTokensFromUrl: () => {
+    libraryUrl: string;
+    idToken: string | null;
+} | null;
+export declare const useHandleLibrary: ({ excalidrawAPI, getInitialLibraryItems, }: {
+    excalidrawAPI: ExcalidrawImperativeAPI | null;
+    getInitialLibraryItems?: (() => LibraryItemsSource) | undefined;
+}) => void;

package/types/data/types.d.ts

@@ -1,5 +1,5 @@
 import { ExcalidrawElement } from "../element/types";
-import { AppState, BinaryFiles, LibraryItems, LibraryItems_v1 } from "../types";
+import { AppState, BinaryFiles, LibraryItems, LibraryItems_anyVersion } from "../types";
 import type { cleanAppStateForExport } from "../appState";
 import { VERSIONS } from "../constants";
 export interface ExportedDataState {
@@ -17,7 +17,7 @@ export interface ImportedDataState {
     elements?: readonly ExcalidrawElement[] | null;
     appState?: Readonly<Partial<AppState>> | null;
     scrollToContent?: boolean;
-    libraryItems?: LibraryItems | LibraryItems_v1;
+    libraryItems?: LibraryItems_anyVersion;
     files?: BinaryFiles;
 }
 export interface ExportedLibraryData {

package/types/distribute.d.ts

@@ -0,0 +1,6 @@
+import { ExcalidrawElement } from "./element/types";
+export interface Distribution {
+    space: "between";
+    axis: "x" | "y";
+}
+export declare const distributeElements: (selectedElements: ExcalidrawElement[], distribution: Distribution) => ExcalidrawElement[];

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

@@ -8,7 +8,7 @@ export default _default;
 export { getSceneVersion, isInvisiblySmallElement, getNonDeletedElements, } from "../../element";
 export { defaultLang, languages } from "../../i18n";
 export { restore, restoreAppState, restoreElements, restoreLibraryItems, } from "../../data/restore";
-export { exportToCanvas, exportToBlob, exportToSvg, serializeAsJSON, serializeLibraryAsJSON, loadLibraryFromBlob, loadFromBlob, getFreeDrawSvgPath, getCommonBoundingBox, //zsviczian
+export { exportToCanvas, exportToBlob, exportToSvg, serializeAsJSON, serializeLibraryAsJSON, loadLibraryFromBlob, loadFromBlob, loadSceneOrLibraryFromBlob, getFreeDrawSvgPath, getCommonBoundingBox, //zsviczian
 getMaximumGroups, //zsviczian
 intersectElementWithLine, //zsviczian
 determineFocusDistance, //zsviczian
@@ -17,3 +17,4 @@ exportToClipboard, mergeLibraryItems, } from "../../packages/utils";
 export { isLinearElement } from "../../element/typeChecks";
 export { FONT_FAMILY, THEME, MIME_TYPES } from "../../constants";
 export { mutateElement, newElementWith, bumpVersion, } from "../../element/mutateElement";
+export { parseLibraryTokensFromUrl, useHandleLibrary, } from "../../data/library";

package/types/packages/utils.d.ts

@@ -1,5 +1,7 @@
 import { AppState, BinaryFiles } from "../types";
 import { ExcalidrawElement, NonDeleted } from "../element/types";
+import { MIME_TYPES } from "../constants";
+export { MIME_TYPES };
 declare type ExportOpts = {
     elements: readonly NonDeleted<ExcalidrawElement>[];
     appState?: Partial<Omit<AppState, "offsetTop" | "offsetLeft">>;
@@ -25,7 +27,7 @@ export declare const exportToClipboard: (opts: ExportOpts & {
     type: "png" | "svg" | "json";
 }) => Promise<void>;
 export { serializeAsJSON, serializeLibraryAsJSON } from "../data/json";
-export { loadFromBlob, loadLibraryFromBlob } from "../data/blob";
+export { loadFromBlob, loadSceneOrLibraryFromBlob, loadLibraryFromBlob, } from "../data/blob";
 export { getFreeDrawSvgPath } from "../renderer/renderElement";
 export { getCommonBoundingBox } from "../element/bounds";
 export { getMaximumGroups } from "../groups";

package/types/scene/Scene.d.ts

@@ -14,10 +14,9 @@ declare class Scene {
     private elements;
     private elementsMap;
     getElementsIncludingDeleted(): readonly ExcalidrawElement[];
-    getElements(): readonly NonDeletedExcalidrawElement[];
+    getNonDeletedElements(): readonly NonDeletedExcalidrawElement[];
     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;
     informMutation(): void;
     addCallback(cb: SceneStateCallback): SceneStateCallbackRemover;

package/types/types.d.ts

@@ -29,7 +29,7 @@ export declare type Collaborator = {
         background: string;
         stroke: string;
     };
-    src?: string;
+    avatarUrl?: string;
 };
 export declare type DataURL = string & {
     _brand: "DataURL";
@@ -177,7 +177,7 @@ export declare class GestureEvent extends UIEvent {
 /** @deprecated legacy: do not use outside of migration paths */
 export declare type LibraryItem_v1 = readonly NonDeleted<ExcalidrawElement>[];
 /** @deprecated legacy: do not use outside of migration paths */
-export declare type LibraryItems_v1 = readonly LibraryItem_v1[];
+declare type LibraryItems_v1 = readonly LibraryItem_v1[];
 /** v2 library item */
 export declare type LibraryItem = {
     id: string;
@@ -189,6 +189,8 @@ export declare type LibraryItem = {
     error?: string;
 };
 export declare type LibraryItems = readonly LibraryItem[];
+export declare type LibraryItems_anyVersion = LibraryItems | LibraryItems_v1;
+export declare type LibraryItemsSource = ((currentLibraryItems: LibraryItems) => Blob | LibraryItems_anyVersion | Promise<LibraryItems_anyVersion | Blob>) | Blob | LibraryItems_anyVersion | Promise<LibraryItems_anyVersion | Blob>;
 export declare type ExcalidrawAPIRefValue = ExcalidrawImperativeAPI | {
     readyPromise?: ResolvablePromise<ExcalidrawImperativeAPI>;
     ready?: false;
@@ -236,13 +238,14 @@ export interface ExcalidrawProps {
         nativeEvent: MouseEvent | React.PointerEvent<HTMLCanvasElement>;
     }>) => void;
     onLinkHover?: (element: NonDeletedExcalidrawElement, event: React.PointerEvent<HTMLCanvasElement>) => void;
+    onPointerDown?: (activeTool: AppState["activeTool"], pointerDownState: PointerDownState) => void;
+    onScrollChange?: (scrollX: number, scrollY: number) => void;
 }
 export declare type SceneData = {
     elements?: ImportedDataState["elements"];
     appState?: ImportedDataState["appState"];
     collaborators?: Map<string, Collaborator>;
     commitToHistory?: boolean;
-    libraryItems?: LibraryItems | LibraryItems_v1;
 };
 export declare enum UserIdleState {
     ACTIVE = "active",
@@ -352,6 +355,7 @@ export declare type PointerDownState = Readonly<{
 }>;
 export declare type ExcalidrawImperativeAPI = {
     updateScene: InstanceType<typeof App>["updateScene"];
+    updateLibrary: InstanceType<typeof Library>["updateLibrary"];
     resetScene: InstanceType<typeof App>["resetScene"];
     getSceneElementsIncludingDeleted: InstanceType<typeof App>["getSceneElementsIncludingDeleted"];
     history: {
@@ -363,7 +367,6 @@ export declare type ExcalidrawImperativeAPI = {
     getAppState: () => InstanceType<typeof App>["state"];
     getFiles: () => InstanceType<typeof App>["files"];
     refresh: InstanceType<typeof App>["refresh"];
-    importLibrary: InstanceType<typeof App>["importLibraryFromUrl"];
     setToastMessage: InstanceType<typeof App>["setToastMessage"];
     addFiles: (data: BinaryFileData[]) => void;
     updateContainerSize: InstanceType<typeof App>["updateContainerSize"];
@@ -378,6 +381,7 @@ export declare type ExcalidrawImperativeAPI = {
     bringToFront: (elements: readonly ExcalidrawElement[]) => void;
     restore: InstanceType<typeof App>["restore"];
     setMobileModeAllowed: (allow: boolean) => void;
+    setActiveTool: InstanceType<typeof App>["setActiveTool"];
 };
 export declare type DeviceType = {
     isMobile: boolean;