Merge branch 'master' into zsviczian-embeddable-scaling
This commit is contained in:
@@ -27,8 +27,7 @@ import {
|
||||
import {
|
||||
isArrowElement,
|
||||
isBoundToContainer,
|
||||
isEmbeddableElement,
|
||||
isFrameElement,
|
||||
isFrameLikeElement,
|
||||
isFreeDrawElement,
|
||||
isImageElement,
|
||||
isLinearElement,
|
||||
@@ -164,7 +163,7 @@ const rotateSingleElement = (
|
||||
const cx = (x1 + x2) / 2;
|
||||
const cy = (y1 + y2) / 2;
|
||||
let angle: number;
|
||||
if (isFrameElement(element)) {
|
||||
if (isFrameLikeElement(element)) {
|
||||
angle = 0;
|
||||
} else {
|
||||
angle = (5 * Math.PI) / 2 + Math.atan2(pointerY - cy, pointerX - cx);
|
||||
@@ -587,7 +586,7 @@ export const resizeSingleElement = (
|
||||
};
|
||||
|
||||
if ("scale" in element && "scale" in stateAtResizeStart) {
|
||||
if (isEmbeddableElement(element)) {
|
||||
if (isFrameLikeElement(element)) {
|
||||
if (shouldMaintainAspectRatio) {
|
||||
const scale: [number, number] = [
|
||||
Math.abs(
|
||||
@@ -917,7 +916,7 @@ const rotateMultipleElements = (
|
||||
}
|
||||
|
||||
elements
|
||||
.filter((element) => element.type !== "frame")
|
||||
.filter((element) => !isFrameLikeElement(element))
|
||||
.forEach((element) => {
|
||||
const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
|
||||
const cx = (x1 + x2) / 2;
|
||||
|
||||
Reference in New Issue
Block a user