* fix: hide canvas-modifying UI in view mode (#5815) * fix: hide canvas-modifying UI in view mode * add class for better targeting * fix missing `key` * fix: useOutsideClick not working in view mode * fix: Corrected typo in toggle theme shortcut (#5813) * fix: incorrectly selecting linear elements on creation while tool-locked (#5785) * fix: syncing 1-point lines to remote clients (#5677) * feat: stop deleting whole line when no point select in line editor (#5676) * feat: stop deleting whole line when no point select in line editor * Comments typo Co-authored-by: DanielJGeiger <1852529+DanielJGeiger@users.noreply.github.com> Co-authored-by: David Luzar <luzar.david@gmail.com> Co-authored-by: Paul Yi <paulyiengr@gmail.com> Co-authored-by: DanielJGeiger <1852529+DanielJGeiger@users.noreply.github.com>
169 lines
5.0 KiB
TypeScript
169 lines
5.0 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;
|
|
}
|
|
// case: no point selected → do nothing, as deleting the whole element
|
|
// is most likely a mistake, where you wanted to delete a specific point
|
|
// but failed to select it (or you thought it's selected, while it was
|
|
// only in a hover state)
|
|
if (selectedPointsIndices == null) {
|
|
return false;
|
|
}
|
|
|
|
// case: deleting last remaining point
|
|
if (element.points.length < 2) {
|
|
const nextElements = elements.map((el) => {
|
|
if (el.id === element.id) {
|
|
return newElementWith(el, { isDeleted: true });
|
|
}
|
|
return el;
|
|
});
|
|
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)}
|
|
/>
|
|
),
|
|
});
|