mirror of
https://github.com/excalidraw/excalidraw.git
synced 2025-04-14 16:40:58 -04:00
* Refactor: simplify linear element type * Refactor: dedupe scrollbar handling * First step towards binding - establish relationship and basic test for dragged lines * Refactor: use zoom from appstate * Refactor: generalize getElementAtPosition * Only consider bindable elements in hit test * Refactor: pull out pieces of hit test for reuse later * Refactor: pull out diamond from hit test for reuse later * Refactor: pull out text from hit test for reuse later * Suggest binding when hovering * Give shapes in regression test real size * Give shapes in undo/redo test real size * Keep bound element highlighted * Show binding suggestion for multi-point elements * Move binding to its on module with functions so that I can use it from actions, add support for binding end of multi-point elements * Use Id instead of ID * Improve boundary offset for non-squarish elements * Fix localStorage for binding on linear elements * Simplify dragging code and fix elements bound twice to the same shape * Fix binding for rectangles * Bind both ends at the end of the linear element creation, needed for focus points * wip * Refactor: Renames and reshapes for next commit * Calculate and store focus points and gaps, but dont use them yet * Focus points for rectangles * Dont blow up when canceling linear element * Stop suggesting binding when a non-compatible tool is selected * Clean up collision code * Using Geometric Algebra for hit tests * Correct binding for all shapes * Constant gap around polygon corners * Fix rotation handling * Generalize update and fix hit test for rotated elements * Handle rotation realtime * Handle scaling * Remove vibration when moving bound and binding element together * Handle simultenous scaling * Allow binding and unbinding when editing linear elements * Dont delete binding when the end point wasnt touched * Bind on enter/escape when editing * Support multiple suggested bindable elements in preparation for supporting linear elements dragging * Update binding when moving linear elements * Update binding when resizing linear elements * Dont re-render UI on binding hints * Update both ends when one is moved * Use distance instead of focus point for binding * Complicated approach for posterity, ignore this commit * Revert the complicated approach * Better focus point strategy, working for all shapes * Update snapshots * Dont break binding gap when mirroring shape * Dont break binding gap when grid mode pushes it inside * Dont bind draw elements * Support alt duplication * Fix alt duplication to * Support cmd+D duplication * All copy mechanisms are supported * Allow binding shapes to arrows, having arrows created first * Prevent arrows from disappearing for ellipses * Better binding suggestion highlight for shapes * Dont suggest second binding for simple elements when editing or moving them * Dont steal already bound linear elements when moving shapes * Fix highlighting diamonds and more precisely highlight other shapes * Highlight linear element edges for binding * Highlight text binding too * Handle deletion * Dont suggest second binding for simple linear elements when creating them * Dont highlight bound element during creation * Fix binding for rotated linear elements * Fix collision check for ellipses * Dont show suggested bindings for selected pairs * Bind multi-point linear elements when the tool is switched - important for mobile * Handle unbinding one of two bound edges correctly * Rename boundElement in state to startBoundElement * Dont double account for zoom when rendering binding highlight * Fix rendering of edited linear element point handles * Suggest binding when adding new point to a linear element * Bind when adding a new point to a linear element and dont unbind when moving middle elements * Handle deleting points * Add cmd modifier key to disable binding * Use state for enabling binding, fix not binding for linear elements during creation * Drop support for binding lines, only arrows are bindable * Reset binding mode on blur * Fix not binding lines
173 lines
6.3 KiB
TypeScript
173 lines
6.3 KiB
TypeScript
import oc from "open-color";
|
|
import { AppState, FlooredNumber } from "./types";
|
|
import { getDateTime } from "./utils";
|
|
import { t } from "./i18n";
|
|
import {
|
|
DEFAULT_FONT_SIZE,
|
|
DEFAULT_FONT_FAMILY,
|
|
DEFAULT_TEXT_ALIGN,
|
|
} from "./constants";
|
|
|
|
export const getDefaultAppState = (): Omit<
|
|
AppState,
|
|
"offsetTop" | "offsetLeft"
|
|
> => {
|
|
return {
|
|
isLoading: false,
|
|
errorMessage: null,
|
|
draggingElement: null,
|
|
resizingElement: null,
|
|
multiElement: null,
|
|
editingElement: null,
|
|
startBoundElement: null,
|
|
editingLinearElement: null,
|
|
elementType: "selection",
|
|
elementLocked: false,
|
|
exportBackground: true,
|
|
shouldAddWatermark: false,
|
|
currentItemStrokeColor: oc.black,
|
|
currentItemBackgroundColor: "transparent",
|
|
currentItemFillStyle: "hachure",
|
|
currentItemStrokeWidth: 1,
|
|
currentItemStrokeStyle: "solid",
|
|
currentItemRoughness: 1,
|
|
currentItemOpacity: 100,
|
|
currentItemFontSize: DEFAULT_FONT_SIZE,
|
|
currentItemFontFamily: DEFAULT_FONT_FAMILY,
|
|
currentItemTextAlign: DEFAULT_TEXT_ALIGN,
|
|
viewBackgroundColor: oc.white,
|
|
scrollX: 0 as FlooredNumber,
|
|
scrollY: 0 as FlooredNumber,
|
|
cursorX: 0,
|
|
cursorY: 0,
|
|
cursorButton: "up",
|
|
scrolledOutside: false,
|
|
name: `${t("labels.untitled")}-${getDateTime()}`,
|
|
username: "",
|
|
isBindingEnabled: true,
|
|
isCollaborating: false,
|
|
isResizing: false,
|
|
isRotating: false,
|
|
selectionElement: null,
|
|
zoom: 1,
|
|
openMenu: null,
|
|
lastPointerDownWith: "mouse",
|
|
selectedElementIds: {},
|
|
previousSelectedElementIds: {},
|
|
collaborators: new Map(),
|
|
shouldCacheIgnoreZoom: false,
|
|
showShortcutsDialog: false,
|
|
suggestedBindings: [],
|
|
zenModeEnabled: false,
|
|
gridSize: null,
|
|
editingGroupId: null,
|
|
selectedGroupIds: {},
|
|
width: window.innerWidth,
|
|
height: window.innerHeight,
|
|
isLibraryOpen: false,
|
|
};
|
|
};
|
|
|
|
/**
|
|
* Config containing all AppState keys. Used to determine whether given state
|
|
* prop should be stripped when exporting to given storage type.
|
|
*/
|
|
const APP_STATE_STORAGE_CONF = (<
|
|
Values extends {
|
|
/** whether to keep when storing to browser storage (localStorage/IDB) */
|
|
browser: boolean;
|
|
/** whether to keep when exporting to file/database */
|
|
export: boolean;
|
|
},
|
|
T extends Record<keyof AppState, Values>
|
|
>(
|
|
config: { [K in keyof T]: K extends keyof AppState ? T[K] : never },
|
|
) => config)({
|
|
collaborators: { browser: false, export: false },
|
|
currentItemBackgroundColor: { browser: true, export: false },
|
|
currentItemFillStyle: { browser: true, export: false },
|
|
currentItemFontFamily: { browser: true, export: false },
|
|
currentItemFontSize: { browser: true, export: false },
|
|
currentItemOpacity: { browser: true, export: false },
|
|
currentItemRoughness: { browser: true, export: false },
|
|
currentItemStrokeColor: { browser: true, export: false },
|
|
currentItemStrokeStyle: { browser: true, export: false },
|
|
currentItemStrokeWidth: { browser: true, export: false },
|
|
currentItemTextAlign: { browser: true, export: false },
|
|
cursorButton: { browser: true, export: false },
|
|
cursorX: { browser: true, export: false },
|
|
cursorY: { browser: true, export: false },
|
|
draggingElement: { browser: false, export: false },
|
|
editingElement: { browser: false, export: false },
|
|
startBoundElement: { browser: false, export: false },
|
|
editingGroupId: { browser: true, export: false },
|
|
editingLinearElement: { browser: false, export: false },
|
|
elementLocked: { browser: true, export: false },
|
|
elementType: { browser: true, export: false },
|
|
errorMessage: { browser: false, export: false },
|
|
exportBackground: { browser: true, export: false },
|
|
gridSize: { browser: true, export: true },
|
|
height: { browser: false, export: false },
|
|
isBindingEnabled: { browser: false, export: false },
|
|
isCollaborating: { browser: false, export: false },
|
|
isLibraryOpen: { browser: false, export: false },
|
|
isLoading: { browser: false, export: false },
|
|
isResizing: { browser: false, export: false },
|
|
isRotating: { browser: false, export: false },
|
|
lastPointerDownWith: { browser: true, export: false },
|
|
multiElement: { browser: false, export: false },
|
|
name: { browser: true, export: false },
|
|
openMenu: { browser: true, export: false },
|
|
previousSelectedElementIds: { browser: true, export: false },
|
|
resizingElement: { browser: false, export: false },
|
|
scrolledOutside: { browser: true, export: false },
|
|
scrollX: { browser: true, export: false },
|
|
scrollY: { browser: true, export: false },
|
|
selectedElementIds: { browser: true, export: false },
|
|
selectedGroupIds: { browser: true, export: false },
|
|
selectionElement: { browser: false, export: false },
|
|
shouldAddWatermark: { browser: true, export: false },
|
|
shouldCacheIgnoreZoom: { browser: true, export: false },
|
|
showShortcutsDialog: { browser: false, export: false },
|
|
suggestedBindings: { browser: false, export: false },
|
|
username: { browser: true, export: false },
|
|
viewBackgroundColor: { browser: true, export: true },
|
|
width: { browser: false, export: false },
|
|
zenModeEnabled: { browser: true, export: false },
|
|
zoom: { browser: true, export: false },
|
|
offsetTop: { browser: false, export: false },
|
|
offsetLeft: { browser: false, export: false },
|
|
});
|
|
|
|
const _clearAppStateForStorage = <ExportType extends "export" | "browser">(
|
|
appState: Partial<AppState>,
|
|
exportType: ExportType,
|
|
) => {
|
|
type ExportableKeys = {
|
|
[K in keyof typeof APP_STATE_STORAGE_CONF]: typeof APP_STATE_STORAGE_CONF[K][ExportType] extends true
|
|
? K
|
|
: never;
|
|
}[keyof typeof APP_STATE_STORAGE_CONF];
|
|
const stateForExport = {} as { [K in ExportableKeys]?: typeof appState[K] };
|
|
for (const key of Object.keys(appState) as (keyof typeof appState)[]) {
|
|
const propConfig = APP_STATE_STORAGE_CONF[key];
|
|
if (!propConfig) {
|
|
console.error(
|
|
`_clearAppStateForStorage: appState key "${key}" config doesn't exist for "${exportType}" export type`,
|
|
);
|
|
}
|
|
if (propConfig?.[exportType]) {
|
|
// @ts-ignore see https://github.com/microsoft/TypeScript/issues/31445
|
|
stateForExport[key] = appState[key];
|
|
}
|
|
}
|
|
return stateForExport;
|
|
};
|
|
|
|
export const clearAppStateForLocalStorage = (appState: Partial<AppState>) => {
|
|
return _clearAppStateForStorage(appState, "browser");
|
|
};
|
|
|
|
export const cleanAppStateForExport = (appState: Partial<AppState>) => {
|
|
return _clearAppStateForStorage(appState, "export");
|
|
};
|