foss/excalidraw
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support rotation

Browse Source
This commit is contained in:
Aakansha Doshi 2023-02-15 17:36:46 +05:30
parent 16db74cedd
commit 96b172ebfa
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/element/textElement.ts
View File

@ -11,7 +11,7 @@ import { mutateElement } from "./mutateElement";
import { BOUND_TEXT_PADDING, TEXT_ALIGN, VERTICAL_ALIGN } from "../constants"; import { BOUND_TEXT_PADDING, TEXT_ALIGN, VERTICAL_ALIGN } from "../constants";
import { MaybeTransformHandleType } from "./transformHandles"; import { MaybeTransformHandleType } from "./transformHandles";
import Scene from "../scene/Scene"; import Scene from "../scene/Scene";
import { getElementBounds, isTextElement } from "."; import { isTextElement } from ".";
import { getMaxContainerHeight, getMaxContainerWidth } from "./newElement"; import { getMaxContainerHeight, getMaxContainerWidth } from "./newElement";
import { import {
isBoundToContainer, isBoundToContainer,
@ -28,6 +28,7 @@ import {
resetOriginalContainerCache, resetOriginalContainerCache,
updateOriginalContainerCache, updateOriginalContainerCache,
} from "./textWysiwyg"; } from "./textWysiwyg";
import { rotatePoint } from "../math";
export const normalizeText = (text: string) => { export const normalizeText = (text: string) => {
return ( return (
@ -730,11 +731,17 @@ export const isHittingContainerStroke = (
container: ExcalidrawTextContainer, container: ExcalidrawTextContainer,
zoom: number, zoom: number,
) => { ) => {
const bounds = getElementBounds(container); const [x1, y1, x2, y2, cx, cy] = getElementAbsoluteCoords(container);
const topLeft = [bounds[0], bounds[1]]; const topLeft = [x1, y1];
const topRight = [bounds[2], bounds[1]]; const topRight = [x2, y1];
const bottomLeft = [bounds[0], bounds[3]]; const bottomLeft = [x1, y2];
const bottomRight = [bounds[2], bounds[3]]; const bottomRight = [x2, y2];
const [counterRotateX, counterRotateY] = rotatePoint(
[x, y],
[cx, cy],
-container.angle,
);
const strokeWidth = container.strokeWidth; const strokeWidth = container.strokeWidth;
if (container.type === "ellipse") { if (container.type === "ellipse") {
@ -744,13 +751,15 @@ export const isHittingContainerStroke = (
let a = container.width / 2 + threshold; let a = container.width / 2 + threshold;
let b = container.height / 2 + threshold; let b = container.height / 2 + threshold;
const checkPointOnOuterEllipse = const checkPointOnOuterEllipse =
Math.pow(x - h, 2) / Math.pow(a, 2) + Math.pow(y - k, 2) / Math.pow(b, 2); Math.pow(counterRotateX - h, 2) / Math.pow(a, 2) +
Math.pow(counterRotateY - k, 2) / Math.pow(b, 2);
a = container.width / 2 - strokeWidth - threshold; a = container.width / 2 - strokeWidth - threshold;
b = container.height / 2 - strokeWidth - threshold; b = container.height / 2 - strokeWidth - threshold;
const checkPointOnInnerEllipse = const checkPointOnInnerEllipse =
Math.pow(x - h, 2) / Math.pow(a, 2) + Math.pow(y - k, 2) / Math.pow(b, 2); Math.pow(counterRotateX - h, 2) / Math.pow(a, 2) +
Math.pow(counterRotateY - k, 2) / Math.pow(b, 2);
// The expression evaluates to 1 means point is on ellipse, // The expression evaluates to 1 means point is on ellipse,
// < 1 means inside ellipse and > 1 means outside ellipse // < 1 means inside ellipse and > 1 means outside ellipse
@ -767,39 +776,39 @@ export const isHittingContainerStroke = (
// Left Stroke // Left Stroke
if ( if (
x >= topLeft[0] - threshold && counterRotateX >= topLeft[0] - threshold &&
x <= topLeft[0] + strokeWidth + threshold && counterRotateX <= topLeft[0] + strokeWidth + threshold &&
y >= topLeft[1] - threshold && counterRotateY >= topLeft[1] - threshold &&
y <= bottomRight[1] + threshold counterRotateY <= bottomRight[1] + threshold
) { ) {
return true; return true;
} }
// Top stroke // Top stroke
if ( if (
x >= topLeft[0] - threshold && counterRotateX >= topLeft[0] - threshold &&
x <= topRight[0] + threshold && counterRotateX <= topRight[0] + threshold &&
y >= topLeft[1] - threshold && counterRotateY >= topLeft[1] - threshold &&
y <= topLeft[1] + threshold + strokeWidth counterRotateY <= topLeft[1] + threshold + strokeWidth
) { ) {
return true; return true;
} }
// Right stroke // Right stroke
if ( if (
x >= topRight[0] - threshold - strokeWidth && counterRotateX >= topRight[0] - threshold - strokeWidth &&
x <= topRight[0] + threshold && counterRotateX <= topRight[0] + threshold &&
y >= topRight[1] - threshold && counterRotateY >= topRight[1] - threshold &&
y <= bottomRight[1] + threshold counterRotateY <= bottomRight[1] + threshold
) { ) {
return true; return true;
} }
// Bottom Stroke // Bottom Stroke
if ( if (
x >= bottomLeft[0] - threshold && counterRotateX >= bottomLeft[0] - threshold &&
x <= bottomRight[0] + threshold && counterRotateX <= bottomRight[0] + threshold &&
y >= bottomLeft[1] - threshold - strokeWidth && counterRotateY >= bottomLeft[1] - threshold - strokeWidth &&
y <= bottomLeft[1] + threshold counterRotateY <= bottomLeft[1] + threshold
) { ) {
return true; return true;
} }