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
121 lines
3.9 KiB
TypeScript
121 lines
3.9 KiB
TypeScript
import React from "react";
|
|
import { KEYS } from "../keys";
|
|
import { register } from "./register";
|
|
import { ExcalidrawElement } from "../element/types";
|
|
import { duplicateElement, getNonDeletedElements } from "../element";
|
|
import { isSomeElementSelected } from "../scene";
|
|
import { ToolButton } from "../components/ToolButton";
|
|
import { clone } from "../components/icons";
|
|
import { t } from "../i18n";
|
|
import { getShortcutKey } from "../utils";
|
|
import { LinearElementEditor } from "../element/linearElementEditor";
|
|
import { mutateElement } from "../element/mutateElement";
|
|
import { selectGroupsForSelectedElements } from "../groups";
|
|
import { AppState } from "../types";
|
|
import { fixBindingsAfterDuplication } from "../element/binding";
|
|
import { ActionResult } from "./types";
|
|
|
|
export const actionDuplicateSelection = register({
|
|
name: "duplicateSelection",
|
|
perform: (elements, appState) => {
|
|
// duplicate point if selected while editing multi-point element
|
|
if (appState.editingLinearElement) {
|
|
const { activePointIndex, elementId } = appState.editingLinearElement;
|
|
const element = LinearElementEditor.getElement(elementId);
|
|
if (!element || activePointIndex === null) {
|
|
return false;
|
|
}
|
|
const { points } = element;
|
|
const selectedPoint = points[activePointIndex];
|
|
const nextPoint = points[activePointIndex + 1];
|
|
mutateElement(element, {
|
|
points: [
|
|
...points.slice(0, activePointIndex + 1),
|
|
nextPoint
|
|
? [
|
|
(selectedPoint[0] + nextPoint[0]) / 2,
|
|
(selectedPoint[1] + nextPoint[1]) / 2,
|
|
]
|
|
: [selectedPoint[0] + 30, selectedPoint[1] + 30],
|
|
...points.slice(activePointIndex + 1),
|
|
],
|
|
});
|
|
return {
|
|
appState: {
|
|
...appState,
|
|
editingLinearElement: {
|
|
...appState.editingLinearElement,
|
|
activePointIndex: activePointIndex + 1,
|
|
},
|
|
},
|
|
elements,
|
|
commitToHistory: true,
|
|
};
|
|
}
|
|
|
|
return {
|
|
...duplicateElements(elements, appState),
|
|
commitToHistory: true,
|
|
};
|
|
},
|
|
contextItemLabel: "labels.duplicateSelection",
|
|
keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.key === "d",
|
|
PanelComponent: ({ elements, appState, updateData }) => (
|
|
<ToolButton
|
|
type="button"
|
|
icon={clone}
|
|
title={`${t("labels.duplicateSelection")} — ${getShortcutKey(
|
|
"CtrlOrCmd+D",
|
|
)}`}
|
|
aria-label={t("labels.duplicateSelection")}
|
|
onClick={() => updateData(null)}
|
|
visible={isSomeElementSelected(getNonDeletedElements(elements), appState)}
|
|
/>
|
|
),
|
|
});
|
|
|
|
const duplicateElements = (
|
|
elements: readonly ExcalidrawElement[],
|
|
appState: AppState,
|
|
): Partial<ActionResult> => {
|
|
const groupIdMap = new Map();
|
|
const newElements: ExcalidrawElement[] = [];
|
|
const oldElements: ExcalidrawElement[] = [];
|
|
const oldIdToDuplicatedId = new Map();
|
|
const finalElements = elements.reduce(
|
|
(acc: Array<ExcalidrawElement>, element: ExcalidrawElement) => {
|
|
if (appState.selectedElementIds[element.id]) {
|
|
const newElement = duplicateElement(
|
|
appState.editingGroupId,
|
|
groupIdMap,
|
|
element,
|
|
{
|
|
x: element.x + 10,
|
|
y: element.y + 10,
|
|
},
|
|
);
|
|
oldIdToDuplicatedId.set(element.id, newElement.id);
|
|
oldElements.push(element);
|
|
newElements.push(newElement);
|
|
return acc.concat([element, newElement]);
|
|
}
|
|
return acc.concat(element);
|
|
},
|
|
[],
|
|
);
|
|
fixBindingsAfterDuplication(finalElements, oldElements, oldIdToDuplicatedId);
|
|
return {
|
|
elements: finalElements,
|
|
appState: selectGroupsForSelectedElements(
|
|
{
|
|
...appState,
|
|
selectedGroupIds: {},
|
|
selectedElementIds: newElements.reduce((acc, element) => {
|
|
acc[element.id] = true;
|
|
return acc;
|
|
}, {} as any),
|
|
},
|
|
getNonDeletedElements(finalElements),
|
|
),
|
|
};
|
|
};
|