@zsviczian/excalidraw 0.17.1-obsidian-40 → 0.17.1-obsidian-41

package/types/excalidraw/element/embeddable.d.ts

@@ -116,8 +116,9 @@ export declare const actionSetEmbeddableAsActiveTool: {
             } | null;
             zenModeEnabled: boolean;
             theme: import("./types").Theme;
-            gridSize: number | null;
-            previousGridSize: number | null;
+            gridSize: number;
+            gridStep: number;
+            gridModeEnabled: boolean;
             viewModeEnabled: boolean;
             selectedGroupIds: {
                 [groupId: string]: boolean;
@@ -183,8 +184,8 @@ export declare const actionSetEmbeddableAsActiveTool: {
             gridColor: {
                 Bold: string;
                 Regular: string;
-                MajorGridFrequency?: number | undefined;
             };
+            highlightSearchResult: boolean;
             dynamicStyle: {
                 [x: string]: string;
             };

package/types/excalidraw/element/linearElementEditor.d.ts

@@ -1,6 +1,6 @@
 import type { NonDeleted, ExcalidrawLinearElement, ExcalidrawElement, PointBinding, ExcalidrawBindableElement, ExcalidrawTextElementWithContainer, ElementsMap, NonDeletedSceneElementsMap, OrderedExcalidrawElement, SceneElementsMap } from "./types";
 import type { Bounds } from "./bounds";
-import type { Point, AppState, PointerCoords, InteractiveCanvasAppState } from "../types";
+import type { Point, AppState, PointerCoords, InteractiveCanvasAppState, AppClassProperties, NullableGridSize } from "../types";
 import type { Store } from "../store";
 import type Scene from "../scene/Scene";
 declare const editorMidPointsCache: {
@@ -49,7 +49,7 @@ export declare class LinearElementEditor {
     static getElement(id: InstanceType<typeof LinearElementEditor>["elementId"], elementsMap: ElementsMap): NonDeleted<ExcalidrawLinearElement> | null;
     static handleBoxSelection(event: PointerEvent, appState: AppState, setState: React.Component<any, AppState>["setState"], elementsMap: NonDeletedSceneElementsMap): false | undefined;
     /** @returns whether point was dragged */
-    static handlePointDragging(event: PointerEvent, appState: AppState, scenePointerX: number, scenePointerY: number, maybeSuggestBinding: (element: NonDeleted<ExcalidrawLinearElement>, pointSceneCoords: {
+    static handlePointDragging(event: PointerEvent, app: AppClassProperties, scenePointerX: number, scenePointerY: number, maybeSuggestBinding: (element: NonDeleted<ExcalidrawLinearElement>, pointSceneCoords: {
         x: number;
         y: number;
     }[]) => void, linearElementEditor: LinearElementEditor, scene: Scene): boolean;
@@ -63,7 +63,7 @@ export declare class LinearElementEditor {
     static isSegmentTooShort(element: NonDeleted<ExcalidrawLinearElement>, startPoint: Point, endPoint: Point, zoom: AppState["zoom"]): boolean;
     static getSegmentMidPoint(element: NonDeleted<ExcalidrawLinearElement>, startPoint: Point, endPoint: Point, endPointIndex: number, elementsMap: ElementsMap): readonly [number, number];
     static getSegmentMidPointIndex(linearElementEditor: LinearElementEditor, appState: AppState, midPoint: Point, elementsMap: ElementsMap): number;
-    static handlePointerDown(event: React.PointerEvent<HTMLElement>, appState: AppState, store: Store, scenePointer: {
+    static handlePointerDown(event: React.PointerEvent<HTMLElement>, app: AppClassProperties, store: Store, scenePointer: {
         x: number;
         y: number;
     }, linearElementEditor: LinearElementEditor, scene: Scene): {
@@ -72,7 +72,7 @@ export declare class LinearElementEditor {
         linearElementEditor: LinearElementEditor | null;
     };
     static arePointsEqual(point1: Point | null, point2: Point | null): boolean;
-    static handlePointerMove(event: React.PointerEvent<HTMLCanvasElement>, scenePointerX: number, scenePointerY: number, appState: AppState, elementsMap: NonDeletedSceneElementsMap | SceneElementsMap): LinearElementEditor | null;
+    static handlePointerMove(event: React.PointerEvent<HTMLCanvasElement>, scenePointerX: number, scenePointerY: number, app: AppClassProperties, elementsMap: NonDeletedSceneElementsMap | SceneElementsMap): LinearElementEditor | null;
     /** scene coords */
     static getPointGlobalCoordinates(element: NonDeleted<ExcalidrawLinearElement>, point: Point, elementsMap: ElementsMap): readonly [number, number];
     /** scene coords */
@@ -81,7 +81,7 @@ export declare class LinearElementEditor {
     elementsMap: ElementsMap): Point;
     static pointFromAbsoluteCoords(element: NonDeleted<ExcalidrawLinearElement>, absoluteCoords: Point, elementsMap: ElementsMap): Point;
     static getPointIndexUnderCursor(element: NonDeleted<ExcalidrawLinearElement>, elementsMap: ElementsMap, zoom: AppState["zoom"], x: number, y: number): number;
-    static createPointAt(element: NonDeleted<ExcalidrawLinearElement>, elementsMap: ElementsMap, scenePointerX: number, scenePointerY: number, gridSize: number | null): Point;
+    static createPointAt(element: NonDeleted<ExcalidrawLinearElement>, elementsMap: ElementsMap, scenePointerX: number, scenePointerY: number, gridSize: NullableGridSize): Point;
     /**
      * Normalizes line points so that the start point is at [0,0]. This is
      * expected in various parts of the codebase. Also returns new x/y to account
@@ -226,8 +226,9 @@ export declare class LinearElementEditor {
             } | null;
             zenModeEnabled: boolean;
             theme: import("./types").Theme;
-            gridSize: number | null;
-            previousGridSize: number | null;
+            gridSize: number;
+            gridStep: number;
+            gridModeEnabled: boolean;
             viewModeEnabled: boolean;
             selectedGroupIds: {
                 [groupId: string]: boolean;
@@ -253,7 +254,7 @@ export declare class LinearElementEditor {
                 avatarUrl?: string | undefined;
                 id?: string | undefined;
                 socketId?: import("../types").SocketId | undefined;
-                isCurrentUser?: boolean | undefined;
+                isCurrentUser?: boolean | undefined; /** whether you're dragging a point */
                 isInCall?: boolean | undefined;
                 isSpeaking?: boolean | undefined;
                 isMuted?: boolean | undefined;
@@ -293,8 +294,8 @@ export declare class LinearElementEditor {
             gridColor: {
                 Bold: string;
                 Regular: string;
-                MajorGridFrequency?: number | undefined;
             };
+            highlightSearchResult: boolean;
             dynamicStyle: {
                 [x: string]: string;
             };
@@ -331,7 +332,7 @@ export declare class LinearElementEditor {
         isDragging?: boolean;
     }): void;
     static shouldAddMidpoint(linearElementEditor: LinearElementEditor, pointerCoords: PointerCoords, appState: AppState, elementsMap: ElementsMap): boolean;
-    static addMidpoint(linearElementEditor: LinearElementEditor, pointerCoords: PointerCoords, appState: AppState, snapToGrid: boolean, elementsMap: ElementsMap): {
+    static addMidpoint(linearElementEditor: LinearElementEditor, pointerCoords: PointerCoords, app: AppClassProperties, snapToGrid: boolean, elementsMap: ElementsMap): {
         pointerDownState: LinearElementEditor["pointerDownState"];
         selectedPointsIndices: LinearElementEditor["selectedPointsIndices"];
     } | undefined;

package/types/excalidraw/index.d.ts

@@ -27,7 +27,7 @@ registerLocalFont, //zsviczian
 getFontFamilies, //zsviczian
 getFontFamilyString, //zsviczian
 registerFontsInCSS, //zsviczian
-getFontDefinition, } from "../utils/export";
+getCSSFontDefinition, } from "../utils/export";
 export { refreshTextDimensions } from "./element/newElement";
 export { getContainerElement } from "./element/textElement";
 export { serializeAsJSON, serializeLibraryAsJSON } from "./data/json";

package/types/excalidraw/math.d.ts

@@ -1,4 +1,4 @@
-import type { Point, Zoom } from "./types";
+import type { NullableGridSize, Point, Zoom } from "./types";
 import type { ExcalidrawElement, ExcalidrawLinearElement, NonDeleted } from "./element/types";
 import type { Bounds } from "./element/bounds";
 export declare const rotate: (x: number, y: number, cx: number, cy: number, angle: number) => [number, number];
@@ -20,7 +20,7 @@ export declare const centerPoint: (a: readonly [number, number], b: readonly [nu
 export declare const isPathALoop: (points: ExcalidrawLinearElement["points"], zoomValue?: Zoom["value"]) => boolean;
 export declare const isPointInPolygon: (points: Point[], x: number, y: number) => boolean;
 export declare const isPointWithinBounds: (p: readonly [number, number], q: readonly [number, number], r: readonly [number, number]) => boolean;
-export declare const getGridPoint: (x: number, y: number, gridSize: number | null) => [number, number];
+export declare const getGridPoint: (x: number, y: number, gridSize: NullableGridSize) => [number, number];
 export declare const getCornerRadius: (x: number, element: ExcalidrawElement) => number;
 export declare const getControlPointsForBezierCurve: (element: NonDeleted<ExcalidrawLinearElement>, endPoint: readonly [number, number]) => [number, number][] | null;
 export declare const getBezierXY: (p0: readonly [number, number], p1: readonly [number, number], p2: readonly [number, number], p3: readonly [number, number], t: number) => number[];
@@ -75,4 +75,5 @@ export declare const getCenterForBounds: (bounds: Bounds) => readonly [number, n
 export declare const getCenterForElement: (element: ExcalidrawElement) => readonly [number, number];
 export declare const aabbsOverlapping: (a: Bounds, b: Bounds) => boolean;
 export declare const clamp: (value: number, min: number, max: number) => number;
+export declare const round: (value: number, precision: number) => number;
 export {};

package/types/excalidraw/obsidianUtils.d.ts

@@ -14,4 +14,4 @@ export declare function registerLocalFont(fontMetrics: FontMetadata & {
 }, uri: string): void;
 export declare function getFontFamilies(): string[];
 export declare function registerFontsInCSS(): Promise<void>;
-export declare function getFontDefinition(fontFamily: number): Promise<string>;
+export declare function getCSSFontDefinition(fontFamily: number): Promise<string>;

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

@@ -1,4 +1,4 @@
 export { isSomeElementSelected, getElementsWithinSelection, getCommonAttributeOfSelectedElements, getSelectedElements, getTargetElements, } from "./selection";
 export { calculateScrollCenter } from "./scroll";
 export { hasBackground, hasStrokeWidth, hasStrokeStyle, canHaveArrowheads, canChangeRoundness, getElementAtPosition, getElementsAtPosition, } from "./comparisons";
-export { getNormalizedZoom } from "./zoom";
+export { getNormalizedZoom, getNormalizedGridSize, getNormalizedGridStep, } from "./normalize";

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

@@ -0,0 +1,4 @@
+import type { NormalizedZoomValue } from "../types";
+export declare const getNormalizedZoom: (zoom: number) => NormalizedZoomValue;
+export declare const getNormalizedGridSize: (gridStep: number) => number;
+export declare const getNormalizedGridStep: (gridStep: number) => number;

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

@@ -1,5 +1,4 @@
 import type { AppState, NormalizedZoomValue } from "../types";
-export declare const getNormalizedZoom: (zoom: number) => NormalizedZoomValue;
 export declare const getStateForZoom: ({ viewportX, viewportY, nextZoom, }: {
     viewportX: number;
     viewportY: number;

package/types/excalidraw/snapping.d.ts

@@ -1,7 +1,7 @@
 import type { Bounds } from "./element/bounds";
 import type { MaybeTransformHandleType } from "./element/transformHandles";
 import type { ElementsMap, ExcalidrawElement, NonDeletedExcalidrawElement } from "./element/types";
-import type { AppState, KeyboardModifiersObject, Point } from "./types";
+import type { AppClassProperties, AppState, KeyboardModifiersObject, Point } from "./types";
 export declare const getSnapDistance: (zoomValue: number) => number;
 type Vector2D = {
     x: number;
@@ -60,8 +60,9 @@ export declare class SnapCache {
     } | null;
     static destroy: () => void;
 }
-export declare const isSnappingEnabled: ({ event, appState, selectedElements, }: {
-    appState: AppState;
+export declare const isGridModeEnabled: (app: AppClassProperties) => boolean;
+export declare const isSnappingEnabled: ({ event, app, selectedElements, }: {
+    app: AppClassProperties;
     event: KeyboardModifiersObject;
     selectedElements: NonDeletedExcalidrawElement[];
 }) => boolean;
@@ -76,28 +77,28 @@ export declare const getVisibleGaps: (elements: readonly NonDeletedExcalidrawEle
     verticalGaps: Gap[];
 };
 export declare const getReferenceSnapPoints: (elements: readonly NonDeletedExcalidrawElement[], selectedElements: ExcalidrawElement[], appState: AppState, elementsMap: ElementsMap) => (readonly [number, number])[];
-export declare const snapDraggedElements: (elements: ExcalidrawElement[], dragOffset: Vector2D, appState: AppState, event: KeyboardModifiersObject, elementsMap: ElementsMap) => {
+export declare const snapDraggedElements: (elements: ExcalidrawElement[], dragOffset: Vector2D, app: AppClassProperties, event: KeyboardModifiersObject, elementsMap: ElementsMap) => {
     snapOffset: {
         x: number;
         y: number;
     };
     snapLines: (PointSnapLine | GapSnapLine)[];
 };
-export declare const snapResizingElements: (selectedElements: ExcalidrawElement[], selectedOriginalElements: ExcalidrawElement[], appState: AppState, event: KeyboardModifiersObject, dragOffset: Vector2D, transformHandle: MaybeTransformHandleType) => {
+export declare const snapResizingElements: (selectedElements: ExcalidrawElement[], selectedOriginalElements: ExcalidrawElement[], app: AppClassProperties, event: KeyboardModifiersObject, dragOffset: Vector2D, transformHandle: MaybeTransformHandleType) => {
     snapOffset: {
         x: number;
         y: number;
     };
     snapLines: PointSnapLine[];
 };
-export declare const snapNewElement: (newElement: ExcalidrawElement, appState: AppState, event: KeyboardModifiersObject, origin: Vector2D, dragOffset: Vector2D, elementsMap: ElementsMap) => {
+export declare const snapNewElement: (newElement: ExcalidrawElement, app: AppClassProperties, event: KeyboardModifiersObject, origin: Vector2D, dragOffset: Vector2D, elementsMap: ElementsMap) => {
     snapOffset: {
         x: number;
         y: number;
     };
     snapLines: PointSnapLine[];
 };
-export declare const getSnapLinesAtPointer: (elements: readonly ExcalidrawElement[], appState: AppState, pointer: Vector2D, event: KeyboardModifiersObject, elementsMap: ElementsMap) => {
+export declare const getSnapLinesAtPointer: (elements: readonly ExcalidrawElement[], app: AppClassProperties, pointer: Vector2D, event: KeyboardModifiersObject, elementsMap: ElementsMap) => {
     originOffset: {
         x: number;
         y: number;

package/types/excalidraw/types.d.ts

@@ -17,7 +17,7 @@ import type { FileSystemHandle } from "./data/filesystem";
 import type { IMAGE_MIME_TYPES, MIME_TYPES } from "./constants";
 import type { ContextMenuItems } from "./components/ContextMenu";
 import type { SnapLine } from "./snapping";
-import type { Merge, MaybePromise, ValueOf } from "./utility-types";
+import type { Merge, MaybePromise, ValueOf, MakeBrand } from "./utility-types";
 import type { ColorPaletteCustom } from "./colors";
 import type { StoreActionType } from "./store";
 export type Point = Readonly<RoughPoint>;
@@ -119,6 +119,7 @@ export type StaticCanvasAppState = Readonly<_CommonCanvasAppState & {
     exportScale: AppState["exportScale"];
     selectedElementsAreBeingDragged: AppState["selectedElementsAreBeingDragged"];
     gridSize: AppState["gridSize"];
+    gridStep: AppState["gridStep"];
     frameRendering: AppState["frameRendering"];
     linkOpacity: AppState["linkOpacity"];
     gridColor: AppState["gridColor"];
@@ -141,6 +142,7 @@ export type InteractiveCanvasAppState = Readonly<_CommonCanvasAppState & {
     zenModeEnabled: AppState["zenModeEnabled"];
     editingElement: AppState["editingElement"];
     gridColor: AppState["gridColor"];
+    highlightSearchResult: AppState["highlightSearchResult"];
 }>;
 export type ObservedAppState = ObservedStandaloneAppState & ObservedElementsAppState;
 export type ObservedStandaloneAppState = {
@@ -288,8 +290,10 @@ export interface AppState {
     } | null;
     zenModeEnabled: boolean;
     theme: Theme;
-    gridSize: number | null;
-    previousGridSize: number | null;
+    /** grid cell px size */
+    gridSize: number;
+    gridStep: number;
+    gridModeEnabled: boolean;
     viewModeEnabled: boolean;
     /** top-most selected groups (i.e. does not include nested groups) */
     selectedGroupIds: {
@@ -341,8 +345,8 @@ export interface AppState {
     gridColor: {
         Bold: string;
         Regular: string;
-        MajorGridFrequency?: number;
     };
+    highlightSearchResult: boolean;
     dynamicStyle: {
         [x: string]: string;
     };
@@ -522,6 +526,7 @@ export type AppProps = Merge<ExcalidrawProps, {
  * in the app, eg Manager. Factored out into a separate type to keep DRY. */
 export type AppClassProperties = {
     props: AppProps;
+    state: AppState;
     interactiveCanvas: HTMLCanvasElement | null;
     /** static canvas */
     canvas: HTMLCanvasElement;
@@ -554,6 +559,7 @@ export type AppClassProperties = {
     getName: App["getName"];
     dismissLinearEditor: App["dismissLinearEditor"];
     flowChartCreator: App["flowChartCreator"];
+    getEffectiveGridSize: App["getEffectiveGridSize"];
 };
 export type PointerDownState = Readonly<{
     origin: Readonly<{
@@ -630,7 +636,7 @@ export interface ExcalidrawImperativeAPI {
     addFiles: (data: BinaryFileData[]) => void;
     updateContainerSize: InstanceType<typeof App>["updateContainerSize"];
     id: string;
-    selectElements: (elements: readonly ExcalidrawElement[]) => void;
+    selectElements: (elements: readonly ExcalidrawElement[], highlightSearchResult?: boolean) => void;
     sendBackward: (elements: readonly ExcalidrawElement[]) => void;
     bringForward: (elements: readonly ExcalidrawElement[]) => void;
     sendToBack: (elements: readonly ExcalidrawElement[]) => void;
@@ -689,4 +695,6 @@ export type JSONValue = string | number | boolean | null | object;
 export type EmbedsValidationStatus = Map<ExcalidrawIframeLikeElement["id"], boolean>;
 export type ElementsPendingErasure = Set<ExcalidrawElement["id"]>;
 export type PendingExcalidrawElements = ExcalidrawElement[];
+/** Runtime gridSize value. Null indicates disabled grid. */
+export type NullableGridSize = (AppState["gridSize"] & MakeBrand<"NullableGridSize">) | null;
 export {};

package/types/utils/export.d.ts

@@ -41,4 +41,4 @@ export { getLineHeight } from "../excalidraw/fonts/index";
 export { getFontString, getFontFamilyString } from "../excalidraw/utils";
 export { getBoundTextMaxWidth } from "../excalidraw/element/textElement";
 export { mermaidToExcalidraw } from "../excalidraw/components/TTDDialog/MermaidToExcalidraw";
-export { destroyObsidianUtils, registerLocalFont, getFontFamilies, registerFontsInCSS, getFontDefinition, } from "../excalidraw/obsidianUtils";
+export { destroyObsidianUtils, registerLocalFont, getFontFamilies, registerFontsInCSS, getCSSFontDefinition, } from "../excalidraw/obsidianUtils";