0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🐛 fix https://github.com/siyuan-note/siyuan/issues/5895

Browse source
This commit is contained in:
Vanessa 2022-09-16 21:16:57 +08:00
parent 4229e68434
commit 8011d36c5d
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/protyle/wysiwyg/index.ts
View file

@ -237,7 +237,7 @@ export class WYSIWYG {
} else if (selectImgElement) {
html = selectImgElement.outerHTML;
} else if (selectTypes.length > 0 && range.startContainer.nodeType === 3 && range.startContainer.parentElement.tagName === "SPAN" &&
range.startContainer.parentElement.isSameNode(range.endContainer.parentElement)) {
range.startContainer.parentElement.isSameNode(range.endContainer.parentElement)) {
// 复制粗体等字体中的一部分
const attributes = range.startContainer.parentElement.attributes
const spanElement = document.createElement("span");
@ -1771,8 +1771,15 @@ export class WYSIWYG {
} else {
shiftStartElement = startElement;
}
let startTop = startElement.getBoundingClientRect().top;
let endTop = endElement.getBoundingClientRect().top;
const startRect = startElement.getBoundingClientRect();
const endRect = endElement.getBoundingClientRect();
let startTop = startRect.top;
let endTop = endRect.top;
if (startTop === endTop) {
// 横排 https://ld246.com/article/1663036247544
startTop = startRect.right;
endTop = endRect.right;
}
if (startTop > endTop) {
const tempElement = endElement;
endElement = startElement;
@ -1787,11 +1794,13 @@ export class WYSIWYG {
let hasJump = false;
while (currentElement) {
if (currentElement && !currentElement.classList.contains("protyle-attr")) {
if (currentElement.getBoundingClientRect().top <= endTop) {
const currentRect = currentElement.getBoundingClientRect()
if (startRect.top === endRect.top ? (currentRect.right <= endTop) : (currentRect.top <= endTop)) {
if (hasJump) {
// 父节点的下个节点在选中范围内才可使用父节点作为选中节点
if (currentElement.nextElementSibling && !currentElement.nextElementSibling.classList.contains("protyle-attr")) {
if (currentElement.nextElementSibling.getBoundingClientRect().top <= endTop) {
const currentNextRect = currentElement.nextElementSibling.getBoundingClientRect()
if (startRect.top === endRect.top ? (currentNextRect.right <= endTop) : (currentNextRect.top <= endTop)) {
selectElements = [currentElement];
currentElement = currentElement.nextElementSibling as HTMLElement;
hasJump = false;