mirror of
https://github.com/excalidraw/excalidraw.git
synced 2025-08-22 01:37:04 +02: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>
336 lines
9.9 KiB
TypeScript
336 lines
9.9 KiB
TypeScript
import React from "react";
|
|
import { ActionManager } from "../actions/manager";
|
|
import { getNonDeletedElements } from "../element";
|
|
import { ExcalidrawElement, PointerType } from "../element/types";
|
|
import { t } from "../i18n";
|
|
import { useDevice } from "../components/App";
|
|
import {
|
|
canChangeSharpness,
|
|
canHaveArrowheads,
|
|
getTargetElements,
|
|
hasBackground,
|
|
hasStrokeStyle,
|
|
hasStrokeWidth,
|
|
hasText,
|
|
} from "../scene";
|
|
import { SHAPES } from "../shapes";
|
|
import { AppState, Zoom } from "../types";
|
|
import {
|
|
capitalizeString,
|
|
isTransparent,
|
|
updateActiveTool,
|
|
setCursorForShape,
|
|
} from "../utils";
|
|
import Stack from "./Stack";
|
|
import { ToolButton } from "./ToolButton";
|
|
import { hasStrokeColor } from "../scene/comparisons";
|
|
import { trackEvent } from "../analytics";
|
|
import { hasBoundTextElement, isBoundToContainer } from "../element/typeChecks";
|
|
import clsx from "clsx";
|
|
import { actionToggleZenMode } from "../actions";
|
|
import "./Actions.scss";
|
|
import { Tooltip } from "./Tooltip";
|
|
|
|
export const SelectedShapeActions = ({
|
|
appState,
|
|
elements,
|
|
renderAction,
|
|
}: {
|
|
appState: AppState;
|
|
elements: readonly ExcalidrawElement[];
|
|
renderAction: ActionManager["renderAction"];
|
|
}) => {
|
|
const targetElements = getTargetElements(
|
|
getNonDeletedElements(elements),
|
|
appState,
|
|
);
|
|
|
|
let isSingleElementBoundContainer = false;
|
|
if (
|
|
targetElements.length === 2 &&
|
|
(hasBoundTextElement(targetElements[0]) ||
|
|
hasBoundTextElement(targetElements[1]))
|
|
) {
|
|
isSingleElementBoundContainer = true;
|
|
}
|
|
const isEditing = Boolean(appState.editingElement);
|
|
const device = useDevice();
|
|
const isRTL = document.documentElement.getAttribute("dir") === "rtl";
|
|
|
|
const showFillIcons =
|
|
hasBackground(appState.activeTool.type) ||
|
|
targetElements.some(
|
|
(element) =>
|
|
hasBackground(element.type) && !isTransparent(element.backgroundColor),
|
|
);
|
|
const showChangeBackgroundIcons =
|
|
hasBackground(appState.activeTool.type) ||
|
|
targetElements.some((element) => hasBackground(element.type));
|
|
|
|
const showLinkIcon =
|
|
targetElements.length === 1 || isSingleElementBoundContainer;
|
|
|
|
let commonSelectedType: string | null = targetElements[0]?.type || null;
|
|
|
|
for (const element of targetElements) {
|
|
if (element.type !== commonSelectedType) {
|
|
commonSelectedType = null;
|
|
break;
|
|
}
|
|
}
|
|
|
|
return (
|
|
<div className="panelColumn">
|
|
<div>
|
|
{((hasStrokeColor(appState.activeTool.type) &&
|
|
appState.activeTool.type !== "image" &&
|
|
commonSelectedType !== "image") ||
|
|
targetElements.some((element) => hasStrokeColor(element.type))) &&
|
|
renderAction("changeStrokeColor")}
|
|
</div>
|
|
{showChangeBackgroundIcons && (
|
|
<div>{renderAction("changeBackgroundColor")}</div>
|
|
)}
|
|
{showFillIcons && renderAction("changeFillStyle")}
|
|
|
|
{(hasStrokeWidth(appState.activeTool.type) ||
|
|
targetElements.some((element) => hasStrokeWidth(element.type))) &&
|
|
renderAction("changeStrokeWidth")}
|
|
|
|
{(appState.activeTool.type === "freedraw" ||
|
|
targetElements.some((element) => element.type === "freedraw")) &&
|
|
renderAction("changeStrokeShape")}
|
|
|
|
{(hasStrokeStyle(appState.activeTool.type) ||
|
|
targetElements.some((element) => hasStrokeStyle(element.type))) && (
|
|
<>
|
|
{renderAction("changeStrokeStyle")}
|
|
{renderAction("changeSloppiness")}
|
|
</>
|
|
)}
|
|
|
|
{(canChangeSharpness(appState.activeTool.type) ||
|
|
targetElements.some((element) => canChangeSharpness(element.type))) && (
|
|
<>{renderAction("changeSharpness")}</>
|
|
)}
|
|
|
|
{(hasText(appState.activeTool.type) ||
|
|
targetElements.some((element) => hasText(element.type))) && (
|
|
<>
|
|
{renderAction("changeFontSize")}
|
|
|
|
{renderAction("changeFontFamily")}
|
|
|
|
{renderAction("changeTextAlign")}
|
|
</>
|
|
)}
|
|
|
|
{targetElements.some(
|
|
(element) =>
|
|
hasBoundTextElement(element) || isBoundToContainer(element),
|
|
) && renderAction("changeVerticalAlign")}
|
|
{(canHaveArrowheads(appState.activeTool.type) ||
|
|
targetElements.some((element) => canHaveArrowheads(element.type))) && (
|
|
<>{renderAction("changeArrowhead")}</>
|
|
)}
|
|
|
|
{renderAction("changeOpacity")}
|
|
|
|
<fieldset>
|
|
<legend>{t("labels.layers")}</legend>
|
|
<div className="buttonList">
|
|
{renderAction("sendToBack")}
|
|
{renderAction("sendBackward")}
|
|
{renderAction("bringToFront")}
|
|
{renderAction("bringForward")}
|
|
</div>
|
|
</fieldset>
|
|
|
|
{targetElements.length > 1 && !isSingleElementBoundContainer && (
|
|
<fieldset>
|
|
<legend>{t("labels.align")}</legend>
|
|
<div className="buttonList">
|
|
{
|
|
// swap this order for RTL so the button positions always match their action
|
|
// (i.e. the leftmost button aligns left)
|
|
}
|
|
{isRTL ? (
|
|
<>
|
|
{renderAction("alignRight")}
|
|
{renderAction("alignHorizontallyCentered")}
|
|
{renderAction("alignLeft")}
|
|
</>
|
|
) : (
|
|
<>
|
|
{renderAction("alignLeft")}
|
|
{renderAction("alignHorizontallyCentered")}
|
|
{renderAction("alignRight")}
|
|
</>
|
|
)}
|
|
{targetElements.length > 2 &&
|
|
renderAction("distributeHorizontally")}
|
|
{/* breaks the row ˇˇ */}
|
|
<div style={{ flexBasis: "100%", height: 0 }} />
|
|
<div
|
|
style={{
|
|
display: "flex",
|
|
flexWrap: "wrap",
|
|
gap: ".5rem",
|
|
marginTop: "-0.5rem",
|
|
}}
|
|
>
|
|
{renderAction("alignTop")}
|
|
{renderAction("alignVerticallyCentered")}
|
|
{renderAction("alignBottom")}
|
|
{targetElements.length > 2 &&
|
|
renderAction("distributeVertically")}
|
|
</div>
|
|
</div>
|
|
</fieldset>
|
|
)}
|
|
{!isEditing && targetElements.length > 0 && (
|
|
<fieldset>
|
|
<legend>{t("labels.actions")}</legend>
|
|
<div className="buttonList">
|
|
{!device.isMobile && renderAction("duplicateSelection")}
|
|
{!device.isMobile && renderAction("deleteSelectedElements")}
|
|
{renderAction("group")}
|
|
{renderAction("ungroup")}
|
|
{showLinkIcon && renderAction("hyperlink")}
|
|
</div>
|
|
</fieldset>
|
|
)}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
export const ShapesSwitcher = ({
|
|
canvas,
|
|
activeTool,
|
|
setAppState,
|
|
onImageAction,
|
|
appState,
|
|
}: {
|
|
canvas: HTMLCanvasElement | null;
|
|
activeTool: AppState["activeTool"];
|
|
setAppState: React.Component<any, AppState>["setState"];
|
|
onImageAction: (data: { pointerType: PointerType | null }) => void;
|
|
appState: AppState;
|
|
}) => (
|
|
<>
|
|
{SHAPES.map(({ value, icon, key, fillable }, index) => {
|
|
const numberKey = value === "eraser" ? 0 : index + 1;
|
|
const label = t(`toolBar.${value}`);
|
|
const letter = key && (typeof key === "string" ? key : key[0]);
|
|
const shortcut = letter
|
|
? `${capitalizeString(letter)} ${t("helpDialog.or")} ${numberKey}`
|
|
: `${numberKey}`;
|
|
return (
|
|
<ToolButton
|
|
className={clsx("Shape", { fillable })}
|
|
key={value}
|
|
type="radio"
|
|
icon={icon}
|
|
checked={activeTool.type === value}
|
|
name="editor-current-shape"
|
|
title={`${capitalizeString(label)} — ${shortcut}`}
|
|
keyBindingLabel={`${numberKey}`}
|
|
aria-label={capitalizeString(label)}
|
|
aria-keyshortcuts={shortcut}
|
|
data-testid={value}
|
|
onPointerDown={({ pointerType }) => {
|
|
if (!appState.penDetected && pointerType === "pen") {
|
|
setAppState({
|
|
penDetected: true,
|
|
penMode: true,
|
|
});
|
|
}
|
|
}}
|
|
onChange={({ pointerType }) => {
|
|
if (appState.activeTool.type !== value) {
|
|
trackEvent("toolbar", value, "ui");
|
|
}
|
|
const nextActiveTool = updateActiveTool(appState, {
|
|
type: value,
|
|
});
|
|
setAppState({
|
|
activeTool: nextActiveTool,
|
|
multiElement: null,
|
|
selectedElementIds: {},
|
|
});
|
|
setCursorForShape(canvas, {
|
|
...appState,
|
|
activeTool: nextActiveTool,
|
|
});
|
|
if (value === "image") {
|
|
onImageAction({ pointerType });
|
|
}
|
|
}}
|
|
/>
|
|
);
|
|
})}
|
|
</>
|
|
);
|
|
|
|
export const ZoomActions = ({
|
|
renderAction,
|
|
zoom,
|
|
}: {
|
|
renderAction: ActionManager["renderAction"];
|
|
zoom: Zoom;
|
|
}) => (
|
|
<Stack.Col gap={1} className="zoom-actions">
|
|
<Stack.Row align="center">
|
|
{renderAction("zoomOut")}
|
|
{renderAction("resetZoom")}
|
|
{renderAction("zoomIn")}
|
|
</Stack.Row>
|
|
</Stack.Col>
|
|
);
|
|
|
|
export const UndoRedoActions = ({
|
|
renderAction,
|
|
className,
|
|
}: {
|
|
renderAction: ActionManager["renderAction"];
|
|
className?: string;
|
|
}) => (
|
|
<div className={`undo-redo-buttons ${className}`}>
|
|
<div className="undo-button-container">
|
|
<Tooltip label={t("buttons.undo")}>{renderAction("undo")}</Tooltip>
|
|
</div>
|
|
<div className="redo-button-container">
|
|
<Tooltip label={t("buttons.redo")}> {renderAction("redo")}</Tooltip>
|
|
</div>
|
|
</div>
|
|
);
|
|
|
|
export const ExitZenModeAction = ({
|
|
actionManager,
|
|
showExitZenModeBtn,
|
|
}: {
|
|
actionManager: ActionManager;
|
|
showExitZenModeBtn: boolean;
|
|
}) => (
|
|
<button
|
|
className={clsx("disable-zen-mode", {
|
|
"disable-zen-mode--visible": showExitZenModeBtn,
|
|
})}
|
|
onClick={() => actionManager.executeAction(actionToggleZenMode)}
|
|
>
|
|
{t("buttons.exitZenMode")}
|
|
</button>
|
|
);
|
|
|
|
export const FinalizeAction = ({
|
|
renderAction,
|
|
className,
|
|
}: {
|
|
renderAction: ActionManager["renderAction"];
|
|
className?: string;
|
|
}) => (
|
|
<div className={`finalize-button ${className}`}>
|
|
{renderAction("finalize", { size: "small" })}
|
|
</div>
|
|
);
|