fix: Coherent stats binding (#10718)
Signed-off-by: Mark Tolmacs <mark@lazycat.hu>
This commit is contained in:
@@ -35,6 +35,7 @@ import {
|
|||||||
import {
|
import {
|
||||||
getAllHoveredElementAtPoint,
|
getAllHoveredElementAtPoint,
|
||||||
getHoveredElementForBinding,
|
getHoveredElementForBinding,
|
||||||
|
hitElementItself,
|
||||||
intersectElementWithLineSegment,
|
intersectElementWithLineSegment,
|
||||||
isBindableElementInsideOtherBindable,
|
isBindableElementInsideOtherBindable,
|
||||||
isPointInElement,
|
isPointInElement,
|
||||||
@@ -1161,6 +1162,68 @@ export const updateBoundElements = (
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const updateArrowBindings = (
|
||||||
|
latestElement: ExcalidrawArrowElement,
|
||||||
|
startOrEnd: "startBinding" | "endBinding",
|
||||||
|
elementsMap: NonDeletedSceneElementsMap,
|
||||||
|
scene: Scene,
|
||||||
|
appState: AppState,
|
||||||
|
) => {
|
||||||
|
invariant(
|
||||||
|
!isElbowArrow(latestElement),
|
||||||
|
"Elbow arrows not supported for indirect updates",
|
||||||
|
);
|
||||||
|
|
||||||
|
const binding = latestElement[startOrEnd];
|
||||||
|
const bindableElement =
|
||||||
|
binding &&
|
||||||
|
(elementsMap.get(binding.elementId) as ExcalidrawBindableElement);
|
||||||
|
const point = LinearElementEditor.getPointAtIndexGlobalCoordinates(
|
||||||
|
latestElement,
|
||||||
|
startOrEnd === "startBinding" ? 0 : -1,
|
||||||
|
elementsMap,
|
||||||
|
);
|
||||||
|
const hit =
|
||||||
|
bindableElement &&
|
||||||
|
hitElementItself({
|
||||||
|
element: bindableElement,
|
||||||
|
point,
|
||||||
|
elementsMap,
|
||||||
|
threshold: maxBindingDistance_simple(appState.zoom),
|
||||||
|
});
|
||||||
|
const strategyName = startOrEnd === "startBinding" ? "start" : "end";
|
||||||
|
unbindBindingElement(latestElement, strategyName, scene);
|
||||||
|
if (hit) {
|
||||||
|
const pointIdx =
|
||||||
|
startOrEnd === "startBinding" ? 0 : latestElement.points.length - 1;
|
||||||
|
const localPoint = latestElement.points[pointIdx];
|
||||||
|
const strategy =
|
||||||
|
getBindingStrategyForDraggingBindingElementEndpoints_simple(
|
||||||
|
latestElement,
|
||||||
|
new Map([[pointIdx, { point: localPoint }]]),
|
||||||
|
point[0],
|
||||||
|
point[1],
|
||||||
|
elementsMap,
|
||||||
|
scene.getNonDeletedElements(),
|
||||||
|
appState,
|
||||||
|
);
|
||||||
|
if (
|
||||||
|
strategy[strategyName] &&
|
||||||
|
strategy[strategyName].element?.id === bindableElement.id &&
|
||||||
|
strategy[strategyName].mode
|
||||||
|
) {
|
||||||
|
bindBindingElement(
|
||||||
|
latestElement,
|
||||||
|
bindableElement,
|
||||||
|
strategy[strategyName].mode,
|
||||||
|
strategyName,
|
||||||
|
scene,
|
||||||
|
strategy[strategyName].focusPoint,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
export const updateBindings = (
|
export const updateBindings = (
|
||||||
latestElement: ExcalidrawElement,
|
latestElement: ExcalidrawElement,
|
||||||
scene: Scene,
|
scene: Scene,
|
||||||
@@ -1171,14 +1234,27 @@ export const updateBindings = (
|
|||||||
},
|
},
|
||||||
) => {
|
) => {
|
||||||
if (isArrowElement(latestElement)) {
|
if (isArrowElement(latestElement)) {
|
||||||
bindOrUnbindBindingElement(
|
const elementsMap = scene.getNonDeletedElementsMap();
|
||||||
latestElement,
|
|
||||||
new Map(),
|
if (latestElement.startBinding) {
|
||||||
Infinity,
|
updateArrowBindings(
|
||||||
Infinity,
|
latestElement,
|
||||||
scene,
|
"startBinding",
|
||||||
appState,
|
elementsMap,
|
||||||
);
|
scene,
|
||||||
|
appState,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (latestElement.endBinding) {
|
||||||
|
updateArrowBindings(
|
||||||
|
latestElement,
|
||||||
|
"endBinding",
|
||||||
|
elementsMap,
|
||||||
|
scene,
|
||||||
|
appState,
|
||||||
|
);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
updateBoundElements(latestElement, scene, {
|
updateBoundElements(latestElement, scene, {
|
||||||
...options,
|
...options,
|
||||||
|
|||||||
Reference in New Issue
Block a user