mirror of
https://github.com/excalidraw/excalidraw.git
synced 2025-04-14 16:40:58 -04:00
* Placed eraser into shape switcher (top toolbar). Redesigned top toolbar. * Redesigned zoom and undo-redo buttons. * Started redesigning left toolbar. * Redesigned help dialog. * Colour picker now somewhat in line with new design * [WIP] Changed a bunch of icons. TODO: organise new icons. * [WIP] Organised a bunch of icons. Still some to do * [WIP] Started working on hamburger menu. * Fixed some bugs with hamburger menu. * Menu and left toolbar positioning. * Added some more items to hamburger menu. * Changed some icons. * Modal/dialog styling & bunch of fixes. * Some more dialog improvements & fixes. * Mobile menu changes. * Menu can now be closed with outside click. * Collab avatars and button changes. * Icon sizing. Left toolbar positioning. * Implemented welcome screen rendering logic. * [WIP] Welcome screen content + design. * Some more welcome screen content and design. * Merge fixes. * Tweaked icon set. * Welcome screen darkmode fix. * Content updates. * Various small fixes & adjustments. Moved language selection into menu. Fixed some problematic icons. Slightly moved encryption icon. * Sidebar header redesign. * Libraries content rendering logic + some styling. * Somem more library sidebar styling. * Publish library dialog styling. * scroll-back-to-content btn styling * ColorPicker positioning. * Library button styling. * ColorPicker positioning "fix". * Misc adjustments. * PenMode button changes. * Trying to make mobile somewhat usable. * Added a couple of icons. * Added some shortcuts. * Prevent welcome screen flickering. Fix issue with welcome screen interactivity. Don't show sidebar button when docked. * Icon sizing on smaller screens. * Sidebar styling changes. * Alignment button... well... alignments. * Fix inconsistent padding in left toolbar. * HintViewer changes. * Hamburger menu changes. * Move encryption badge back to its original pos. * Arrowhead changes. Active state, colours + stronger shadow. * Added new custom font. * Fixed bug with library button not rendering. * Fixed issue with lang selection colours. * Add tooltips for undo, redo. * Address some dark mode contrast issues. * (Re)introduce counter for selectedItems in sidebar * [WIP] Tweaked bounding box colour & padding. * Dashed bounding box for remote clients. * Some more bounding box tweaks. * Removed docking animation for now... * Address some RTL issues. * Welcome screen responsiveness. * use lighter selection color in dark mode & align naming * use rounded corners for transform handles * use lighter gray for welcomeScreen text in dark mode * disable selection on dialog buttons * change selection button icon * fix library item width being flexible * library: visually align spinner with first section heading * lint * fix scrollbar color in dark mode & make thinner * adapt properties panel max-height * add shrotcut label to save-to-current-file * fix unrelated `useOutsideClick` firing for active modal * add promo color to e+ menu item * fix type * lowered button size * fix transform handles raidus not accounting for zoom * attempt fix for excal logo on safari * final fix for excal logo on safari * fixing fhd resolution button sized * remove TODO shortcut * Collab related styling changes. Expanding avatar list no longer offsets top toolbar. Added active state & collaborator count badge for collab button. * Tweaked collab button active colours. * Added active style to collab btn in hamburger menu * Remove unnecessary comment. * Added back promo link for non (signed in) E+ users * Go to E+ button added for signed in E+ users. * Close menu & dropdown on modal close. * tweak icons & fix rendering on smaller sizes [part one] * align welcomeScreen icons with other UI * switch icon resize mq to `device-width` * disable welcomeScreen items `:hover` when selecting on canvas * change selection box color and style * reduce selection padding and fix group selection styling * improve collab cursor styling - make name borders round - hide status when "active" - remove black/gray colors * add Twitter to hamburger menu * align collab button * add shortcut for image export dialog * revert yarn.lock * fix more tabler icons * slightly better-looking penMode button * change penMode button & tooltip * revert hamburger menu icon * align padding on lang picker & canvas bg * updated robot txt to allow twitter bot and fb bot * added new OG and tweaked the OG state * add tooltip to collab button * align style for scroll-to-content button * fix pointer-events around toolbar * fix decor arrow positioning and RTL * fix welcomeScreen-item active state in dark mode * change `load` button copy * prevent shadow anim when opening a docked sidebar * update E+ links ga params * show redirect-to-eplus welcomeScreen subheading for signed-in users * make more generic * add ga for eplus redirect button * change copy and icons for hamburger export buttons * update snaps * trim the username to account for trailing spaces * tweaks around decor breakpoints * fix linear element editor test * remove .env change * remove `it.only` Co-authored-by: dwelle <luzar.david@gmail.com> Co-authored-by: Maielo <maielo.mv@gmail.com> Co-authored-by: Aakansha Doshi <aakansha1216@gmail.com>
184 lines
5 KiB
TypeScript
184 lines
5 KiB
TypeScript
import React from "react";
|
|
import {
|
|
Action,
|
|
UpdaterFn,
|
|
ActionName,
|
|
ActionResult,
|
|
PanelComponentProps,
|
|
ActionSource,
|
|
} from "./types";
|
|
import { ExcalidrawElement } from "../element/types";
|
|
import { AppClassProperties, AppState } from "../types";
|
|
import { MODES } from "../constants";
|
|
import { trackEvent } from "../analytics";
|
|
|
|
const trackAction = (
|
|
action: Action,
|
|
source: ActionSource,
|
|
appState: Readonly<AppState>,
|
|
elements: readonly ExcalidrawElement[],
|
|
app: AppClassProperties,
|
|
value: any,
|
|
) => {
|
|
if (action.trackEvent) {
|
|
try {
|
|
if (typeof action.trackEvent === "object") {
|
|
const shouldTrack = action.trackEvent.predicate
|
|
? action.trackEvent.predicate(appState, elements, value)
|
|
: true;
|
|
if (shouldTrack) {
|
|
trackEvent(
|
|
action.trackEvent.category,
|
|
action.trackEvent.action || action.name,
|
|
`${source} (${app.device.isMobile ? "mobile" : "desktop"})`,
|
|
);
|
|
}
|
|
}
|
|
} catch (error) {
|
|
console.error("error while logging action:", error);
|
|
}
|
|
}
|
|
};
|
|
|
|
export class ActionManager {
|
|
actions = {} as Record<ActionName, Action>;
|
|
|
|
updater: (actionResult: ActionResult | Promise<ActionResult>) => void;
|
|
|
|
getAppState: () => Readonly<AppState>;
|
|
getElementsIncludingDeleted: () => readonly ExcalidrawElement[];
|
|
app: AppClassProperties;
|
|
|
|
constructor(
|
|
updater: UpdaterFn,
|
|
getAppState: () => AppState,
|
|
getElementsIncludingDeleted: () => readonly ExcalidrawElement[],
|
|
app: AppClassProperties,
|
|
) {
|
|
this.updater = (actionResult) => {
|
|
if (actionResult && "then" in actionResult) {
|
|
actionResult.then((actionResult) => {
|
|
return updater(actionResult);
|
|
});
|
|
} else {
|
|
return updater(actionResult);
|
|
}
|
|
};
|
|
this.getAppState = getAppState;
|
|
this.getElementsIncludingDeleted = getElementsIncludingDeleted;
|
|
this.app = app;
|
|
}
|
|
|
|
registerAction(action: Action) {
|
|
this.actions[action.name] = action;
|
|
}
|
|
|
|
registerAll(actions: readonly Action[]) {
|
|
actions.forEach((action) => this.registerAction(action));
|
|
}
|
|
|
|
handleKeyDown(event: React.KeyboardEvent | KeyboardEvent) {
|
|
const canvasActions = this.app.props.UIOptions.canvasActions;
|
|
const data = Object.values(this.actions)
|
|
.sort((a, b) => (b.keyPriority || 0) - (a.keyPriority || 0))
|
|
.filter(
|
|
(action) =>
|
|
(action.name in canvasActions
|
|
? canvasActions[action.name as keyof typeof canvasActions]
|
|
: true) &&
|
|
action.keyTest &&
|
|
action.keyTest(
|
|
event,
|
|
this.getAppState(),
|
|
this.getElementsIncludingDeleted(),
|
|
),
|
|
);
|
|
|
|
if (data.length !== 1) {
|
|
if (data.length > 1) {
|
|
console.warn("Canceling as multiple actions match this shortcut", data);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
const action = data[0];
|
|
|
|
const { viewModeEnabled } = this.getAppState();
|
|
if (viewModeEnabled) {
|
|
if (!Object.values(MODES).includes(data[0].name)) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
const elements = this.getElementsIncludingDeleted();
|
|
const appState = this.getAppState();
|
|
const value = null;
|
|
|
|
trackAction(action, "keyboard", appState, elements, this.app, null);
|
|
|
|
event.preventDefault();
|
|
event.stopPropagation();
|
|
this.updater(data[0].perform(elements, appState, value, this.app));
|
|
return true;
|
|
}
|
|
|
|
executeAction(action: Action, source: ActionSource = "api") {
|
|
const elements = this.getElementsIncludingDeleted();
|
|
const appState = this.getAppState();
|
|
const value = null;
|
|
|
|
trackAction(action, source, appState, elements, this.app, value);
|
|
|
|
this.updater(action.perform(elements, appState, value, this.app));
|
|
}
|
|
|
|
/**
|
|
* @param data additional data sent to the PanelComponent
|
|
*/
|
|
renderAction = (
|
|
name: ActionName,
|
|
data?: PanelComponentProps["data"],
|
|
isInHamburgerMenu = false,
|
|
) => {
|
|
const canvasActions = this.app.props.UIOptions.canvasActions;
|
|
|
|
if (
|
|
this.actions[name] &&
|
|
"PanelComponent" in this.actions[name] &&
|
|
(name in canvasActions
|
|
? canvasActions[name as keyof typeof canvasActions]
|
|
: true)
|
|
) {
|
|
const action = this.actions[name];
|
|
const PanelComponent = action.PanelComponent!;
|
|
PanelComponent.displayName = "PanelComponent";
|
|
const elements = this.getElementsIncludingDeleted();
|
|
const appState = this.getAppState();
|
|
const updateData = (formState?: any) => {
|
|
trackAction(action, "ui", appState, elements, this.app, formState);
|
|
|
|
this.updater(
|
|
action.perform(
|
|
this.getElementsIncludingDeleted(),
|
|
this.getAppState(),
|
|
formState,
|
|
this.app,
|
|
),
|
|
);
|
|
};
|
|
|
|
return (
|
|
<PanelComponent
|
|
elements={this.getElementsIncludingDeleted()}
|
|
appState={this.getAppState()}
|
|
updateData={updateData}
|
|
appProps={this.app.props}
|
|
data={data}
|
|
isInHamburgerMenu={isInHamburgerMenu}
|
|
/>
|
|
);
|
|
}
|
|
|
|
return null;
|
|
};
|
|
}
|