smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

scale embeddable and fix youtube start bug

Browse source
This commit is contained in:
zsviczian 2023-11-16 18:27:28 +00:00
parent 23b24ea5c3
commit e2982a2968
7 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/element/embeddable.ts
View file

@ -27,7 +27,7 @@ type EmbeddedLink =
const embeddedLinkCache = new Map<string, EmbeddedLink>();
const RE_YOUTUBE =
/^(?:http(?:s)?:\/\/)?(?:www\.)?youtu(?:be\.com|\.be)\/(embed\/|watch\?v=|shorts\/|playlist\?list=|embed\/videoseries\?list=)?([a-zA-Z0-9_-]+)(?:\?t=|&t=|\?start=|&start=)?([a-zA-Z0-9_-]+)?[^\s]*$/;
/^(?:http(?:s)?:\/\/)?(?:www\.)?youtu(?:be\.com|\.be)\/(embed\/|watch\?v=|shorts\/|playlist\?list=|embed\/videoseries\?list=)?([a-zA-Z0-9_-]+)(?:\?t=|.*&t=|\?start=|.*&start=)?([a-zA-Z0-9_-]+)?[^\s]*$/;
const RE_VIMEO =
/^(?:http(?:s)?:\/\/)?(?:(?:w){3}.)?(?:player\.)?vimeo\.com\/(?:video\/)?([^?\s]+)(?:\?.*)?$/;

1
src/element/newElement.ts
View file

@ -140,6 +140,7 @@ export const newEmbeddableElement = (
return {
..._newElementBase<ExcalidrawEmbeddableElement>("embeddable", opts),
validated: opts.validated,
scale: [1, 1],
};
};

28
src/element/resizeElements.ts
View file

@ -27,6 +27,7 @@ import {
import {
isArrowElement,
isBoundToContainer,
isEmbeddableElement,
isFrameElement,
isFreeDrawElement,
isImageElement,
@ -586,15 +587,24 @@ export const resizeSingleElement = (
};
if ("scale" in element && "scale" in stateAtResizeStart) {
mutateElement(element, {
scale: [
// defaulting because scaleX/Y can be 0/-0
(Math.sign(newBoundsX2 - stateAtResizeStart.x) ||
stateAtResizeStart.scale[0]) * stateAtResizeStart.scale[0],
(Math.sign(newBoundsY2 - stateAtResizeStart.y) ||
stateAtResizeStart.scale[1]) * stateAtResizeStart.scale[1],
],
});
if (isEmbeddableElement(element) && shouldMaintainAspectRatio) {
const scale: [number, number] = [
eleNewWidth / (stateAtResizeStart.width / stateAtResizeStart.scale[0]),
eleNewHeight /
(stateAtResizeStart.height / stateAtResizeStart.scale[1]),
];
mutateElement(element, { scale });
} else {
mutateElement(element, {
scale: [
// defaulting because scaleX/Y can be 0/-0
(Math.sign(newBoundsX2 - stateAtResizeStart.x) ||
stateAtResizeStart.scale[0]) * stateAtResizeStart.scale[0],
(Math.sign(newBoundsY2 - stateAtResizeStart.y) ||
stateAtResizeStart.scale[1]) * stateAtResizeStart.scale[1],
],
});
}
}
if (

1
src/element/types.ts
View file

@ -95,6 +95,7 @@ export type ExcalidrawEmbeddableElement = _ExcalidrawElementBase &
* may not have access to host-app supplied url validator during restore.
*/
validated: boolean | null;
scale: [number, number];
}>;
export type ExcalidrawImageElement = _ExcalidrawElementBase &