* 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>
160 lines
4.7 KiB
TypeScript
160 lines
4.7 KiB
TypeScript
import { isSomeElementSelected } from "../scene";
|
|
import { KEYS } from "../keys";
|
|
import { ToolButton } from "../components/ToolButton";
|
|
import { t } from "../i18n";
|
|
import { register } from "./register";
|
|
import { getNonDeletedElements } from "../element";
|
|
import { ExcalidrawElement } from "../element/types";
|
|
import { AppState } from "../types";
|
|
import { newElementWith } from "../element/mutateElement";
|
|
import { getElementsInGroup } from "../groups";
|
|
import { LinearElementEditor } from "../element/linearElementEditor";
|
|
import { fixBindingsAfterDeletion } from "../element/binding";
|
|
import { isBoundToContainer } from "../element/typeChecks";
|
|
import { updateActiveTool } from "../utils";
|
|
import { TrashIcon } from "../components/icons";
|
|
|
|
const deleteSelectedElements = (
|
|
elements: readonly ExcalidrawElement[],
|
|
appState: AppState,
|
|
) => {
|
|
return {
|
|
elements: elements.map((el) => {
|
|
if (appState.selectedElementIds[el.id]) {
|
|
return newElementWith(el, { isDeleted: true });
|
|
}
|
|
if (
|
|
isBoundToContainer(el) &&
|
|
appState.selectedElementIds[el.containerId]
|
|
) {
|
|
return newElementWith(el, { isDeleted: true });
|
|
}
|
|
return el;
|
|
}),
|
|
appState: {
|
|
...appState,
|
|
selectedElementIds: {},
|
|
},
|
|
};
|
|
};
|
|
|
|
const handleGroupEditingState = (
|
|
appState: AppState,
|
|
elements: readonly ExcalidrawElement[],
|
|
): AppState => {
|
|
if (appState.editingGroupId) {
|
|
const siblingElements = getElementsInGroup(
|
|
getNonDeletedElements(elements),
|
|
appState.editingGroupId!,
|
|
);
|
|
if (siblingElements.length) {
|
|
return {
|
|
...appState,
|
|
selectedElementIds: { [siblingElements[0].id]: true },
|
|
};
|
|
}
|
|
}
|
|
return appState;
|
|
};
|
|
|
|
export const actionDeleteSelected = register({
|
|
name: "deleteSelectedElements",
|
|
trackEvent: { category: "element", action: "delete" },
|
|
perform: (elements, appState) => {
|
|
if (appState.editingLinearElement) {
|
|
const {
|
|
elementId,
|
|
selectedPointsIndices,
|
|
startBindingElement,
|
|
endBindingElement,
|
|
} = appState.editingLinearElement;
|
|
const element = LinearElementEditor.getElement(elementId);
|
|
if (!element) {
|
|
return false;
|
|
}
|
|
if (
|
|
// case: no point selected → delete whole element
|
|
selectedPointsIndices == null ||
|
|
// case: deleting last remaining point
|
|
element.points.length < 2
|
|
) {
|
|
const nextElements = elements.filter((el) => el.id !== element.id);
|
|
const nextAppState = handleGroupEditingState(appState, nextElements);
|
|
|
|
return {
|
|
elements: nextElements,
|
|
appState: {
|
|
...nextAppState,
|
|
editingLinearElement: null,
|
|
},
|
|
commitToHistory: false,
|
|
};
|
|
}
|
|
|
|
// We cannot do this inside `movePoint` because it is also called
|
|
// when deleting the uncommitted point (which hasn't caused any binding)
|
|
const binding = {
|
|
startBindingElement: selectedPointsIndices?.includes(0)
|
|
? null
|
|
: startBindingElement,
|
|
endBindingElement: selectedPointsIndices?.includes(
|
|
element.points.length - 1,
|
|
)
|
|
? null
|
|
: endBindingElement,
|
|
};
|
|
|
|
LinearElementEditor.deletePoints(element, selectedPointsIndices);
|
|
|
|
return {
|
|
elements,
|
|
appState: {
|
|
...appState,
|
|
editingLinearElement: {
|
|
...appState.editingLinearElement,
|
|
...binding,
|
|
selectedPointsIndices:
|
|
selectedPointsIndices?.[0] > 0
|
|
? [selectedPointsIndices[0] - 1]
|
|
: [0],
|
|
},
|
|
},
|
|
commitToHistory: true,
|
|
};
|
|
}
|
|
let { elements: nextElements, appState: nextAppState } =
|
|
deleteSelectedElements(elements, appState);
|
|
fixBindingsAfterDeletion(
|
|
nextElements,
|
|
elements.filter(({ id }) => appState.selectedElementIds[id]),
|
|
);
|
|
|
|
nextAppState = handleGroupEditingState(nextAppState, nextElements);
|
|
|
|
return {
|
|
elements: nextElements,
|
|
appState: {
|
|
...nextAppState,
|
|
activeTool: updateActiveTool(appState, { type: "selection" }),
|
|
multiElement: null,
|
|
},
|
|
commitToHistory: isSomeElementSelected(
|
|
getNonDeletedElements(elements),
|
|
appState,
|
|
),
|
|
};
|
|
},
|
|
contextItemLabel: "labels.delete",
|
|
keyTest: (event) => event.key === KEYS.BACKSPACE || event.key === KEYS.DELETE,
|
|
PanelComponent: ({ elements, appState, updateData }) => (
|
|
<ToolButton
|
|
type="button"
|
|
icon={TrashIcon}
|
|
title={t("labels.delete")}
|
|
aria-label={t("labels.delete")}
|
|
onClick={() => updateData(null)}
|
|
visible={isSomeElementSelected(getNonDeletedElements(elements), appState)}
|
|
/>
|
|
),
|
|
});
|