@wildmio/excalidraw 0.18.0-custom-1 → 0.18.0-custom.2

package/dist/types/excalidraw/data/json.d.ts

@@ -7,7 +7,163 @@ export declare const saveAsJSON: (elements: readonly ExcalidrawElement[], appSta
 name?: string) => Promise<{
     fileHandle: import("browser-fs-access").FileSystemHandle | null;
 }>;
-export declare const loadFromJSON: (localAppState: AppState, localElements: readonly ExcalidrawElement[] | null) => Promise<import("./restore").RestoredDataState>;
+export declare const loadFromJSON: (localAppState: AppState, localElements: readonly ExcalidrawElement[] | null) => Promise<{
+    elements: import("@excalidraw/element/types").OrderedExcalidrawElement[];
+    appState: {
+        viewBackgroundColor: string;
+        theme: import("@excalidraw/element/types").Theme;
+        frameRendering: {
+            enabled: boolean;
+            name: boolean;
+            outline: boolean;
+            clip: boolean;
+        };
+        name: string | null;
+        zoom: import("../types").Zoom;
+        scrollX: number;
+        scrollY: number;
+        hideAnnotations: boolean;
+        viewModeEnabled: boolean;
+        openDialog: null | {
+            name: "imageExport" | "help" | "jsonExport";
+        } | {
+            name: "ttd";
+            tab: "text-to-diagram" | "mermaid";
+        } | {
+            name: "commandPalette";
+        } | {
+            name: "settings";
+        } | {
+            name: "elementLinkSelector";
+            sourceElementId: ExcalidrawElement["id"];
+        };
+        editingGroupId: import("@excalidraw/element/types").GroupId | null;
+        selectedElementIds: Readonly<{
+            [id: string]: true;
+        }>;
+        frameToHighlight: import("@excalidraw/element/types").NonDeleted<import("@excalidraw/element/types").ExcalidrawFrameLikeElement> | null;
+        activeEmbeddable: {
+            element: import("@excalidraw/element/types").NonDeletedExcalidrawElement;
+            state: "hover" | "active";
+        } | null;
+        selectionElement: import("@excalidraw/element/types").NonDeletedExcalidrawElement | null;
+        selectedGroupIds: {
+            [groupId: string]: boolean;
+        };
+        selectedLinearElement: import("@excalidraw/element").LinearElementEditor | null;
+        multiElement: import("@excalidraw/element/types").NonDeleted<import("@excalidraw/element/types").ExcalidrawLinearElement> | null;
+        newElement: import("@excalidraw/element/types").NonDeleted<import("@excalidraw/element/types").ExcalidrawNonSelectionElement> | null;
+        isBindingEnabled: boolean;
+        suggestedBinding: import("@excalidraw/element/types").NonDeleted<import("@excalidraw/element/types").ExcalidrawBindableElement> | null;
+        isRotating: boolean;
+        elementsToHighlight: import("@excalidraw/element/types").NonDeleted<ExcalidrawElement>[] | null;
+        collaborators: Map<import("../types").SocketId, import("../types").Collaborator>;
+        snapLines: readonly import("../snapping").SnapLine[];
+        zenModeEnabled: boolean;
+        editingTextElement: import("@excalidraw/element/types").NonDeletedExcalidrawElement | null;
+        isCropping: boolean;
+        croppingElementId: ExcalidrawElement["id"] | null;
+        searchMatches: Readonly<{
+            focusedId: ExcalidrawElement["id"] | null;
+            matches: readonly import("../types").SearchMatch[];
+        }> | null;
+        activeLockedId: string | null;
+        hoveredElementIds: Readonly<{
+            [id: string]: true;
+        }>;
+        shouldCacheIgnoreZoom: boolean;
+        exportScale: number;
+        bindMode: import("@excalidraw/element/types").BindMode;
+        gridSize: number;
+        contextMenu: {
+            items: import("../components/ContextMenu").ContextMenuItems;
+            top: number;
+            left: number;
+        } | null;
+        showWelcomeScreen: boolean;
+        isLoading: boolean;
+        errorMessage: React.ReactNode;
+        resizingElement: import("@excalidraw/element/types").NonDeletedExcalidrawElement | null;
+        startBoundElement: import("@excalidraw/element/types").NonDeleted<import("@excalidraw/element/types").ExcalidrawBindableElement> | null;
+        editingFrame: string | null;
+        activeTool: {
+            lastActiveTool: import("../types").ActiveTool | null;
+            locked: boolean;
+            fromSelection: boolean;
+        } & import("../types").ActiveTool;
+        preferredSelectionTool: {
+            type: "selection" | "lasso";
+            initialized: boolean;
+        };
+        penMode: boolean;
+        penDetected: boolean;
+        exportBackground: boolean;
+        exportEmbedScene: boolean;
+        exportWithDarkMode: boolean;
+        currentItemStrokeColor: string;
+        currentItemBackgroundColor: string;
+        currentItemFillStyle: ExcalidrawElement["fillStyle"];
+        currentItemStrokeWidth: number;
+        currentItemStrokeStyle: ExcalidrawElement["strokeStyle"];
+        currentItemRoughness: number;
+        currentItemOpacity: number;
+        currentItemFontFamily: import("@excalidraw/element/types").FontFamilyValues;
+        currentItemFontSize: number;
+        currentItemTextAlign: import("@excalidraw/element/types").TextAlign;
+        currentItemStartArrowhead: import("@excalidraw/element/types").Arrowhead | null;
+        currentItemEndArrowhead: import("@excalidraw/element/types").Arrowhead | null;
+        currentHoveredFontFamily: import("@excalidraw/element/types").FontFamilyValues | null;
+        currentItemRoundness: import("@excalidraw/element/types").StrokeRoundness;
+        currentItemArrowType: "sharp" | "round" | "elbow";
+        cursorButton: "up" | "down";
+        scrolledOutside: boolean;
+        isResizing: boolean;
+        openMenu: "canvas" | null;
+        openPopup: "canvasBackground" | "elementBackground" | "elementStroke" | "fontFamily" | "compactTextProperties" | "compactStrokeStyles" | "compactOtherProperties" | "compactArrowProperties" | null;
+        openSidebar: {
+            name: import("../types").SidebarName;
+            tab?: import("../types").SidebarTabName;
+        } | null;
+        defaultSidebarDockedPreference: boolean;
+        lastPointerDownWith: import("@excalidraw/element/types").PointerType;
+        previousSelectedElementIds: {
+            [id: string]: true;
+        };
+        selectedElementsAreBeingDragged: boolean;
+        toast: {
+            message: string;
+            closable?: boolean;
+            duration?: number;
+        } | null;
+        gridStep: number;
+        gridModeEnabled: boolean;
+        fileHandle: import("browser-fs-access").FileSystemHandle | null;
+        stats: {
+            open: boolean;
+            panels: number;
+        };
+        currentChartType: import("@excalidraw/element/types").ChartType;
+        pasteDialog: {
+            shown: false;
+            data: null;
+        } | {
+            shown: true;
+            data: import("../charts").Spreadsheet;
+        };
+        showHyperlinkPopup: false | "info" | "editor";
+        originSnapOffset: {
+            x: number;
+            y: number;
+        } | null;
+        objectsSnapModeEnabled: boolean;
+        userToFollow: import("../types").UserToFollow | null;
+        followedBy: Set<import("../types").SocketId>;
+        lockedMultiSelections: {
+            [groupId: string]: true;
+        };
+    };
+    files: BinaryFiles;
+}>;
 export declare const isValidExcalidrawData: (data?: {
     type?: any;
     elements?: any;

package/dist/types/excalidraw/data/restore.d.ts

@@ -1,3 +1,4 @@
+import { type CombineBrandsIfNeeded } from "@excalidraw/common";
 import type { ElementsMap, ElementsMapOrArray, ExcalidrawElement, ExcalidrawSelectionElement, OrderedExcalidrawElement } from "@excalidraw/element/types";
 import type { AppState, BinaryFiles, LibraryItem } from "../types";
 import type { ImportedDataState } from "./types";
@@ -8,28 +9,33 @@ export type RestoredDataState = {
     appState: RestoredAppState;
     files: BinaryFiles;
 };
-export declare const restoreElement: (element: Exclude<ExcalidrawElement, ExcalidrawSelectionElement>, targetElementsMap: Readonly<ElementsMap>, localElementsMap: Readonly<ElementsMap> | null | undefined, opts?: {
+export declare const restoreElement: (
+/** element to be restored */
+element: Exclude<ExcalidrawElement, ExcalidrawSelectionElement>, 
+/** all elements to be restored */
+targetElementsMap: Readonly<ElementsMap>, 
+/** used for additional context */
+existingElementsMap: Readonly<ElementsMap> | null | undefined, opts?: {
     deleteInvisibleElements?: boolean;
 }) => typeof element | null;
-export declare const restoreElements: (targetElements: ImportedDataState["elements"], 
-/** NOTE doesn't serve for reconciliation */
-localElements: Readonly<ElementsMapOrArray> | null | undefined, opts?: {
+export declare const restoreElements: <T extends ExcalidrawElement>(targetElements: readonly T[] | undefined | null, 
+/** used for additional context (e.g. repairing arrow bindings) */
+existingElements: Readonly<ElementsMapOrArray> | null | undefined, opts?: {
     refreshDimensions?: boolean;
     repairBindings?: boolean;
     deleteInvisibleElements?: boolean;
-} | undefined) => OrderedExcalidrawElement[];
-export declare const restoreAppState: (appState: ImportedDataState["appState"], localAppState: Partial<AppState> | null | undefined) => RestoredAppState;
-export declare const restore: (data: Pick<ImportedDataState, "appState" | "elements" | "files"> | null, 
+} | undefined) => CombineBrandsIfNeeded<T, OrderedExcalidrawElement>;
 /**
- * Local AppState (`this.state` or initial state from localStorage) so that we
- * don't overwrite local state with default values (when values not
- * explicitly specified).
- * Supply `null` if you can't get access to it.
+ * When replacing elements that may exist locally, this bumps their versions
+ * to the local version + 1. Mainly for later reconciliation to work properly.
+ *
+ * See https://github.com/excalidraw/excalidraw/issues/3795
+ *
+ * Generally use this on editor boundaries (importing from file etc.), though
+ * it does not apply universally (e.g. we don't want to do this for collab
+ * updates).
  */
-localAppState: Partial<AppState> | null | undefined, localElements: readonly ExcalidrawElement[] | null | undefined, elementsConfig?: {
-    refreshDimensions?: boolean;
-    repairBindings?: boolean;
-    deleteInvisibleElements?: boolean;
-}) => RestoredDataState;
+export declare const bumpElementVersions: <T extends ExcalidrawElement>(targetElements: readonly T[], localElements: Readonly<ElementsMapOrArray> | null | undefined) => T[];
+export declare const restoreAppState: (appState: ImportedDataState["appState"], localAppState: Partial<AppState> | null | undefined) => RestoredAppState;
 export declare const restoreLibraryItems: (libraryItems: ImportedDataState["libraryItems"], defaultStatus: LibraryItem["status"]) => LibraryItem[];
 export {};

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

@@ -12,12 +12,11 @@ export { getSceneVersion, hashElementsVersion, hashString, getNonDeletedElements
 export { getTextFromElements } from "@excalidraw/element";
 export { isInvisiblySmallElement } from "@excalidraw/element";
 export { defaultLang, useI18n, languages } from "./i18n";
-export { restore, restoreAppState, restoreElement, restoreElements, restoreLibraryItems, } from "./data/restore";
+export { restoreAppState, restoreElement, restoreElements, restoreLibraryItems, } from "./data/restore";
 export { reconcileElements } from "./data/reconcile";
 export { exportToCanvas, exportToBlob, exportToSvg, exportToClipboard, } from "@excalidraw/utils/export";
 export { serializeAsJSON, serializeLibraryAsJSON } from "./data/json";
 export { loadFromBlob, loadSceneOrLibraryFromBlob, loadLibraryFromBlob, } from "./data/blob";
-export { getFreeDrawSvgPath } from "@excalidraw/element";
 export { mergeLibraryItems, getLibraryItemsHash } from "./data/library";
 export { isLinearElement } from "@excalidraw/element";
 export { FONT_FAMILY, THEME, MIME_TYPES, ROUNDNESS, DEFAULT_LASER_COLOR, UserIdleState, normalizeLink, sceneCoordsToViewportCoords, viewportCoordsToSceneCoords, getFormFactor, } from "@excalidraw/common";

package/dist/types/excalidraw/scene/Renderer.d.ts

@@ -1,5 +1,6 @@
 import type { ExcalidrawElement, NonDeletedExcalidrawElement } from "@excalidraw/element/types";
 import type { Scene } from "@excalidraw/element";
+import type { RenderableElementsMap } from "./types";
 import type { AppState } from "../types";
 export declare class Renderer {
     private scene;
@@ -19,8 +20,9 @@ export declare class Renderer {
          * (we'd have to prefilter elements outside of this function) */
         newElementId: ExcalidrawElement["id"] | undefined;
         sceneNonce: ReturnType<InstanceType<typeof Scene>["getSceneNonce"]>;
+        hideAnnotations: AppState["hideAnnotations"];
     }) => {
-        elementsMap: Map<string, NonDeletedExcalidrawElement> & import("@excalidraw/common/utility-types").MakeBrand<"NonDeletedElementsMap"> & import("@excalidraw/common/utility-types").MakeBrand<"RenderableElementsMap">;
+        elementsMap: RenderableElementsMap;
         visibleElements: readonly NonDeletedExcalidrawElement[];
     }) & {
         clear: () => void;

package/dist/types/excalidraw/scene/types.d.ts

@@ -15,6 +15,7 @@ export type StaticCanvasRenderConfig = {
     embedsValidationStatus: EmbedsValidationStatus;
     elementsPendingErasure: ElementsPendingErasure;
     pendingFlowchartNodes: PendingExcalidrawElements | null;
+    theme: AppState["theme"];
 };
 export type SVGRenderConfig = {
     offsetX: number;
@@ -32,6 +33,7 @@ export type SVGRenderConfig = {
      * @default true
      */
     reuseImages: boolean;
+    theme: AppState["theme"];
 };
 export type InteractiveCanvasRenderConfig = {
     remoteSelectedElementIds: Map<ExcalidrawElement["id"], SocketId[]>;
@@ -115,14 +117,17 @@ export type ScrollBars = {
         deltaMultiplier: number;
     } | null;
 };
-export type ElementShape = Drawable | Drawable[] | null;
+export type SVGPathString = string & {
+    __brand: "SVGPathString";
+};
+export type ElementShape = Drawable | Drawable[] | Path2D | (Drawable | SVGPathString)[] | null;
 export type ElementShapes = {
     rectangle: Drawable;
     ellipse: Drawable;
     diamond: Drawable;
     iframe: Drawable;
     embeddable: Drawable;
-    freedraw: Drawable | null;
+    freedraw: (Drawable | SVGPathString)[];
     arrow: Drawable[];
     line: Drawable[];
     text: null;

package/dist/types/excalidraw/types.d.ts

@@ -104,6 +104,7 @@ type _CommonCanvasAppState = {
     scrollY: AppState["scrollY"];
     width: AppState["width"];
     height: AppState["height"];
+    hideAnnotations: AppState["hideAnnotations"];
     viewModeEnabled: AppState["viewModeEnabled"];
     openDialog: AppState["openDialog"];
     editingGroupId: AppState["editingGroupId"];
@@ -311,6 +312,7 @@ export interface AppState {
     gridStep: number;
     gridModeEnabled: boolean;
     viewModeEnabled: boolean;
+    hideAnnotations: boolean;
     /** top-most selected groups (i.e. does not include nested groups) */
     selectedGroupIds: {
         [groupId: string]: boolean;
@@ -456,6 +458,7 @@ export interface ExcalidrawProps {
     renderTopLeftUI?: (isMobile: boolean, appState: UIAppState) => JSX.Element | null;
     renderTopRightUI?: (isMobile: boolean, appState: UIAppState) => JSX.Element | null;
     langCode?: Language["code"];
+    hideAnnotations?: boolean;
     viewModeEnabled?: boolean;
     zenModeEnabled?: boolean;
     gridModeEnabled?: boolean;
@@ -480,6 +483,7 @@ export interface ExcalidrawProps {
     onUserFollow?: (payload: OnUserFollowedPayload) => void;
     children?: React.ReactNode;
     validateEmbeddable?: boolean | string[] | RegExp | RegExp[] | ((link: string) => boolean | undefined);
+    onHideAnnotationsChange?: (hideAnnotations: boolean) => void;
     renderEmbeddable?: (element: NonDeleted<ExcalidrawEmbeddableElement>, appState: AppState) => JSX.Element | null;
     aiEnabled?: boolean;
     showDeprecatedFonts?: boolean;
@@ -530,7 +534,11 @@ export type UIOptions = Partial<{
     fontPicker?: {
         familyChangeEnabled?: boolean;
     };
+    shapeControl?: {
+        sloppinessChangeEnabled?: boolean;
+    };
     viewModeControlEnabled?: boolean;
+    hideAnnotationsControlEnabled?: boolean;
     undoRedoPosition: "footer" | "toolbar";
     swapTopMenuAndFooter?: boolean;
     /** @deprecated does nothing. Will be removed in 0.15 */
@@ -692,6 +700,7 @@ export interface ExcalidrawImperativeAPI {
     onPointerUp: (callback: (activeTool: AppState["activeTool"], pointerDownState: PointerDownState, event: PointerEvent) => void) => UnsubscribeCallback;
     onScrollChange: (callback: (scrollX: number, scrollY: number, zoom: Zoom) => void) => UnsubscribeCallback;
     onUserFollow: (callback: (payload: OnUserFollowedPayload) => void) => UnsubscribeCallback;
+    onHideAnnotationsChange: (callback: (hideAnnotations: boolean) => void) => UnsubscribeCallback;
 }
 export type FrameNameBounds = {
     x: number;

package/dist/types/math/src/range.d.ts

@@ -13,9 +13,7 @@ export declare function rangeInclusive(start: number, end: number): InclusiveRan
  * @param pair The number pair to convert to an inclusive range
  * @returns The new inclusive range
  */
-export declare function rangeInclusiveFromPair(pair: [start: number, end: number]): [number, number] & {
-    _brand: "excalimath_degree";
-};
+export declare function rangeInclusiveFromPair(pair: [start: number, end: number]): InclusiveRange;
 /**
  * Given two ranges, return if the two ranges overlap with each other e.g.
  * [1, 3] overlaps with [2, 4] while [1, 3] does not overlap with [4, 5].

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wildmio/excalidraw",
-  "version": "0.18.0-custom-1",
+  "version": "0.18.0-custom.2",
   "type": "module",
   "types": "./dist/types/excalidraw/index.d.ts",
   "main": "./dist/prod/index.js",
@@ -79,10 +79,7 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "6.0.2",
-    "@excalidraw/common": "0.18.0",
-    "@excalidraw/element": "0.18.0",
     "@excalidraw/laser-pointer": "1.3.1",
-    "@excalidraw/math": "0.18.0",
     "@excalidraw/mermaid-to-excalidraw": "1.1.3",
     "@excalidraw/random-username": "1.1.0",
     "@radix-ui/react-popover": "1.1.6",
@@ -114,6 +111,9 @@
     "tunnel-rat": "0.1.2"
   },
   "devDependencies": {
+    "@excalidraw/common": "0.18.0",
+    "@excalidraw/element": "0.18.0",
+    "@excalidraw/math": "0.18.0",
     "@size-limit/preset-big-lib": "9.0.0",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.6.3",