Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0e76cd4230 | ||
|
|
e5a9786af3 | ||
|
|
55be6de5ec | ||
|
|
42faafe138 | ||
|
|
798c795405 | ||
|
|
107eae3916 | ||
|
|
56fca30bd0 | ||
|
|
1e3399eac8 | ||
|
|
873698a1a2 | ||
|
|
606ac6c743 | ||
|
|
d99e4a23ca | ||
|
|
551bae07a7 | ||
|
|
2af3221974 |
+1
-1
@@ -25,7 +25,7 @@ VITE_APP_ENABLE_TRACKING=true
|
|||||||
FAST_REFRESH=false
|
FAST_REFRESH=false
|
||||||
|
|
||||||
# The port the run the dev server
|
# The port the run the dev server
|
||||||
VITE_APP_PORT=3000
|
VITE_APP_PORT=3001
|
||||||
|
|
||||||
#Debug flags
|
#Debug flags
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import { Excalidraw } from "@excalidraw/excalidraw";
|
|||||||
|
|
||||||
Throughout the documentation we use live, editable Excalidraw examples like the one shown below.
|
Throughout the documentation we use live, editable Excalidraw examples like the one shown below.
|
||||||
|
|
||||||
While we aim for the examples to closely reflect what you'd get if you rendered it yourself, we actually initialize it with some props behind the scenes.
|
While we aim for the examples to closely reflect what you'd get if you rendered it yourself, we actually initialize it with some props behind the scenes.
|
||||||
For example, we're passing a `theme` prop to it based on the current color theme of the docs you're just reading.
|
For example, we're passing a `theme` prop to it based on the current color theme of the docs you're just reading.
|
||||||
|
|
||||||
:::
|
:::
|
||||||
@@ -70,9 +70,9 @@ If you are using `pages router` then importing the wrapper dynamically would wor
|
|||||||
height: 141.9765625,
|
height: 141.9765625,
|
||||||
},]));
|
},]));
|
||||||
return (
|
return (
|
||||||
<div style={{height:"500px", width:"500px"}}>
|
<div style={{height:"500px", width:"500px"}}>
|
||||||
<Excalidraw />
|
<Excalidraw />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
export default ExcalidrawWrapper;
|
export default ExcalidrawWrapper;
|
||||||
@@ -84,8 +84,8 @@ If you are using `pages router` then importing the wrapper dynamically would wor
|
|||||||
|
|
||||||
```jsx showLineNumbers
|
```jsx showLineNumbers
|
||||||
import dynamic from "next/dynamic";
|
import dynamic from "next/dynamic";
|
||||||
|
|
||||||
// Since client components get prerenderd on server as well hence importing
|
// Since client components get prerenderd on server as well hence importing
|
||||||
// the excalidraw stuff dynamically with ssr false
|
// the excalidraw stuff dynamically with ssr false
|
||||||
|
|
||||||
const ExcalidrawWrapper = dynamic(
|
const ExcalidrawWrapper = dynamic(
|
||||||
@@ -97,7 +97,7 @@ If you are using `pages router` then importing the wrapper dynamically would wor
|
|||||||
|
|
||||||
export default function Page() {
|
export default function Page() {
|
||||||
return (
|
return (
|
||||||
<ExcalidrawWrapper />
|
<ExcalidrawWrapper />
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
@@ -108,7 +108,7 @@ If you are using `pages router` then importing the wrapper dynamically would wor
|
|||||||
```jsx showLineNumbers
|
```jsx showLineNumbers
|
||||||
import dynamic from "next/dynamic";
|
import dynamic from "next/dynamic";
|
||||||
|
|
||||||
// Since client components get prerenderd on server as well hence importing
|
// Since client components get prerenderd on server as well hence importing
|
||||||
// the excalidraw stuff dynamically with ssr false
|
// the excalidraw stuff dynamically with ssr false
|
||||||
|
|
||||||
const ExcalidrawWrapper = dynamic(
|
const ExcalidrawWrapper = dynamic(
|
||||||
@@ -153,7 +153,7 @@ Since Vite removes env variables by default, you can update the vite config to e
|
|||||||
"process.env.IS_PREACT": JSON.stringify("true"),
|
"process.env.IS_PREACT": JSON.stringify("true"),
|
||||||
},
|
},
|
||||||
```
|
```
|
||||||
:::
|
:::
|
||||||
|
|
||||||
## Browser
|
## Browser
|
||||||
|
|
||||||
@@ -235,3 +235,5 @@ root.render(React.createElement(App));
|
|||||||
|
|
||||||
</TabItem>
|
</TabItem>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
|
|
||||||
|
You can try it out [here](https://codesandbox.io/p/sandbox/excalidraw-in-browser-tlqom?file=%2Findex.html%3A1%2C10).
|
||||||
|
|||||||
@@ -169,7 +169,7 @@ export default defineConfig(({ mode }) => {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
start_url: "/",
|
start_url: "/",
|
||||||
id:"excalidraw",
|
id: "excalidraw",
|
||||||
display: "standalone",
|
display: "standalone",
|
||||||
theme_color: "#121212",
|
theme_color: "#121212",
|
||||||
background_color: "#ffffff",
|
background_color: "#ffffff",
|
||||||
|
|||||||
@@ -161,6 +161,7 @@ export const actionDeleteSelected = register({
|
|||||||
element,
|
element,
|
||||||
selectedPointsIndices,
|
selectedPointsIndices,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
appState.zoom,
|
||||||
);
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import { resizeMultipleElements } from "../element/resizeElements";
|
|||||||
import type { AppClassProperties, AppState } from "../types";
|
import type { AppClassProperties, AppState } from "../types";
|
||||||
import { arrayToMap } from "../utils";
|
import { arrayToMap } from "../utils";
|
||||||
import { CODES, KEYS } from "../keys";
|
import { CODES, KEYS } from "../keys";
|
||||||
import { getCommonBoundingBox } from "../element/bounds";
|
|
||||||
import {
|
import {
|
||||||
bindOrUnbindLinearElements,
|
bindOrUnbindLinearElements,
|
||||||
isBindingEnabled,
|
isBindingEnabled,
|
||||||
@@ -27,6 +26,7 @@ import {
|
|||||||
} from "../element/typeChecks";
|
} from "../element/typeChecks";
|
||||||
import { mutateElbowArrow } from "../element/routing";
|
import { mutateElbowArrow } from "../element/routing";
|
||||||
import { mutateElement, newElementWith } from "../element/mutateElement";
|
import { mutateElement, newElementWith } from "../element/mutateElement";
|
||||||
|
import { getCommonBoundingBox } from "../element/bounds";
|
||||||
|
|
||||||
export const actionFlipHorizontal = register({
|
export const actionFlipHorizontal = register({
|
||||||
name: "flipHorizontal",
|
name: "flipHorizontal",
|
||||||
@@ -132,19 +132,14 @@ const flipElements = (
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const { minX, minY, maxX, maxY, midX, midY } =
|
const { midX, midY } = getCommonBoundingBox(selectedElements);
|
||||||
getCommonBoundingBox(selectedElements);
|
|
||||||
|
|
||||||
resizeMultipleElements(
|
resizeMultipleElements(selectedElements, elementsMap, "nw", app.scene, {
|
||||||
elementsMap,
|
flipByX: flipDirection === "horizontal",
|
||||||
selectedElements,
|
flipByY: flipDirection === "vertical",
|
||||||
elementsMap,
|
shouldResizeFromCenter: true,
|
||||||
"nw",
|
shouldMaintainAspectRatio: true,
|
||||||
true,
|
});
|
||||||
true,
|
|
||||||
flipDirection === "horizontal" ? maxX : minX,
|
|
||||||
flipDirection === "horizontal" ? minY : maxY,
|
|
||||||
);
|
|
||||||
|
|
||||||
bindOrUnbindLinearElements(
|
bindOrUnbindLinearElements(
|
||||||
selectedElements.filter(isLinearElement),
|
selectedElements.filter(isLinearElement),
|
||||||
@@ -153,6 +148,7 @@ const flipElements = (
|
|||||||
app.scene,
|
app.scene,
|
||||||
isBindingEnabled(appState),
|
isBindingEnabled(appState),
|
||||||
[],
|
[],
|
||||||
|
appState.zoom,
|
||||||
);
|
);
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -1591,6 +1591,7 @@ export const actionChangeArrowType = register({
|
|||||||
tupleToCoors(startGlobalPoint),
|
tupleToCoors(startGlobalPoint),
|
||||||
elements,
|
elements,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
appState.zoom,
|
||||||
true,
|
true,
|
||||||
);
|
);
|
||||||
const endHoveredElement =
|
const endHoveredElement =
|
||||||
@@ -1599,6 +1600,7 @@ export const actionChangeArrowType = register({
|
|||||||
tupleToCoors(endGlobalPoint),
|
tupleToCoors(endGlobalPoint),
|
||||||
elements,
|
elements,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
appState.zoom,
|
||||||
true,
|
true,
|
||||||
);
|
);
|
||||||
const startElement = startHoveredElement
|
const startElement = startHoveredElement
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ import { deepCopyElement } from "./element/newElement";
|
|||||||
import { mutateElement } from "./element/mutateElement";
|
import { mutateElement } from "./element/mutateElement";
|
||||||
import { getContainingFrame } from "./frame";
|
import { getContainingFrame } from "./frame";
|
||||||
import { arrayToMap, isMemberOf, isPromiseLike } from "./utils";
|
import { arrayToMap, isMemberOf, isPromiseLike } from "./utils";
|
||||||
|
import { createFile, isSupportedImageFileType } from "./data/blob";
|
||||||
|
import { ExcalidrawError } from "./errors";
|
||||||
|
|
||||||
type ElementsClipboard = {
|
type ElementsClipboard = {
|
||||||
type: typeof EXPORT_DATA_TYPES.excalidrawClipboard;
|
type: typeof EXPORT_DATA_TYPES.excalidrawClipboard;
|
||||||
@@ -39,7 +41,7 @@ export interface ClipboardData {
|
|||||||
|
|
||||||
type AllowedPasteMimeTypes = typeof ALLOWED_PASTE_MIME_TYPES[number];
|
type AllowedPasteMimeTypes = typeof ALLOWED_PASTE_MIME_TYPES[number];
|
||||||
|
|
||||||
type ParsedClipboardEvent =
|
type ParsedClipboardEventTextData =
|
||||||
| { type: "text"; value: string }
|
| { type: "text"; value: string }
|
||||||
| { type: "mixedContent"; value: PastedMixedContent };
|
| { type: "mixedContent"; value: PastedMixedContent };
|
||||||
|
|
||||||
@@ -75,7 +77,7 @@ export const createPasteEvent = ({
|
|||||||
types,
|
types,
|
||||||
files,
|
files,
|
||||||
}: {
|
}: {
|
||||||
types?: { [key in AllowedPasteMimeTypes]?: string };
|
types?: { [key in AllowedPasteMimeTypes]?: string | File };
|
||||||
files?: File[];
|
files?: File[];
|
||||||
}) => {
|
}) => {
|
||||||
if (!types && !files) {
|
if (!types && !files) {
|
||||||
@@ -88,6 +90,11 @@ export const createPasteEvent = ({
|
|||||||
|
|
||||||
if (types) {
|
if (types) {
|
||||||
for (const [type, value] of Object.entries(types)) {
|
for (const [type, value] of Object.entries(types)) {
|
||||||
|
if (typeof value !== "string") {
|
||||||
|
files = files || [];
|
||||||
|
files.push(value);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
event.clipboardData?.setData(type, value);
|
event.clipboardData?.setData(type, value);
|
||||||
if (event.clipboardData?.getData(type) !== value) {
|
if (event.clipboardData?.getData(type) !== value) {
|
||||||
@@ -217,14 +224,14 @@ function parseHTMLTree(el: ChildNode) {
|
|||||||
const maybeParseHTMLPaste = (
|
const maybeParseHTMLPaste = (
|
||||||
event: ClipboardEvent,
|
event: ClipboardEvent,
|
||||||
): { type: "mixedContent"; value: PastedMixedContent } | null => {
|
): { type: "mixedContent"; value: PastedMixedContent } | null => {
|
||||||
const html = event.clipboardData?.getData("text/html");
|
const html = event.clipboardData?.getData(MIME_TYPES.html);
|
||||||
|
|
||||||
if (!html) {
|
if (!html) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const doc = new DOMParser().parseFromString(html, "text/html");
|
const doc = new DOMParser().parseFromString(html, MIME_TYPES.html);
|
||||||
|
|
||||||
const content = parseHTMLTree(doc.body);
|
const content = parseHTMLTree(doc.body);
|
||||||
|
|
||||||
@@ -238,34 +245,44 @@ const maybeParseHTMLPaste = (
|
|||||||
return null;
|
return null;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads OS clipboard programmatically. May not work on all browsers.
|
||||||
|
* Will prompt user for permission if not granted.
|
||||||
|
*/
|
||||||
export const readSystemClipboard = async () => {
|
export const readSystemClipboard = async () => {
|
||||||
const types: { [key in AllowedPasteMimeTypes]?: string } = {};
|
const types: { [key in AllowedPasteMimeTypes]?: string | File } = {};
|
||||||
|
|
||||||
try {
|
|
||||||
if (navigator.clipboard?.readText) {
|
|
||||||
return { "text/plain": await navigator.clipboard?.readText() };
|
|
||||||
}
|
|
||||||
} catch (error: any) {
|
|
||||||
// @ts-ignore
|
|
||||||
if (navigator.clipboard?.read) {
|
|
||||||
console.warn(
|
|
||||||
`navigator.clipboard.readText() failed (${error.message}). Failling back to navigator.clipboard.read()`,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let clipboardItems: ClipboardItems;
|
let clipboardItems: ClipboardItems;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
clipboardItems = await navigator.clipboard?.read();
|
clipboardItems = await navigator.clipboard?.read();
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
if (error.name === "DataError") {
|
try {
|
||||||
console.warn(
|
if (navigator.clipboard?.readText) {
|
||||||
`navigator.clipboard.read() error, clipboard is probably empty: ${error.message}`,
|
console.warn(
|
||||||
);
|
`navigator.clipboard.readText() failed (${error.message}). Failling back to navigator.clipboard.read()`,
|
||||||
return types;
|
);
|
||||||
|
const readText = await navigator.clipboard?.readText();
|
||||||
|
if (readText) {
|
||||||
|
return { [MIME_TYPES.text]: readText };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error: any) {
|
||||||
|
// @ts-ignore
|
||||||
|
if (navigator.clipboard?.read) {
|
||||||
|
console.warn(
|
||||||
|
`navigator.clipboard.readText() failed (${error.message}). Failling back to navigator.clipboard.read()`,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
if (error.name === "DataError") {
|
||||||
|
console.warn(
|
||||||
|
`navigator.clipboard.read() error, clipboard is probably empty: ${error.message}`,
|
||||||
|
);
|
||||||
|
return types;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
@@ -276,10 +293,20 @@ export const readSystemClipboard = async () => {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
types[type] = await (await item.getType(type)).text();
|
if (type === MIME_TYPES.text || type === MIME_TYPES.html) {
|
||||||
|
types[type] = await (await item.getType(type)).text();
|
||||||
|
} else if (isSupportedImageFileType(type)) {
|
||||||
|
const imageBlob = await item.getType(type);
|
||||||
|
const file = createFile(imageBlob, type, undefined);
|
||||||
|
types[type] = file;
|
||||||
|
} else {
|
||||||
|
throw new ExcalidrawError(`Unsupported clipboard type: ${type}`);
|
||||||
|
}
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
console.warn(
|
console.warn(
|
||||||
`Cannot retrieve ${type} from clipboardItem: ${error.message}`,
|
error instanceof ExcalidrawError
|
||||||
|
? error.message
|
||||||
|
: `Cannot retrieve ${type} from clipboardItem: ${error.message}`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -296,10 +323,10 @@ export const readSystemClipboard = async () => {
|
|||||||
/**
|
/**
|
||||||
* Parses "paste" ClipboardEvent.
|
* Parses "paste" ClipboardEvent.
|
||||||
*/
|
*/
|
||||||
const parseClipboardEvent = async (
|
const parseClipboardEventTextData = async (
|
||||||
event: ClipboardEvent,
|
event: ClipboardEvent,
|
||||||
isPlainPaste = false,
|
isPlainPaste = false,
|
||||||
): Promise<ParsedClipboardEvent> => {
|
): Promise<ParsedClipboardEventTextData> => {
|
||||||
try {
|
try {
|
||||||
const mixedContent = !isPlainPaste && event && maybeParseHTMLPaste(event);
|
const mixedContent = !isPlainPaste && event && maybeParseHTMLPaste(event);
|
||||||
|
|
||||||
@@ -308,7 +335,7 @@ const parseClipboardEvent = async (
|
|||||||
return {
|
return {
|
||||||
type: "text",
|
type: "text",
|
||||||
value:
|
value:
|
||||||
event.clipboardData?.getData("text/plain") ||
|
event.clipboardData?.getData(MIME_TYPES.text) ||
|
||||||
mixedContent.value
|
mixedContent.value
|
||||||
.map((item) => item.value)
|
.map((item) => item.value)
|
||||||
.join("\n")
|
.join("\n")
|
||||||
@@ -319,7 +346,7 @@ const parseClipboardEvent = async (
|
|||||||
return mixedContent;
|
return mixedContent;
|
||||||
}
|
}
|
||||||
|
|
||||||
const text = event.clipboardData?.getData("text/plain");
|
const text = event.clipboardData?.getData(MIME_TYPES.text);
|
||||||
|
|
||||||
return { type: "text", value: (text || "").trim() };
|
return { type: "text", value: (text || "").trim() };
|
||||||
} catch {
|
} catch {
|
||||||
@@ -328,13 +355,16 @@ const parseClipboardEvent = async (
|
|||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attempts to parse clipboard. Prefers system clipboard.
|
* Attempts to parse clipboard event.
|
||||||
*/
|
*/
|
||||||
export const parseClipboard = async (
|
export const parseClipboard = async (
|
||||||
event: ClipboardEvent,
|
event: ClipboardEvent,
|
||||||
isPlainPaste = false,
|
isPlainPaste = false,
|
||||||
): Promise<ClipboardData> => {
|
): Promise<ClipboardData> => {
|
||||||
const parsedEventData = await parseClipboardEvent(event, isPlainPaste);
|
const parsedEventData = await parseClipboardEventTextData(
|
||||||
|
event,
|
||||||
|
isPlainPaste,
|
||||||
|
);
|
||||||
|
|
||||||
if (parsedEventData.type === "mixedContent") {
|
if (parsedEventData.type === "mixedContent") {
|
||||||
return {
|
return {
|
||||||
@@ -423,8 +453,8 @@ export const copyTextToSystemClipboard = async (
|
|||||||
// (2) if fails and we have access to ClipboardEvent, use plain old setData()
|
// (2) if fails and we have access to ClipboardEvent, use plain old setData()
|
||||||
try {
|
try {
|
||||||
if (clipboardEvent) {
|
if (clipboardEvent) {
|
||||||
clipboardEvent.clipboardData?.setData("text/plain", text || "");
|
clipboardEvent.clipboardData?.setData(MIME_TYPES.text, text || "");
|
||||||
if (clipboardEvent.clipboardData?.getData("text/plain") !== text) {
|
if (clipboardEvent.clipboardData?.getData(MIME_TYPES.text) !== text) {
|
||||||
throw new Error("Failed to setData on clipboardEvent");
|
throw new Error("Failed to setData on clipboardEvent");
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -1341,8 +1341,18 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
_cache: new Map(),
|
_cache: new Map(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
private resetEditingFrame = (frame: ExcalidrawFrameLikeElement | null) => {
|
||||||
|
if (frame) {
|
||||||
|
mutateElement(frame, { name: frame.name?.trim() || null });
|
||||||
|
}
|
||||||
|
this.setState({ editingFrame: null });
|
||||||
|
};
|
||||||
|
|
||||||
private renderFrameNames = () => {
|
private renderFrameNames = () => {
|
||||||
if (!this.state.frameRendering.enabled || !this.state.frameRendering.name) {
|
if (!this.state.frameRendering.enabled || !this.state.frameRendering.name) {
|
||||||
|
if (this.state.editingFrame) {
|
||||||
|
this.resetEditingFrame(null);
|
||||||
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1364,6 +1374,9 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
this.scene.getNonDeletedElementsMap(),
|
this.scene.getNonDeletedElementsMap(),
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
|
if (this.state.editingFrame === f.id) {
|
||||||
|
this.resetEditingFrame(f);
|
||||||
|
}
|
||||||
// if frame not visible, don't render its name
|
// if frame not visible, don't render its name
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -1375,11 +1388,6 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
|
|
||||||
const FRAME_NAME_EDIT_PADDING = 6;
|
const FRAME_NAME_EDIT_PADDING = 6;
|
||||||
|
|
||||||
const reset = () => {
|
|
||||||
mutateElement(f, { name: f.name?.trim() || null });
|
|
||||||
this.setState({ editingFrame: null });
|
|
||||||
};
|
|
||||||
|
|
||||||
let frameNameJSX;
|
let frameNameJSX;
|
||||||
|
|
||||||
const frameName = getFrameLikeTitle(f);
|
const frameName = getFrameLikeTitle(f);
|
||||||
@@ -1397,13 +1405,13 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
onFocus={(e) => e.target.select()}
|
onFocus={(e) => e.target.select()}
|
||||||
onBlur={() => reset()}
|
onBlur={() => this.resetEditingFrame(f)}
|
||||||
onKeyDown={(event) => {
|
onKeyDown={(event) => {
|
||||||
// for some inexplicable reason, `onBlur` triggered on ESC
|
// for some inexplicable reason, `onBlur` triggered on ESC
|
||||||
// does not reset `state.editingFrame` despite being called,
|
// does not reset `state.editingFrame` despite being called,
|
||||||
// and we need to reset it here as well
|
// and we need to reset it here as well
|
||||||
if (event.key === KEYS.ESCAPE || event.key === KEYS.ENTER) {
|
if (event.key === KEYS.ESCAPE || event.key === KEYS.ENTER) {
|
||||||
reset();
|
this.resetEditingFrame(f);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
style={{
|
style={{
|
||||||
@@ -2575,6 +2583,21 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
this.handleWheel,
|
this.handleWheel,
|
||||||
{ passive: false },
|
{ passive: false },
|
||||||
),
|
),
|
||||||
|
addEventListener(window, "focusin", (event) => {
|
||||||
|
console.log("%c@@@@@@ focusin:", "color:lime", event.target);
|
||||||
|
const target = event.target;
|
||||||
|
if (
|
||||||
|
event.target instanceof HTMLElement &&
|
||||||
|
this.state.editingTextElement
|
||||||
|
) {
|
||||||
|
if (event.target.tagName !== "TEXTAREA") {
|
||||||
|
this.focusContainer();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
addEventListener(window, "focusout", (event) => {
|
||||||
|
console.log("%c@@@@@@ focusout:", "color:red", event.target);
|
||||||
|
}),
|
||||||
addEventListener(window, EVENT.MESSAGE, this.onWindowMessage, false),
|
addEventListener(window, EVENT.MESSAGE, this.onWindowMessage, false),
|
||||||
addEventListener(document, EVENT.POINTER_UP, this.removePointer, {
|
addEventListener(document, EVENT.POINTER_UP, this.removePointer, {
|
||||||
passive: false,
|
passive: false,
|
||||||
@@ -3207,6 +3230,10 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
[el.points[0], el.points[el.points.length - 1]],
|
[el.points[0], el.points[el.points.length - 1]],
|
||||||
|
undefined,
|
||||||
|
{
|
||||||
|
zoom: this.state.zoom,
|
||||||
|
},
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -4364,6 +4391,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
|
|
||||||
updateBoundElements(element, this.scene.getNonDeletedElementsMap(), {
|
updateBoundElements(element, this.scene.getNonDeletedElementsMap(), {
|
||||||
simultaneouslyUpdated: selectedElements,
|
simultaneouslyUpdated: selectedElements,
|
||||||
|
zoom: this.state.zoom,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -4373,6 +4401,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
(element) => element.id !== elbowArrow?.id || step !== 0,
|
(element) => element.id !== elbowArrow?.id || step !== 0,
|
||||||
),
|
),
|
||||||
this.scene.getNonDeletedElementsMap(),
|
this.scene.getNonDeletedElementsMap(),
|
||||||
|
this.state.zoom,
|
||||||
),
|
),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -4588,6 +4617,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
this.scene,
|
this.scene,
|
||||||
isBindingEnabled(this.state),
|
isBindingEnabled(this.state),
|
||||||
this.state.selectedLinearElement?.selectedPointsIndices ?? [],
|
this.state.selectedLinearElement?.selectedPointsIndices ?? [],
|
||||||
|
this.state.zoom,
|
||||||
);
|
);
|
||||||
this.setState({ suggestedBindings: [] });
|
this.setState({ suggestedBindings: [] });
|
||||||
}
|
}
|
||||||
@@ -4830,6 +4860,12 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
) {
|
) {
|
||||||
const elementsMap = this.scene.getElementsMapIncludingDeleted();
|
const elementsMap = this.scene.getElementsMapIncludingDeleted();
|
||||||
|
|
||||||
|
// flushSync(() => {
|
||||||
|
// this.setState({
|
||||||
|
// editingTextElement: element,
|
||||||
|
// });
|
||||||
|
// });
|
||||||
|
|
||||||
const updateElement = (nextOriginalText: string, isDeleted: boolean) => {
|
const updateElement = (nextOriginalText: string, isDeleted: boolean) => {
|
||||||
this.scene.replaceAllElements([
|
this.scene.replaceAllElements([
|
||||||
// Not sure why we include deleted elements as well hence using deleted elements map
|
// Not sure why we include deleted elements as well hence using deleted elements map
|
||||||
@@ -5085,7 +5121,11 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
isImageElement(element) ? 0 : this.getElementHitThreshold(),
|
isImageElement(element) ? 0 : this.getElementHitThreshold(),
|
||||||
);
|
);
|
||||||
|
|
||||||
return isPointInShape(pointFrom(x, y), selectionShape);
|
// if hitting the bounding box, return early
|
||||||
|
// but if not, we should check for other cases as well (e.g. frame name)
|
||||||
|
if (isPointInShape(pointFrom(x, y), selectionShape)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// take bound text element into consideration for hit collision as well
|
// take bound text element into consideration for hit collision as well
|
||||||
@@ -5842,6 +5882,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
{
|
{
|
||||||
isDragging: true,
|
isDragging: true,
|
||||||
informMutation: false,
|
informMutation: false,
|
||||||
|
zoom: this.state.zoom,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
@@ -6258,6 +6299,11 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
private handleCanvasPointerDown = (
|
private handleCanvasPointerDown = (
|
||||||
event: React.PointerEvent<HTMLElement>,
|
event: React.PointerEvent<HTMLElement>,
|
||||||
) => {
|
) => {
|
||||||
|
console.log("(1)", document.activeElement);
|
||||||
|
console.time();
|
||||||
|
this.focusContainer();
|
||||||
|
console.timeEnd();
|
||||||
|
console.log("(2)", document.activeElement);
|
||||||
this.maybeCleanupAfterMissingPointerUp(event.nativeEvent);
|
this.maybeCleanupAfterMissingPointerUp(event.nativeEvent);
|
||||||
this.maybeUnfollowRemoteUser();
|
this.maybeUnfollowRemoteUser();
|
||||||
|
|
||||||
@@ -6702,17 +6748,16 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
}
|
}
|
||||||
isPanning = true;
|
isPanning = true;
|
||||||
|
|
||||||
// due to event.preventDefault below, container wouldn't get focus
|
|
||||||
// automatically
|
|
||||||
this.focusContainer();
|
|
||||||
|
|
||||||
// preventing defualt while text editing messes with cursor/focus
|
// preventing defualt while text editing messes with cursor/focus
|
||||||
if (!this.state.editingTextElement) {
|
if (!this.state.editingTextElement) {
|
||||||
// necessary to prevent browser from scrolling the page if excalidraw
|
// necessary to prevent browser from scrolling the page if excalidraw
|
||||||
// not full-page #4489
|
// not full-page #4489
|
||||||
//
|
//
|
||||||
// as such, the above is broken when panning canvas while in wysiwyg
|
// note, this fix won't work when panning canvas while in wysiwyg since
|
||||||
|
// we don't execute it while in wysiwyg
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
// focus explicitly due to the event.preventDefault above
|
||||||
|
this.focusContainer();
|
||||||
}
|
}
|
||||||
|
|
||||||
let nextPastePrevented = false;
|
let nextPastePrevented = false;
|
||||||
@@ -7389,6 +7434,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
pointerDownState.origin,
|
pointerDownState.origin,
|
||||||
this.scene.getNonDeletedElements(),
|
this.scene.getNonDeletedElements(),
|
||||||
this.scene.getNonDeletedElementsMap(),
|
this.scene.getNonDeletedElementsMap(),
|
||||||
|
this.state.zoom,
|
||||||
);
|
);
|
||||||
|
|
||||||
this.setState({
|
this.setState({
|
||||||
@@ -7686,6 +7732,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
pointerDownState.origin,
|
pointerDownState.origin,
|
||||||
this.scene.getNonDeletedElements(),
|
this.scene.getNonDeletedElements(),
|
||||||
this.scene.getNonDeletedElementsMap(),
|
this.scene.getNonDeletedElementsMap(),
|
||||||
|
this.state.zoom,
|
||||||
isElbowArrow(element),
|
isElbowArrow(element),
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -8264,6 +8311,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
suggestedBindings: getSuggestedBindingsForArrows(
|
suggestedBindings: getSuggestedBindingsForArrows(
|
||||||
selectedElements,
|
selectedElements,
|
||||||
this.scene.getNonDeletedElementsMap(),
|
this.scene.getNonDeletedElementsMap(),
|
||||||
|
this.state.zoom,
|
||||||
),
|
),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -8432,6 +8480,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
{
|
{
|
||||||
isDragging: true,
|
isDragging: true,
|
||||||
informMutation: false,
|
informMutation: false,
|
||||||
|
zoom: this.state.zoom,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
} else if (points.length === 2) {
|
} else if (points.length === 2) {
|
||||||
@@ -9396,6 +9445,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
this.scene,
|
this.scene,
|
||||||
isBindingEnabled(this.state),
|
isBindingEnabled(this.state),
|
||||||
this.state.selectedLinearElement?.selectedPointsIndices ?? [],
|
this.state.selectedLinearElement?.selectedPointsIndices ?? [],
|
||||||
|
this.state.zoom,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -9888,6 +9938,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
pointerCoords,
|
pointerCoords,
|
||||||
this.scene.getNonDeletedElements(),
|
this.scene.getNonDeletedElements(),
|
||||||
this.scene.getNonDeletedElementsMap(),
|
this.scene.getNonDeletedElementsMap(),
|
||||||
|
this.state.zoom,
|
||||||
);
|
);
|
||||||
this.setState({
|
this.setState({
|
||||||
suggestedBindings:
|
suggestedBindings:
|
||||||
@@ -9916,6 +9967,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
coords,
|
coords,
|
||||||
this.scene.getNonDeletedElements(),
|
this.scene.getNonDeletedElements(),
|
||||||
this.scene.getNonDeletedElementsMap(),
|
this.scene.getNonDeletedElementsMap(),
|
||||||
|
this.state.zoom,
|
||||||
isArrowElement(linearElement) && isElbowArrow(linearElement),
|
isArrowElement(linearElement) && isElbowArrow(linearElement),
|
||||||
);
|
);
|
||||||
if (
|
if (
|
||||||
@@ -10356,7 +10408,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
const [x, y] = getGridPoint(
|
const [x, y] = getGridPoint(
|
||||||
pointerCoords.x - pointerDownState.resize.offset.x,
|
pointerCoords.x - pointerDownState.resize.offset.x,
|
||||||
pointerCoords.y - pointerDownState.resize.offset.y,
|
pointerCoords.y - pointerDownState.resize.offset.y,
|
||||||
this.getEffectiveGridSize(),
|
event[KEYS.CTRL_OR_CMD] ? null : this.getEffectiveGridSize(),
|
||||||
);
|
);
|
||||||
|
|
||||||
const croppingElement = this.scene
|
const croppingElement = this.scene
|
||||||
@@ -10382,6 +10434,28 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
image &&
|
image &&
|
||||||
!(image instanceof Promise)
|
!(image instanceof Promise)
|
||||||
) {
|
) {
|
||||||
|
const [gridX, gridY] = getGridPoint(
|
||||||
|
pointerCoords.x,
|
||||||
|
pointerCoords.y,
|
||||||
|
event[KEYS.CTRL_OR_CMD] ? null : this.getEffectiveGridSize(),
|
||||||
|
);
|
||||||
|
|
||||||
|
const dragOffset = {
|
||||||
|
x: gridX - pointerDownState.originInGrid.x,
|
||||||
|
y: gridY - pointerDownState.originInGrid.y,
|
||||||
|
};
|
||||||
|
|
||||||
|
this.maybeCacheReferenceSnapPoints(event, [croppingElement]);
|
||||||
|
|
||||||
|
const { snapOffset, snapLines } = snapResizingElements(
|
||||||
|
[croppingElement],
|
||||||
|
[croppingAtStateStart],
|
||||||
|
this,
|
||||||
|
event,
|
||||||
|
dragOffset,
|
||||||
|
transformHandleType,
|
||||||
|
);
|
||||||
|
|
||||||
mutateElement(
|
mutateElement(
|
||||||
croppingElement,
|
croppingElement,
|
||||||
cropElement(
|
cropElement(
|
||||||
@@ -10389,8 +10463,8 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
transformHandleType,
|
transformHandleType,
|
||||||
image.naturalWidth,
|
image.naturalWidth,
|
||||||
image.naturalHeight,
|
image.naturalHeight,
|
||||||
x,
|
x + snapOffset.x,
|
||||||
y,
|
y + snapOffset.y,
|
||||||
event.shiftKey
|
event.shiftKey
|
||||||
? croppingAtStateStart.width / croppingAtStateStart.height
|
? croppingAtStateStart.width / croppingAtStateStart.height
|
||||||
: undefined,
|
: undefined,
|
||||||
@@ -10410,6 +10484,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
|
|
||||||
this.setState({
|
this.setState({
|
||||||
isCropping: transformHandleType && transformHandleType !== "rotation",
|
isCropping: transformHandleType && transformHandleType !== "rotation",
|
||||||
|
snapLines,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -10520,6 +10595,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
transformHandleType,
|
transformHandleType,
|
||||||
selectedElements,
|
selectedElements,
|
||||||
this.scene.getElementsMapIncludingDeleted(),
|
this.scene.getElementsMapIncludingDeleted(),
|
||||||
|
this.scene,
|
||||||
shouldRotateWithDiscreteAngle(event),
|
shouldRotateWithDiscreteAngle(event),
|
||||||
shouldResizeFromCenter(event),
|
shouldResizeFromCenter(event),
|
||||||
selectedElements.some((element) => isImageElement(element))
|
selectedElements.some((element) => isImageElement(element))
|
||||||
@@ -10534,6 +10610,7 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
const suggestedBindings = getSuggestedBindingsForArrows(
|
const suggestedBindings = getSuggestedBindingsForArrows(
|
||||||
selectedElements,
|
selectedElements,
|
||||||
this.scene.getNonDeletedElementsMap(),
|
this.scene.getNonDeletedElementsMap(),
|
||||||
|
this.state.zoom,
|
||||||
);
|
);
|
||||||
|
|
||||||
const elementsToHighlight = new Set<ExcalidrawElement>();
|
const elementsToHighlight = new Set<ExcalidrawElement>();
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import { jotaiScope } from "../../jotai";
|
|||||||
import { ColorInput } from "./ColorInput";
|
import { ColorInput } from "./ColorInput";
|
||||||
import { activeEyeDropperAtom } from "../EyeDropper";
|
import { activeEyeDropperAtom } from "../EyeDropper";
|
||||||
import { PropertiesPopover } from "../PropertiesPopover";
|
import { PropertiesPopover } from "../PropertiesPopover";
|
||||||
|
import { CLASSES } from "../../constants";
|
||||||
|
|
||||||
import "./ColorPicker.scss";
|
import "./ColorPicker.scss";
|
||||||
|
|
||||||
@@ -186,9 +187,13 @@ const ColorPickerTrigger = ({
|
|||||||
return (
|
return (
|
||||||
<Popover.Trigger
|
<Popover.Trigger
|
||||||
type="button"
|
type="button"
|
||||||
className={clsx("color-picker__button active-color properties-trigger", {
|
className={clsx(
|
||||||
"is-transparent": color === "transparent" || !color,
|
"color-picker__button active-color",
|
||||||
})}
|
CLASSES.PROPERTIES_POPOVER_TRIGGER,
|
||||||
|
{
|
||||||
|
"is-transparent": color === "transparent" || !color,
|
||||||
|
},
|
||||||
|
)}
|
||||||
aria-label={label}
|
aria-label={label}
|
||||||
style={color ? { "--swatch-color": color } : undefined}
|
style={color ? { "--swatch-color": color } : undefined}
|
||||||
title={
|
title={
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import clsx from "clsx";
|
import clsx from "clsx";
|
||||||
import { useAtom } from "jotai";
|
import { useAtom } from "jotai";
|
||||||
import { useEffect, useRef } from "react";
|
import { useEffect, useRef } from "react";
|
||||||
|
import { useUIAppState } from "../../context/ui-appState";
|
||||||
import { activeColorPickerSectionAtom } from "./colorPickerUtils";
|
import { activeColorPickerSectionAtom } from "./colorPickerUtils";
|
||||||
import HotkeyLabel from "./HotkeyLabel";
|
import HotkeyLabel from "./HotkeyLabel";
|
||||||
|
|
||||||
@@ -17,6 +18,7 @@ export const CustomColorList = ({
|
|||||||
onChange,
|
onChange,
|
||||||
label,
|
label,
|
||||||
}: CustomColorListProps) => {
|
}: CustomColorListProps) => {
|
||||||
|
const appState = useUIAppState();
|
||||||
const [activeColorPickerSection, setActiveColorPickerSection] = useAtom(
|
const [activeColorPickerSection, setActiveColorPickerSection] = useAtom(
|
||||||
activeColorPickerSectionAtom,
|
activeColorPickerSectionAtom,
|
||||||
);
|
);
|
||||||
@@ -54,7 +56,9 @@ export const CustomColorList = ({
|
|||||||
key={i}
|
key={i}
|
||||||
>
|
>
|
||||||
<div className="color-picker__button-outline" />
|
<div className="color-picker__button-outline" />
|
||||||
<HotkeyLabel color={c} keyLabel={i + 1} isCustomColor />
|
{!appState.editingTextElement && (
|
||||||
|
<HotkeyLabel color={c} keyLabel={i + 1} isCustomColor />
|
||||||
|
)}
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import HotkeyLabel from "./HotkeyLabel";
|
|||||||
import type { ColorPaletteCustom } from "../../colors";
|
import type { ColorPaletteCustom } from "../../colors";
|
||||||
import type { TranslationKeys } from "../../i18n";
|
import type { TranslationKeys } from "../../i18n";
|
||||||
import { t } from "../../i18n";
|
import { t } from "../../i18n";
|
||||||
|
import { useUIAppState } from "../../context/ui-appState";
|
||||||
|
|
||||||
interface PickerColorListProps {
|
interface PickerColorListProps {
|
||||||
palette: ColorPaletteCustom;
|
palette: ColorPaletteCustom;
|
||||||
@@ -26,6 +27,8 @@ const PickerColorList = ({
|
|||||||
label,
|
label,
|
||||||
activeShade,
|
activeShade,
|
||||||
}: PickerColorListProps) => {
|
}: PickerColorListProps) => {
|
||||||
|
const appState = useUIAppState();
|
||||||
|
|
||||||
const colorObj = getColorNameAndShadeFromColor({
|
const colorObj = getColorNameAndShadeFromColor({
|
||||||
color: color || "transparent",
|
color: color || "transparent",
|
||||||
palette,
|
palette,
|
||||||
@@ -80,7 +83,9 @@ const PickerColorList = ({
|
|||||||
key={key}
|
key={key}
|
||||||
>
|
>
|
||||||
<div className="color-picker__button-outline" />
|
<div className="color-picker__button-outline" />
|
||||||
<HotkeyLabel color={color} keyLabel={keybinding} />
|
{!appState.editingTextElement && (
|
||||||
|
<HotkeyLabel color={color} keyLabel={keybinding} />
|
||||||
|
)}
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
import HotkeyLabel from "./HotkeyLabel";
|
import HotkeyLabel from "./HotkeyLabel";
|
||||||
import { t } from "../../i18n";
|
import { t } from "../../i18n";
|
||||||
import type { ColorPaletteCustom } from "../../colors";
|
import type { ColorPaletteCustom } from "../../colors";
|
||||||
|
import { useUIAppState } from "../../context/ui-appState";
|
||||||
|
|
||||||
interface ShadeListProps {
|
interface ShadeListProps {
|
||||||
hex: string;
|
hex: string;
|
||||||
@@ -16,6 +17,8 @@ interface ShadeListProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const ShadeList = ({ hex, onChange, palette }: ShadeListProps) => {
|
export const ShadeList = ({ hex, onChange, palette }: ShadeListProps) => {
|
||||||
|
const appState = useUIAppState();
|
||||||
|
|
||||||
const colorObj = getColorNameAndShadeFromColor({
|
const colorObj = getColorNameAndShadeFromColor({
|
||||||
color: hex || "transparent",
|
color: hex || "transparent",
|
||||||
palette,
|
palette,
|
||||||
@@ -31,7 +34,7 @@ export const ShadeList = ({ hex, onChange, palette }: ShadeListProps) => {
|
|||||||
if (btnRef.current && activeColorPickerSection === "shades") {
|
if (btnRef.current && activeColorPickerSection === "shades") {
|
||||||
btnRef.current.focus();
|
btnRef.current.focus();
|
||||||
}
|
}
|
||||||
}, [colorObj, activeColorPickerSection]);
|
}, [colorObj?.colorName, colorObj?.shade, activeColorPickerSection]);
|
||||||
|
|
||||||
if (colorObj) {
|
if (colorObj) {
|
||||||
const { colorName, shade } = colorObj;
|
const { colorName, shade } = colorObj;
|
||||||
@@ -64,7 +67,9 @@ export const ShadeList = ({ hex, onChange, palette }: ShadeListProps) => {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div className="color-picker__button-outline" />
|
<div className="color-picker__button-outline" />
|
||||||
<HotkeyLabel color={color} keyLabel={i + 1} isShade />
|
{!appState.editingTextElement && (
|
||||||
|
<HotkeyLabel color={color} keyLabel={i + 1} isShade />
|
||||||
|
)}
|
||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ export const TopPicks = ({
|
|||||||
title={color}
|
title={color}
|
||||||
onClick={() => onChange(color)}
|
onClick={() => onChange(color)}
|
||||||
data-testid={`color-top-pick-${color}`}
|
data-testid={`color-top-pick-${color}`}
|
||||||
|
tabIndex={-1}
|
||||||
>
|
>
|
||||||
<div className="color-picker__button-outline" />
|
<div className="color-picker__button-outline" />
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -250,6 +250,10 @@ export const FontPickerList = React.memo(
|
|||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
onPointerLeave={onLeave}
|
onPointerLeave={onLeave}
|
||||||
onKeyDown={onKeyDown}
|
onKeyDown={onKeyDown}
|
||||||
|
onFocusOutside={(event) => {
|
||||||
|
// so we don't close when refocusing wysiwyg while editing
|
||||||
|
event.preventDefault();
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<QuickSearch
|
<QuickSearch
|
||||||
ref={inputRef}
|
ref={inputRef}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { TextIcon } from "../icons";
|
|||||||
import type { FontFamilyValues } from "../../element/types";
|
import type { FontFamilyValues } from "../../element/types";
|
||||||
import { t } from "../../i18n";
|
import { t } from "../../i18n";
|
||||||
import { isDefaultFont } from "./FontPicker";
|
import { isDefaultFont } from "./FontPicker";
|
||||||
|
import { CLASSES } from "../../constants";
|
||||||
|
|
||||||
interface FontPickerTriggerProps {
|
interface FontPickerTriggerProps {
|
||||||
selectedFontFamily: FontFamilyValues | null;
|
selectedFontFamily: FontFamilyValues | null;
|
||||||
@@ -26,7 +27,7 @@ export const FontPickerTrigger = ({
|
|||||||
standalone
|
standalone
|
||||||
icon={TextIcon}
|
icon={TextIcon}
|
||||||
title={t("labels.showFonts")}
|
title={t("labels.showFonts")}
|
||||||
className="properties-trigger"
|
className={CLASSES.PROPERTIES_POPOVER_TRIGGER}
|
||||||
testId={"font-family-show-fonts"}
|
testId={"font-family-show-fonts"}
|
||||||
active={isTriggerActive}
|
active={isTriggerActive}
|
||||||
// no-op
|
// no-op
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import * as Popover from "@radix-ui/react-popover";
|
|||||||
import { useDevice } from "./App";
|
import { useDevice } from "./App";
|
||||||
import { Island } from "./Island";
|
import { Island } from "./Island";
|
||||||
import { isInteractive } from "../utils";
|
import { isInteractive } from "../utils";
|
||||||
|
import { CLASSES } from "../constants";
|
||||||
|
|
||||||
interface PropertiesPopoverProps {
|
interface PropertiesPopoverProps {
|
||||||
className?: string;
|
className?: string;
|
||||||
@@ -42,7 +43,11 @@ export const PropertiesPopover = React.forwardRef<
|
|||||||
<Popover.Portal container={container}>
|
<Popover.Portal container={container}>
|
||||||
<Popover.Content
|
<Popover.Content
|
||||||
ref={ref}
|
ref={ref}
|
||||||
className={clsx("focus-visible-none", className)}
|
className={clsx(
|
||||||
|
"focus-visible-none",
|
||||||
|
CLASSES.PROPERTIES_POPOVER,
|
||||||
|
className,
|
||||||
|
)}
|
||||||
data-prevent-outside-click
|
data-prevent-outside-click
|
||||||
side={
|
side={
|
||||||
device.editor.isMobile && !device.viewport.isLandscape
|
device.editor.isMobile && !device.viewport.isLandscape
|
||||||
|
|||||||
@@ -1,10 +1,18 @@
|
|||||||
import type { ExcalidrawElement } from "../../element/types";
|
import type { ExcalidrawElement } from "../../element/types";
|
||||||
import DragInput from "./DragInput";
|
import DragInput from "./DragInput";
|
||||||
import type { DragInputCallbackType } from "./DragInput";
|
import type { DragInputCallbackType } from "./DragInput";
|
||||||
import { getStepSizedValue, isPropertyEditable, resizeElement } from "./utils";
|
import { getStepSizedValue, isPropertyEditable } from "./utils";
|
||||||
import { MIN_WIDTH_OR_HEIGHT } from "../../constants";
|
import { MIN_WIDTH_OR_HEIGHT } from "../../constants";
|
||||||
|
import { resizeSingleElement } from "../../element/resizeElements";
|
||||||
import type Scene from "../../scene/Scene";
|
import type Scene from "../../scene/Scene";
|
||||||
import type { AppState } from "../../types";
|
import type { AppState } from "../../types";
|
||||||
|
import { isImageElement } from "../../element/typeChecks";
|
||||||
|
import {
|
||||||
|
MINIMAL_CROP_SIZE,
|
||||||
|
getUncroppedWidthAndHeight,
|
||||||
|
} from "../../element/cropElement";
|
||||||
|
import { mutateElement } from "../../element/mutateElement";
|
||||||
|
import { clamp, round } from "../../../math";
|
||||||
|
|
||||||
interface DimensionDragInputProps {
|
interface DimensionDragInputProps {
|
||||||
property: "width" | "height";
|
property: "width" | "height";
|
||||||
@@ -23,20 +31,124 @@ const handleDimensionChange: DragInputCallbackType<
|
|||||||
> = ({
|
> = ({
|
||||||
accumulatedChange,
|
accumulatedChange,
|
||||||
originalElements,
|
originalElements,
|
||||||
|
originalElementsMap,
|
||||||
shouldKeepAspectRatio,
|
shouldKeepAspectRatio,
|
||||||
shouldChangeByStepSize,
|
shouldChangeByStepSize,
|
||||||
nextValue,
|
nextValue,
|
||||||
property,
|
property,
|
||||||
|
originalAppState,
|
||||||
|
instantChange,
|
||||||
scene,
|
scene,
|
||||||
}) => {
|
}) => {
|
||||||
const elementsMap = scene.getNonDeletedElementsMap();
|
const elementsMap = scene.getNonDeletedElementsMap();
|
||||||
const elements = scene.getNonDeletedElements();
|
|
||||||
const origElement = originalElements[0];
|
const origElement = originalElements[0];
|
||||||
if (origElement) {
|
const latestElement = elementsMap.get(origElement.id);
|
||||||
|
if (origElement && latestElement) {
|
||||||
const keepAspectRatio =
|
const keepAspectRatio =
|
||||||
shouldKeepAspectRatio || _shouldKeepAspectRatio(origElement);
|
shouldKeepAspectRatio || _shouldKeepAspectRatio(origElement);
|
||||||
const aspectRatio = origElement.width / origElement.height;
|
const aspectRatio = origElement.width / origElement.height;
|
||||||
|
|
||||||
|
if (originalAppState.croppingElementId === origElement.id) {
|
||||||
|
const element = elementsMap.get(origElement.id);
|
||||||
|
|
||||||
|
if (!element || !isImageElement(element) || !element.crop) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const crop = element.crop;
|
||||||
|
let nextCrop = { ...crop };
|
||||||
|
|
||||||
|
const isFlippedByX = element.scale[0] === -1;
|
||||||
|
const isFlippedByY = element.scale[1] === -1;
|
||||||
|
|
||||||
|
const { width: uncroppedWidth, height: uncroppedHeight } =
|
||||||
|
getUncroppedWidthAndHeight(element);
|
||||||
|
|
||||||
|
const naturalToUncroppedWidthRatio = crop.naturalWidth / uncroppedWidth;
|
||||||
|
const naturalToUncroppedHeightRatio =
|
||||||
|
crop.naturalHeight / uncroppedHeight;
|
||||||
|
|
||||||
|
const MAX_POSSIBLE_WIDTH = isFlippedByX
|
||||||
|
? crop.width + crop.x
|
||||||
|
: crop.naturalWidth - crop.x;
|
||||||
|
|
||||||
|
const MAX_POSSIBLE_HEIGHT = isFlippedByY
|
||||||
|
? crop.height + crop.y
|
||||||
|
: crop.naturalHeight - crop.y;
|
||||||
|
|
||||||
|
const MIN_WIDTH = MINIMAL_CROP_SIZE * naturalToUncroppedWidthRatio;
|
||||||
|
const MIN_HEIGHT = MINIMAL_CROP_SIZE * naturalToUncroppedHeightRatio;
|
||||||
|
|
||||||
|
if (nextValue !== undefined) {
|
||||||
|
if (property === "width") {
|
||||||
|
const nextValueInNatural = nextValue * naturalToUncroppedWidthRatio;
|
||||||
|
|
||||||
|
const nextCropWidth = clamp(
|
||||||
|
nextValueInNatural,
|
||||||
|
MIN_WIDTH,
|
||||||
|
MAX_POSSIBLE_WIDTH,
|
||||||
|
);
|
||||||
|
|
||||||
|
nextCrop = {
|
||||||
|
...nextCrop,
|
||||||
|
width: nextCropWidth,
|
||||||
|
x: isFlippedByX ? crop.x + crop.width - nextCropWidth : crop.x,
|
||||||
|
};
|
||||||
|
} else if (property === "height") {
|
||||||
|
const nextValueInNatural = nextValue * naturalToUncroppedHeightRatio;
|
||||||
|
const nextCropHeight = clamp(
|
||||||
|
nextValueInNatural,
|
||||||
|
MIN_HEIGHT,
|
||||||
|
MAX_POSSIBLE_HEIGHT,
|
||||||
|
);
|
||||||
|
|
||||||
|
nextCrop = {
|
||||||
|
...nextCrop,
|
||||||
|
height: nextCropHeight,
|
||||||
|
y: isFlippedByY ? crop.y + crop.height - nextCropHeight : crop.y,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
mutateElement(element, {
|
||||||
|
crop: nextCrop,
|
||||||
|
width: nextCrop.width / (crop.naturalWidth / uncroppedWidth),
|
||||||
|
height: nextCrop.height / (crop.naturalHeight / uncroppedHeight),
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const changeInWidth = property === "width" ? instantChange : 0;
|
||||||
|
const changeInHeight = property === "height" ? instantChange : 0;
|
||||||
|
|
||||||
|
const nextCropWidth = clamp(
|
||||||
|
crop.width + changeInWidth,
|
||||||
|
MIN_WIDTH,
|
||||||
|
MAX_POSSIBLE_WIDTH,
|
||||||
|
);
|
||||||
|
|
||||||
|
const nextCropHeight = clamp(
|
||||||
|
crop.height + changeInHeight,
|
||||||
|
MIN_WIDTH,
|
||||||
|
MAX_POSSIBLE_HEIGHT,
|
||||||
|
);
|
||||||
|
|
||||||
|
nextCrop = {
|
||||||
|
...crop,
|
||||||
|
x: isFlippedByX ? crop.x + crop.width - nextCropWidth : crop.x,
|
||||||
|
y: isFlippedByY ? crop.y + crop.height - nextCropHeight : crop.y,
|
||||||
|
width: nextCropWidth,
|
||||||
|
height: nextCropHeight,
|
||||||
|
};
|
||||||
|
|
||||||
|
mutateElement(element, {
|
||||||
|
crop: nextCrop,
|
||||||
|
width: nextCrop.width / (crop.naturalWidth / uncroppedWidth),
|
||||||
|
height: nextCrop.height / (crop.naturalHeight / uncroppedHeight),
|
||||||
|
});
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (nextValue !== undefined) {
|
if (nextValue !== undefined) {
|
||||||
const nextWidth = Math.max(
|
const nextWidth = Math.max(
|
||||||
property === "width"
|
property === "width"
|
||||||
@@ -55,14 +167,17 @@ const handleDimensionChange: DragInputCallbackType<
|
|||||||
MIN_WIDTH_OR_HEIGHT,
|
MIN_WIDTH_OR_HEIGHT,
|
||||||
);
|
);
|
||||||
|
|
||||||
resizeElement(
|
resizeSingleElement(
|
||||||
nextWidth,
|
nextWidth,
|
||||||
nextHeight,
|
nextHeight,
|
||||||
keepAspectRatio,
|
latestElement,
|
||||||
origElement,
|
origElement,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
elements,
|
originalElementsMap,
|
||||||
scene,
|
property === "width" ? "e" : "s",
|
||||||
|
{
|
||||||
|
shouldMaintainAspectRatio: keepAspectRatio,
|
||||||
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
@@ -99,14 +214,17 @@ const handleDimensionChange: DragInputCallbackType<
|
|||||||
nextHeight = Math.max(MIN_WIDTH_OR_HEIGHT, nextHeight);
|
nextHeight = Math.max(MIN_WIDTH_OR_HEIGHT, nextHeight);
|
||||||
nextWidth = Math.max(MIN_WIDTH_OR_HEIGHT, nextWidth);
|
nextWidth = Math.max(MIN_WIDTH_OR_HEIGHT, nextWidth);
|
||||||
|
|
||||||
resizeElement(
|
resizeSingleElement(
|
||||||
nextWidth,
|
nextWidth,
|
||||||
nextHeight,
|
nextHeight,
|
||||||
keepAspectRatio,
|
latestElement,
|
||||||
origElement,
|
origElement,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
elements,
|
originalElementsMap,
|
||||||
scene,
|
property === "width" ? "e" : "s",
|
||||||
|
{
|
||||||
|
shouldMaintainAspectRatio: keepAspectRatio,
|
||||||
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -117,9 +235,25 @@ const DimensionDragInput = ({
|
|||||||
scene,
|
scene,
|
||||||
appState,
|
appState,
|
||||||
}: DimensionDragInputProps) => {
|
}: DimensionDragInputProps) => {
|
||||||
const value =
|
let value = round(property === "width" ? element.width : element.height, 2);
|
||||||
Math.round((property === "width" ? element.width : element.height) * 100) /
|
|
||||||
100;
|
if (
|
||||||
|
appState.croppingElementId &&
|
||||||
|
appState.croppingElementId === element.id &&
|
||||||
|
isImageElement(element) &&
|
||||||
|
element.crop
|
||||||
|
) {
|
||||||
|
const { width: uncroppedWidth, height: uncroppedHeight } =
|
||||||
|
getUncroppedWidthAndHeight(element);
|
||||||
|
if (property === "width") {
|
||||||
|
const ratio = uncroppedWidth / element.crop.naturalWidth;
|
||||||
|
value = round(element.crop.width * ratio, 2);
|
||||||
|
}
|
||||||
|
if (property === "height") {
|
||||||
|
const ratio = uncroppedHeight / element.crop.naturalHeight;
|
||||||
|
value = round(element.crop.height * ratio, 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DragInput
|
<DragInput
|
||||||
|
|||||||
@@ -2,7 +2,10 @@ import { useMemo } from "react";
|
|||||||
import { getCommonBounds, isTextElement } from "../../element";
|
import { getCommonBounds, isTextElement } from "../../element";
|
||||||
import { updateBoundElements } from "../../element/binding";
|
import { updateBoundElements } from "../../element/binding";
|
||||||
import { mutateElement } from "../../element/mutateElement";
|
import { mutateElement } from "../../element/mutateElement";
|
||||||
import { rescalePointsInElement } from "../../element/resizeElements";
|
import {
|
||||||
|
rescalePointsInElement,
|
||||||
|
resizeSingleElement,
|
||||||
|
} from "../../element/resizeElements";
|
||||||
import {
|
import {
|
||||||
getBoundTextElement,
|
getBoundTextElement,
|
||||||
handleBindTextResize,
|
handleBindTextResize,
|
||||||
@@ -17,7 +20,7 @@ import type { AppState } from "../../types";
|
|||||||
import DragInput from "./DragInput";
|
import DragInput from "./DragInput";
|
||||||
import type { DragInputCallbackType } from "./DragInput";
|
import type { DragInputCallbackType } from "./DragInput";
|
||||||
import { getAtomicUnits, getStepSizedValue, isPropertyEditable } from "./utils";
|
import { getAtomicUnits, getStepSizedValue, isPropertyEditable } from "./utils";
|
||||||
import { getElementsInAtomicUnit, resizeElement } from "./utils";
|
import { getElementsInAtomicUnit } from "./utils";
|
||||||
import type { AtomicUnit } from "./utils";
|
import type { AtomicUnit } from "./utils";
|
||||||
import { MIN_WIDTH_OR_HEIGHT } from "../../constants";
|
import { MIN_WIDTH_OR_HEIGHT } from "../../constants";
|
||||||
import { pointFrom, type GlobalPoint } from "../../../math";
|
import { pointFrom, type GlobalPoint } from "../../../math";
|
||||||
@@ -150,7 +153,6 @@ const handleDimensionChange: DragInputCallbackType<
|
|||||||
property,
|
property,
|
||||||
}) => {
|
}) => {
|
||||||
const elementsMap = scene.getNonDeletedElementsMap();
|
const elementsMap = scene.getNonDeletedElementsMap();
|
||||||
const elements = scene.getNonDeletedElements();
|
|
||||||
const atomicUnits = getAtomicUnits(originalElements, originalAppState);
|
const atomicUnits = getAtomicUnits(originalElements, originalAppState);
|
||||||
if (nextValue !== undefined) {
|
if (nextValue !== undefined) {
|
||||||
for (const atomicUnit of atomicUnits) {
|
for (const atomicUnit of atomicUnits) {
|
||||||
@@ -223,15 +225,17 @@ const handleDimensionChange: DragInputCallbackType<
|
|||||||
nextWidth = Math.max(MIN_WIDTH_OR_HEIGHT, nextWidth);
|
nextWidth = Math.max(MIN_WIDTH_OR_HEIGHT, nextWidth);
|
||||||
nextHeight = Math.max(MIN_WIDTH_OR_HEIGHT, nextHeight);
|
nextHeight = Math.max(MIN_WIDTH_OR_HEIGHT, nextHeight);
|
||||||
|
|
||||||
resizeElement(
|
resizeSingleElement(
|
||||||
nextWidth,
|
nextWidth,
|
||||||
nextHeight,
|
nextHeight,
|
||||||
false,
|
latestElement,
|
||||||
origElement,
|
origElement,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
elements,
|
originalElementsMap,
|
||||||
scene,
|
property === "width" ? "e" : "s",
|
||||||
false,
|
{
|
||||||
|
shouldInformMutation: false,
|
||||||
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -324,14 +328,17 @@ const handleDimensionChange: DragInputCallbackType<
|
|||||||
nextWidth = Math.max(MIN_WIDTH_OR_HEIGHT, nextWidth);
|
nextWidth = Math.max(MIN_WIDTH_OR_HEIGHT, nextWidth);
|
||||||
nextHeight = Math.max(MIN_WIDTH_OR_HEIGHT, nextHeight);
|
nextHeight = Math.max(MIN_WIDTH_OR_HEIGHT, nextHeight);
|
||||||
|
|
||||||
resizeElement(
|
resizeSingleElement(
|
||||||
nextWidth,
|
nextWidth,
|
||||||
nextHeight,
|
nextHeight,
|
||||||
false,
|
latestElement,
|
||||||
origElement,
|
origElement,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
elements,
|
originalElementsMap,
|
||||||
scene,
|
property === "width" ? "e" : "s",
|
||||||
|
{
|
||||||
|
shouldInformMutation: false,
|
||||||
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,13 @@ import type { DragInputCallbackType } from "./DragInput";
|
|||||||
import { getStepSizedValue, moveElement } from "./utils";
|
import { getStepSizedValue, moveElement } from "./utils";
|
||||||
import type Scene from "../../scene/Scene";
|
import type Scene from "../../scene/Scene";
|
||||||
import type { AppState } from "../../types";
|
import type { AppState } from "../../types";
|
||||||
import { pointFrom, pointRotateRads } from "../../../math";
|
import { clamp, pointFrom, pointRotateRads, round } from "../../../math";
|
||||||
|
import { isImageElement } from "../../element/typeChecks";
|
||||||
|
import {
|
||||||
|
getFlipAdjustedCropPosition,
|
||||||
|
getUncroppedWidthAndHeight,
|
||||||
|
} from "../../element/cropElement";
|
||||||
|
import { mutateElement } from "../../element/mutateElement";
|
||||||
|
|
||||||
interface PositionProps {
|
interface PositionProps {
|
||||||
property: "x" | "y";
|
property: "x" | "y";
|
||||||
@@ -18,12 +24,14 @@ const STEP_SIZE = 10;
|
|||||||
|
|
||||||
const handlePositionChange: DragInputCallbackType<"x" | "y"> = ({
|
const handlePositionChange: DragInputCallbackType<"x" | "y"> = ({
|
||||||
accumulatedChange,
|
accumulatedChange,
|
||||||
|
instantChange,
|
||||||
originalElements,
|
originalElements,
|
||||||
originalElementsMap,
|
originalElementsMap,
|
||||||
shouldChangeByStepSize,
|
shouldChangeByStepSize,
|
||||||
nextValue,
|
nextValue,
|
||||||
property,
|
property,
|
||||||
scene,
|
scene,
|
||||||
|
originalAppState,
|
||||||
}) => {
|
}) => {
|
||||||
const elementsMap = scene.getNonDeletedElementsMap();
|
const elementsMap = scene.getNonDeletedElementsMap();
|
||||||
const elements = scene.getNonDeletedElements();
|
const elements = scene.getNonDeletedElements();
|
||||||
@@ -38,6 +46,82 @@ const handlePositionChange: DragInputCallbackType<"x" | "y"> = ({
|
|||||||
origElement.angle,
|
origElement.angle,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (originalAppState.croppingElementId === origElement.id) {
|
||||||
|
const element = elementsMap.get(origElement.id);
|
||||||
|
|
||||||
|
if (!element || !isImageElement(element) || !element.crop) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const crop = element.crop;
|
||||||
|
let nextCrop = crop;
|
||||||
|
const isFlippedByX = element.scale[0] === -1;
|
||||||
|
const isFlippedByY = element.scale[1] === -1;
|
||||||
|
const { width: uncroppedWidth, height: uncroppedHeight } =
|
||||||
|
getUncroppedWidthAndHeight(element);
|
||||||
|
|
||||||
|
if (nextValue !== undefined) {
|
||||||
|
if (property === "x") {
|
||||||
|
const nextValueInNatural =
|
||||||
|
nextValue * (crop.naturalWidth / uncroppedWidth);
|
||||||
|
|
||||||
|
if (isFlippedByX) {
|
||||||
|
nextCrop = {
|
||||||
|
...crop,
|
||||||
|
x: clamp(
|
||||||
|
crop.naturalWidth - nextValueInNatural - crop.width,
|
||||||
|
0,
|
||||||
|
crop.naturalWidth - crop.width,
|
||||||
|
),
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
nextCrop = {
|
||||||
|
...crop,
|
||||||
|
x: clamp(
|
||||||
|
nextValue * (crop.naturalWidth / uncroppedWidth),
|
||||||
|
0,
|
||||||
|
crop.naturalWidth - crop.width,
|
||||||
|
),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (property === "y") {
|
||||||
|
nextCrop = {
|
||||||
|
...crop,
|
||||||
|
y: clamp(
|
||||||
|
nextValue * (crop.naturalHeight / uncroppedHeight),
|
||||||
|
0,
|
||||||
|
crop.naturalHeight - crop.height,
|
||||||
|
),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
mutateElement(element, {
|
||||||
|
crop: nextCrop,
|
||||||
|
});
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const changeInX =
|
||||||
|
(property === "x" ? instantChange : 0) * (isFlippedByX ? -1 : 1);
|
||||||
|
const changeInY =
|
||||||
|
(property === "y" ? instantChange : 0) * (isFlippedByY ? -1 : 1);
|
||||||
|
|
||||||
|
nextCrop = {
|
||||||
|
...crop,
|
||||||
|
x: clamp(crop.x + changeInX, 0, crop.naturalWidth - crop.width),
|
||||||
|
y: clamp(crop.y + changeInY, 0, crop.naturalHeight - crop.height),
|
||||||
|
};
|
||||||
|
|
||||||
|
mutateElement(element, {
|
||||||
|
crop: nextCrop,
|
||||||
|
});
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (nextValue !== undefined) {
|
if (nextValue !== undefined) {
|
||||||
const newTopLeftX = property === "x" ? nextValue : topLeftX;
|
const newTopLeftX = property === "x" ? nextValue : topLeftX;
|
||||||
const newTopLeftY = property === "y" ? nextValue : topLeftY;
|
const newTopLeftY = property === "y" ? nextValue : topLeftY;
|
||||||
@@ -97,8 +181,22 @@ const Position = ({
|
|||||||
pointFrom(element.x + element.width / 2, element.y + element.height / 2),
|
pointFrom(element.x + element.width / 2, element.y + element.height / 2),
|
||||||
element.angle,
|
element.angle,
|
||||||
);
|
);
|
||||||
const value =
|
let value = round(property === "x" ? topLeftX : topLeftY, 2);
|
||||||
Math.round((property === "x" ? topLeftX : topLeftY) * 100) / 100;
|
|
||||||
|
if (
|
||||||
|
appState.croppingElementId === element.id &&
|
||||||
|
isImageElement(element) &&
|
||||||
|
element.crop
|
||||||
|
) {
|
||||||
|
const flipAdjustedPosition = getFlipAdjustedCropPosition(element);
|
||||||
|
|
||||||
|
if (flipAdjustedPosition) {
|
||||||
|
value = round(
|
||||||
|
property === "x" ? flipAdjustedPosition.x : flipAdjustedPosition.y,
|
||||||
|
2,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<StatsDragInput
|
<StatsDragInput
|
||||||
|
|||||||
@@ -23,12 +23,14 @@ import Collapsible from "./Collapsible";
|
|||||||
import { useExcalidrawAppState, useExcalidrawSetAppState } from "../App";
|
import { useExcalidrawAppState, useExcalidrawSetAppState } from "../App";
|
||||||
import { getAtomicUnits } from "./utils";
|
import { getAtomicUnits } from "./utils";
|
||||||
import { STATS_PANELS } from "../../constants";
|
import { STATS_PANELS } from "../../constants";
|
||||||
import { isElbowArrow } from "../../element/typeChecks";
|
import { isElbowArrow, isImageElement } from "../../element/typeChecks";
|
||||||
import CanvasGrid from "./CanvasGrid";
|
import CanvasGrid from "./CanvasGrid";
|
||||||
import clsx from "clsx";
|
import clsx from "clsx";
|
||||||
|
|
||||||
import "./Stats.scss";
|
import "./Stats.scss";
|
||||||
import { isGridModeEnabled } from "../../snapping";
|
import { isGridModeEnabled } from "../../snapping";
|
||||||
|
import { getUncroppedWidthAndHeight } from "../../element/cropElement";
|
||||||
|
import { round } from "../../../math";
|
||||||
|
|
||||||
interface StatsProps {
|
interface StatsProps {
|
||||||
app: AppClassProperties;
|
app: AppClassProperties;
|
||||||
@@ -128,6 +130,13 @@ export const StatsInner = memo(
|
|||||||
const multipleElements =
|
const multipleElements =
|
||||||
selectedElements.length > 1 ? selectedElements : null;
|
selectedElements.length > 1 ? selectedElements : null;
|
||||||
|
|
||||||
|
const cropMode =
|
||||||
|
appState.croppingElementId && isImageElement(singleElement);
|
||||||
|
|
||||||
|
const unCroppedDimension = cropMode
|
||||||
|
? getUncroppedWidthAndHeight(singleElement)
|
||||||
|
: null;
|
||||||
|
|
||||||
const [sceneDimension, setSceneDimension] = useState<{
|
const [sceneDimension, setSceneDimension] = useState<{
|
||||||
width: number;
|
width: number;
|
||||||
height: number;
|
height: number;
|
||||||
@@ -244,8 +253,34 @@ export const StatsInner = memo(
|
|||||||
<StatsRows>
|
<StatsRows>
|
||||||
{singleElement && (
|
{singleElement && (
|
||||||
<>
|
<>
|
||||||
|
{cropMode && (
|
||||||
|
<StatsRow heading>
|
||||||
|
{t("labels.unCroppedDimension")}
|
||||||
|
</StatsRow>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{appState.croppingElementId &&
|
||||||
|
isImageElement(singleElement) &&
|
||||||
|
unCroppedDimension && (
|
||||||
|
<StatsRow columns={2}>
|
||||||
|
<div>{t("stats.width")}</div>
|
||||||
|
<div>{round(unCroppedDimension.width, 2)}</div>
|
||||||
|
</StatsRow>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{appState.croppingElementId &&
|
||||||
|
isImageElement(singleElement) &&
|
||||||
|
unCroppedDimension && (
|
||||||
|
<StatsRow columns={2}>
|
||||||
|
<div>{t("stats.height")}</div>
|
||||||
|
<div>{round(unCroppedDimension.height, 2)}</div>
|
||||||
|
</StatsRow>
|
||||||
|
)}
|
||||||
|
|
||||||
<StatsRow heading data-testid="stats-element-type">
|
<StatsRow heading data-testid="stats-element-type">
|
||||||
{t(`element.${singleElement.type}`)}
|
{appState.croppingElementId
|
||||||
|
? t("labels.imageCropping")
|
||||||
|
: t(`element.${singleElement.type}`)}
|
||||||
</StatsRow>
|
</StatsRow>
|
||||||
|
|
||||||
<StatsRow>
|
<StatsRow>
|
||||||
@@ -387,7 +422,8 @@ export const StatsInner = memo(
|
|||||||
prev.selectedElements === next.selectedElements &&
|
prev.selectedElements === next.selectedElements &&
|
||||||
prev.appState.stats.panels === next.appState.stats.panels &&
|
prev.appState.stats.panels === next.appState.stats.panels &&
|
||||||
prev.gridModeEnabled === next.gridModeEnabled &&
|
prev.gridModeEnabled === next.gridModeEnabled &&
|
||||||
prev.appState.gridStep === next.appState.gridStep
|
prev.appState.gridStep === next.appState.gridStep &&
|
||||||
|
prev.appState.croppingElementId === next.appState.croppingElementId
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -5,17 +5,7 @@ import {
|
|||||||
updateBoundElements,
|
updateBoundElements,
|
||||||
} from "../../element/binding";
|
} from "../../element/binding";
|
||||||
import { mutateElement } from "../../element/mutateElement";
|
import { mutateElement } from "../../element/mutateElement";
|
||||||
import {
|
import { getBoundTextElement } from "../../element/textElement";
|
||||||
measureFontSizeFromWidth,
|
|
||||||
rescalePointsInElement,
|
|
||||||
} from "../../element/resizeElements";
|
|
||||||
import {
|
|
||||||
getApproxMinLineHeight,
|
|
||||||
getApproxMinLineWidth,
|
|
||||||
getBoundTextElement,
|
|
||||||
getBoundTextMaxWidth,
|
|
||||||
handleBindTextResize,
|
|
||||||
} from "../../element/textElement";
|
|
||||||
import {
|
import {
|
||||||
isFrameLikeElement,
|
isFrameLikeElement,
|
||||||
isLinearElement,
|
isLinearElement,
|
||||||
@@ -34,7 +24,6 @@ import {
|
|||||||
} from "../../groups";
|
} from "../../groups";
|
||||||
import type Scene from "../../scene/Scene";
|
import type Scene from "../../scene/Scene";
|
||||||
import type { AppState } from "../../types";
|
import type { AppState } from "../../types";
|
||||||
import { getFontString } from "../../utils";
|
|
||||||
|
|
||||||
export type StatsInputProperty =
|
export type StatsInputProperty =
|
||||||
| "x"
|
| "x"
|
||||||
@@ -121,95 +110,6 @@ export const newOrigin = (
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export const resizeElement = (
|
|
||||||
nextWidth: number,
|
|
||||||
nextHeight: number,
|
|
||||||
keepAspectRatio: boolean,
|
|
||||||
origElement: ExcalidrawElement,
|
|
||||||
elementsMap: NonDeletedSceneElementsMap,
|
|
||||||
elements: readonly NonDeletedExcalidrawElement[],
|
|
||||||
scene: Scene,
|
|
||||||
shouldInformMutation = true,
|
|
||||||
) => {
|
|
||||||
const latestElement = elementsMap.get(origElement.id);
|
|
||||||
if (!latestElement) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let boundTextFont: { fontSize?: number } = {};
|
|
||||||
const boundTextElement = getBoundTextElement(latestElement, elementsMap);
|
|
||||||
|
|
||||||
if (boundTextElement) {
|
|
||||||
const minWidth = getApproxMinLineWidth(
|
|
||||||
getFontString(boundTextElement),
|
|
||||||
boundTextElement.lineHeight,
|
|
||||||
);
|
|
||||||
const minHeight = getApproxMinLineHeight(
|
|
||||||
boundTextElement.fontSize,
|
|
||||||
boundTextElement.lineHeight,
|
|
||||||
);
|
|
||||||
nextWidth = Math.max(nextWidth, minWidth);
|
|
||||||
nextHeight = Math.max(nextHeight, minHeight);
|
|
||||||
}
|
|
||||||
|
|
||||||
mutateElement(
|
|
||||||
latestElement,
|
|
||||||
{
|
|
||||||
...newOrigin(
|
|
||||||
latestElement.x,
|
|
||||||
latestElement.y,
|
|
||||||
latestElement.width,
|
|
||||||
latestElement.height,
|
|
||||||
nextWidth,
|
|
||||||
nextHeight,
|
|
||||||
latestElement.angle,
|
|
||||||
),
|
|
||||||
width: nextWidth,
|
|
||||||
height: nextHeight,
|
|
||||||
...rescalePointsInElement(origElement, nextWidth, nextHeight, true),
|
|
||||||
},
|
|
||||||
shouldInformMutation,
|
|
||||||
);
|
|
||||||
updateBindings(latestElement, elementsMap, elements, scene, {
|
|
||||||
newSize: {
|
|
||||||
width: nextWidth,
|
|
||||||
height: nextHeight,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (boundTextElement) {
|
|
||||||
boundTextFont = {
|
|
||||||
fontSize: boundTextElement.fontSize,
|
|
||||||
};
|
|
||||||
if (keepAspectRatio) {
|
|
||||||
const updatedElement = {
|
|
||||||
...latestElement,
|
|
||||||
width: nextWidth,
|
|
||||||
height: nextHeight,
|
|
||||||
};
|
|
||||||
|
|
||||||
const nextFont = measureFontSizeFromWidth(
|
|
||||||
boundTextElement,
|
|
||||||
elementsMap,
|
|
||||||
getBoundTextMaxWidth(updatedElement, boundTextElement),
|
|
||||||
);
|
|
||||||
boundTextFont = {
|
|
||||||
fontSize: nextFont?.size ?? boundTextElement.fontSize,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
updateBoundElements(latestElement, elementsMap, {
|
|
||||||
newSize: { width: nextWidth, height: nextHeight },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (boundTextElement && boundTextFont) {
|
|
||||||
mutateElement(boundTextElement, {
|
|
||||||
fontSize: boundTextFont.fontSize,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
handleBindTextResize(latestElement, elementsMap, "e", keepAspectRatio);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const moveElement = (
|
export const moveElement = (
|
||||||
newTopLeftX: number,
|
newTopLeftX: number,
|
||||||
newTopLeftY: number,
|
newTopLeftY: number,
|
||||||
@@ -300,6 +200,7 @@ export const updateBindings = (
|
|||||||
options?: {
|
options?: {
|
||||||
simultaneouslyUpdated?: readonly ExcalidrawElement[];
|
simultaneouslyUpdated?: readonly ExcalidrawElement[];
|
||||||
newSize?: { width: number; height: number };
|
newSize?: { width: number; height: number };
|
||||||
|
zoom?: AppState["zoom"];
|
||||||
},
|
},
|
||||||
) => {
|
) => {
|
||||||
if (isLinearElement(latestElement)) {
|
if (isLinearElement(latestElement)) {
|
||||||
@@ -310,6 +211,7 @@ export const updateBindings = (
|
|||||||
scene,
|
scene,
|
||||||
true,
|
true,
|
||||||
[],
|
[],
|
||||||
|
options?.zoom,
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
updateBoundElements(latestElement, elementsMap, options);
|
updateBoundElements(latestElement, elementsMap, options);
|
||||||
|
|||||||
@@ -115,6 +115,8 @@ export const CLASSES = {
|
|||||||
SHAPE_ACTIONS_MENU: "App-menu__left",
|
SHAPE_ACTIONS_MENU: "App-menu__left",
|
||||||
ZOOM_ACTIONS: "zoom-actions",
|
ZOOM_ACTIONS: "zoom-actions",
|
||||||
SEARCH_MENU_INPUT_WRAPPER: "layer-ui__search-inputWrapper",
|
SEARCH_MENU_INPUT_WRAPPER: "layer-ui__search-inputWrapper",
|
||||||
|
PROPERTIES_POPOVER: "properties-popover",
|
||||||
|
PROPERTIES_POPOVER_TRIGGER: "properties-popover-trigger",
|
||||||
};
|
};
|
||||||
|
|
||||||
export const CJK_HAND_DRAWN_FALLBACK_FONT = "Xiaolai";
|
export const CJK_HAND_DRAWN_FALLBACK_FONT = "Xiaolai";
|
||||||
@@ -214,9 +216,9 @@ export const IMAGE_MIME_TYPES = {
|
|||||||
jfif: "image/jfif",
|
jfif: "image/jfif",
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export const ALLOWED_PASTE_MIME_TYPES = ["text/plain", "text/html"] as const;
|
|
||||||
|
|
||||||
export const MIME_TYPES = {
|
export const MIME_TYPES = {
|
||||||
|
text: "text/plain",
|
||||||
|
html: "text/html",
|
||||||
json: "application/json",
|
json: "application/json",
|
||||||
// excalidraw data
|
// excalidraw data
|
||||||
excalidraw: "application/vnd.excalidraw+json",
|
excalidraw: "application/vnd.excalidraw+json",
|
||||||
@@ -230,6 +232,12 @@ export const MIME_TYPES = {
|
|||||||
...IMAGE_MIME_TYPES,
|
...IMAGE_MIME_TYPES,
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
|
export const ALLOWED_PASTE_MIME_TYPES = [
|
||||||
|
MIME_TYPES.text,
|
||||||
|
MIME_TYPES.html,
|
||||||
|
...Object.values(IMAGE_MIME_TYPES),
|
||||||
|
] as const;
|
||||||
|
|
||||||
export const EXPORT_IMAGE_TYPES = {
|
export const EXPORT_IMAGE_TYPES = {
|
||||||
png: "png",
|
png: "png",
|
||||||
svg: "svg",
|
svg: "svg",
|
||||||
|
|||||||
@@ -759,3 +759,8 @@ body.excalidraw-cursor-resize * {
|
|||||||
font-family: "Assistant";
|
font-family: "Assistant";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.excalidraw-textEditorContainer {
|
||||||
|
position: fixed;
|
||||||
|
z-index: var(--zIndex-wysiwyg);
|
||||||
|
}
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
|
|||||||
"fillStyle": "solid",
|
"fillStyle": "solid",
|
||||||
"frameId": null,
|
"frameId": null,
|
||||||
"groupIds": [],
|
"groupIds": [],
|
||||||
"height": 35,
|
"height": 33.519031369643244,
|
||||||
"id": Any<String>,
|
"id": Any<String>,
|
||||||
"index": "a2",
|
"index": "a2",
|
||||||
"isDeleted": false,
|
"isDeleted": false,
|
||||||
@@ -109,8 +109,8 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
|
|||||||
0.5,
|
0.5,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
394.5,
|
382.47606040672997,
|
||||||
34.5,
|
34.019031369643244,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
"roughness": 1,
|
"roughness": 1,
|
||||||
@@ -128,9 +128,9 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 4,
|
"version": 7,
|
||||||
"versionNonce": Any<Number>,
|
"versionNonce": Any<Number>,
|
||||||
"width": 395,
|
"width": 381.97606040672997,
|
||||||
"x": 247,
|
"x": 247,
|
||||||
"y": 420,
|
"y": 420,
|
||||||
}
|
}
|
||||||
@@ -167,7 +167,7 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
399.5,
|
389.5,
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -186,10 +186,10 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 4,
|
"version": 6,
|
||||||
"versionNonce": Any<Number>,
|
"versionNonce": Any<Number>,
|
||||||
"width": 400,
|
"width": 390,
|
||||||
"x": 227,
|
"x": 237,
|
||||||
"y": 450,
|
"y": 450,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -319,7 +319,7 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing t
|
|||||||
"verticalAlign": "top",
|
"verticalAlign": "top",
|
||||||
"width": 100,
|
"width": 100,
|
||||||
"x": 560,
|
"x": 560,
|
||||||
"y": 226.5,
|
"y": 236.95454545454544,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
@@ -339,13 +339,13 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing t
|
|||||||
"endBinding": {
|
"endBinding": {
|
||||||
"elementId": "text-2",
|
"elementId": "text-2",
|
||||||
"fixedPoint": null,
|
"fixedPoint": null,
|
||||||
"focus": 0,
|
"focus": 1.625925925925924,
|
||||||
"gap": 205,
|
"gap": 14,
|
||||||
},
|
},
|
||||||
"fillStyle": "solid",
|
"fillStyle": "solid",
|
||||||
"frameId": null,
|
"frameId": null,
|
||||||
"groupIds": [],
|
"groupIds": [],
|
||||||
"height": 0,
|
"height": 18.278619528619487,
|
||||||
"id": Any<String>,
|
"id": Any<String>,
|
||||||
"index": "a2",
|
"index": "a2",
|
||||||
"isDeleted": false,
|
"isDeleted": false,
|
||||||
@@ -356,11 +356,11 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing t
|
|||||||
"points": [
|
"points": [
|
||||||
[
|
[
|
||||||
0.5,
|
0.5,
|
||||||
0,
|
-0.5,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
99.5,
|
357.2037037037038,
|
||||||
0,
|
-17.778619528619487,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
"roughness": 1,
|
"roughness": 1,
|
||||||
@@ -378,11 +378,11 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing t
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 4,
|
"version": 6,
|
||||||
"versionNonce": Any<Number>,
|
"versionNonce": Any<Number>,
|
||||||
"width": 100,
|
"width": 357.7037037037038,
|
||||||
"x": 255,
|
"x": 171,
|
||||||
"y": 239,
|
"y": 249.45454545454544,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
@@ -482,7 +482,7 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to shapes whe
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 4,
|
"version": 6,
|
||||||
"versionNonce": Any<Number>,
|
"versionNonce": Any<Number>,
|
||||||
"width": 100,
|
"width": 100,
|
||||||
"x": 255,
|
"x": 255,
|
||||||
@@ -660,7 +660,7 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to text when
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 4,
|
"version": 6,
|
||||||
"versionNonce": Any<Number>,
|
"versionNonce": Any<Number>,
|
||||||
"width": 100,
|
"width": 100,
|
||||||
"x": 255,
|
"x": 255,
|
||||||
@@ -1505,7 +1505,7 @@ exports[`Test Transform > should transform the elements correctly when linear el
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
272.485,
|
270.98528125,
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -1526,10 +1526,10 @@ exports[`Test Transform > should transform the elements correctly when linear el
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 4,
|
"version": 7,
|
||||||
"versionNonce": Any<Number>,
|
"versionNonce": Any<Number>,
|
||||||
"width": 272.985,
|
"width": 270.48528125,
|
||||||
"x": 111.262,
|
"x": 112.76171875,
|
||||||
"y": 57,
|
"y": 57,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -1587,11 +1587,11 @@ exports[`Test Transform > should transform the elements correctly when linear el
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 4,
|
"version": 6,
|
||||||
"versionNonce": Any<Number>,
|
"versionNonce": Any<Number>,
|
||||||
"width": 0,
|
"width": 0,
|
||||||
"x": 77.017,
|
"x": 83.015625,
|
||||||
"y": 79,
|
"y": 81.5,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|||||||
@@ -106,11 +106,15 @@ export const isImageFileHandle = (handle: FileSystemHandle | null) => {
|
|||||||
return type === "png" || type === "svg";
|
return type === "png" || type === "svg";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const isSupportedImageFileType = (type: string | null | undefined) => {
|
||||||
|
return !!type && (Object.values(IMAGE_MIME_TYPES) as string[]).includes(type);
|
||||||
|
};
|
||||||
|
|
||||||
export const isSupportedImageFile = (
|
export const isSupportedImageFile = (
|
||||||
blob: Blob | null | undefined,
|
blob: Blob | null | undefined,
|
||||||
): blob is Blob & { type: ValueOf<typeof IMAGE_MIME_TYPES> } => {
|
): blob is Blob & { type: ValueOf<typeof IMAGE_MIME_TYPES> } => {
|
||||||
const { type } = blob || {};
|
const { type } = blob || {};
|
||||||
return !!type && (Object.values(IMAGE_MIME_TYPES) as string[]).includes(type);
|
return isSupportedImageFileType(type);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const loadSceneOrLibraryFromBlob = async (
|
export const loadSceneOrLibraryFromBlob = async (
|
||||||
|
|||||||
@@ -639,6 +639,7 @@ export const restoreAppState = (
|
|||||||
gridStep: getNormalizedGridStep(
|
gridStep: getNormalizedGridStep(
|
||||||
isFiniteNumber(appState.gridStep) ? appState.gridStep : DEFAULT_GRID_STEP,
|
isFiniteNumber(appState.gridStep) ? appState.gridStep : DEFAULT_GRID_STEP,
|
||||||
),
|
),
|
||||||
|
editingFrame: null,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -779,7 +779,7 @@ describe("Test Transform", () => {
|
|||||||
elementId: "rect-1",
|
elementId: "rect-1",
|
||||||
fixedPoint: null,
|
fixedPoint: null,
|
||||||
focus: 0,
|
focus: 0,
|
||||||
gap: 205,
|
gap: 14,
|
||||||
});
|
});
|
||||||
expect(rect.boundElements).toStrictEqual([
|
expect(rect.boundElements).toStrictEqual([
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ import {
|
|||||||
isBoundToContainer,
|
isBoundToContainer,
|
||||||
isElbowArrow,
|
isElbowArrow,
|
||||||
isFixedPointBinding,
|
isFixedPointBinding,
|
||||||
isFrameLikeElement,
|
|
||||||
isLinearElement,
|
isLinearElement,
|
||||||
isRectangularElement,
|
isRectangularElement,
|
||||||
isTextElement,
|
isTextElement,
|
||||||
@@ -97,6 +96,8 @@ export const isBindingEnabled = (appState: AppState): boolean => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const FIXED_BINDING_DISTANCE = 5;
|
export const FIXED_BINDING_DISTANCE = 5;
|
||||||
|
export const BINDING_HIGHLIGHT_THICKNESS = 10;
|
||||||
|
export const BINDING_HIGHLIGHT_OFFSET = 4;
|
||||||
|
|
||||||
const getNonDeletedElements = (
|
const getNonDeletedElements = (
|
||||||
scene: Scene,
|
scene: Scene,
|
||||||
@@ -213,6 +214,7 @@ const getOriginalBindingIfStillCloseOfLinearElementEdge = (
|
|||||||
linearElement: NonDeleted<ExcalidrawLinearElement>,
|
linearElement: NonDeleted<ExcalidrawLinearElement>,
|
||||||
edge: "start" | "end",
|
edge: "start" | "end",
|
||||||
elementsMap: NonDeletedSceneElementsMap,
|
elementsMap: NonDeletedSceneElementsMap,
|
||||||
|
zoom?: AppState["zoom"],
|
||||||
): NonDeleted<ExcalidrawElement> | null => {
|
): NonDeleted<ExcalidrawElement> | null => {
|
||||||
const coors = getLinearElementEdgeCoors(linearElement, edge, elementsMap);
|
const coors = getLinearElementEdgeCoors(linearElement, edge, elementsMap);
|
||||||
const elementId =
|
const elementId =
|
||||||
@@ -223,7 +225,7 @@ const getOriginalBindingIfStillCloseOfLinearElementEdge = (
|
|||||||
const element = elementsMap.get(elementId);
|
const element = elementsMap.get(elementId);
|
||||||
if (
|
if (
|
||||||
isBindableElement(element) &&
|
isBindableElement(element) &&
|
||||||
bindingBorderTest(element, coors, elementsMap)
|
bindingBorderTest(element, coors, elementsMap, zoom)
|
||||||
) {
|
) {
|
||||||
return element;
|
return element;
|
||||||
}
|
}
|
||||||
@@ -235,12 +237,14 @@ const getOriginalBindingIfStillCloseOfLinearElementEdge = (
|
|||||||
const getOriginalBindingsIfStillCloseToArrowEnds = (
|
const getOriginalBindingsIfStillCloseToArrowEnds = (
|
||||||
linearElement: NonDeleted<ExcalidrawLinearElement>,
|
linearElement: NonDeleted<ExcalidrawLinearElement>,
|
||||||
elementsMap: NonDeletedSceneElementsMap,
|
elementsMap: NonDeletedSceneElementsMap,
|
||||||
|
zoom?: AppState["zoom"],
|
||||||
): (NonDeleted<ExcalidrawElement> | null)[] =>
|
): (NonDeleted<ExcalidrawElement> | null)[] =>
|
||||||
["start", "end"].map((edge) =>
|
["start", "end"].map((edge) =>
|
||||||
getOriginalBindingIfStillCloseOfLinearElementEdge(
|
getOriginalBindingIfStillCloseOfLinearElementEdge(
|
||||||
linearElement,
|
linearElement,
|
||||||
edge as "start" | "end",
|
edge as "start" | "end",
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
zoom,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -250,6 +254,7 @@ const getBindingStrategyForDraggingArrowEndpoints = (
|
|||||||
draggingPoints: readonly number[],
|
draggingPoints: readonly number[],
|
||||||
elementsMap: NonDeletedSceneElementsMap,
|
elementsMap: NonDeletedSceneElementsMap,
|
||||||
elements: readonly NonDeletedExcalidrawElement[],
|
elements: readonly NonDeletedExcalidrawElement[],
|
||||||
|
zoom?: AppState["zoom"],
|
||||||
): (NonDeleted<ExcalidrawBindableElement> | null | "keep")[] => {
|
): (NonDeleted<ExcalidrawBindableElement> | null | "keep")[] => {
|
||||||
const startIdx = 0;
|
const startIdx = 0;
|
||||||
const endIdx = selectedElement.points.length - 1;
|
const endIdx = selectedElement.points.length - 1;
|
||||||
@@ -262,6 +267,7 @@ const getBindingStrategyForDraggingArrowEndpoints = (
|
|||||||
"start",
|
"start",
|
||||||
elementsMap,
|
elementsMap,
|
||||||
elements,
|
elements,
|
||||||
|
zoom,
|
||||||
)
|
)
|
||||||
: null // If binding is disabled and start is dragged, break all binds
|
: null // If binding is disabled and start is dragged, break all binds
|
||||||
: // We have to update the focus and gap of the binding, so let's rebind
|
: // We have to update the focus and gap of the binding, so let's rebind
|
||||||
@@ -270,6 +276,7 @@ const getBindingStrategyForDraggingArrowEndpoints = (
|
|||||||
"start",
|
"start",
|
||||||
elementsMap,
|
elementsMap,
|
||||||
elements,
|
elements,
|
||||||
|
zoom,
|
||||||
);
|
);
|
||||||
const end = endDragged
|
const end = endDragged
|
||||||
? isBindingEnabled
|
? isBindingEnabled
|
||||||
@@ -278,6 +285,7 @@ const getBindingStrategyForDraggingArrowEndpoints = (
|
|||||||
"end",
|
"end",
|
||||||
elementsMap,
|
elementsMap,
|
||||||
elements,
|
elements,
|
||||||
|
zoom,
|
||||||
)
|
)
|
||||||
: null // If binding is disabled and end is dragged, break all binds
|
: null // If binding is disabled and end is dragged, break all binds
|
||||||
: // We have to update the focus and gap of the binding, so let's rebind
|
: // We have to update the focus and gap of the binding, so let's rebind
|
||||||
@@ -286,6 +294,7 @@ const getBindingStrategyForDraggingArrowEndpoints = (
|
|||||||
"end",
|
"end",
|
||||||
elementsMap,
|
elementsMap,
|
||||||
elements,
|
elements,
|
||||||
|
zoom,
|
||||||
);
|
);
|
||||||
|
|
||||||
return [start, end];
|
return [start, end];
|
||||||
@@ -296,10 +305,12 @@ const getBindingStrategyForDraggingArrowOrJoints = (
|
|||||||
elementsMap: NonDeletedSceneElementsMap,
|
elementsMap: NonDeletedSceneElementsMap,
|
||||||
elements: readonly NonDeletedExcalidrawElement[],
|
elements: readonly NonDeletedExcalidrawElement[],
|
||||||
isBindingEnabled: boolean,
|
isBindingEnabled: boolean,
|
||||||
|
zoom?: AppState["zoom"],
|
||||||
): (NonDeleted<ExcalidrawBindableElement> | null | "keep")[] => {
|
): (NonDeleted<ExcalidrawBindableElement> | null | "keep")[] => {
|
||||||
const [startIsClose, endIsClose] = getOriginalBindingsIfStillCloseToArrowEnds(
|
const [startIsClose, endIsClose] = getOriginalBindingsIfStillCloseToArrowEnds(
|
||||||
selectedElement,
|
selectedElement,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
zoom,
|
||||||
);
|
);
|
||||||
const start = startIsClose
|
const start = startIsClose
|
||||||
? isBindingEnabled
|
? isBindingEnabled
|
||||||
@@ -308,6 +319,7 @@ const getBindingStrategyForDraggingArrowOrJoints = (
|
|||||||
"start",
|
"start",
|
||||||
elementsMap,
|
elementsMap,
|
||||||
elements,
|
elements,
|
||||||
|
zoom,
|
||||||
)
|
)
|
||||||
: null
|
: null
|
||||||
: null;
|
: null;
|
||||||
@@ -318,6 +330,7 @@ const getBindingStrategyForDraggingArrowOrJoints = (
|
|||||||
"end",
|
"end",
|
||||||
elementsMap,
|
elementsMap,
|
||||||
elements,
|
elements,
|
||||||
|
zoom,
|
||||||
)
|
)
|
||||||
: null
|
: null
|
||||||
: null;
|
: null;
|
||||||
@@ -332,6 +345,7 @@ export const bindOrUnbindLinearElements = (
|
|||||||
scene: Scene,
|
scene: Scene,
|
||||||
isBindingEnabled: boolean,
|
isBindingEnabled: boolean,
|
||||||
draggingPoints: readonly number[] | null,
|
draggingPoints: readonly number[] | null,
|
||||||
|
zoom?: AppState["zoom"],
|
||||||
): void => {
|
): void => {
|
||||||
selectedElements.forEach((selectedElement) => {
|
selectedElements.forEach((selectedElement) => {
|
||||||
const [start, end] = draggingPoints?.length
|
const [start, end] = draggingPoints?.length
|
||||||
@@ -342,6 +356,7 @@ export const bindOrUnbindLinearElements = (
|
|||||||
draggingPoints ?? [],
|
draggingPoints ?? [],
|
||||||
elementsMap,
|
elementsMap,
|
||||||
elements,
|
elements,
|
||||||
|
zoom,
|
||||||
)
|
)
|
||||||
: // The arrow itself (the shaft) or the inner joins are dragged
|
: // The arrow itself (the shaft) or the inner joins are dragged
|
||||||
getBindingStrategyForDraggingArrowOrJoints(
|
getBindingStrategyForDraggingArrowOrJoints(
|
||||||
@@ -349,6 +364,7 @@ export const bindOrUnbindLinearElements = (
|
|||||||
elementsMap,
|
elementsMap,
|
||||||
elements,
|
elements,
|
||||||
isBindingEnabled,
|
isBindingEnabled,
|
||||||
|
zoom,
|
||||||
);
|
);
|
||||||
|
|
||||||
bindOrUnbindLinearElement(selectedElement, start, end, elementsMap, scene);
|
bindOrUnbindLinearElement(selectedElement, start, end, elementsMap, scene);
|
||||||
@@ -358,6 +374,7 @@ export const bindOrUnbindLinearElements = (
|
|||||||
export const getSuggestedBindingsForArrows = (
|
export const getSuggestedBindingsForArrows = (
|
||||||
selectedElements: NonDeleted<ExcalidrawElement>[],
|
selectedElements: NonDeleted<ExcalidrawElement>[],
|
||||||
elementsMap: NonDeletedSceneElementsMap,
|
elementsMap: NonDeletedSceneElementsMap,
|
||||||
|
zoom: AppState["zoom"],
|
||||||
): SuggestedBinding[] => {
|
): SuggestedBinding[] => {
|
||||||
// HOT PATH: Bail out if selected elements list is too large
|
// HOT PATH: Bail out if selected elements list is too large
|
||||||
if (selectedElements.length > 50) {
|
if (selectedElements.length > 50) {
|
||||||
@@ -368,7 +385,7 @@ export const getSuggestedBindingsForArrows = (
|
|||||||
selectedElements
|
selectedElements
|
||||||
.filter(isLinearElement)
|
.filter(isLinearElement)
|
||||||
.flatMap((element) =>
|
.flatMap((element) =>
|
||||||
getOriginalBindingsIfStillCloseToArrowEnds(element, elementsMap),
|
getOriginalBindingsIfStillCloseToArrowEnds(element, elementsMap, zoom),
|
||||||
)
|
)
|
||||||
.filter(
|
.filter(
|
||||||
(element): element is NonDeleted<ExcalidrawBindableElement> =>
|
(element): element is NonDeleted<ExcalidrawBindableElement> =>
|
||||||
@@ -406,6 +423,7 @@ export const maybeBindLinearElement = (
|
|||||||
pointerCoords,
|
pointerCoords,
|
||||||
elements,
|
elements,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
appState.zoom,
|
||||||
isElbowArrow(linearElement) && isElbowArrow(linearElement),
|
isElbowArrow(linearElement) && isElbowArrow(linearElement),
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -422,6 +440,26 @@ export const maybeBindLinearElement = (
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const normalizePointBinding = (
|
||||||
|
binding: { focus: number; gap: number },
|
||||||
|
hoveredElement: ExcalidrawBindableElement,
|
||||||
|
) => {
|
||||||
|
let gap = binding.gap;
|
||||||
|
const maxGap = maxBindingGap(
|
||||||
|
hoveredElement,
|
||||||
|
hoveredElement.width,
|
||||||
|
hoveredElement.height,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (gap > maxGap) {
|
||||||
|
gap = BINDING_HIGHLIGHT_THICKNESS + BINDING_HIGHLIGHT_OFFSET;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
...binding,
|
||||||
|
gap,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
export const bindLinearElement = (
|
export const bindLinearElement = (
|
||||||
linearElement: NonDeleted<ExcalidrawLinearElement>,
|
linearElement: NonDeleted<ExcalidrawLinearElement>,
|
||||||
hoveredElement: ExcalidrawBindableElement,
|
hoveredElement: ExcalidrawBindableElement,
|
||||||
@@ -433,11 +471,14 @@ export const bindLinearElement = (
|
|||||||
}
|
}
|
||||||
const binding: PointBinding = {
|
const binding: PointBinding = {
|
||||||
elementId: hoveredElement.id,
|
elementId: hoveredElement.id,
|
||||||
...calculateFocusAndGap(
|
...normalizePointBinding(
|
||||||
linearElement,
|
calculateFocusAndGap(
|
||||||
|
linearElement,
|
||||||
|
hoveredElement,
|
||||||
|
startOrEnd,
|
||||||
|
elementsMap,
|
||||||
|
),
|
||||||
hoveredElement,
|
hoveredElement,
|
||||||
startOrEnd,
|
|
||||||
elementsMap,
|
|
||||||
),
|
),
|
||||||
...(isElbowArrow(linearElement)
|
...(isElbowArrow(linearElement)
|
||||||
? calculateFixedPointForElbowArrowBinding(
|
? calculateFixedPointForElbowArrowBinding(
|
||||||
@@ -462,6 +503,12 @@ export const bindLinearElement = (
|
|||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// update bound elements to make sure the binding tips are in sync with
|
||||||
|
// the normalized gap from above
|
||||||
|
if (!isElbowArrow(linearElement)) {
|
||||||
|
updateBoundElements(hoveredElement, elementsMap);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Don't bind both ends of a simple segment
|
// Don't bind both ends of a simple segment
|
||||||
@@ -514,6 +561,7 @@ export const getHoveredElementForBinding = (
|
|||||||
},
|
},
|
||||||
elements: readonly NonDeletedExcalidrawElement[],
|
elements: readonly NonDeletedExcalidrawElement[],
|
||||||
elementsMap: NonDeletedSceneElementsMap,
|
elementsMap: NonDeletedSceneElementsMap,
|
||||||
|
zoom?: AppState["zoom"],
|
||||||
fullShape?: boolean,
|
fullShape?: boolean,
|
||||||
): NonDeleted<ExcalidrawBindableElement> | null => {
|
): NonDeleted<ExcalidrawBindableElement> | null => {
|
||||||
const hoveredElement = getElementAtPosition(
|
const hoveredElement = getElementAtPosition(
|
||||||
@@ -524,11 +572,13 @@ export const getHoveredElementForBinding = (
|
|||||||
element,
|
element,
|
||||||
pointerCoords,
|
pointerCoords,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
zoom,
|
||||||
// disable fullshape snapping for frame elements so we
|
// disable fullshape snapping for frame elements so we
|
||||||
// can bind to frame children
|
// can bind to frame children
|
||||||
fullShape && !isFrameLikeElement(element),
|
fullShape,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
return hoveredElement as NonDeleted<ExcalidrawBindableElement> | null;
|
return hoveredElement as NonDeleted<ExcalidrawBindableElement> | null;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -578,9 +628,11 @@ export const updateBoundElements = (
|
|||||||
simultaneouslyUpdated?: readonly ExcalidrawElement[];
|
simultaneouslyUpdated?: readonly ExcalidrawElement[];
|
||||||
newSize?: { width: number; height: number };
|
newSize?: { width: number; height: number };
|
||||||
changedElements?: Map<string, OrderedExcalidrawElement>;
|
changedElements?: Map<string, OrderedExcalidrawElement>;
|
||||||
|
zoom?: AppState["zoom"];
|
||||||
},
|
},
|
||||||
) => {
|
) => {
|
||||||
const { newSize, simultaneouslyUpdated, changedElements } = options ?? {};
|
const { newSize, simultaneouslyUpdated, changedElements, zoom } =
|
||||||
|
options ?? {};
|
||||||
const simultaneouslyUpdatedElementIds = getSimultaneouslyUpdatedElementIds(
|
const simultaneouslyUpdatedElementIds = getSimultaneouslyUpdatedElementIds(
|
||||||
simultaneouslyUpdated,
|
simultaneouslyUpdated,
|
||||||
);
|
);
|
||||||
@@ -670,6 +722,7 @@ export const updateBoundElements = (
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
changedElements,
|
changedElements,
|
||||||
|
zoom,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -703,6 +756,7 @@ export const getHeadingForElbowArrowSnap = (
|
|||||||
aabb: Bounds | undefined | null,
|
aabb: Bounds | undefined | null,
|
||||||
elementsMap: ElementsMap,
|
elementsMap: ElementsMap,
|
||||||
origPoint: GlobalPoint,
|
origPoint: GlobalPoint,
|
||||||
|
zoom?: AppState["zoom"],
|
||||||
): Heading => {
|
): Heading => {
|
||||||
const otherPointHeading = vectorToHeading(vectorFromPoint(otherPoint, p));
|
const otherPointHeading = vectorToHeading(vectorFromPoint(otherPoint, p));
|
||||||
|
|
||||||
@@ -714,6 +768,7 @@ export const getHeadingForElbowArrowSnap = (
|
|||||||
origPoint,
|
origPoint,
|
||||||
bindableElement,
|
bindableElement,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
zoom,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!distance) {
|
if (!distance) {
|
||||||
@@ -737,6 +792,7 @@ const getDistanceForBinding = (
|
|||||||
point: Readonly<GlobalPoint>,
|
point: Readonly<GlobalPoint>,
|
||||||
bindableElement: ExcalidrawBindableElement,
|
bindableElement: ExcalidrawBindableElement,
|
||||||
elementsMap: ElementsMap,
|
elementsMap: ElementsMap,
|
||||||
|
zoom?: AppState["zoom"],
|
||||||
) => {
|
) => {
|
||||||
const distance = distanceToBindableElement(
|
const distance = distanceToBindableElement(
|
||||||
bindableElement,
|
bindableElement,
|
||||||
@@ -747,6 +803,7 @@ const getDistanceForBinding = (
|
|||||||
bindableElement,
|
bindableElement,
|
||||||
bindableElement.width,
|
bindableElement.width,
|
||||||
bindableElement.height,
|
bindableElement.height,
|
||||||
|
zoom,
|
||||||
);
|
);
|
||||||
|
|
||||||
return distance > bindDistance ? null : distance;
|
return distance > bindDistance ? null : distance;
|
||||||
@@ -1174,11 +1231,13 @@ const getElligibleElementForBindingElement = (
|
|||||||
startOrEnd: "start" | "end",
|
startOrEnd: "start" | "end",
|
||||||
elementsMap: NonDeletedSceneElementsMap,
|
elementsMap: NonDeletedSceneElementsMap,
|
||||||
elements: readonly NonDeletedExcalidrawElement[],
|
elements: readonly NonDeletedExcalidrawElement[],
|
||||||
|
zoom?: AppState["zoom"],
|
||||||
): NonDeleted<ExcalidrawBindableElement> | null => {
|
): NonDeleted<ExcalidrawBindableElement> | null => {
|
||||||
return getHoveredElementForBinding(
|
return getHoveredElementForBinding(
|
||||||
getLinearElementEdgeCoors(linearElement, startOrEnd, elementsMap),
|
getLinearElementEdgeCoors(linearElement, startOrEnd, elementsMap),
|
||||||
elements,
|
elements,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
zoom,
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1341,9 +1400,11 @@ export const bindingBorderTest = (
|
|||||||
element: NonDeleted<ExcalidrawBindableElement>,
|
element: NonDeleted<ExcalidrawBindableElement>,
|
||||||
{ x, y }: { x: number; y: number },
|
{ x, y }: { x: number; y: number },
|
||||||
elementsMap: NonDeletedSceneElementsMap,
|
elementsMap: NonDeletedSceneElementsMap,
|
||||||
|
zoom?: AppState["zoom"],
|
||||||
fullShape?: boolean,
|
fullShape?: boolean,
|
||||||
): boolean => {
|
): boolean => {
|
||||||
const threshold = maxBindingGap(element, element.width, element.height);
|
const threshold = maxBindingGap(element, element.width, element.height, zoom);
|
||||||
|
|
||||||
const shape = getElementShape(element, elementsMap);
|
const shape = getElementShape(element, elementsMap);
|
||||||
return (
|
return (
|
||||||
isPointOnShape(pointFrom(x, y), shape, threshold) ||
|
isPointOnShape(pointFrom(x, y), shape, threshold) ||
|
||||||
@@ -1356,12 +1417,21 @@ export const maxBindingGap = (
|
|||||||
element: ExcalidrawElement,
|
element: ExcalidrawElement,
|
||||||
elementWidth: number,
|
elementWidth: number,
|
||||||
elementHeight: number,
|
elementHeight: number,
|
||||||
|
zoom?: AppState["zoom"],
|
||||||
): number => {
|
): number => {
|
||||||
|
const zoomValue = zoom?.value && zoom.value < 1 ? zoom.value : 1;
|
||||||
|
|
||||||
// Aligns diamonds with rectangles
|
// Aligns diamonds with rectangles
|
||||||
const shapeRatio = element.type === "diamond" ? 1 / Math.sqrt(2) : 1;
|
const shapeRatio = element.type === "diamond" ? 1 / Math.sqrt(2) : 1;
|
||||||
const smallerDimension = shapeRatio * Math.min(elementWidth, elementHeight);
|
const smallerDimension = shapeRatio * Math.min(elementWidth, elementHeight);
|
||||||
// We make the bindable boundary bigger for bigger elements
|
|
||||||
return Math.max(16, Math.min(0.25 * smallerDimension, 32));
|
return Math.max(
|
||||||
|
16,
|
||||||
|
// bigger bindable boundary for bigger elements
|
||||||
|
Math.min(0.25 * smallerDimension, 32),
|
||||||
|
// keep in sync with the zoomed highlight
|
||||||
|
BINDING_HIGHLIGHT_THICKNESS / zoomValue + BINDING_HIGHLIGHT_OFFSET,
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const distanceToBindableElement = (
|
export const distanceToBindableElement = (
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import {
|
|||||||
getResizedElementAbsoluteCoords,
|
getResizedElementAbsoluteCoords,
|
||||||
} from "./bounds";
|
} from "./bounds";
|
||||||
|
|
||||||
const MINIMAL_CROP_SIZE = 10;
|
export const MINIMAL_CROP_SIZE = 10;
|
||||||
|
|
||||||
export const cropElement = (
|
export const cropElement = (
|
||||||
element: ExcalidrawImageElement,
|
element: ExcalidrawImageElement,
|
||||||
@@ -585,3 +585,41 @@ const adjustCropPosition = (
|
|||||||
cropY,
|
cropY,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getFlipAdjustedCropPosition = (
|
||||||
|
element: ExcalidrawImageElement,
|
||||||
|
natural = false,
|
||||||
|
) => {
|
||||||
|
const crop = element.crop;
|
||||||
|
if (!crop) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const isFlippedByX = element.scale[0] === -1;
|
||||||
|
const isFlippedByY = element.scale[1] === -1;
|
||||||
|
|
||||||
|
let cropX = crop.x;
|
||||||
|
let cropY = crop.y;
|
||||||
|
|
||||||
|
if (isFlippedByX) {
|
||||||
|
cropX = crop.naturalWidth - crop.width - crop.x;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isFlippedByY) {
|
||||||
|
cropY = crop.naturalHeight - crop.height - crop.y;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (natural) {
|
||||||
|
return {
|
||||||
|
x: cropX,
|
||||||
|
y: cropY,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const { width, height } = getUncroppedWidthAndHeight(element);
|
||||||
|
|
||||||
|
return {
|
||||||
|
x: cropX / (crop.naturalWidth / width),
|
||||||
|
y: cropY / (crop.naturalHeight / height),
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|||||||
@@ -124,7 +124,9 @@ export const normalizeSVG = (SVGString: string) => {
|
|||||||
height = height || "50";
|
height = height || "50";
|
||||||
|
|
||||||
if (viewBox) {
|
if (viewBox) {
|
||||||
const match = viewBox.match(/\d+ +\d+ +(\d+) +(\d+)/);
|
const match = viewBox.match(
|
||||||
|
/\d+ +\d+ +(\d+(?:\.\d+)?) +(\d+(?:\.\d+)?)/,
|
||||||
|
);
|
||||||
if (match) {
|
if (match) {
|
||||||
[, width, height] = match;
|
[, width, height] = match;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -448,6 +448,7 @@ export class LinearElementEditor {
|
|||||||
),
|
),
|
||||||
elements,
|
elements,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
appState.zoom,
|
||||||
)
|
)
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
@@ -787,6 +788,7 @@ export class LinearElementEditor {
|
|||||||
scenePointer,
|
scenePointer,
|
||||||
elements,
|
elements,
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
app.state.zoom,
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -911,6 +913,7 @@ export class LinearElementEditor {
|
|||||||
element,
|
element,
|
||||||
[points.length - 1],
|
[points.length - 1],
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
app.state.zoom,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
@@ -964,6 +967,7 @@ export class LinearElementEditor {
|
|||||||
element,
|
element,
|
||||||
[{ point: newPoint }],
|
[{ point: newPoint }],
|
||||||
elementsMap,
|
elementsMap,
|
||||||
|
app.state.zoom,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
@@ -1218,6 +1222,7 @@ export class LinearElementEditor {
|
|||||||
element: NonDeleted<ExcalidrawLinearElement>,
|
element: NonDeleted<ExcalidrawLinearElement>,
|
||||||
pointIndices: readonly number[],
|
pointIndices: readonly number[],
|
||||||
elementsMap: NonDeletedSceneElementsMap | SceneElementsMap,
|
elementsMap: NonDeletedSceneElementsMap | SceneElementsMap,
|
||||||
|
zoom: AppState["zoom"],
|
||||||
) {
|
) {
|
||||||
let offsetX = 0;
|
let offsetX = 0;
|
||||||
let offsetY = 0;
|
let offsetY = 0;
|
||||||
@@ -1260,6 +1265,7 @@ export class LinearElementEditor {
|
|||||||
element: NonDeleted<ExcalidrawLinearElement>,
|
element: NonDeleted<ExcalidrawLinearElement>,
|
||||||
targetPoints: { point: LocalPoint }[],
|
targetPoints: { point: LocalPoint }[],
|
||||||
elementsMap: NonDeletedSceneElementsMap | SceneElementsMap,
|
elementsMap: NonDeletedSceneElementsMap | SceneElementsMap,
|
||||||
|
zoom: AppState["zoom"],
|
||||||
) {
|
) {
|
||||||
const offsetX = 0;
|
const offsetX = 0;
|
||||||
const offsetY = 0;
|
const offsetY = 0;
|
||||||
@@ -1285,6 +1291,7 @@ export class LinearElementEditor {
|
|||||||
options?: {
|
options?: {
|
||||||
changedElements?: Map<string, OrderedExcalidrawElement>;
|
changedElements?: Map<string, OrderedExcalidrawElement>;
|
||||||
isDragging?: boolean;
|
isDragging?: boolean;
|
||||||
|
zoom?: AppState["zoom"];
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
const { points } = element;
|
const { points } = element;
|
||||||
@@ -1337,6 +1344,7 @@ export class LinearElementEditor {
|
|||||||
false,
|
false,
|
||||||
),
|
),
|
||||||
changedElements: options?.changedElements,
|
changedElements: options?.changedElements,
|
||||||
|
zoom: options?.zoom,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -1451,6 +1459,7 @@ export class LinearElementEditor {
|
|||||||
options?: {
|
options?: {
|
||||||
changedElements?: Map<string, OrderedExcalidrawElement>;
|
changedElements?: Map<string, OrderedExcalidrawElement>;
|
||||||
isDragging?: boolean;
|
isDragging?: boolean;
|
||||||
|
zoom?: AppState["zoom"];
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
if (isElbowArrow(element)) {
|
if (isElbowArrow(element)) {
|
||||||
@@ -1487,6 +1496,7 @@ export class LinearElementEditor {
|
|||||||
bindings,
|
bindings,
|
||||||
{
|
{
|
||||||
isDragging: options?.isDragging,
|
isDragging: options?.isDragging,
|
||||||
|
zoom: options?.zoom,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -14,6 +14,7 @@ import {
|
|||||||
import BinaryHeap from "../binaryheap";
|
import BinaryHeap from "../binaryheap";
|
||||||
import { getSizeFromPoints } from "../points";
|
import { getSizeFromPoints } from "../points";
|
||||||
import { aabbForElement, pointInsideBounds } from "../shapes";
|
import { aabbForElement, pointInsideBounds } from "../shapes";
|
||||||
|
import type { AppState } from "../types";
|
||||||
import { isAnyTrue, toBrandedType, tupleToCoors } from "../utils";
|
import { isAnyTrue, toBrandedType, tupleToCoors } from "../utils";
|
||||||
import {
|
import {
|
||||||
bindPointToSnapToElementOutline,
|
bindPointToSnapToElementOutline,
|
||||||
@@ -79,6 +80,7 @@ export const mutateElbowArrow = (
|
|||||||
options?: {
|
options?: {
|
||||||
isDragging?: boolean;
|
isDragging?: boolean;
|
||||||
informMutation?: boolean;
|
informMutation?: boolean;
|
||||||
|
zoom?: AppState["zoom"];
|
||||||
},
|
},
|
||||||
) => {
|
) => {
|
||||||
const update = updateElbowArrow(
|
const update = updateElbowArrow(
|
||||||
@@ -112,6 +114,7 @@ export const updateElbowArrow = (
|
|||||||
isDragging?: boolean;
|
isDragging?: boolean;
|
||||||
disableBinding?: boolean;
|
disableBinding?: boolean;
|
||||||
informMutation?: boolean;
|
informMutation?: boolean;
|
||||||
|
zoom?: AppState["zoom"];
|
||||||
},
|
},
|
||||||
): ElementUpdate<ExcalidrawElbowArrowElement> | null => {
|
): ElementUpdate<ExcalidrawElbowArrowElement> | null => {
|
||||||
const origStartGlobalPoint: GlobalPoint = pointTranslate(
|
const origStartGlobalPoint: GlobalPoint = pointTranslate(
|
||||||
@@ -136,7 +139,12 @@ export const updateElbowArrow = (
|
|||||||
arrow.endBinding &&
|
arrow.endBinding &&
|
||||||
getBindableElementForId(arrow.endBinding.elementId, elementsMap);
|
getBindableElementForId(arrow.endBinding.elementId, elementsMap);
|
||||||
const [hoveredStartElement, hoveredEndElement] = options?.isDragging
|
const [hoveredStartElement, hoveredEndElement] = options?.isDragging
|
||||||
? getHoveredElements(origStartGlobalPoint, origEndGlobalPoint, elementsMap)
|
? getHoveredElements(
|
||||||
|
origStartGlobalPoint,
|
||||||
|
origEndGlobalPoint,
|
||||||
|
elementsMap,
|
||||||
|
options?.zoom,
|
||||||
|
)
|
||||||
: [startElement, endElement];
|
: [startElement, endElement];
|
||||||
const startGlobalPoint = getGlobalPoint(
|
const startGlobalPoint = getGlobalPoint(
|
||||||
arrow.startBinding?.fixedPoint,
|
arrow.startBinding?.fixedPoint,
|
||||||
@@ -1072,6 +1080,7 @@ const getHoveredElements = (
|
|||||||
origStartGlobalPoint: GlobalPoint,
|
origStartGlobalPoint: GlobalPoint,
|
||||||
origEndGlobalPoint: GlobalPoint,
|
origEndGlobalPoint: GlobalPoint,
|
||||||
elementsMap: NonDeletedSceneElementsMap | SceneElementsMap,
|
elementsMap: NonDeletedSceneElementsMap | SceneElementsMap,
|
||||||
|
zoom?: AppState["zoom"],
|
||||||
) => {
|
) => {
|
||||||
// TODO: Might be a performance bottleneck and the Map type
|
// TODO: Might be a performance bottleneck and the Map type
|
||||||
// remembers the insertion order anyway...
|
// remembers the insertion order anyway...
|
||||||
@@ -1084,12 +1093,14 @@ const getHoveredElements = (
|
|||||||
tupleToCoors(origStartGlobalPoint),
|
tupleToCoors(origStartGlobalPoint),
|
||||||
elements,
|
elements,
|
||||||
nonDeletedSceneElementsMap,
|
nonDeletedSceneElementsMap,
|
||||||
|
zoom,
|
||||||
true,
|
true,
|
||||||
),
|
),
|
||||||
getHoveredElementForBinding(
|
getHoveredElementForBinding(
|
||||||
tupleToCoors(origEndGlobalPoint),
|
tupleToCoors(origEndGlobalPoint),
|
||||||
elements,
|
elements,
|
||||||
nonDeletedSceneElementsMap,
|
nonDeletedSceneElementsMap,
|
||||||
|
zoom,
|
||||||
true,
|
true,
|
||||||
),
|
),
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import {
|
|||||||
isBoundToContainer,
|
isBoundToContainer,
|
||||||
isTextElement,
|
isTextElement,
|
||||||
} from "./typeChecks";
|
} from "./typeChecks";
|
||||||
import { CLASSES, POINTER_BUTTON } from "../constants";
|
import { CLASSES, EVENT, isSafari, POINTER_BUTTON } from "../constants";
|
||||||
import type {
|
import type {
|
||||||
ExcalidrawElement,
|
ExcalidrawElement,
|
||||||
ExcalidrawLinearElement,
|
ExcalidrawLinearElement,
|
||||||
@@ -50,6 +50,8 @@ import {
|
|||||||
originalContainerCache,
|
originalContainerCache,
|
||||||
updateOriginalContainerCache,
|
updateOriginalContainerCache,
|
||||||
} from "./containerCache";
|
} from "./containerCache";
|
||||||
|
import { activeEyeDropperAtom } from "../components/EyeDropper";
|
||||||
|
import { jotaiStore } from "../jotai";
|
||||||
|
|
||||||
const getTransform = (
|
const getTransform = (
|
||||||
width: number,
|
width: number,
|
||||||
@@ -289,6 +291,8 @@ export const textWysiwyg = ({
|
|||||||
editable.dataset.type = "wysiwyg";
|
editable.dataset.type = "wysiwyg";
|
||||||
// prevent line wrapping on Safari
|
// prevent line wrapping on Safari
|
||||||
editable.wrap = "off";
|
editable.wrap = "off";
|
||||||
|
// set placeholder fix for Safari not showing caret for empty textarea
|
||||||
|
editable.placeholder = "\u00A0";
|
||||||
editable.classList.add("excalidraw-wysiwyg");
|
editable.classList.add("excalidraw-wysiwyg");
|
||||||
|
|
||||||
let whiteSpace = "pre";
|
let whiteSpace = "pre";
|
||||||
@@ -522,6 +526,7 @@ export const textWysiwyg = ({
|
|||||||
// so that we don't need to create separate a callback for event handlers
|
// so that we don't need to create separate a callback for event handlers
|
||||||
let submittedViaKeyboard = false;
|
let submittedViaKeyboard = false;
|
||||||
const handleSubmit = () => {
|
const handleSubmit = () => {
|
||||||
|
console.warn("handleSubmit");
|
||||||
// prevent double submit
|
// prevent double submit
|
||||||
if (isDestroyed) {
|
if (isDestroyed) {
|
||||||
return;
|
return;
|
||||||
@@ -579,62 +584,96 @@ export const textWysiwyg = ({
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const onBlur = () => {
|
||||||
|
console.warn("onBlur", document.activeElement);
|
||||||
|
const isColorPicking = jotaiStore.get(activeEyeDropperAtom);
|
||||||
|
if (isColorPicking) {
|
||||||
|
focusEditable(null);
|
||||||
|
} else if (document.activeElement !== editable) {
|
||||||
|
handleSubmit();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const cleanup = () => {
|
const cleanup = () => {
|
||||||
// remove events to ensure they don't late-fire
|
// remove events to ensure they don't late-fire
|
||||||
editable.onblur = null;
|
editable.onblur = null;
|
||||||
editable.oninput = null;
|
editable.oninput = null;
|
||||||
editable.onkeydown = null;
|
editable.onkeydown = null;
|
||||||
|
editable.onpointerdown = null;
|
||||||
|
|
||||||
if (observer) {
|
if (observer) {
|
||||||
observer.disconnect();
|
observer.disconnect();
|
||||||
}
|
}
|
||||||
|
|
||||||
window.removeEventListener("resize", updateWysiwygStyle);
|
window.removeEventListener(EVENT.RESIZE, updateWysiwygStyle);
|
||||||
window.removeEventListener("wheel", stopEvent, true);
|
window.removeEventListener(EVENT.WHEEL, stopEvent, true);
|
||||||
window.removeEventListener("pointerdown", onPointerDown);
|
window.removeEventListener(EVENT.POINTER_DOWN, onPointerDown, {
|
||||||
window.removeEventListener("pointerup", bindBlurEvent);
|
capture: true,
|
||||||
window.removeEventListener("blur", handleSubmit);
|
});
|
||||||
window.removeEventListener("beforeunload", handleSubmit);
|
window.removeEventListener(EVENT.POINTER_UP, onPointerUp);
|
||||||
|
window.removeEventListener(EVENT.BLUR, onBlur);
|
||||||
|
window.removeEventListener(EVENT.BEFORE_UNLOAD, handleSubmit);
|
||||||
unbindUpdate();
|
unbindUpdate();
|
||||||
unbindOnScroll();
|
unbindOnScroll();
|
||||||
|
|
||||||
editable.remove();
|
editable.remove();
|
||||||
};
|
};
|
||||||
|
|
||||||
const bindBlurEvent = (event?: MouseEvent) => {
|
const focusEditable = (event: MouseEvent | FocusEvent | null) => {
|
||||||
window.removeEventListener("pointerup", bindBlurEvent);
|
|
||||||
// Deferred so that the pointerdown that initiates the wysiwyg doesn't
|
|
||||||
// trigger the blur on ensuing pointerup.
|
|
||||||
// Also to handle cases such as picking a color which would trigger a blur
|
|
||||||
// in that same tick.
|
|
||||||
const target = event?.target;
|
const target = event?.target;
|
||||||
|
|
||||||
const isPropertiesTrigger =
|
const shouldSkipRefocus =
|
||||||
target instanceof HTMLElement &&
|
target &&
|
||||||
target.classList.contains("properties-trigger");
|
// don't steal focus if user is focusing an input such as HEX input
|
||||||
|
((isWritableElement(target) && document.activeElement !== editable) ||
|
||||||
|
// refocusing while clicking on popver breaks safari
|
||||||
|
(isSafari &&
|
||||||
|
target instanceof HTMLElement &&
|
||||||
|
target.classList.contains(CLASSES.PROPERTIES_POPOVER_TRIGGER)));
|
||||||
|
|
||||||
setTimeout(() => {
|
if (!shouldSkipRefocus) {
|
||||||
editable.onblur = handleSubmit;
|
// Deferred so that the pointerdown that initiates the wysiwyg doesn't
|
||||||
|
// trigger the blur on ensuing pointerup.
|
||||||
// case: clicking on the same property → no change → no update → no focus
|
// Also to handle cases such as picking a color which would trigger a blur
|
||||||
if (!isPropertiesTrigger) {
|
// in that same tick.
|
||||||
editable.focus();
|
setTimeout(() => {
|
||||||
}
|
// double deferred because on onUpdate/color picker shennanings
|
||||||
});
|
setTimeout(() => {
|
||||||
|
editable.focus();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const temporarilyDisableSubmit = () => {
|
const onPointerUp = (event: PointerEvent | FocusEvent) => {
|
||||||
|
window.removeEventListener(EVENT.POINTER_UP, onPointerUp);
|
||||||
|
window.removeEventListener(EVENT.FOCUS, onPointerUp);
|
||||||
|
// needs to be deferred due to Safari
|
||||||
|
setTimeout(() => {
|
||||||
|
editable.onblur = onBlur;
|
||||||
|
});
|
||||||
|
focusEditable(event);
|
||||||
|
};
|
||||||
|
|
||||||
|
const disableBlurUntilNextPointerUp = () => {
|
||||||
editable.onblur = null;
|
editable.onblur = null;
|
||||||
window.addEventListener("pointerup", bindBlurEvent);
|
window.addEventListener(EVENT.POINTER_UP, onPointerUp);
|
||||||
// handle edge-case where pointerup doesn't fire e.g. due to user
|
// handle edge-case where pointerup doesn't fire e.g. due to user
|
||||||
// alt-tabbing away
|
// alt-tabbing away
|
||||||
window.addEventListener("blur", handleSubmit);
|
window.addEventListener(EVENT.FOCUS, onPointerUp);
|
||||||
};
|
};
|
||||||
|
|
||||||
// prevent blur when changing properties from the menu
|
// prevent blur when changing properties from the menu
|
||||||
const onPointerDown = (event: MouseEvent) => {
|
const onPointerDown = (event: MouseEvent) => {
|
||||||
const target = event?.target;
|
const target = event?.target;
|
||||||
|
|
||||||
|
// ugly hack to close popups such as color picker when clicking back
|
||||||
|
// into the wysiwyg editor (it won't autoclose as blur won't trigger
|
||||||
|
// since we perpetually keep focus inside the wysiwyg)
|
||||||
|
if (target === editable && app.state.openPopup) {
|
||||||
|
app.setState({ openPopup: null });
|
||||||
|
}
|
||||||
|
|
||||||
// panning canvas
|
// panning canvas
|
||||||
if (event.button === POINTER_BUTTON.WHEEL) {
|
if (event.button === POINTER_BUTTON.WHEEL) {
|
||||||
// trying to pan by clicking inside text area itself -> handle here
|
// trying to pan by clicking inside text area itself -> handle here
|
||||||
@@ -642,24 +681,18 @@ export const textWysiwyg = ({
|
|||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
app.handleCanvasPanUsingWheelOrSpaceDrag(event);
|
app.handleCanvasPanUsingWheelOrSpaceDrag(event);
|
||||||
}
|
}
|
||||||
temporarilyDisableSubmit();
|
disableBlurUntilNextPointerUp();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const isPropertiesTrigger =
|
|
||||||
target instanceof HTMLElement &&
|
|
||||||
target.classList.contains("properties-trigger");
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
((event.target instanceof HTMLElement ||
|
(event.target instanceof HTMLElement ||
|
||||||
event.target instanceof SVGElement) &&
|
event.target instanceof SVGElement) &&
|
||||||
event.target.closest(
|
event.target.closest(
|
||||||
`.${CLASSES.SHAPE_ACTIONS_MENU}, .${CLASSES.ZOOM_ACTIONS}`,
|
`.${CLASSES.SHAPE_ACTIONS_MENU}, .${CLASSES.ZOOM_ACTIONS}, .${CLASSES.PROPERTIES_POPOVER}`,
|
||||||
) &&
|
)
|
||||||
!isWritableElement(event.target)) ||
|
|
||||||
isPropertiesTrigger
|
|
||||||
) {
|
) {
|
||||||
temporarilyDisableSubmit();
|
disableBlurUntilNextPointerUp();
|
||||||
} else if (
|
} else if (
|
||||||
event.target instanceof HTMLCanvasElement &&
|
event.target instanceof HTMLCanvasElement &&
|
||||||
// Vitest simply ignores stopPropagation, capture-mode, or rAF
|
// Vitest simply ignores stopPropagation, capture-mode, or rAF
|
||||||
@@ -682,9 +715,11 @@ export const textWysiwyg = ({
|
|||||||
const unbindUpdate = app.scene.onUpdate(() => {
|
const unbindUpdate = app.scene.onUpdate(() => {
|
||||||
updateWysiwygStyle();
|
updateWysiwygStyle();
|
||||||
const isPopupOpened = !!document.activeElement?.closest(
|
const isPopupOpened = !!document.activeElement?.closest(
|
||||||
".properties-content",
|
CLASSES.PROPERTIES_POPOVER,
|
||||||
);
|
);
|
||||||
if (!isPopupOpened) {
|
if (!isPopupOpened) {
|
||||||
|
// we need to keep this code path for safari (iPadOS) bs reasons
|
||||||
|
// (also Vitest)
|
||||||
editable.focus();
|
editable.focus();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -702,8 +737,11 @@ export const textWysiwyg = ({
|
|||||||
// because we need it to happen *after* the blur event from `pointerdown`)
|
// because we need it to happen *after* the blur event from `pointerdown`)
|
||||||
editable.select();
|
editable.select();
|
||||||
}
|
}
|
||||||
bindBlurEvent();
|
focusEditable(null);
|
||||||
|
setTimeout(() => {
|
||||||
|
editable.onblur = onBlur;
|
||||||
|
});
|
||||||
|
console.log(">>>>>>>>", app.state.editingTextElement);
|
||||||
// reposition wysiwyg in case of canvas is resized. Using ResizeObserver
|
// reposition wysiwyg in case of canvas is resized. Using ResizeObserver
|
||||||
// is preferred so we catch changes from host, where window may not resize.
|
// is preferred so we catch changes from host, where window may not resize.
|
||||||
let observer: ResizeObserver | null = null;
|
let observer: ResizeObserver | null = null;
|
||||||
@@ -713,7 +751,7 @@ export const textWysiwyg = ({
|
|||||||
});
|
});
|
||||||
observer.observe(canvas);
|
observer.observe(canvas);
|
||||||
} else {
|
} else {
|
||||||
window.addEventListener("resize", updateWysiwygStyle);
|
window.addEventListener(EVENT.RESIZE, updateWysiwygStyle);
|
||||||
}
|
}
|
||||||
|
|
||||||
editable.onpointerdown = (event) => event.stopPropagation();
|
editable.onpointerdown = (event) => event.stopPropagation();
|
||||||
@@ -721,9 +759,11 @@ export const textWysiwyg = ({
|
|||||||
// rAF (+ capture to by doubly sure) so we don't catch te pointerdown that
|
// rAF (+ capture to by doubly sure) so we don't catch te pointerdown that
|
||||||
// triggered the wysiwyg
|
// triggered the wysiwyg
|
||||||
requestAnimationFrame(() => {
|
requestAnimationFrame(() => {
|
||||||
window.addEventListener("pointerdown", onPointerDown, { capture: true });
|
window.addEventListener(EVENT.POINTER_DOWN, onPointerDown, {
|
||||||
|
capture: true,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
window.addEventListener("beforeunload", handleSubmit);
|
window.addEventListener(EVENT.BEFORE_UNLOAD, handleSubmit);
|
||||||
excalidrawContainer
|
excalidrawContainer
|
||||||
?.querySelector(".excalidraw-textEditorContainer")!
|
?.querySelector(".excalidraw-textEditorContainer")!
|
||||||
.appendChild(editable);
|
.appendChild(editable);
|
||||||
|
|||||||
@@ -157,6 +157,8 @@
|
|||||||
"zoomToFit": "Zoom to fit all elements",
|
"zoomToFit": "Zoom to fit all elements",
|
||||||
"installPWA": "Install Excalidraw locally (PWA)",
|
"installPWA": "Install Excalidraw locally (PWA)",
|
||||||
"autoResize": "Enable text auto-resizing",
|
"autoResize": "Enable text auto-resizing",
|
||||||
|
"imageCropping": "Image cropping",
|
||||||
|
"unCroppedDimension": "Uncropped dimension",
|
||||||
"copyElementLink": "Copy link to object",
|
"copyElementLink": "Copy link to object",
|
||||||
"linkToElement": "Link to object"
|
"linkToElement": "Link to object"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -43,7 +43,11 @@ import type {
|
|||||||
SuggestedBinding,
|
SuggestedBinding,
|
||||||
SuggestedPointBinding,
|
SuggestedPointBinding,
|
||||||
} from "../element/binding";
|
} from "../element/binding";
|
||||||
import { maxBindingGap } from "../element/binding";
|
import {
|
||||||
|
BINDING_HIGHLIGHT_OFFSET,
|
||||||
|
BINDING_HIGHLIGHT_THICKNESS,
|
||||||
|
maxBindingGap,
|
||||||
|
} from "../element/binding";
|
||||||
import { LinearElementEditor } from "../element/linearElementEditor";
|
import { LinearElementEditor } from "../element/linearElementEditor";
|
||||||
import {
|
import {
|
||||||
bootstrapCanvas,
|
bootstrapCanvas,
|
||||||
@@ -217,17 +221,18 @@ const renderBindingHighlightForBindableElement = (
|
|||||||
context: CanvasRenderingContext2D,
|
context: CanvasRenderingContext2D,
|
||||||
element: ExcalidrawBindableElement,
|
element: ExcalidrawBindableElement,
|
||||||
elementsMap: ElementsMap,
|
elementsMap: ElementsMap,
|
||||||
|
zoom: InteractiveCanvasAppState["zoom"],
|
||||||
) => {
|
) => {
|
||||||
const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
|
const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
|
||||||
const width = x2 - x1;
|
const width = x2 - x1;
|
||||||
const height = y2 - y1;
|
const height = y2 - y1;
|
||||||
const thickness = 10;
|
|
||||||
|
|
||||||
// So that we don't overlap the element itself
|
|
||||||
const strokeOffset = 4;
|
|
||||||
context.strokeStyle = "rgba(0,0,0,.05)";
|
context.strokeStyle = "rgba(0,0,0,.05)";
|
||||||
context.lineWidth = thickness - strokeOffset;
|
// When zooming out, make line width greater for visibility
|
||||||
const padding = strokeOffset / 2 + thickness / 2;
|
const zoomValue = zoom.value < 1 ? zoom.value : 1;
|
||||||
|
context.lineWidth = BINDING_HIGHLIGHT_THICKNESS / zoomValue;
|
||||||
|
// To ensure the binding highlight doesn't overlap the element itself
|
||||||
|
const padding = context.lineWidth / 2 + BINDING_HIGHLIGHT_OFFSET;
|
||||||
|
|
||||||
const radius = getCornerRadius(
|
const radius = getCornerRadius(
|
||||||
Math.min(element.width, element.height),
|
Math.min(element.width, element.height),
|
||||||
@@ -285,6 +290,7 @@ const renderBindingHighlightForSuggestedPointBinding = (
|
|||||||
context: CanvasRenderingContext2D,
|
context: CanvasRenderingContext2D,
|
||||||
suggestedBinding: SuggestedPointBinding,
|
suggestedBinding: SuggestedPointBinding,
|
||||||
elementsMap: ElementsMap,
|
elementsMap: ElementsMap,
|
||||||
|
zoom: InteractiveCanvasAppState["zoom"],
|
||||||
) => {
|
) => {
|
||||||
const [element, startOrEnd, bindableElement] = suggestedBinding;
|
const [element, startOrEnd, bindableElement] = suggestedBinding;
|
||||||
|
|
||||||
@@ -292,6 +298,7 @@ const renderBindingHighlightForSuggestedPointBinding = (
|
|||||||
bindableElement,
|
bindableElement,
|
||||||
bindableElement.width,
|
bindableElement.width,
|
||||||
bindableElement.height,
|
bindableElement.height,
|
||||||
|
zoom,
|
||||||
);
|
);
|
||||||
|
|
||||||
context.strokeStyle = "rgba(0,0,0,0)";
|
context.strokeStyle = "rgba(0,0,0,0)";
|
||||||
@@ -390,7 +397,7 @@ const renderBindingHighlight = (
|
|||||||
|
|
||||||
context.save();
|
context.save();
|
||||||
context.translate(appState.scrollX, appState.scrollY);
|
context.translate(appState.scrollX, appState.scrollY);
|
||||||
renderHighlight(context, suggestedBinding as any, elementsMap);
|
renderHighlight(context, suggestedBinding as any, elementsMap, appState.zoom);
|
||||||
|
|
||||||
context.restore();
|
context.restore();
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -635,7 +635,7 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende
|
|||||||
aria-expanded="false"
|
aria-expanded="false"
|
||||||
aria-haspopup="dialog"
|
aria-haspopup="dialog"
|
||||||
aria-label="Canvas background"
|
aria-label="Canvas background"
|
||||||
class="color-picker__button active-color properties-trigger"
|
class="color-picker__button active-color properties-popover-trigger"
|
||||||
data-state="closed"
|
data-state="closed"
|
||||||
style="--swatch-color: #ffffff;"
|
style="--swatch-color: #ffffff;"
|
||||||
title="Show background color picker"
|
title="Show background color picker"
|
||||||
|
|||||||
@@ -197,7 +197,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
|
|||||||
"fillStyle": "solid",
|
"fillStyle": "solid",
|
||||||
"frameId": null,
|
"frameId": null,
|
||||||
"groupIds": [],
|
"groupIds": [],
|
||||||
"height": 99,
|
"height": 125,
|
||||||
"id": "id166",
|
"id": "id166",
|
||||||
"index": "a2",
|
"index": "a2",
|
||||||
"isDeleted": false,
|
"isDeleted": false,
|
||||||
@@ -211,8 +211,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
"98.20800",
|
125,
|
||||||
99,
|
125,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
"roughness": 1,
|
"roughness": 1,
|
||||||
@@ -226,9 +226,9 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 40,
|
"version": 47,
|
||||||
"width": "98.20800",
|
"width": 125,
|
||||||
"x": 1,
|
"x": 0,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -298,7 +298,7 @@ History {
|
|||||||
"focus": "0.00990",
|
"focus": "0.00990",
|
||||||
"gap": 1,
|
"gap": 1,
|
||||||
},
|
},
|
||||||
"height": "0.98017",
|
"height": "0.98000",
|
||||||
"points": [
|
"points": [
|
||||||
[
|
[
|
||||||
0,
|
0,
|
||||||
@@ -306,7 +306,7 @@ History {
|
|||||||
],
|
],
|
||||||
[
|
[
|
||||||
98,
|
98,
|
||||||
"-0.98017",
|
"-0.98000",
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
"startBinding": {
|
"startBinding": {
|
||||||
@@ -320,10 +320,10 @@ History {
|
|||||||
"endBinding": {
|
"endBinding": {
|
||||||
"elementId": "id165",
|
"elementId": "id165",
|
||||||
"fixedPoint": null,
|
"fixedPoint": null,
|
||||||
"focus": "-0.02000",
|
"focus": "-0.02040",
|
||||||
"gap": 1,
|
"gap": 1,
|
||||||
},
|
},
|
||||||
"height": "0.00169",
|
"height": "0.02000",
|
||||||
"points": [
|
"points": [
|
||||||
[
|
[
|
||||||
0,
|
0,
|
||||||
@@ -331,13 +331,13 @@ History {
|
|||||||
],
|
],
|
||||||
[
|
[
|
||||||
98,
|
98,
|
||||||
"0.00169",
|
"0.02000",
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
"startBinding": {
|
"startBinding": {
|
||||||
"elementId": "id164",
|
"elementId": "id164",
|
||||||
"fixedPoint": null,
|
"fixedPoint": null,
|
||||||
"focus": "0.02000",
|
"focus": "0.01959",
|
||||||
"gap": 1,
|
"gap": 1,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -393,18 +393,20 @@ History {
|
|||||||
"focus": 0,
|
"focus": 0,
|
||||||
"gap": 1,
|
"gap": 1,
|
||||||
},
|
},
|
||||||
"height": 99,
|
"height": 125,
|
||||||
"points": [
|
"points": [
|
||||||
[
|
[
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
"98.20800",
|
125,
|
||||||
99,
|
125,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
"startBinding": null,
|
"startBinding": null,
|
||||||
|
"width": 125,
|
||||||
|
"x": 0,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
},
|
},
|
||||||
"inserted": {
|
"inserted": {
|
||||||
@@ -414,7 +416,7 @@ History {
|
|||||||
"focus": "0.00990",
|
"focus": "0.00990",
|
||||||
"gap": 1,
|
"gap": 1,
|
||||||
},
|
},
|
||||||
"height": "0.98161",
|
"height": "0.98000",
|
||||||
"points": [
|
"points": [
|
||||||
[
|
[
|
||||||
0,
|
0,
|
||||||
@@ -422,7 +424,7 @@ History {
|
|||||||
],
|
],
|
||||||
[
|
[
|
||||||
98,
|
98,
|
||||||
"-0.98161",
|
"-0.98000",
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
"startBinding": {
|
"startBinding": {
|
||||||
@@ -431,7 +433,9 @@ History {
|
|||||||
"focus": "0.02970",
|
"focus": "0.02970",
|
||||||
"gap": 1,
|
"gap": 1,
|
||||||
},
|
},
|
||||||
"y": "0.99245",
|
"width": 98,
|
||||||
|
"x": 1,
|
||||||
|
"y": "0.99000",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"id169" => Delta {
|
"id169" => Delta {
|
||||||
@@ -823,9 +827,9 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 30,
|
"version": 37,
|
||||||
"width": 0,
|
"width": 100,
|
||||||
"x": 200,
|
"x": 150,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -862,6 +866,8 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
"width": 0,
|
||||||
|
"x": 149,
|
||||||
},
|
},
|
||||||
"inserted": {
|
"inserted": {
|
||||||
"points": [
|
"points": [
|
||||||
@@ -870,10 +876,12 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
"width": "98.00000",
|
||||||
|
"x": "1.00000",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -930,6 +938,8 @@ History {
|
|||||||
],
|
],
|
||||||
],
|
],
|
||||||
"startBinding": null,
|
"startBinding": null,
|
||||||
|
"width": 100,
|
||||||
|
"x": 150,
|
||||||
},
|
},
|
||||||
"inserted": {
|
"inserted": {
|
||||||
"endBinding": {
|
"endBinding": {
|
||||||
@@ -954,6 +964,8 @@ History {
|
|||||||
"focus": 0,
|
"focus": 0,
|
||||||
"gap": 1,
|
"gap": 1,
|
||||||
},
|
},
|
||||||
|
"width": 0,
|
||||||
|
"x": 149,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -2363,9 +2375,9 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 10,
|
"version": 12,
|
||||||
"width": 498,
|
"width": 498,
|
||||||
"x": 1,
|
"x": "1.00000",
|
||||||
"y": 0,
|
"y": 0,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -2504,7 +2516,7 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -2523,8 +2535,8 @@ History {
|
|||||||
"strokeStyle": "solid",
|
"strokeStyle": "solid",
|
||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"width": 100,
|
"width": "98.00000",
|
||||||
"x": 0,
|
"x": 1,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
},
|
},
|
||||||
"inserted": {
|
"inserted": {
|
||||||
@@ -15167,9 +15179,9 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 10,
|
"version": 12,
|
||||||
"width": "98.00000",
|
"width": "98.00000",
|
||||||
"x": 1,
|
"x": "1.00000",
|
||||||
"y": 0,
|
"y": 0,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -15208,7 +15220,7 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -15221,7 +15233,7 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -15517,7 +15529,7 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -15536,8 +15548,8 @@ History {
|
|||||||
"strokeStyle": "solid",
|
"strokeStyle": "solid",
|
||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"width": 100,
|
"width": "98.00000",
|
||||||
"x": 0,
|
"x": 1,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
},
|
},
|
||||||
"inserted": {
|
"inserted": {
|
||||||
@@ -15866,9 +15878,9 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 10,
|
"version": 12,
|
||||||
"width": "98.00000",
|
"width": "98.00000",
|
||||||
"x": 1,
|
"x": "1.00000",
|
||||||
"y": 0,
|
"y": 0,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -16140,7 +16152,7 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -16159,8 +16171,8 @@ History {
|
|||||||
"strokeStyle": "solid",
|
"strokeStyle": "solid",
|
||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"width": 100,
|
"width": "98.00000",
|
||||||
"x": 0,
|
"x": 1,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
},
|
},
|
||||||
"inserted": {
|
"inserted": {
|
||||||
@@ -16489,9 +16501,9 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 10,
|
"version": 12,
|
||||||
"width": "98.00000",
|
"width": "98.00000",
|
||||||
"x": 1,
|
"x": "1.00000",
|
||||||
"y": 0,
|
"y": 0,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -16763,7 +16775,7 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -16782,8 +16794,8 @@ History {
|
|||||||
"strokeStyle": "solid",
|
"strokeStyle": "solid",
|
||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"width": 100,
|
"width": "98.00000",
|
||||||
"x": 0,
|
"x": 1,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
},
|
},
|
||||||
"inserted": {
|
"inserted": {
|
||||||
@@ -17110,9 +17122,9 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 10,
|
"version": 12,
|
||||||
"width": "98.00000",
|
"width": "98.00000",
|
||||||
"x": 1,
|
"x": "1.00000",
|
||||||
"y": 0,
|
"y": 0,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -17168,7 +17180,7 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -17186,7 +17198,7 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -17455,7 +17467,7 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -17474,8 +17486,8 @@ History {
|
|||||||
"strokeStyle": "solid",
|
"strokeStyle": "solid",
|
||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"width": 100,
|
"width": "98.00000",
|
||||||
"x": 0,
|
"x": 1,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
},
|
},
|
||||||
"inserted": {
|
"inserted": {
|
||||||
@@ -17828,9 +17840,9 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 11,
|
"version": 13,
|
||||||
"width": "98.00000",
|
"width": "98.00000",
|
||||||
"x": 1,
|
"x": "1.00000",
|
||||||
"y": 0,
|
"y": 0,
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
@@ -17901,7 +17913,7 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -17920,7 +17932,7 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -18189,7 +18201,7 @@ History {
|
|||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
100,
|
"98.00000",
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -18208,8 +18220,8 @@ History {
|
|||||||
"strokeStyle": "solid",
|
"strokeStyle": "solid",
|
||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"width": 100,
|
"width": "98.00000",
|
||||||
"x": 0,
|
"x": 1,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
},
|
},
|
||||||
"inserted": {
|
"inserted": {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ exports[`Test Linear Elements > Test bound text element > should match styles fo
|
|||||||
class="excalidraw-wysiwyg"
|
class="excalidraw-wysiwyg"
|
||||||
data-type="wysiwyg"
|
data-type="wysiwyg"
|
||||||
dir="auto"
|
dir="auto"
|
||||||
|
placeholder=" "
|
||||||
style="position: absolute; display: inline-block; min-height: 1em; backface-visibility: hidden; margin: 0px; padding: 0px; border: 0px; outline: 0; resize: none; background: transparent; overflow: hidden; z-index: var(--zIndex-wysiwyg); word-break: break-word; white-space: pre-wrap; overflow-wrap: break-word; box-sizing: content-box; width: 10.5px; height: 26.25px; left: 35px; top: 7.5px; transform: translate(0px, 0px) scale(1) rotate(0deg); text-align: center; vertical-align: middle; color: rgb(30, 30, 30); opacity: 1; filter: var(--theme-filter); max-height: 992.5px; font: Emoji 20px 20px; line-height: 1.25; font-family: Excalifont, Xiaolai, Segoe UI Emoji;"
|
style="position: absolute; display: inline-block; min-height: 1em; backface-visibility: hidden; margin: 0px; padding: 0px; border: 0px; outline: 0; resize: none; background: transparent; overflow: hidden; z-index: var(--zIndex-wysiwyg); word-break: break-word; white-space: pre-wrap; overflow-wrap: break-word; box-sizing: content-box; width: 10.5px; height: 26.25px; left: 35px; top: 7.5px; transform: translate(0px, 0px) scale(1) rotate(0deg); text-align: center; vertical-align: middle; color: rgb(30, 30, 30); opacity: 1; filter: var(--theme-filter); max-height: 992.5px; font: Emoji 20px 20px; line-height: 1.25; font-family: Excalifont, Xiaolai, Segoe UI Emoji;"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
wrap="off"
|
wrap="off"
|
||||||
|
|||||||
@@ -173,7 +173,7 @@ exports[`move element > rectangles with binding arrow 6`] = `
|
|||||||
"type": "rectangle",
|
"type": "rectangle",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 7,
|
"version": 7,
|
||||||
"versionNonce": 745419401,
|
"versionNonce": 2066753033,
|
||||||
"width": 300,
|
"width": 300,
|
||||||
"x": 201,
|
"x": 201,
|
||||||
"y": 2,
|
"y": 2,
|
||||||
@@ -232,8 +232,8 @@ exports[`move element > rectangles with binding arrow 7`] = `
|
|||||||
"strokeWidth": 2,
|
"strokeWidth": 2,
|
||||||
"type": "arrow",
|
"type": "arrow",
|
||||||
"updated": 1,
|
"updated": 1,
|
||||||
"version": 11,
|
"version": 15,
|
||||||
"versionNonce": 1996028265,
|
"versionNonce": 271613161,
|
||||||
"width": 81,
|
"width": 81,
|
||||||
"x": 110,
|
"x": 110,
|
||||||
"y": 50,
|
"y": 50,
|
||||||
|
|||||||
@@ -186,14 +186,14 @@ describe("Crop an image", () => {
|
|||||||
// 50 x 50 square
|
// 50 x 50 square
|
||||||
UI.crop(image, "nw", naturalWidth, naturalHeight, [150, 50]);
|
UI.crop(image, "nw", naturalWidth, naturalHeight, [150, 50]);
|
||||||
UI.crop(image, "n", naturalWidth, naturalHeight, [0, -100], true);
|
UI.crop(image, "n", naturalWidth, naturalHeight, [0, -100], true);
|
||||||
expect(image.width).toEqual(image.height);
|
expect(image.width).toBeCloseTo(image.height);
|
||||||
// image is at the corner, not space to its right to expand, should not be able to resize
|
// image is at the corner, not space to its right to expand, should not be able to resize
|
||||||
expect(image.height).toBeCloseTo(50);
|
expect(image.height).toBeCloseTo(50);
|
||||||
|
|
||||||
UI.crop(image, "nw", naturalWidth, naturalHeight, [-150, -100], true);
|
UI.crop(image, "nw", naturalWidth, naturalHeight, [-150, -100], true);
|
||||||
expect(image.width).toEqual(image.height);
|
expect(image.width).toBeCloseTo(image.height);
|
||||||
// max height should be reached
|
// max height should be reached
|
||||||
expect(image.height).toEqual(initialHeight);
|
expect(image.height).toBeCloseTo(initialHeight);
|
||||||
expect(image.width).toBe(initialHeight);
|
expect(image.width).toBe(initialHeight);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -38,6 +38,8 @@ import { pointFrom, pointRotateRads } from "../../../math";
|
|||||||
import { cropElement } from "../../element/cropElement";
|
import { cropElement } from "../../element/cropElement";
|
||||||
import type { ToolType } from "../../types";
|
import type { ToolType } from "../../types";
|
||||||
|
|
||||||
|
const TEXT_EDITOR_SELECTOR = ".excalidraw-textEditorContainer > textarea";
|
||||||
|
|
||||||
// so that window.h is available when App.tsx is not imported as well.
|
// so that window.h is available when App.tsx is not imported as well.
|
||||||
createTestHook();
|
createTestHook();
|
||||||
|
|
||||||
@@ -477,12 +479,20 @@ export class UI {
|
|||||||
pointFrom(0, 0),
|
pointFrom(0, 0),
|
||||||
pointFrom(width, height),
|
pointFrom(width, height),
|
||||||
];
|
];
|
||||||
|
|
||||||
UI.clickTool(type);
|
UI.clickTool(type);
|
||||||
|
|
||||||
if (type === "text") {
|
if (type === "text") {
|
||||||
mouse.reset();
|
mouse.reset();
|
||||||
mouse.click(x, y);
|
mouse.click(x, y);
|
||||||
|
|
||||||
|
const openedEditor =
|
||||||
|
document.querySelector<HTMLTextAreaElement>(TEXT_EDITOR_SELECTOR);
|
||||||
|
|
||||||
|
// NOTE this is a hack to make sure the editor is focused on edit
|
||||||
|
// which for some reason doesn't work in tests after latest changes.
|
||||||
|
// This means that a regression in wysiwyg editor might not be caught
|
||||||
|
// tests.
|
||||||
|
openedEditor?.focus();
|
||||||
} else if ((type === "line" || type === "arrow") && points.length > 2) {
|
} else if ((type === "line" || type === "arrow") && points.length > 2) {
|
||||||
points.forEach((point) => {
|
points.forEach((point) => {
|
||||||
mouse.reset();
|
mouse.reset();
|
||||||
@@ -518,20 +528,25 @@ export class UI {
|
|||||||
static async editText<
|
static async editText<
|
||||||
T extends ExcalidrawTextElement | ExcalidrawTextContainer,
|
T extends ExcalidrawTextElement | ExcalidrawTextContainer,
|
||||||
>(element: T, text: string) {
|
>(element: T, text: string) {
|
||||||
const textEditorSelector = ".excalidraw-textEditorContainer > textarea";
|
|
||||||
const openedEditor =
|
const openedEditor =
|
||||||
document.querySelector<HTMLTextAreaElement>(textEditorSelector);
|
document.querySelector<HTMLTextAreaElement>(TEXT_EDITOR_SELECTOR);
|
||||||
|
|
||||||
if (!openedEditor) {
|
if (!openedEditor) {
|
||||||
mouse.select(element);
|
mouse.select(element);
|
||||||
Keyboard.keyPress(KEYS.ENTER);
|
Keyboard.keyPress(KEYS.ENTER);
|
||||||
}
|
}
|
||||||
|
|
||||||
const editor = await getTextEditor(textEditorSelector);
|
const editor = await getTextEditor();
|
||||||
if (!editor) {
|
if (!editor) {
|
||||||
throw new Error("Can't find wysiwyg text editor in the dom");
|
throw new Error("Can't find wysiwyg text editor in the dom");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NOTE this is a hack to make sure the editor is focused on edit
|
||||||
|
// which for some reason doesn't work in tests after latest changes.
|
||||||
|
// This means that a regression in wysiwyg editor might not be caught
|
||||||
|
// tests.
|
||||||
|
editor.focus();
|
||||||
|
|
||||||
fireEvent.input(editor, { target: { value: text } });
|
fireEvent.input(editor, { target: { value: text } });
|
||||||
act(() => {
|
act(() => {
|
||||||
editor.blur();
|
editor.blur();
|
||||||
|
|||||||
@@ -4785,21 +4785,17 @@ describe("history", () => {
|
|||||||
expect.objectContaining({ id: rect2.id, boundElements: [] }),
|
expect.objectContaining({ id: rect2.id, boundElements: [] }),
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
id: arrowId,
|
id: arrowId,
|
||||||
points: [
|
|
||||||
[0, 0],
|
|
||||||
[100, 0],
|
|
||||||
],
|
|
||||||
startBinding: expect.objectContaining({
|
startBinding: expect.objectContaining({
|
||||||
elementId: rect1.id,
|
elementId: rect1.id,
|
||||||
fixedPoint: null,
|
fixedPoint: null,
|
||||||
focus: expect.toBeNonNaNNumber(),
|
focus: 0,
|
||||||
gap: expect.toBeNonNaNNumber(),
|
gap: 1,
|
||||||
}),
|
}),
|
||||||
endBinding: expect.objectContaining({
|
endBinding: expect.objectContaining({
|
||||||
elementId: rect2.id,
|
elementId: rect2.id,
|
||||||
fixedPoint: null,
|
fixedPoint: null,
|
||||||
focus: expect.toBeNonNaNNumber(),
|
focus: 0,
|
||||||
gap: expect.toBeNonNaNNumber(),
|
gap: 1,
|
||||||
}),
|
}),
|
||||||
isDeleted: true,
|
isDeleted: true,
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
import { waitFor } from "@testing-library/dom";
|
import { waitFor } from "@testing-library/dom";
|
||||||
import { fireEvent } from "@testing-library/react";
|
import { fireEvent } from "@testing-library/react";
|
||||||
|
|
||||||
export const getTextEditor = async (selector: string, waitForEditor = true) => {
|
export const getTextEditor = async (
|
||||||
|
selector = ".excalidraw-textEditorContainer > textarea",
|
||||||
|
waitForEditor = true,
|
||||||
|
) => {
|
||||||
const query = () => document.querySelector(selector) as HTMLTextAreaElement;
|
const query = () => document.querySelector(selector) as HTMLTextAreaElement;
|
||||||
if (waitForEditor) {
|
if (waitForEditor) {
|
||||||
await waitFor(() => expect(query()).not.toBe(null));
|
await waitFor(() => expect(query()).not.toBe(null));
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ import { LinearElementEditor } from "../element/linearElementEditor";
|
|||||||
import { arrayToMap } from "../utils";
|
import { arrayToMap } from "../utils";
|
||||||
import type { LocalPoint } from "../../math";
|
import type { LocalPoint } from "../../math";
|
||||||
import { pointFrom } from "../../math";
|
import { pointFrom } from "../../math";
|
||||||
|
import { resizeSingleElement } from "../element/resizeElements";
|
||||||
|
import { getSizeFromPoints } from "../points";
|
||||||
|
|
||||||
ReactDOM.unmountComponentAtNode(document.getElementById("root")!);
|
ReactDOM.unmountComponentAtNode(document.getElementById("root")!);
|
||||||
|
|
||||||
@@ -235,7 +237,7 @@ describe.each(["line", "freedraw"] as const)("%s element", (type) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
it("resizes", async () => {
|
it("resizes", async () => {
|
||||||
const element = UI.createElement(type, { points: points[type] });
|
const element = UI.createElement("freedraw", { points: points.freedraw });
|
||||||
const bounds = getBoundsFromPoints(element);
|
const bounds = getBoundsFromPoints(element);
|
||||||
|
|
||||||
UI.resize(element, "ne", [30, -60]);
|
UI.resize(element, "ne", [30, -60]);
|
||||||
@@ -249,7 +251,7 @@ describe.each(["line", "freedraw"] as const)("%s element", (type) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("flips while resizing", async () => {
|
it("flips while resizing", async () => {
|
||||||
const element = UI.createElement(type, { points: points[type] });
|
const element = UI.createElement("freedraw", { points: points.freedraw });
|
||||||
const bounds = getBoundsFromPoints(element);
|
const bounds = getBoundsFromPoints(element);
|
||||||
|
|
||||||
UI.resize(element, "sw", [140, -80]);
|
UI.resize(element, "sw", [140, -80]);
|
||||||
@@ -263,7 +265,7 @@ describe.each(["line", "freedraw"] as const)("%s element", (type) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("resizes with locked aspect ratio", async () => {
|
it("resizes with locked aspect ratio", async () => {
|
||||||
const element = UI.createElement(type, { points: points[type] });
|
const element = UI.createElement("freedraw", { points: points.freedraw });
|
||||||
const bounds = getBoundsFromPoints(element);
|
const bounds = getBoundsFromPoints(element);
|
||||||
|
|
||||||
UI.resize(element, "ne", [30, -60], { shift: true });
|
UI.resize(element, "ne", [30, -60], { shift: true });
|
||||||
@@ -280,7 +282,7 @@ describe.each(["line", "freedraw"] as const)("%s element", (type) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("resizes from center", async () => {
|
it("resizes from center", async () => {
|
||||||
const element = UI.createElement(type, { points: points[type] });
|
const element = UI.createElement("freedraw", { points: points.freedraw });
|
||||||
const bounds = getBoundsFromPoints(element);
|
const bounds = getBoundsFromPoints(element);
|
||||||
|
|
||||||
UI.resize(element, "nw", [-20, -30], { alt: true });
|
UI.resize(element, "nw", [-20, -30], { alt: true });
|
||||||
@@ -294,6 +296,147 @@ describe.each(["line", "freedraw"] as const)("%s element", (type) => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("line element", () => {
|
||||||
|
const points: LocalPoint[] = [
|
||||||
|
pointFrom(0, 0),
|
||||||
|
pointFrom(60, -20),
|
||||||
|
pointFrom(20, 40),
|
||||||
|
pointFrom(-40, 0),
|
||||||
|
];
|
||||||
|
|
||||||
|
it("resizes", async () => {
|
||||||
|
UI.createElement("line", { points });
|
||||||
|
|
||||||
|
const element = h.elements[0] as ExcalidrawLinearElement;
|
||||||
|
|
||||||
|
const {
|
||||||
|
x: prevX,
|
||||||
|
y: prevY,
|
||||||
|
width: prevWidth,
|
||||||
|
height: prevHeight,
|
||||||
|
} = element;
|
||||||
|
|
||||||
|
const nextWidth = prevWidth + 30;
|
||||||
|
const nextHeight = prevHeight + 30;
|
||||||
|
|
||||||
|
resizeSingleElement(
|
||||||
|
nextWidth,
|
||||||
|
nextHeight,
|
||||||
|
element,
|
||||||
|
element,
|
||||||
|
h.app.scene.getNonDeletedElementsMap(),
|
||||||
|
h.app.scene.getNonDeletedElementsMap(),
|
||||||
|
"ne",
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(element.x).not.toBe(prevX);
|
||||||
|
expect(element.y).not.toBe(prevY);
|
||||||
|
|
||||||
|
expect(element.width).toBe(nextWidth);
|
||||||
|
expect(element.height).toBe(nextHeight);
|
||||||
|
|
||||||
|
expect(element.points[0]).toEqual([0, 0]);
|
||||||
|
|
||||||
|
const { width, height } = getSizeFromPoints(element.points);
|
||||||
|
expect(width).toBe(element.width);
|
||||||
|
expect(height).toBe(element.height);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("flips while resizing", async () => {
|
||||||
|
UI.createElement("line", { points });
|
||||||
|
const element = h.elements[0] as ExcalidrawLinearElement;
|
||||||
|
|
||||||
|
const {
|
||||||
|
width: prevWidth,
|
||||||
|
height: prevHeight,
|
||||||
|
points: prevPoints,
|
||||||
|
} = element;
|
||||||
|
|
||||||
|
const nextWidth = prevWidth * -1;
|
||||||
|
const nextHeight = prevHeight * -1;
|
||||||
|
|
||||||
|
resizeSingleElement(
|
||||||
|
nextWidth,
|
||||||
|
nextHeight,
|
||||||
|
element,
|
||||||
|
element,
|
||||||
|
h.app.scene.getNonDeletedElementsMap(),
|
||||||
|
h.app.scene.getNonDeletedElementsMap(),
|
||||||
|
"se",
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(element.width).toBe(prevWidth);
|
||||||
|
expect(element.height).toBe(prevHeight);
|
||||||
|
|
||||||
|
element.points.forEach((point, idx) => {
|
||||||
|
expect(point[0]).toBeCloseTo(prevPoints[idx][0] * -1);
|
||||||
|
expect(point[1]).toBeCloseTo(prevPoints[idx][1] * -1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("resizes with locked aspect ratio", async () => {
|
||||||
|
UI.createElement("line", { points });
|
||||||
|
const element = h.elements[0] as ExcalidrawLinearElement;
|
||||||
|
|
||||||
|
const { width: prevWidth, height: prevHeight } = element;
|
||||||
|
|
||||||
|
UI.resize(element, "ne", [30, -60], { shift: true });
|
||||||
|
|
||||||
|
const scaleHeight = element.width / prevWidth;
|
||||||
|
const scaleWidth = element.height / prevHeight;
|
||||||
|
|
||||||
|
expect(scaleHeight).toBeCloseTo(scaleWidth);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("resizes from center", async () => {
|
||||||
|
UI.createElement("line", {
|
||||||
|
points: [
|
||||||
|
pointFrom(0, 0),
|
||||||
|
pointFrom(338.05644048727373, -180.4761618151104),
|
||||||
|
pointFrom(338.05644048727373, 180.4761618151104),
|
||||||
|
pointFrom(-338.05644048727373, 180.4761618151104),
|
||||||
|
pointFrom(-338.05644048727373, -180.4761618151104),
|
||||||
|
],
|
||||||
|
});
|
||||||
|
const element = h.elements[0] as ExcalidrawLinearElement;
|
||||||
|
|
||||||
|
const {
|
||||||
|
x: prevX,
|
||||||
|
y: prevY,
|
||||||
|
width: prevWidth,
|
||||||
|
height: prevHeight,
|
||||||
|
} = element;
|
||||||
|
|
||||||
|
const prevSmallestX = Math.min(...element.points.map((p) => p[0]));
|
||||||
|
const prevBiggestX = Math.max(...element.points.map((p) => p[0]));
|
||||||
|
|
||||||
|
resizeSingleElement(
|
||||||
|
prevWidth + 20,
|
||||||
|
prevHeight,
|
||||||
|
element,
|
||||||
|
element,
|
||||||
|
h.app.scene.getNonDeletedElementsMap(),
|
||||||
|
h.app.scene.getNonDeletedElementsMap(),
|
||||||
|
"e",
|
||||||
|
{
|
||||||
|
shouldResizeFromCenter: true,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(element.width).toBeCloseTo(prevWidth + 20);
|
||||||
|
expect(element.height).toBeCloseTo(prevHeight);
|
||||||
|
|
||||||
|
expect(element.x).toBeCloseTo(prevX);
|
||||||
|
expect(element.y).toBeCloseTo(prevY);
|
||||||
|
|
||||||
|
const smallestX = Math.min(...element.points.map((p) => p[0]));
|
||||||
|
const biggestX = Math.max(...element.points.map((p) => p[0]));
|
||||||
|
|
||||||
|
expect(prevSmallestX - smallestX).toBeCloseTo(10);
|
||||||
|
expect(biggestX - prevBiggestX).toBeCloseTo(10);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe("arrow element", () => {
|
describe("arrow element", () => {
|
||||||
it("resizes with a label", async () => {
|
it("resizes with a label", async () => {
|
||||||
const arrow = UI.createElement("arrow", {
|
const arrow = UI.createElement("arrow", {
|
||||||
@@ -983,7 +1126,7 @@ describe("multiple selection", () => {
|
|||||||
expect(bottomArrowLabel.fontSize).toBeCloseTo(28 * scale);
|
expect(bottomArrowLabel.fontSize).toBeCloseTo(28 * scale);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("resizes with text elements", async () => {
|
it.only("resizes with text elements", async () => {
|
||||||
const topText = UI.createElement("text", { position: 0 });
|
const topText = UI.createElement("text", { position: 0 });
|
||||||
await UI.editText(topText, "lorem ipsum");
|
await UI.editText(topText, "lorem ipsum");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user