@plait/common 0.75.0-next.9 → 0.76.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core/element-ref.d.ts +1 -0
- package/esm2022/core/element-ref.mjs +3 -2
- package/esm2022/core/group.component.mjs +3 -3
- package/esm2022/generators/active.generator.mjs +12 -9
- package/esm2022/generators/generator.mjs +20 -14
- package/esm2022/image/image.generator.mjs +5 -5
- package/esm2022/plugins/with-group.mjs +22 -22
- package/esm2022/text/text-measure.mjs +31 -3
- package/fesm2022/plait-common.mjs +86 -49
- package/fesm2022/plait-common.mjs.map +1 -1
- package/generators/active.generator.d.ts +3 -2
- package/generators/generator.d.ts +1 -0
- package/package.json +1 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Node } from 'slate';
|
|
2
2
|
import { getLineHeightByFontSize } from '../utils/text';
|
|
3
|
+
import { IS_WINDOWS } from '@plait/core';
|
|
3
4
|
export function measureElement(element, options, containerMaxWidth = 10000) {
|
|
4
5
|
const canvas = document.createElement('canvas');
|
|
5
6
|
const ctx = canvas.getContext('2d');
|
|
@@ -30,8 +31,35 @@ export function measureElement(element, options, containerMaxWidth = 10000) {
|
|
|
30
31
|
lineTexts.forEach((text, index) => {
|
|
31
32
|
const font = getFont(text, { fontFamily: options.fontFamily, fontSize: options.fontSize });
|
|
32
33
|
ctx.font = font;
|
|
33
|
-
|
|
34
|
-
|
|
34
|
+
// Windows 平台下的特殊处理
|
|
35
|
+
if (IS_WINDOWS) {
|
|
36
|
+
let adjustedWidth = 0;
|
|
37
|
+
// 逐字符处理
|
|
38
|
+
for (let i = 0; i < text.text.length; i++) {
|
|
39
|
+
const char = text.text[i];
|
|
40
|
+
const charMetrics = ctx.measureText(char);
|
|
41
|
+
// 判断是否为汉字(通过 Unicode 范围)
|
|
42
|
+
if (/[\u4e00-\u9fa5]/.test(char)) {
|
|
43
|
+
adjustedWidth += charMetrics.width;
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
// 非汉字字符的宽度调整
|
|
47
|
+
if (/[a-zA-Z]/.test(char)) {
|
|
48
|
+
adjustedWidth += charMetrics.width + 1.5; // 字母
|
|
49
|
+
}
|
|
50
|
+
else if (/[0-9]/.test(char)) {
|
|
51
|
+
adjustedWidth += charMetrics.width + 1.5; // 数字
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
adjustedWidth += charMetrics.width + 0.8; // 其他符号
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
lineWidth += adjustedWidth;
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
lineWidth += ctx.measureText(text.text).width;
|
|
62
|
+
}
|
|
35
63
|
const isLast = index === lineTexts.length - 1;
|
|
36
64
|
// skip when text is empty and is not last text of line
|
|
37
65
|
if (text['font-size'] && (isLast || text.text !== '')) {
|
|
@@ -58,4 +86,4 @@ export function measureElement(element, options, containerMaxWidth = 10000) {
|
|
|
58
86
|
const getFont = (text, options) => {
|
|
59
87
|
return `${text.italic ? 'italic ' : ''} ${text.bold ? 'bold ' : ''} ${text['font-size'] || options.fontSize}px ${options.fontFamily} `;
|
|
60
88
|
};
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGV4dC1tZWFzdXJlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcGFja2FnZXMvY29tbW9uL3NyYy90ZXh0L3RleHQtbWVhc3VyZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sT0FBTyxDQUFDO0FBRTdCLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUV4RCxNQUFNLFVBQVUsY0FBYyxDQUMxQixPQUF5QixFQUN6QixPQUdDLEVBQ0Qsb0JBQTRCLEtBQUs7SUFFakMsTUFBTSxNQUFNLEdBQUcsUUFBUSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNoRCxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBNkIsQ0FBQztJQUNoRSxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3hDLE1BQU0sS0FBSyxHQUFtQixDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ25DLEtBQUssTUFBTSxTQUFTLElBQUksV0FBVyxFQUFFLENBQUM7UUFDbEMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLFNBQVMsQ0FBQztRQUN6QixNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3JDLE1BQU0sU0FBUyxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDekMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLGlCQUF5QixFQUFFLEtBQWEsRUFBRSxFQUFFO1lBQzNELE1BQU0sV0FBVyxHQUFHLEVBQUUsR0FBRyxJQUFJLEVBQUUsSUFBSSxFQUFFLGlCQUFpQixFQUFFLENBQUM7WUFDekQsSUFBSSxLQUFLLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0JBQ2QsTUFBTSxXQUFXLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQzVDLFdBQVcsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDbEMsQ0FBQztpQkFBTSxDQUFDO2dCQUNKLE1BQU0sT0FBTyxHQUFpQixFQUFFLENBQUM7Z0JBQ2pDLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7Z0JBQzFCLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDeEIsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUNELElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQztJQUNkLElBQUksTUFBTSxHQUFHLENBQUMsQ0FBQztJQUNmLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxTQUF1QixFQUFFLEtBQWEsRUFBRSxFQUFFO1FBQ3JELElBQUksU0FBUyxHQUFHLENBQUMsQ0FBQztRQUNsQixJQUFJLGFBQWEsR0FBRyx1QkFBdUIsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDOUQsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQWdCLEVBQUUsS0FBYSxFQUFFLEVBQUU7WUFDbEQsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksRUFBRSxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQUMsVUFBVSxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztZQUMzRixHQUFHLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztZQUNoQixNQUFNLFdBQVcsR0FBRyxHQUFHLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUMvQyxTQUFTLElBQUksV0FBVyxDQUFDLEtBQUssQ0FBQztZQUMvQixNQUFNLE1BQU0sR0FBRyxLQUFLLEtBQUssU0FBUyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUM7WUFDOUMsdURBQXVEO1lBQ3ZELElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsTUFBTSxJQUFJLElBQUksQ0FBQyxJQUFJLEtBQUssRUFBRSxDQUFDLEVBQUUsQ0FBQztnQkFDcEQsTUFBTSxVQUFVLEdBQUcsdUJBQXVCLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQzFFLElBQUksVUFBVSxHQUFHLGFBQWEsRUFBRSxDQUFDO29CQUM3QixhQUFhLEdBQUcsVUFBVSxDQUFDO2dCQUMvQixDQUFDO1lBQ0wsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxTQUFTLElBQUksaUJBQWlCLEVBQUUsQ0FBQztZQUNqQyxJQUFJLFNBQVMsR0FBRyxLQUFLLEVBQUUsQ0FBQztnQkFDcEIsS0FBSyxHQUFHLFNBQVMsQ0FBQztZQUN0QixDQUFDO1lBQ0QsTUFBTSxJQUFJLGFBQWEsQ0FBQztRQUM1QixDQUFDO2FBQU0sQ0FBQztZQUNKLEtBQUssR0FBRyxpQkFBaUIsQ0FBQztZQUMxQixNQUFNLGNBQWMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsR0FBRyxpQkFBaUIsQ0FBQyxDQUFDO1lBQ2hFLE1BQU0sSUFBSSxhQUFhLEdBQUcsY0FBYyxDQUFDO1FBQzdDLENBQUM7SUFDTCxDQUFDLENBQUMsQ0FBQztJQUNILE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFDN0IsQ0FBQztBQUVELE1BQU0sT0FBTyxHQUFHLENBQ1osSUFBZ0IsRUFDaEIsT0FHQyxFQUNILEVBQUU7SUFDQSxPQUFPLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxRQUFRLE1BQU0sT0FBTyxDQUFDLFVBQVUsR0FBRyxDQUFDO0FBQzNJLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5vZGUgfSBmcm9tICdzbGF0ZSc7XG5pbXBvcnQgeyBDdXN0b21UZXh0LCBQYXJhZ3JhcGhFbGVtZW50IH0gZnJvbSAnLi90eXBlcyc7XG5pbXBvcnQgeyBnZXRMaW5lSGVpZ2h0QnlGb250U2l6ZSB9IGZyb20gJy4uL3V0aWxzL3RleHQnO1xuXG5leHBvcnQgZnVuY3Rpb24gbWVhc3VyZUVsZW1lbnQoXG4gICAgZWxlbWVudDogUGFyYWdyYXBoRWxlbWVudCxcbiAgICBvcHRpb25zOiB7XG4gICAgICAgIGZvbnRTaXplOiBudW1iZXI7XG4gICAgICAgIGZvbnRGYW1pbHk6IHN0cmluZztcbiAgICB9LFxuICAgIGNvbnRhaW5lck1heFdpZHRoOiBudW1iZXIgPSAxMDAwMFxuKSB7XG4gICAgY29uc3QgY2FudmFzID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnY2FudmFzJyk7XG4gICAgY29uc3QgY3R4ID0gY2FudmFzLmdldENvbnRleHQoJzJkJykgYXMgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEO1xuICAgIGNvbnN0IHRleHRFbnRyaWVzID0gTm9kZS50ZXh0cyhlbGVtZW50KTtcbiAgICBjb25zdCBsaW5lczogQ3VzdG9tVGV4dFtdW10gPSBbW11dO1xuICAgIGZvciAoY29uc3QgdGV4dEVudHJ5IG9mIHRleHRFbnRyaWVzKSB7XG4gICAgICAgIGNvbnN0IFt0ZXh0XSA9IHRleHRFbnRyeTtcbiAgICAgICAgY29uc3QgdGV4dFN0cmluZyA9IE5vZGUuc3RyaW5nKHRleHQpO1xuICAgICAgICBjb25zdCB0ZXh0QXJyYXkgPSB0ZXh0U3RyaW5nLnNwbGl0KCdcXG4nKTtcbiAgICAgICAgdGV4dEFycmF5LmZvckVhY2goKHNlZ21lbnRUZXh0U3RyaW5nOiBzdHJpbmcsIGluZGV4OiBudW1iZXIpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHNlZ21lbnRUZXh0ID0geyAuLi50ZXh0LCB0ZXh0OiBzZWdtZW50VGV4dFN0cmluZyB9O1xuICAgICAgICAgICAgaWYgKGluZGV4ID09PSAwKSB7XG4gICAgICAgICAgICAgICAgY29uc3QgY3VycmVudExpbmUgPSBsaW5lc1tsaW5lcy5sZW5ndGggLSAxXTtcbiAgICAgICAgICAgICAgICBjdXJyZW50TGluZS5wdXNoKHNlZ21lbnRUZXh0KTtcbiAgICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICAgICAgY29uc3QgbmV3TGluZTogQ3VzdG9tVGV4dFtdID0gW107XG4gICAgICAgICAgICAgICAgbmV3TGluZS5wdXNoKHNlZ21lbnRUZXh0KTtcbiAgICAgICAgICAgICAgICBsaW5lcy5wdXNoKG5ld0xpbmUpO1xuICAgICAgICAgICAgfVxuICAgICAgICB9KTtcbiAgICB9XG4gICAgbGV0IHdpZHRoID0gMDtcbiAgICBsZXQgaGVpZ2h0ID0gMDtcbiAgICBsaW5lcy5mb3JFYWNoKChsaW5lVGV4dHM6IEN1c3RvbVRleHRbXSwgaW5kZXg6IG51bWJlcikgPT4ge1xuICAgICAgICBsZXQgbGluZVdpZHRoID0gMDtcbiAgICAgICAgbGV0IG1heExpbmVIZWlnaHQgPSBnZXRMaW5lSGVpZ2h0QnlGb250U2l6ZShvcHRpb25zLmZvbnRTaXplKTtcbiAgICAgICAgbGluZVRleHRzLmZvckVhY2goKHRleHQ6IEN1c3RvbVRleHQsIGluZGV4OiBudW1iZXIpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IGZvbnQgPSBnZXRGb250KHRleHQsIHsgZm9udEZhbWlseTogb3B0aW9ucy5mb250RmFtaWx5LCBmb250U2l6ZTogb3B0aW9ucy5mb250U2l6ZSB9KTtcbiAgICAgICAgICAgIGN0eC5mb250ID0gZm9udDtcbiAgICAgICAgICAgIGNvbnN0IHRleHRNZXRyaWNzID0gY3R4Lm1lYXN1cmVUZXh0KHRleHQudGV4dCk7XG4gICAgICAgICAgICBsaW5lV2lkdGggKz0gdGV4dE1ldHJpY3Mud2lkdGg7XG4gICAgICAgICAgICBjb25zdCBpc0xhc3QgPSBpbmRleCA9PT0gbGluZVRleHRzLmxlbmd0aCAtIDE7XG4gICAgICAgICAgICAvLyBza2lwIHdoZW4gdGV4dCBpcyBlbXB0eSBhbmQgaXMgbm90IGxhc3QgdGV4dCBvZiBsaW5lXG4gICAgICAgICAgICBpZiAodGV4dFsnZm9udC1zaXplJ10gJiYgKGlzTGFzdCB8fCB0ZXh0LnRleHQgIT09ICcnKSkge1xuICAgICAgICAgICAgICAgIGNvbnN0IGxpbmVIZWlnaHQgPSBnZXRMaW5lSGVpZ2h0QnlGb250U2l6ZShwYXJzZUZsb2F0KHRleHRbJ2ZvbnQtc2l6ZSddKSk7XG4gICAgICAgICAgICAgICAgaWYgKGxpbmVIZWlnaHQgPiBtYXhMaW5lSGVpZ2h0KSB7XG4gICAgICAgICAgICAgICAgICAgIG1heExpbmVIZWlnaHQgPSBsaW5lSGVpZ2h0O1xuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgIH1cbiAgICAgICAgfSk7XG4gICAgICAgIGlmIChsaW5lV2lkdGggPD0gY29udGFpbmVyTWF4V2lkdGgpIHtcbiAgICAgICAgICAgIGlmIChsaW5lV2lkdGggPiB3aWR0aCkge1xuICAgICAgICAgICAgICAgIHdpZHRoID0gbGluZVdpZHRoO1xuICAgICAgICAgICAgfVxuICAgICAgICAgICAgaGVpZ2h0ICs9IG1heExpbmVIZWlnaHQ7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICB3aWR0aCA9IGNvbnRhaW5lck1heFdpZHRoO1xuICAgICAgICAgICAgY29uc3QgbGluZVdyYXBOdW1iZXIgPSBNYXRoLmNlaWwobGluZVdpZHRoIC8gY29udGFpbmVyTWF4V2lkdGgpO1xuICAgICAgICAgICAgaGVpZ2h0ICs9IG1heExpbmVIZWlnaHQgKiBsaW5lV3JhcE51bWJlcjtcbiAgICAgICAgfVxuICAgIH0pO1xuICAgIHJldHVybiB7IHdpZHRoLCBoZWlnaHQgfTtcbn1cblxuY29uc3QgZ2V0Rm9udCA9IChcbiAgICB0ZXh0OiBDdXN0b21UZXh0LFxuICAgIG9wdGlvbnM6IHtcbiAgICAgICAgZm9udFNpemU6IG51bWJlcjtcbiAgICAgICAgZm9udEZhbWlseTogc3RyaW5nO1xuICAgIH1cbikgPT4ge1xuICAgIHJldHVybiBgJHt0ZXh0Lml0YWxpYyA/ICdpdGFsaWMgJyA6ICcnfSAke3RleHQuYm9sZCA/ICdib2xkICcgOiAnJ30gJHt0ZXh0Wydmb250LXNpemUnXSB8fCBvcHRpb25zLmZvbnRTaXplfXB4ICR7b3B0aW9ucy5mb250RmFtaWx5fSBgO1xufTtcbiJdfQ==
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"text-measure.js","sourceRoot":"","sources":["../../../../packages/common/src/text/text-measure.ts"],"names":[],"mappings":"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","sourcesContent":["import { Node } from 'slate';\nimport { CustomText, ParagraphElement } from './types';\nimport { getLineHeightByFontSize } from '../utils/text';\nimport { IS_WINDOWS } from '@plait/core';\n\nexport function measureElement(\n    element: ParagraphElement,\n    options: {\n        fontSize: number;\n        fontFamily: string;\n    },\n    containerMaxWidth: number = 10000\n) {\n    const canvas = document.createElement('canvas');\n    const ctx = canvas.getContext('2d') as CanvasRenderingContext2D;\n    const textEntries = Node.texts(element);\n    const lines: CustomText[][] = [[]];\n    for (const textEntry of textEntries) {\n        const [text] = textEntry;\n        const textString = Node.string(text);\n        const textArray = textString.split('\\n');\n        textArray.forEach((segmentTextString: string, index: number) => {\n            const segmentText = { ...text, text: segmentTextString };\n            if (index === 0) {\n                const currentLine = lines[lines.length - 1];\n                currentLine.push(segmentText);\n            } else {\n                const newLine: CustomText[] = [];\n                newLine.push(segmentText);\n                lines.push(newLine);\n            }\n        });\n    }\n    let width = 0;\n    let height = 0;\n    lines.forEach((lineTexts: CustomText[], index: number) => {\n        let lineWidth = 0;\n        let maxLineHeight = getLineHeightByFontSize(options.fontSize);\n        lineTexts.forEach((text: CustomText, index: number) => {\n            const font = getFont(text, { fontFamily: options.fontFamily, fontSize: options.fontSize });\n            ctx.font = font;\n            \n            // Windows 平台下的特殊处理\n            if (IS_WINDOWS) {\n                let adjustedWidth = 0;\n                // 逐字符处理\n                for (let i = 0; i < text.text.length; i++) {\n                    const char = text.text[i];\n                    const charMetrics = ctx.measureText(char);\n                    // 判断是否为汉字（通过 Unicode 范围）\n                    if (/[\\u4e00-\\u9fa5]/.test(char)) {\n                        adjustedWidth += charMetrics.width;\n                    } else {\n                        // 非汉字字符的宽度调整\n                        if (/[a-zA-Z]/.test(char)) {\n                            adjustedWidth += charMetrics.width + 1.5; // 字母\n                        } else if (/[0-9]/.test(char)) {\n                            adjustedWidth += charMetrics.width + 1.5; // 数字\n                        } else {\n                            adjustedWidth += charMetrics.width + 0.8; // 其他符号\n                        }\n                    }\n                }\n                lineWidth += adjustedWidth;\n            } else {\n                lineWidth += ctx.measureText(text.text).width;\n            }\n\n            const isLast = index === lineTexts.length - 1;\n            // skip when text is empty and is not last text of line\n            if (text['font-size'] && (isLast || text.text !== '')) {\n                const lineHeight = getLineHeightByFontSize(parseFloat(text['font-size']));\n                if (lineHeight > maxLineHeight) {\n                    maxLineHeight = lineHeight;\n                }\n            }\n        });\n        if (lineWidth <= containerMaxWidth) {\n            if (lineWidth > width) {\n                width = lineWidth;\n            }\n            height += maxLineHeight;\n        } else {\n            width = containerMaxWidth;\n            const lineWrapNumber = Math.ceil(lineWidth / containerMaxWidth);\n            height += maxLineHeight * lineWrapNumber;\n        }\n    });\n    return { width, height };\n}\n\nconst getFont = (\n    text: CustomText,\n    options: {\n        fontSize: number;\n        fontFamily: string;\n    }\n) => {\n    return `${text.italic ? 'italic ' : ''} ${text.bold ? 'bold ' : ''} ${text['font-size'] || options.fontSize}px ${options.fontFamily} `;\n};\n"]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PlaitGroupElement, getSelectionAngle, getElementsInGroup, setAngleForG,
|
|
1
|
+
import { RectangleClient, toActiveRectangleFromViewBoxRectangle, PlaitGroupElement, getSelectionAngle, getElementsInGroup, setAngleForG, drawCircle, PlaitBoard, RESIZE_HANDLE_CLASS_NAME, DEFAULT_COLOR, createG, setStrokeLinecap, drawRectangle, ACTIVE_STROKE_WIDTH, SELECTION_RECTANGLE_CLASS_NAME, ResizeCursorClass, RESIZE_CURSORS, setDragging, rotatePoints, isSelectionMoving, getSelectedElements, distanceBetweenPointAndPoint, Point, Direction, hotkeys, PlaitElement, createDebugGenerator, idCreator, Transforms, createForeignObject, updateForeignObject, getHighestSelectedElements, getRectangleByElements, MERGING, PlaitPointerType, isMainPointer, toViewBoxPoint, toHostPoint, PRESS_AND_MOVE_BUFFER, isDragging, throttleRAF, getRectangleByGroup, ElementFlavour, isSelectedElementOrGroup, Selection, isMovingElements, getHitElementsBySelection, createGroupRectangleG, getSelectedGroups, getHighestSelectedGroups, getSelectedIsolatedElements, getSelectedIsolatedElementsCanAddToGroup, getGroupByElement, IS_WINDOWS, updateForeignObjectWidth, IS_TEXT_EDITABLE } from '@plait/core';
|
|
2
2
|
import { isKeyHotkey } from 'is-hotkey';
|
|
3
3
|
import { Node, Operation, Transforms as Transforms$1, Range, Editor } from 'slate';
|
|
4
4
|
import { fromEvent, timer } from 'rxjs';
|
|
@@ -65,18 +65,24 @@ class Generator {
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
this.g = g;
|
|
68
|
-
const
|
|
69
|
-
if (
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
68
|
+
const rectangle = this.board.getRectangle(element);
|
|
69
|
+
if (!rectangle) {
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
let centerPoint = RectangleClient.getCenterPoint(rectangle);
|
|
73
|
+
if (this.options?.active) {
|
|
74
|
+
const activeRectangle = toActiveRectangleFromViewBoxRectangle(this.board, rectangle);
|
|
75
|
+
centerPoint = RectangleClient.getCenterPoint(activeRectangle);
|
|
76
|
+
}
|
|
77
|
+
let angle;
|
|
78
|
+
if (PlaitGroupElement.isGroup(element)) {
|
|
79
|
+
angle = getSelectionAngle(getElementsInGroup(this.board, element, true));
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
angle = element.angle;
|
|
83
|
+
}
|
|
84
|
+
if (angle) {
|
|
85
|
+
setAngleForG(g, centerPoint, angle);
|
|
80
86
|
}
|
|
81
87
|
}
|
|
82
88
|
else {
|
|
@@ -147,10 +153,13 @@ const drawRotateHandle = (board, rectangle) => {
|
|
|
147
153
|
return handleG;
|
|
148
154
|
};
|
|
149
155
|
|
|
156
|
+
const createActiveGenerator = (board, options) => {
|
|
157
|
+
return new ActiveGenerator(board, { ...options, active: true });
|
|
158
|
+
};
|
|
150
159
|
class ActiveGenerator extends Generator {
|
|
151
160
|
static { this.key = 'active-generator'; }
|
|
152
161
|
constructor(board, options) {
|
|
153
|
-
super(board, options);
|
|
162
|
+
super(board, { ...options, active: true });
|
|
154
163
|
this.board = board;
|
|
155
164
|
this.options = options;
|
|
156
165
|
this.hasResizeHandle = false;
|
|
@@ -165,12 +174,12 @@ class ActiveGenerator extends Generator {
|
|
|
165
174
|
}
|
|
166
175
|
draw(element, data) {
|
|
167
176
|
const activeG = createG();
|
|
168
|
-
const
|
|
169
|
-
const delta = this.options.getStrokeWidth();
|
|
170
|
-
const
|
|
171
|
-
const strokeG = drawRectangle(this.board,
|
|
177
|
+
const activeRectangle = toActiveRectangleFromViewBoxRectangle(this.board, this.options.getRectangle(element));
|
|
178
|
+
const delta = this.options.getStrokeWidth() * this.board.viewport.zoom;
|
|
179
|
+
const activeRectangleWithDelta = RectangleClient.inflate(activeRectangle, delta);
|
|
180
|
+
const strokeG = drawRectangle(this.board, activeRectangleWithDelta, {
|
|
172
181
|
stroke: PRIMARY_COLOR,
|
|
173
|
-
strokeWidth:
|
|
182
|
+
strokeWidth: ACTIVE_STROKE_WIDTH
|
|
174
183
|
});
|
|
175
184
|
activeG.append(strokeG);
|
|
176
185
|
strokeG.classList.add(SELECTION_RECTANGLE_CLASS_NAME);
|
|
@@ -178,7 +187,7 @@ class ActiveGenerator extends Generator {
|
|
|
178
187
|
if (this.options.hasResizeHandle()) {
|
|
179
188
|
this.hasResizeHandle = true;
|
|
180
189
|
// draw resize handle
|
|
181
|
-
RectangleClient.getCornerPoints(
|
|
190
|
+
RectangleClient.getCornerPoints(activeRectangleWithDelta).forEach((corner) => {
|
|
182
191
|
const cornerHandleG = drawHandle(this.board, corner);
|
|
183
192
|
activeG.append(cornerHandleG);
|
|
184
193
|
});
|
|
@@ -1362,7 +1371,7 @@ class ImageGenerator extends Generator {
|
|
|
1362
1371
|
}
|
|
1363
1372
|
};
|
|
1364
1373
|
this.imageComponentRef = this.board.renderImage(this.foreignObject, props);
|
|
1365
|
-
this.activeGenerator =
|
|
1374
|
+
this.activeGenerator = createActiveGenerator(this.board, {
|
|
1366
1375
|
getStrokeWidth: () => {
|
|
1367
1376
|
const selectedElements = getSelectedElements(this.board);
|
|
1368
1377
|
if (!(selectedElements.length === 1 && !isSelectionMoving(this.board))) {
|
|
@@ -1409,12 +1418,12 @@ class ImageGenerator extends Generator {
|
|
|
1409
1418
|
if (currentForeignObject && current.angle) {
|
|
1410
1419
|
setAngleForG(this.g, RectangleClient.getCenterPoint(currentForeignObject), current.angle);
|
|
1411
1420
|
}
|
|
1412
|
-
const activeG = PlaitBoard.
|
|
1421
|
+
const activeG = PlaitBoard.getActiveHost(this.board);
|
|
1413
1422
|
this.activeGenerator.processDrawing(current, activeG, { selected: this.isFocus });
|
|
1414
1423
|
}
|
|
1415
1424
|
setFocus(element, isFocus) {
|
|
1416
1425
|
this.isFocus = isFocus;
|
|
1417
|
-
const activeG = PlaitBoard.
|
|
1426
|
+
const activeG = PlaitBoard.getActiveHost(this.board);
|
|
1418
1427
|
this.activeGenerator.processDrawing(element, activeG, { selected: isFocus });
|
|
1419
1428
|
const props = {
|
|
1420
1429
|
isFocus
|
|
@@ -1727,6 +1736,7 @@ class PlaitCommonElementRef {
|
|
|
1727
1736
|
constructor() {
|
|
1728
1737
|
this.textManages = [];
|
|
1729
1738
|
this.generatorMap = new Map();
|
|
1739
|
+
this.updateActiveSection = () => { };
|
|
1730
1740
|
}
|
|
1731
1741
|
addGenerator(key, generator) {
|
|
1732
1742
|
this.generatorMap.set(key, generator);
|
|
@@ -1747,7 +1757,7 @@ class PlaitCommonElementRef {
|
|
|
1747
1757
|
return this.textManages;
|
|
1748
1758
|
}
|
|
1749
1759
|
destroyTextManage() {
|
|
1750
|
-
this.textManages.forEach(textManage => {
|
|
1760
|
+
this.textManages.forEach((textManage) => {
|
|
1751
1761
|
textManage.destroy();
|
|
1752
1762
|
});
|
|
1753
1763
|
this.textManages = [];
|
|
@@ -1765,7 +1775,7 @@ class GroupComponent extends CommonElementFlavour {
|
|
|
1765
1775
|
super();
|
|
1766
1776
|
}
|
|
1767
1777
|
initializeGenerator() {
|
|
1768
|
-
this.activeGenerator =
|
|
1778
|
+
this.activeGenerator = createActiveGenerator(this.board, {
|
|
1769
1779
|
getRectangle: (element) => {
|
|
1770
1780
|
return getRectangleByGroup(this.board, element);
|
|
1771
1781
|
},
|
|
@@ -1818,7 +1828,7 @@ function withGroup(board) {
|
|
|
1818
1828
|
const hitElements = getHitElementsBySelection(board, selection);
|
|
1819
1829
|
if (hitElements.length) {
|
|
1820
1830
|
groupRectangleG = createGroupRectangleG(board, hitElements);
|
|
1821
|
-
groupRectangleG && PlaitBoard.
|
|
1831
|
+
groupRectangleG && PlaitBoard.getElementTopHost(board).append(groupRectangleG);
|
|
1822
1832
|
}
|
|
1823
1833
|
}
|
|
1824
1834
|
});
|
|
@@ -1839,13 +1849,13 @@ function withGroup(board) {
|
|
|
1839
1849
|
elements = new Array(clipboardData?.elements?.length);
|
|
1840
1850
|
const groups = getHighestSelectedGroups(board, clipboardData?.elements);
|
|
1841
1851
|
const selectedIsolatedElements = getSelectedIsolatedElements(board, clipboardData?.elements);
|
|
1842
|
-
selectedIsolatedElements.forEach(item => {
|
|
1843
|
-
const index = clipboardData.elements.map(element => element.id).indexOf(item.id);
|
|
1852
|
+
selectedIsolatedElements.forEach((item) => {
|
|
1853
|
+
const index = clipboardData.elements.map((element) => element.id).indexOf(item.id);
|
|
1844
1854
|
elements.splice(index, 1, !item.groupId ? item : updateGroupId(item, undefined));
|
|
1845
1855
|
});
|
|
1846
1856
|
if (groups.length) {
|
|
1847
|
-
groups.forEach(item => {
|
|
1848
|
-
const index = clipboardData.elements.map(element => element.id).indexOf(item.id);
|
|
1857
|
+
groups.forEach((item) => {
|
|
1858
|
+
const index = clipboardData.elements.map((element) => element.id).indexOf(item.id);
|
|
1849
1859
|
const newGroup = { ...updateGroupId(item, undefined), id: idCreator() };
|
|
1850
1860
|
elements.splice(index, 1, newGroup);
|
|
1851
1861
|
updateElementsGroupId(item, clipboardData.elements, newGroup.id, elements);
|
|
@@ -1854,8 +1864,8 @@ function withGroup(board) {
|
|
|
1854
1864
|
clipboardData.elements = elements;
|
|
1855
1865
|
}
|
|
1856
1866
|
insertFragment(clipboardData, targetPoint, operationType);
|
|
1857
|
-
const groupElements = elements?.filter(value => PlaitGroupElement.isGroup(value));
|
|
1858
|
-
groupElements.forEach(element => {
|
|
1867
|
+
const groupElements = elements?.filter((value) => PlaitGroupElement.isGroup(value));
|
|
1868
|
+
groupElements.forEach((element) => {
|
|
1859
1869
|
Transforms.insertNode(board, element, [board.children.length]);
|
|
1860
1870
|
});
|
|
1861
1871
|
};
|
|
@@ -1903,10 +1913,10 @@ const updateGroupId = (element, groupId) => {
|
|
|
1903
1913
|
};
|
|
1904
1914
|
};
|
|
1905
1915
|
const updateElementsGroupId = (group, clipboardDataElements, newGroupId, elements) => {
|
|
1906
|
-
const elementsInGroup = clipboardDataElements.filter(item => item.groupId === group.id);
|
|
1916
|
+
const elementsInGroup = clipboardDataElements.filter((item) => item.groupId === group.id);
|
|
1907
1917
|
if (elementsInGroup.length) {
|
|
1908
|
-
elementsInGroup.forEach(item => {
|
|
1909
|
-
const index = clipboardDataElements.map(item => item.id).indexOf(item.id);
|
|
1918
|
+
elementsInGroup.forEach((item) => {
|
|
1919
|
+
const index = clipboardDataElements.map((item) => item.id).indexOf(item.id);
|
|
1910
1920
|
if (PlaitGroupElement.isGroup(item)) {
|
|
1911
1921
|
const newGroup = { ...updateGroupId(item, newGroupId), id: idCreator() };
|
|
1912
1922
|
elements.splice(index, 1, newGroup);
|
|
@@ -1925,11 +1935,11 @@ const getRemoveGroups = (board) => {
|
|
|
1925
1935
|
const highestSelectedGroups = getHighestSelectedGroups(board);
|
|
1926
1936
|
const selectedIsolatedElements = getSelectedIsolatedElementsCanAddToGroup(board);
|
|
1927
1937
|
const removeNodes = [...highestSelectedGroups, ...selectedIsolatedElements];
|
|
1928
|
-
removeNodes.forEach(item => {
|
|
1938
|
+
removeNodes.forEach((item) => {
|
|
1929
1939
|
const hitElementGroups = getGroupByElement(board, item, true);
|
|
1930
1940
|
if (hitElementGroups.length) {
|
|
1931
1941
|
const elementsInGroup = getElementsInGroup(board, hitElementGroups[0], false, true);
|
|
1932
|
-
const siblingElements = elementsInGroup.filter(element => ![...removeNodes, ...removeGroups].map(item => item.id).includes(element.id));
|
|
1942
|
+
const siblingElements = elementsInGroup.filter((element) => ![...removeNodes, ...removeGroups].map((item) => item.id).includes(element.id));
|
|
1933
1943
|
if (siblingElements.length === 1 || siblingElements.length === 0) {
|
|
1934
1944
|
if (!removeGroups.includes(hitElementGroups[0])) {
|
|
1935
1945
|
removeGroups.push(hitElementGroups[0]);
|
|
@@ -1942,9 +1952,9 @@ const getRemoveGroups = (board) => {
|
|
|
1942
1952
|
]);
|
|
1943
1953
|
let index = hitElementGroups.length;
|
|
1944
1954
|
if (aboveGroup) {
|
|
1945
|
-
index = hitElementGroups.findIndex(item => item.id === aboveGroup.id);
|
|
1955
|
+
index = hitElementGroups.findIndex((item) => item.id === aboveGroup.id);
|
|
1946
1956
|
}
|
|
1947
|
-
[...hitElementGroups.slice(1, index)].forEach(item => {
|
|
1957
|
+
[...hitElementGroups.slice(1, index)].forEach((item) => {
|
|
1948
1958
|
if (!removeGroups.includes(item)) {
|
|
1949
1959
|
removeGroups.push(item);
|
|
1950
1960
|
}
|
|
@@ -1960,7 +1970,7 @@ const findAboveGroupWithAnotherElement = (board, groups, excludeNodes) => {
|
|
|
1960
1970
|
let group = null;
|
|
1961
1971
|
for (let i = 0; i < groups.length; i++) {
|
|
1962
1972
|
const elementsInGroup = getElementsInGroup(board, groups[i], false, true);
|
|
1963
|
-
const siblingElements = elementsInGroup.filter(element => !excludeNodes.map(item => item.id).includes(element.id));
|
|
1973
|
+
const siblingElements = elementsInGroup.filter((element) => !excludeNodes.map((item) => item.id).includes(element.id));
|
|
1964
1974
|
if (siblingElements.length > 0) {
|
|
1965
1975
|
group = groups[i];
|
|
1966
1976
|
break;
|
|
@@ -1971,16 +1981,16 @@ const findAboveGroupWithAnotherElement = (board, groups, excludeNodes) => {
|
|
|
1971
1981
|
const updateSiblingElementGroupId = (board, removeGroups) => {
|
|
1972
1982
|
const selectedIsolatedElements = getSelectedIsolatedElementsCanAddToGroup(board);
|
|
1973
1983
|
const highestSelectedGroups = getHighestSelectedGroups(board);
|
|
1974
|
-
const isolatedElementsInGroup = selectedIsolatedElements.filter(item => item.groupId);
|
|
1975
|
-
[...highestSelectedGroups, ...isolatedElementsInGroup].forEach(item => {
|
|
1984
|
+
const isolatedElementsInGroup = selectedIsolatedElements.filter((item) => item.groupId);
|
|
1985
|
+
[...highestSelectedGroups, ...isolatedElementsInGroup].forEach((item) => {
|
|
1976
1986
|
const hitElementGroups = getGroupByElement(board, item, true);
|
|
1977
1987
|
if (hitElementGroups.length) {
|
|
1978
1988
|
const elementsInGroup = getElementsInGroup(board, hitElementGroups[0], false, true);
|
|
1979
|
-
const siblingElements = elementsInGroup.filter(element => element.id !== item.id);
|
|
1989
|
+
const siblingElements = elementsInGroup.filter((element) => element.id !== item.id);
|
|
1980
1990
|
if (siblingElements.length === 1) {
|
|
1981
|
-
const removeGroupIds = removeGroups.map(item => item.id);
|
|
1982
|
-
if (hitElementGroups.some(group => removeGroupIds.includes(group.id))) {
|
|
1983
|
-
const group = hitElementGroups.find(group => !removeGroupIds.includes(group.id));
|
|
1991
|
+
const removeGroupIds = removeGroups.map((item) => item.id);
|
|
1992
|
+
if (hitElementGroups.some((group) => removeGroupIds.includes(group.id))) {
|
|
1993
|
+
const group = hitElementGroups.find((group) => !removeGroupIds.includes(group.id));
|
|
1984
1994
|
const path = PlaitBoard.findPath(board, siblingElements[0]);
|
|
1985
1995
|
Transforms.setNode(board, { groupId: group?.id || undefined }, path);
|
|
1986
1996
|
}
|
|
@@ -2028,8 +2038,35 @@ function measureElement(element, options, containerMaxWidth = 10000) {
|
|
|
2028
2038
|
lineTexts.forEach((text, index) => {
|
|
2029
2039
|
const font = getFont(text, { fontFamily: options.fontFamily, fontSize: options.fontSize });
|
|
2030
2040
|
ctx.font = font;
|
|
2031
|
-
|
|
2032
|
-
|
|
2041
|
+
// Windows 平台下的特殊处理
|
|
2042
|
+
if (IS_WINDOWS) {
|
|
2043
|
+
let adjustedWidth = 0;
|
|
2044
|
+
// 逐字符处理
|
|
2045
|
+
for (let i = 0; i < text.text.length; i++) {
|
|
2046
|
+
const char = text.text[i];
|
|
2047
|
+
const charMetrics = ctx.measureText(char);
|
|
2048
|
+
// 判断是否为汉字(通过 Unicode 范围)
|
|
2049
|
+
if (/[\u4e00-\u9fa5]/.test(char)) {
|
|
2050
|
+
adjustedWidth += charMetrics.width;
|
|
2051
|
+
}
|
|
2052
|
+
else {
|
|
2053
|
+
// 非汉字字符的宽度调整
|
|
2054
|
+
if (/[a-zA-Z]/.test(char)) {
|
|
2055
|
+
adjustedWidth += charMetrics.width + 1.5; // 字母
|
|
2056
|
+
}
|
|
2057
|
+
else if (/[0-9]/.test(char)) {
|
|
2058
|
+
adjustedWidth += charMetrics.width + 1.5; // 数字
|
|
2059
|
+
}
|
|
2060
|
+
else {
|
|
2061
|
+
adjustedWidth += charMetrics.width + 0.8; // 其他符号
|
|
2062
|
+
}
|
|
2063
|
+
}
|
|
2064
|
+
}
|
|
2065
|
+
lineWidth += adjustedWidth;
|
|
2066
|
+
}
|
|
2067
|
+
else {
|
|
2068
|
+
lineWidth += ctx.measureText(text.text).width;
|
|
2069
|
+
}
|
|
2033
2070
|
const isLast = index === lineTexts.length - 1;
|
|
2034
2071
|
// skip when text is empty and is not last text of line
|
|
2035
2072
|
if (text['font-size'] && (isLast || text.text !== '')) {
|
|
@@ -2231,5 +2268,5 @@ const withImage = (board) => {
|
|
|
2231
2268
|
* Generated bundle index. Do not edit.
|
|
2232
2269
|
*/
|
|
2233
2270
|
|
|
2234
|
-
export { AStar, ActiveGenerator, AlignTransform, Alignment, BASE, BoardCreationMode, CommonElementFlavour, DEFAULT_FILL, DEFAULT_FONT_FAMILY, DEFAULT_ROUTE_MARGIN, FOREIGN_OBJECT_IMAGE_CLASS_NAME, Generator, GroupComponent, IS_RESIZING, IS_ROTATING, ImageBaseComponent, ImageGenerator, MediaKeys, PICTURE_ACCEPTED_UPLOAD_SIZE, PRIMARY_COLOR, PlaitCommonElementRef, PointGraph, PointNode, PriorityQueue, PropertyTransforms, RESIZE_HANDLE_DIAMETER, ROTATE_HANDLE_DISTANCE_TO_ELEMENT, ROTATE_HANDLE_SIZE, ResizeHandle, StrokeStyle, TRANSPARENT, TextManage, WithCommonPluginKey, WithTextPluginKey, acceptImageTypes, addElementOfFocusedImage, addResizing, addRotating, alignBottom, alignHorizontalCenter, alignLeft, alignRight, alignTop, alignVerticalCenter, animate, buildClipboardData, buildCompositionData, buildImage, buildText, calculatePolylineLength, createGraph, distributeHorizontal, distributeVertical, drawFillPrimaryHandle, drawHandle, drawPrimaryHandle, drawRotateHandle, findFirstTextEditor, generateElbowLineRoute, getCreationMode, getCrossingPointsBetweenPointAndSegment, getDirectionBetweenPointAndPoint, getDirectionByPointOfRectangle, getDirectionByVector, getDirectionFactor, getDirectionFactorByDirectionComponent, getEditingTextEditor, getElementArea, getElementOfFocusedImage, getElementsText, getExtendPoint, getFirstTextEditor, getFirstTextManage, getGraphPoints, getIndexByResizeHandle, getLineHeightByFontSize, getMemorizedLatest, getNextPoint, getOppositeDirection, getPointByVectorComponent, getPointByVectorDirectionComponent, getPointOnPolyline, getPoints, getRatioByPoint, getRectangleResizeHandleRefs, getResizeHandleByIndex, getResizeHandlePointByIndex, getRotatedResizeCursorClassByAngle, getSourceAndTargetOuterRectangle, getStrokeLineDash, getSymmetricHandleIndex, getTextEditors, getTextEditorsByElement, getTextManages, getTimestamp, getUnitVectorByPointAndPoint, hasAfterDraw, hasMoreThanOnePoint, hasResizeHandle, insertClipboardData, isCornerHandle, isDelete, isDndMode, isDrawingMode, isEdgeHandle, isEnterHotkey, isExpandHotkey, isFilled, isPointOnSegment, isResizing, isResizingByCondition, isRotating, isSourceAndTargetIntersect, isSpaceHotkey, isTabHotkey, isVirtualKey, linear, measureElement, memorizeLatest, normalizeShapePoints, reduceRouteMargin, removeDuplicatePoints, removeElementOfFocusedImage, removeResizing, removeRotating, resetPointsAfterResize, rotateVector, rotateVectorAnti90, routeAdjust, selectImage, setCreationMode, setProperty, simplifyOrthogonalPoints, sortElementsByArea, withGroup, withImage, withResize, withText };
|
|
2271
|
+
export { AStar, ActiveGenerator, AlignTransform, Alignment, BASE, BoardCreationMode, CommonElementFlavour, DEFAULT_FILL, DEFAULT_FONT_FAMILY, DEFAULT_ROUTE_MARGIN, FOREIGN_OBJECT_IMAGE_CLASS_NAME, Generator, GroupComponent, IS_RESIZING, IS_ROTATING, ImageBaseComponent, ImageGenerator, MediaKeys, PICTURE_ACCEPTED_UPLOAD_SIZE, PRIMARY_COLOR, PlaitCommonElementRef, PointGraph, PointNode, PriorityQueue, PropertyTransforms, RESIZE_HANDLE_DIAMETER, ROTATE_HANDLE_DISTANCE_TO_ELEMENT, ROTATE_HANDLE_SIZE, ResizeHandle, StrokeStyle, TRANSPARENT, TextManage, WithCommonPluginKey, WithTextPluginKey, acceptImageTypes, addElementOfFocusedImage, addResizing, addRotating, alignBottom, alignHorizontalCenter, alignLeft, alignRight, alignTop, alignVerticalCenter, animate, buildClipboardData, buildCompositionData, buildImage, buildText, calculatePolylineLength, createActiveGenerator, createGraph, distributeHorizontal, distributeVertical, drawFillPrimaryHandle, drawHandle, drawPrimaryHandle, drawRotateHandle, findFirstTextEditor, generateElbowLineRoute, getCreationMode, getCrossingPointsBetweenPointAndSegment, getDirectionBetweenPointAndPoint, getDirectionByPointOfRectangle, getDirectionByVector, getDirectionFactor, getDirectionFactorByDirectionComponent, getEditingTextEditor, getElementArea, getElementOfFocusedImage, getElementsText, getExtendPoint, getFirstTextEditor, getFirstTextManage, getGraphPoints, getIndexByResizeHandle, getLineHeightByFontSize, getMemorizedLatest, getNextPoint, getOppositeDirection, getPointByVectorComponent, getPointByVectorDirectionComponent, getPointOnPolyline, getPoints, getRatioByPoint, getRectangleResizeHandleRefs, getResizeHandleByIndex, getResizeHandlePointByIndex, getRotatedResizeCursorClassByAngle, getSourceAndTargetOuterRectangle, getStrokeLineDash, getSymmetricHandleIndex, getTextEditors, getTextEditorsByElement, getTextManages, getTimestamp, getUnitVectorByPointAndPoint, hasAfterDraw, hasMoreThanOnePoint, hasResizeHandle, insertClipboardData, isCornerHandle, isDelete, isDndMode, isDrawingMode, isEdgeHandle, isEnterHotkey, isExpandHotkey, isFilled, isPointOnSegment, isResizing, isResizingByCondition, isRotating, isSourceAndTargetIntersect, isSpaceHotkey, isTabHotkey, isVirtualKey, linear, measureElement, memorizeLatest, normalizeShapePoints, reduceRouteMargin, removeDuplicatePoints, removeElementOfFocusedImage, removeResizing, removeRotating, resetPointsAfterResize, rotateVector, rotateVectorAnti90, routeAdjust, selectImage, setCreationMode, setProperty, simplifyOrthogonalPoints, sortElementsByArea, withGroup, withImage, withResize, withText };
|
|
2235
2272
|
//# sourceMappingURL=plait-common.mjs.map
|