Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-28 09:54:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

♻️ https://github.com/siyuan-note/siyuan/pull/15347

Browse source
This commit is contained in:
Vanessa 2025-07-23 13:08:38 +08:00
parent c88f99646c
commit 508eb93183
33 changed files with 111 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/protyle/gutter/index.ts
View file

@ -563,7 +563,7 @@ export class Gutter {
hasEmbedBlock = true;
}
if (item.nextElementSibling && selectsElement[index + 1] &&
(item.nextElementSibling === selectsElement[index + 1])) {
item.nextElementSibling === selectsElement[index + 1]) {
isContinue = true;
} else if (index !== selectsElement.length - 1) {
isContinue = false;
@ -2329,7 +2329,7 @@ export class Gutter {
listItem = undefined;
}
// 标题必须显示
if ((topElement !== nodeElement) && type !== "NodeHeading") {
if (topElement !== nodeElement && type !== "NodeHeading") {
nodeElement = topElement;
parentElement = hasClosestBlock(nodeElement.parentElement);
type = nodeElement.getAttribute("data-type");

6
app/src/protyle/render/av/blockAttr.ts
View file

@ -298,11 +298,11 @@ class="fn__flex-1 fn__flex${["url", "text", "number", "email", "phone", "block"]
if (!targetElement) {
targetElement = hasClosestByClassName(document.elementFromPoint(event.clientX, event.clientY - 1), "av__row");
}
if (!targetElement || (targetElement === window.siyuan.dragElement) || !dragBlockElement) {
if (!targetElement || targetElement === window.siyuan.dragElement || !dragBlockElement) {
return;
}
const targetBlockElement = hasClosestBlock(targetElement);
if (!targetBlockElement || (targetBlockElement !== dragBlockElement)) {
if (!targetBlockElement || targetBlockElement !== dragBlockElement) {
return;
}
event.preventDefault();
@ -455,7 +455,7 @@ const openEdit = (protyle: IProtyle, element: HTMLElement, event: MouseEvent) =>
if (!blockElement) {
return;
}
while (target && (element !== target)) {
while (target && element !== target) {
const type = target.getAttribute("data-type");
if (target.classList.contains("av__celltext--url") || target.classList.contains("av__cellassetimg")) {
if (event.type === "contextmenu" || (!target.dataset.url && target.tagName !== "IMG")) {

4
app/src/protyle/render/av/cell.ts
View file

@ -743,9 +743,9 @@ export const updateCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, va
const cellId = item.dataset.id; // 刚创建时无 id，更新需和 oldValue 保持一致
const colId = getColId(item, viewType);
text += getCellText(item) + ((cellElements[elementIndex + 1] && item.nextElementSibling && (item.nextElementSibling === cellElements[elementIndex + 1])) ? "\t" : "\n\n");
text += getCellText(item) + ((cellElements[elementIndex + 1] && item.nextElementSibling && item.nextElementSibling === cellElements[elementIndex + 1]) ? "\t" : "\n\n");
const oldValue = genCellValueByElement(type, item);
if (elementIndex === 0 || (cellElements[elementIndex - 1] !== item.previousElementSibling)) {
if (elementIndex === 0 || cellElements[elementIndex - 1] !== item.previousElementSibling) {
json.push([]);
}
json[json.length - 1].push(oldValue);

2
app/src/protyle/render/av/col.ts
View file

@ -1015,7 +1015,7 @@ export const showColMenu = (protyle: IProtyle, blockElement: Element, cellElemen
dialog.element.addEventListener("click", (event) => {
let target = event.target as HTMLElement;
const isDispatch = typeof event.detail === "string";
while (target && (target !== dialog.element) || isDispatch) {
while (target && target !== dialog.element || isDispatch) {
const action = target.getAttribute("data-action");
if (action === "delete" || (isDispatch && event.detail === "Enter")) {
removeColByMenu({

6
app/src/protyle/render/av/gallery/render.ts
View file

@ -45,7 +45,7 @@ export const renderGallery = (options: {
const created = options.protyle.options.history?.created;
const snapshot = options.protyle.options.history?.snapshot;
let searchInputElement = options.blockElement.querySelector('[data-type="av-search"]') as HTMLInputElement;
const isSearching = searchInputElement && (document.activeElement === searchInputElement);
const isSearching = searchInputElement && document.activeElement === searchInputElement;
const query = searchInputElement?.value || "";
fetchPost(created ? "/api/av/renderHistoryAttributeView" : (snapshot ? "/api/av/renderSnapshotAttributeView" : "/api/av/renderAttributeView"), {
id: options.blockElement.getAttribute("data-av-id"),
@ -213,7 +213,7 @@ ${view.hideAttrViewName ? " av__gallery--top" : ""}">
const range = getSelection().getRangeAt(0);
if (!hasClosestByClassName(range.startContainer, "av__title")) {
const blockElement = hasClosestBlock(range.startContainer);
if (blockElement && (options.blockElement === blockElement) && !isSearching) {
if (blockElement && options.blockElement === blockElement && !isSearching) {
focusBlock(options.blockElement);
}
}
@ -245,7 +245,7 @@ ${view.hideAttrViewName ? " av__gallery--top" : ""}">
if (event.isComposing) {
return;
}
if (searchInputElement.value || (document.activeElement === searchInputElement)) {
if (searchInputElement.value || document.activeElement === searchInputElement) {
viewsElement.classList.add("av__views--show");
} else {
viewsElement.classList.remove("av__views--show");

8
app/src/protyle/render/av/openMenuPanel.ts
View file

@ -475,11 +475,11 @@ export const openMenuPanel = (options: {
if (!targetElement) {
targetElement = hasClosestByAttribute(document.elementFromPoint(event.clientX, event.clientY - 1), "draggable", "true");
}
if (!targetElement || (targetElement === window.siyuan.dragElement)) {
if (!targetElement || targetElement === window.siyuan.dragElement) {
return;
}
event.preventDefault();
if (dragoverElement && (targetElement === dragoverElement)) {
if (dragoverElement && targetElement === dragoverElement) {
const nodeRect = targetElement.getBoundingClientRect();
avPanelElement.querySelectorAll(".dragover__bottom, .dragover__top").forEach((item: HTMLElement) => {
item.classList.remove("dragover__bottom", "dragover__top");
@ -526,7 +526,7 @@ export const openMenuPanel = (options: {
type = (event.detail as { type: string }).type;
target = (event.detail as { target: HTMLElement }).target;
}
while (target && (target !== avPanelElement) || type) {
while (target && target !== avPanelElement || type) {
type = target?.dataset.type || type;
if (type === "close") {
if (!options.protyle.toolbar.subElement.classList.contains("fn__none")) {
@ -1181,7 +1181,7 @@ export const openMenuPanel = (options: {
dialog.element.addEventListener("click", (dialogEvent) => {
let target = dialogEvent.target as HTMLElement;
const isDispatch = typeof dialogEvent.detail === "string";
while (target && (target !== dialog.element) || isDispatch) {
while (target && target !== dialog.element || isDispatch) {
const action = target.getAttribute("data-action");
if (action === "delete" || (isDispatch && dialogEvent.detail === "Enter")) {
removeCol({

8
app/src/protyle/render/av/render.ts
View file

@ -85,7 +85,7 @@ export const avRender = (element: Element, protyle: IProtyle, cb?: (data: IAV) =
const created = protyle.options.history?.created;
const snapshot = protyle.options.history?.snapshot;
let searchInputElement = e.querySelector('[data-type="av-search"]') as HTMLInputElement;
const isSearching = searchInputElement && (document.activeElement === searchInputElement);
const isSearching = searchInputElement && document.activeElement === searchInputElement;
const query = searchInputElement?.value || "";
fetchPost(created ? "/api/av/renderHistoryAttributeView" : (snapshot ? "/api/av/renderSnapshotAttributeView" : "/api/av/renderAttributeView"), {
id: e.getAttribute("data-av-id"),
@ -336,7 +336,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value, rowIndex,
} else if (!avPanelElement && !isSearching && getSelection().rangeCount > 0) {
const range = getSelection().getRangeAt(0);
const blockElement = hasClosestBlock(range.startContainer);
if (blockElement && (e === blockElement)) {
if (blockElement && e === blockElement) {
focusBlock(e);
}
} else if (avPanelElement && !newCellElement) {
@ -366,7 +366,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value, rowIndex,
const range = getSelection().getRangeAt(0);
if (!hasClosestByClassName(range.startContainer, "av__title")) {
const blockElement = hasClosestBlock(range.startContainer);
if (blockElement && (e === blockElement) && !isSearching) {
if (blockElement && e === blockElement && !isSearching) {
focusBlock(e);
}
}
@ -398,7 +398,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value, rowIndex,
if (event.isComposing) {
return;
}
if (searchInputElement.value || (document.activeElement === searchInputElement)) {
if (searchInputElement.value || document.activeElement === searchInputElement) {
viewsElement.classList.add("av__views--show");
} else {
viewsElement.classList.remove("av__views--show");

6
app/src/protyle/render/av/view.ts
View file

@ -408,17 +408,17 @@ export const dragoverTab = (event: DragEvent) => {
if (!target) {
return;
}
if ((viewTabElement !== window.siyuan.dragElement.parentElement) || (target === window.siyuan.dragElement)) {
if (viewTabElement !== window.siyuan.dragElement.parentElement || (target === window.siyuan.dragElement)) {
return;
}
const targetRect = target.getBoundingClientRect();
if (targetRect.left + targetRect.width / 2 < event.clientX) {
if (target.nextElementSibling && (target.nextElementSibling === window.siyuan.dragElement)) {
if (target.nextElementSibling && target.nextElementSibling === window.siyuan.dragElement) {
return;
}
target.after(window.siyuan.dragElement);
} else {
if (target.previousElementSibling && (target.previousElementSibling === window.siyuan.dragElement)) {
if (target.previousElementSibling && target.previousElementSibling === window.siyuan.dragElement) {
return;
}
target.before(window.siyuan.dragElement);

16
app/src/protyle/toolbar/index.ts
View file

@ -134,7 +134,7 @@ export class Toolbar {
// shift+方向键或三击选中，不同的块 https://github.com/siyuan-note/siyuan/issues/3891
const startElement = hasClosestBlock(range.startContainer);
const endElement = hasClosestBlock(range.endContainer);
if (startElement && endElement && (startElement !== endElement)) {
if (startElement && endElement && startElement !== endElement) {
if (event) { // 在 keyup 中使用 shift+方向键选中
if (event.key === "ArrowLeft") {
this.range = setLastNodeRange(getContenteditableElement(startElement), range, false);
@ -212,7 +212,7 @@ export class Toolbar {
if (types.length === 0 && (!endElement || endElement.nodeType === 3)) {
return [];
}
if (endElement && !["DIV", "TD", "TH", "TR"].includes(endElement.tagName) && (startElement !== endElement)) {
if (endElement && !["DIV", "TD", "TH", "TR"].includes(endElement.tagName) && startElement !== endElement) {
types = types.concat((endElement.getAttribute("data-type") || "").split(" "));
}
range.cloneContents().childNodes.forEach((item: HTMLElement) => {
@ -251,9 +251,9 @@ export class Toolbar {
}
});
const rangeStartNextSibling = hasNextSibling(this.range.startContainer);
const isSameNode = (this.range.startContainer === this.range.endContainer) ||
(rangeStartNextSibling && (rangeStartNextSibling === this.range.endContainer) &&
(this.range.startContainer.parentElement === this.range.endContainer.parentElement));
const isSameNode = this.range.startContainer === this.range.endContainer ||
(rangeStartNextSibling && rangeStartNextSibling === this.range.endContainer &&
this.range.startContainer.parentElement === this.range.endContainer.parentElement);
if (this.range.startContainer.nodeType === 3 && this.range.startContainer.parentElement.tagName === "SPAN" &&
isSameNode &&
this.range.startOffset > -1 && this.range.endOffset <= this.range.endContainer.textContent.length) {
@ -284,7 +284,7 @@ export class Toolbar {
}
}
// https://github.com/siyuan-note/siyuan/issues/14534
if (rangeTypes.includes("text") && type === "text" && textObj && this.range.startContainer.nodeType === 3 && (this.range.startContainer === this.range.endContainer)) {
if (rangeTypes.includes("text") && type === "text" && textObj && this.range.startContainer.nodeType === 3 && this.range.startContainer === this.range.endContainer) {
const selectParentElement = this.range.startContainer.parentElement;
if (selectParentElement && hasSameTextStyle(null, selectParentElement, textObj)) {
return;
@ -304,14 +304,14 @@ export class Toolbar {
this.range.startOffset !== 0 ||
// https://github.com/siyuan-note/siyuan/issues/14869
(this.range.startOffset === 0 && this.range.startContainer.previousSibling?.nodeType === 3 &&
(this.range.startContainer.previousSibling.parentElement === this.range.startContainer.parentElement))
this.range.startContainer.previousSibling.parentElement === this.range.startContainer.parentElement)
) && (
this.range.endOffset !== this.range.endContainer.textContent.length ||
// https://github.com/siyuan-note/siyuan/issues/14869#issuecomment-2911553387
(
this.range.endOffset === this.range.endContainer.textContent.length &&
this.range.endContainer.nextSibling?.nodeType === 3 &&
(this.range.endContainer.nextSibling.parentElement === this.range.endContainer.parentElement)
this.range.endContainer.nextSibling.parentElement === this.range.endContainer.parentElement
)
) &&
!(this.range.startOffset === 1 && this.range.startContainer.textContent.startsWith(Constants.ZWSP))) {

2
app/src/protyle/ui/initUI.ts
View file

@ -229,7 +229,7 @@ export const initUI = (protyle: IProtyle) => {
if (item !== hlItem) {
hlItem.classList.remove("protyle-wysiwyg--hl");
}
if (rowItem && (rowItem !== hlItem)) {
if (rowItem && rowItem !== hlItem) {
rowItem.classList.remove("av__row--hl");
}
});

21
app/src/protyle/util/editorCommonEvent.ts
View file

@ -481,7 +481,7 @@ const dragSb = async (protyle: IProtyle, sourceElements: Element[], targetElemen
// https://github.com/siyuan-note/insider/issues/536
if (!isCopy && oldSourceParentElement && oldSourceParentElement.classList.contains("list") &&
oldSourceParentElement.getAttribute("data-subtype") === "o" &&
(oldSourceParentElement !== sourceElements[0].parentElement) && oldSourceParentElement.childElementCount > 1) {
oldSourceParentElement !== sourceElements[0].parentElement && oldSourceParentElement.childElementCount > 1) {
Array.from(oldSourceParentElement.children).forEach((item) => {
if (item.classList.contains("protyle-attr")) {
return;
@ -676,7 +676,7 @@ const dragSame = async (protyle: IProtyle, sourceElements: Element[], targetElem
isSameDoc && // 同一文档分屏后，oldSourceParentElement 已经被移走，不可再 update https://github.com/siyuan-note/siyuan/issues/8863
oldSourceParentElement && oldSourceParentElement.classList.contains("list") &&
oldSourceParentElement.getAttribute("data-subtype") === "o" &&
(oldSourceParentElement !== sourceElements[0].parentElement) && oldSourceParentElement.childElementCount > 1) {
oldSourceParentElement !== sourceElements[0].parentElement && oldSourceParentElement.childElementCount > 1) {
Array.from(oldSourceParentElement.children).forEach((item) => {
if (item.classList.contains("protyle-attr")) {
return;
@ -1423,7 +1423,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
if (targetElement && targetElement.getAttribute("data-dtype") === "mAsset" &&
!targetElement.classList.contains("av__cell--header")) {
event.preventDefault(); // 不使用导致无法触发 drop
if (dragoverElement && (targetElement === dragoverElement)) {
if (dragoverElement && targetElement === dragoverElement) {
return;
}
const blockElement = hasClosestBlock(targetElement);
@ -1528,8 +1528,8 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
if (targetElement) {
const targetRowElement = hasClosestByClassName(targetElement, "av__row--header");
const dragRowElement = hasClosestByClassName(window.siyuan.dragElement, "av__row--header");
if ((targetElement === window.siyuan.dragElement) || !targetRowElement || !dragRowElement ||
(targetRowElement && dragRowElement && (targetRowElement !== dragRowElement))
if (targetElement === window.siyuan.dragElement || !targetRowElement || !dragRowElement ||
(targetRowElement && dragRowElement && targetRowElement !== dragRowElement)
) {
targetElement = false;
}
@ -1544,7 +1544,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
// gallery item 只能拖拽当前 av 中
const galleryElement = hasClosestByClassName(event.target, "av__gallery");
if (targetElement.classList.contains("av") || !galleryElement ||
!galleryElement.contains(window.siyuan.dragElement) || (targetElement === window.siyuan.dragElement)) {
!galleryElement.contains(window.siyuan.dragElement) || targetElement === window.siyuan.dragElement) {
targetElement = false;
editorElement.querySelectorAll(".dragover__left, .dragover__right").forEach((item: HTMLElement) => {
item.classList.remove("dragover__left", "dragover__right");
@ -1559,7 +1559,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
!targetElement.classList.contains("av__row--util") &&
!targetElement.classList.contains("av__gallery-item") &&
!targetElement.classList.contains("av__gallery-add");
if (targetElement && dragoverElement && (targetElement === dragoverElement)) {
if (targetElement && dragoverElement && targetElement === dragoverElement) {
// 性能优化，目标为同一个元素不再进行校验
const nodeRect = targetElement.getBoundingClientRect();
editorElement.querySelectorAll(".dragover__left, .dragover__right, .dragover__bottom, .dragover__top, .dragover").forEach((item: HTMLElement) => {
@ -1597,11 +1597,12 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
if (targetElement.classList.contains("av__cell")) {
if (event.clientX < nodeRect.left + nodeRect.width / 2 && event.clientX > nodeRect.left &&
!targetElement.classList.contains("av__row") && (targetElement.previousElementSibling !== window.siyuan.dragElement)) {
!targetElement.classList.contains("av__row") && targetElement.previousElementSibling !== window.siyuan.dragElement) {
targetElement.classList.add("dragover__left");
} else if (event.clientX > nodeRect.right - nodeRect.width / 2 && event.clientX <= nodeRect.right + 1 &&
!targetElement.classList.contains("av__row") && (targetElement !== window.siyuan.dragElement.previousElementSibling)) {
if (window.siyuan.dragElement.previousElementSibling.classList.contains("av__colsticky") && (targetElement === window.siyuan.dragElement.previousElementSibling.lastElementChild)) {
!targetElement.classList.contains("av__row") && targetElement !== window.siyuan.dragElement.previousElementSibling) {
if (window.siyuan.dragElement.previousElementSibling.classList.contains("av__colsticky") &&
targetElement === window.siyuan.dragElement.previousElementSibling.lastElementChild) {
// 拖拽到固定列的最后一个元素
} else {
targetElement.classList.add("dragover__right");

2
app/src/protyle/util/insertHTML.ts
View file

@ -403,7 +403,7 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
}
// 粘贴带样式的行内元素到另一个行内元素中需进行切割
const spanElement = range.startContainer.nodeType === 3 ? range.startContainer.parentElement : range.startContainer as HTMLElement;
if (spanElement.tagName === "SPAN" && (spanElement === (range.endContainer.nodeType === 3 ? range.endContainer.parentElement : range.endContainer)) &&
if (spanElement.tagName === "SPAN" && spanElement === (range.endContainer.nodeType === 3 ? range.endContainer.parentElement : range.endContainer) &&
// 粘贴纯文本不需切割 https://ld246.com/article/1665556907936
// emoji 图片需要切割 https://github.com/siyuan-note/siyuan/issues/9370
tempElement.content.querySelector("span, img")

5
app/src/protyle/util/onGet.ts
View file

@ -153,7 +153,8 @@ const setHTML = (options: {
if (!protyle.wysiwyg.element.querySelector(".protyle-wysiwyg--select") && !protyle.scroll.keepLazyLoad && protyle.contentElement.scrollHeight > REMOVED_OVER_HEIGHT) {
let removeElement = protyle.wysiwyg.element.firstElementChild as HTMLElement;
const removeElements = [];
while (protyle.wysiwyg.element.childElementCount > 2 && removeElements && (protyle.wysiwyg.element.lastElementChild !== removeElement)) {
while (protyle.wysiwyg.element.childElementCount > 2 && removeElements &&
protyle.wysiwyg.element.lastElementChild !== removeElement) {
if (protyle.contentElement.scrollHeight - removeElement.offsetTop > REMOVED_OVER_HEIGHT) {
removeElements.push(removeElement);
} else {
@ -508,7 +509,7 @@ const focusElementById = (protyle: IProtyle, action: string[], scrollAttr?: IScr
protyle.observer.observe(protyle.wysiwyg.element);
}, 1000 * 3);
if ((focusElement === protyle.wysiwyg.element.firstElementChild) && !hasScrollTop) {
if (focusElement === protyle.wysiwyg.element.firstElementChild && !hasScrollTop) {
protyle.observerLoad.disconnect();
}
};

4
app/src/protyle/util/selection.ts
View file

@ -139,7 +139,7 @@ export const getEditorRange = (element: Element): Range => {
let range: Range;
if (getSelection().rangeCount > 0) {
range = getSelection().getRangeAt(0);
if ((element === range.startContainer) || element.contains(range.startContainer)) {
if (element === range.startContainer || element.contains(range.startContainer)) {
// 有时候点击编辑器头部需要矫正到第一个块中
if (range.toString() === "" && range.startContainer.nodeType === 1 && range.startOffset === 0 &&
(range.startContainer as HTMLElement).classList.contains("protyle-wysiwyg")) {
@ -528,7 +528,7 @@ export const focusByWbr = (element: Element, range: Range) => {
}
} else {
const wbrPreviousSibling = hasPreviousSibling(wbrElement);
if (wbrPreviousSibling && (wbrElement.previousElementSibling === wbrPreviousSibling)) {
if (wbrPreviousSibling && wbrElement.previousElementSibling === wbrPreviousSibling) {
if (wbrElement.previousElementSibling.lastChild?.nodeType === 3) {
// <em>text</em><wbr> 需把光标放在里面，因为 chrome 点击后也是默认在里面
range.setStart(wbrElement.previousElementSibling.lastChild, wbrElement.previousElementSibling.lastChild.textContent.length);

2
app/src/protyle/util/table.ts
View file

@ -422,7 +422,7 @@ export const fixTable = (protyle: IProtyle, event: KeyboardEvent, range: Range)
// 表格后无内容时，按右键需新建空块
if (event.key === "ArrowRight" && range.toString() === "" &&
!nodeElement.nextElementSibling &&
(cellElement === nodeElement.querySelector("table").lastElementChild.lastElementChild.lastElementChild) &&
cellElement === nodeElement.querySelector("table").lastElementChild.lastElementChild.lastElementChild &&
getSelectionOffset(cellElement, protyle.wysiwyg.element, range).start === cellElement.textContent.length) {
event.preventDefault();
insertEmptyBlock(protyle, "afterend", nodeElement.getAttribute("data-node-id"));

2
app/src/protyle/wysiwyg/enter.ts
View file

@ -384,7 +384,7 @@ const listEnter = (protyle: IProtyle, blockElement: HTMLElement, range: Range) =
let newElement;
if (subListElement && listItemElement.getAttribute("fold") !== "1" &&
// 子列表下的段落块回车 https://ld246.com/article/1623919354587
(blockElement.nextElementSibling === subListElement)) {
blockElement.nextElementSibling === subListElement) {
// 含有子列表的换行
if (position.end >= editableElement.textContent.length -
// 数学公式结尾会有 zwsp https://github.com/siyuan-note/siyuan/issues/6679

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

@ -319,15 +319,16 @@ export class WYSIWYG {
cellElements.forEach((item: HTMLElement, index) => {
const cellText = getCellText(item);
if (index === 0 || (
(cellElements[index - 1] !== item.previousElementSibling) &&
!(item.previousElementSibling?.classList.contains("av__colsticky") && !cellElements[index - 1].nextElementSibling && (cellElements[index - 1].parentElement === item.previousElementSibling))
cellElements[index - 1] !== item.previousElementSibling &&
!(item.previousElementSibling?.classList.contains("av__colsticky") && !cellElements[index - 1].nextElementSibling &&
cellElements[index - 1].parentElement === item.previousElementSibling)
)) {
html += "[";
}
html += JSON.stringify(genCellValueByElement(getTypeByCellElement(item), item)) + ",";
if (index === cellElements.length - 1 || (
(cellElements[index + 1] !== item.nextElementSibling) &&
!(!item.nextElementSibling && (item.parentElement.nextElementSibling === cellElements[index + 1]))
cellElements[index + 1] !== item.nextElementSibling &&
!(!item.nextElementSibling && item.parentElement.nextElementSibling === cellElements[index + 1])
)) {
html = html.substring(0, html.length - 1) + "],";
textPlain += cellText + "\n";
@ -356,12 +357,12 @@ export class WYSIWYG {
});
selectCellElements.forEach((item, index) => {
if (index === 0 || !item.previousElementSibling ||
(item.previousElementSibling !== selectCellElements[index - 1])) {
item.previousElementSibling !== selectCellElements[index - 1]) {
html += "<tr>";
}
html += item.outerHTML;
if (!item.nextElementSibling || !selectCellElements[index + 1] ||
(item.nextElementSibling !== selectCellElements[index + 1])) {
item.nextElementSibling !== selectCellElements[index + 1]) {
html += "</tr>";
}
});
@ -395,7 +396,7 @@ export class WYSIWYG {
textPlain = selectImgElement.querySelector("img").getAttribute("data-src");
} else if (selectTypes.length > 0 && range.startContainer.nodeType === 3 &&
range.startContainer.parentElement.tagName === "SPAN" &&
(range.startContainer.parentElement === range.endContainer.parentElement)) {
range.startContainer.parentElement === range.endContainer.parentElement) {
// 复制粗体等字体中的一部分
const attributes = range.startContainer.parentElement.attributes;
const spanElement = document.createElement("span");
@ -507,7 +508,7 @@ export class WYSIWYG {
item.classList.add("av__gallery-item--select");
});
event.preventDefault();
} else if (startElement && endElement && (startElement !== endElement)) {
} else if (startElement && endElement && startElement !== endElement) {
let toDown = true;
const startRect = startElement.getBoundingClientRect();
const endRect = endElement.getBoundingClientRect();
@ -823,7 +824,7 @@ export class WYSIWYG {
protyle.contentElement.scrollTop += 5;
}
}
if (moveSelectCellElement && tempCellElement && (tempCellElement === moveSelectCellElement)) {
if (moveSelectCellElement && tempCellElement && tempCellElement === moveSelectCellElement) {
return;
}
if (tempCellElement && tempCellElement.dataset.id && (event.clientX !== moveEvent.clientX || event.clientY !== moveEvent.clientY)) {
@ -1021,14 +1022,14 @@ export class WYSIWYG {
moveTarget.classList.remove("fn__none");
moveTarget = hasClosestByTag(pointElement, "TH") || hasClosestByTag(pointElement, "TD");
}
if (moveTarget && (moveTarget === target)) {
if (moveTarget && moveTarget === target) {
tableBlockElement.querySelector(".table__select").removeAttribute("style");
protyle.wysiwyg.element.classList.remove("protyle-wysiwyg--hiderange");
moveCellElement = moveTarget;
return false;
}
if (moveTarget && (moveTarget.tagName === "TH" || moveTarget.tagName === "TD") &&
(!moveCellElement || (moveCellElement !== moveTarget))) {
(!moveCellElement || moveCellElement !== moveTarget)) {
// @ts-ignore
tableBlockElement.firstElementChild.style.webkitUserModify = "read-only";
let width = target.offsetLeft + target.clientWidth - moveTarget.offsetLeft;
@ -1150,7 +1151,7 @@ export class WYSIWYG {
}
protyle.selectElement.setAttribute("style", `background-color: ${protyle.selectElement.style.backgroundColor};top:${newTop}px;height:${newHeight}px;left:${newLeft + 2}px;width:${newWidth - 2}px;`);
const newMouseElement = document.elementFromPoint(moveEvent.clientX, moveEvent.clientY);
if (mouseElement && (mouseElement === newMouseElement) && !mouseElement.classList.contains("protyle-wysiwyg") &&
if (mouseElement && mouseElement === newMouseElement && !mouseElement.classList.contains("protyle-wysiwyg") &&
!mouseElement.classList.contains("list") && !mouseElement.classList.contains("bq") && !mouseElement.classList.contains("sb")) {
// 性能优化，同一个p元素不进行选中计算
return;
@ -1318,7 +1319,7 @@ export class WYSIWYG {
tableBlockElement.querySelectorAll("th, td").forEach((item: HTMLTableCellElement, index: number) => {
if (item.classList.contains("fn__none")) {
// 合并的元素中间有 fn__none 的元素
if (item.previousElementSibling && (item.previousElementSibling === selectCellElements[selectCellElements.length - 1])) {
if (item.previousElementSibling && item.previousElementSibling === selectCellElements[selectCellElements.length - 1]) {
selectCellElements.push(item);
if (!isTHead && item.parentElement.parentElement.tagName === "THEAD") {
isTHead = true;
@ -1359,7 +1360,7 @@ export class WYSIWYG {
let cellElement = selectCellElements[0];
let colSpan = cellElement.colSpan;
let index = 1;
while (cellElement.nextElementSibling && (cellElement.nextElementSibling === selectCellElements[index])) {
while (cellElement.nextElementSibling && cellElement.nextElementSibling === selectCellElements[index]) {
cellElement = cellElement.nextElementSibling as HTMLTableCellElement;
if (!cellElement.classList.contains("fn__none")) { // https://github.com/siyuan-note/insider/issues/1007#issuecomment-1046195608
colSpan += cellElement.colSpan;
@ -1558,7 +1559,7 @@ export class WYSIWYG {
selectCellElements.forEach((item, index) => {
textPlain += item.textContent.trim() + "\t";
if (!item.nextElementSibling || !selectCellElements[index + 1] ||
(item.nextElementSibling !== selectCellElements[index + 1])) {
item.nextElementSibling !== selectCellElements[index + 1]) {
textPlain = textPlain.slice(0, -1) + "\n";
}
});
@ -1680,7 +1681,7 @@ export class WYSIWYG {
} else {
endBlockElement = hasClosestBlock(range.endContainer);
}
if (startBlockElement && endBlockElement && (endBlockElement !== startBlockElement)) {
if (startBlockElement && endBlockElement && endBlockElement !== startBlockElement) {
if ((range.startContainer.nodeType === 1 && (range.startContainer as HTMLElement).tagName === "DIV" && (range.startContainer as HTMLElement).classList.contains("protyle-attr")) ||
event.clientY > mouseUpEvent.clientY) {
setFirstNodeRange(getContenteditableElement(endBlockElement), range);
@ -1711,7 +1712,7 @@ export class WYSIWYG {
return;
}
const range = getSelection().getRangeAt(0);
if ((this.element === range.startContainer) || this.element.contains(range.startContainer)) {
if (this.element === range.startContainer || this.element.contains(range.startContainer)) {
protyle.toolbar.range = range;
}
});
@ -1810,12 +1811,12 @@ export class WYSIWYG {
nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss"));
selectCellElements.forEach((item, index) => {
if (index === 0 || !item.previousElementSibling ||
(item.previousElementSibling !== selectCellElements[index - 1])) {
item.previousElementSibling !== selectCellElements[index - 1]) {
html += "<tr>";
}
html += item.outerHTML;
if (!item.nextElementSibling || !selectCellElements[index + 1] ||
(item.nextElementSibling !== selectCellElements[index + 1])) {
item.nextElementSibling !== selectCellElements[index + 1]) {
html += "</tr>";
}
item.innerHTML = "";
@ -1840,7 +1841,7 @@ export class WYSIWYG {
if (headElement && range.toString() === headElement.firstElementChild.textContent) {
tempElement.insertAdjacentHTML("afterbegin", headElement.firstElementChild.innerHTML);
headElement.firstElementChild.innerHTML = "";
} else if (range.toString() !== "" && (startContainer === range.endContainer) &&
} else if (range.toString() !== "" && startContainer === range.endContainer &&
range.startContainer.nodeType === 3 &&
// 需使用 wholeText https://github.com/siyuan-note/siyuan/issues/14339
range.endOffset === (range.endContainer as Text).wholeText.length &&
@ -1852,7 +1853,7 @@ export class WYSIWYG {
tempElement.append(selectImgElement);
} else if (range.startContainer.nodeType === 3 && range.startContainer.parentElement.tagName === "SPAN" &&
range.startContainer.parentElement.getAttribute("data-type") &&
(range.startContainer.parentElement === range.endContainer.parentElement)) {
range.startContainer.parentElement === range.endContainer.parentElement) {
// 剪切粗体等字体中的一部分
const spanElement = range.startContainer.parentElement;
const attributes = spanElement.attributes;
@ -2486,10 +2487,10 @@ export class WYSIWYG {
if (item.tagName !== "DIV") {
return;
}
if (!tableElement || (item !== tableElement)) {
if (!tableElement || item !== tableElement) {
item.querySelector(".table__select").removeAttribute("style");
}
if (tableElement && (tableElement === item) && item.querySelector(".table__select").getAttribute("style")) {
if (tableElement && tableElement === item && item.querySelector(".table__select").getAttribute("style")) {
// 防止合并单元格的菜单消失
event.stopPropagation();
}

16
app/src/protyle/wysiwyg/keydown.ts
View file

@ -115,7 +115,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
// https://ld246.com/article/1694506408293
const endElement = hasClosestBlock(range.endContainer);
if (!matchHotKey("⌘C", event) && endElement && (nodeElement !== endElement)) {
if (!matchHotKey("⌘C", event) && endElement && nodeElement !== endElement) {
event.stopPropagation();
event.preventDefault();
return;
@ -540,7 +540,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
centerElement = document.elementFromPoint(contentRect.x + contentRect.width / 2, contentRect.y + contentRect.height / 2 + Constants.SIZE_TOOLBAR_HEIGHT);
}
const centerBlockElement = hasClosestBlock(centerElement);
if (centerBlockElement && (centerBlockElement !== nodeElement)) {
if (centerBlockElement && centerBlockElement !== nodeElement) {
focusBlock(centerBlockElement, undefined, false);
}
event.stopPropagation();
@ -594,7 +594,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
return;
} else if (!previousSibling &&
range.startContainer.parentElement.previousSibling &&
(range.startContainer.parentElement.previousSibling === range.startContainer.parentElement.previousElementSibling) &&
range.startContainer.parentElement.previousSibling === range.startContainer.parentElement.previousElementSibling &&
range.startContainer.parentElement.previousElementSibling.getAttribute("data-type")?.indexOf("inline-math") > -1
) {
inlineMathMenu(protyle, range.startContainer.parentElement.previousElementSibling);
@ -649,7 +649,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
!getPreviousBlock(nodeElement) && // 列表第一个块为嵌入块，第二个块为段落块，上键应选中第一个块 https://ld246.com/article/1652667912155
nodeElement.contains(firstEditElement)
) ||
(!firstEditElement && (nodeElement === protyle.wysiwyg.element.firstElementChild))) {
(!firstEditElement && nodeElement === protyle.wysiwyg.element.firstElementChild)) {
// 不能用\n判断，否则文字过长折行将错误 https://github.com/siyuan-note/siyuan/issues/6156
if (getSelectionPosition(nodeEditableElement, range).top - nodeEditableElement.getBoundingClientRect().top < 20 || nodeElement.classList.contains("av")) {
if (protyle.title && protyle.title.editElement &&
@ -704,7 +704,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
}
}
}
} else if (selectText === "" && (event.key === "ArrowDown" || event.key === "ArrowRight") && (nodeElement === getLastBlock(protyle.wysiwyg.element.lastElementChild)) &&
} else if (selectText === "" && (event.key === "ArrowDown" || event.key === "ArrowRight") && nodeElement === getLastBlock(protyle.wysiwyg.element.lastElementChild) &&
// 表格无法右移动 https://ld246.com/article/1631434502215
!hasClosestByTag(range.startContainer, "TD") && !hasClosestByTag(range.startContainer, "TH")) {
// 页面按向下/右箭头丢失焦点 https://ld246.com/article/1629954026096
@ -715,7 +715,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
event.preventDefault();
focusByRange(range);
}
} else if (selectText === "" && event.key === "ArrowLeft" && (nodeElement === getFirstBlock(protyle.wysiwyg.element.firstElementChild))) {
} else if (selectText === "" && event.key === "ArrowLeft" && nodeElement === getFirstBlock(protyle.wysiwyg.element.firstElementChild)) {
// 页面向左箭头丢失焦点 https://github.com/siyuan-note/siyuan/issues/2768
const firstEditElement = getContenteditableElement(nodeElement);
if (firstEditElement && getSelectionOffset(firstEditElement, undefined, range).start === 0) {
@ -726,7 +726,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
}
if (event.key === "ArrowDown") {
if (nodeEditableElement?.innerText.trimRight().substr(position.start).indexOf("\n") === -1 &&
(nodeElement === protyle.wysiwyg.element.lastElementChild)) {
nodeElement === protyle.wysiwyg.element.lastElementChild) {
setLastNodeRange(getContenteditableElement(nodeEditableElement), range, false);
range.collapse(false);
event.stopPropagation();
@ -1580,7 +1580,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
return true;
}
if (item.nextElementSibling && selectsElement[index + 1] &&
(item.nextElementSibling === selectsElement[index + 1])) {
item.nextElementSibling === selectsElement[index + 1]) {
isContinue = true;
} else if (index !== selectsElement.length - 1) {
isContinue = false;

2
app/src/protyle/wysiwyg/list.ts
View file

@ -228,7 +228,7 @@ export const breakList = (protyle: IProtyle, blockElement: Element, range: Range
let newListHTML = "";
let hasFind = 0;
Array.from(listItemElement.parentElement.children).forEach(item => {
if (!hasFind && (item === listItemElement)) {
if (!hasFind && item === listItemElement) {
hasFind = 1;
} else if (hasFind && !item.classList.contains("protyle-attr")) {
undoOperations.push({

4
app/src/protyle/wysiwyg/transaction.ts
View file

@ -104,7 +104,7 @@ const promiseTransaction = () => {
// 反链中有多个相同块的情况
Array.from(protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${operation.id}"]`)).forEach(item => {
if (!isInEmbedBlock(item)) {
if (range && ((item === range.startContainer) || item.contains(range.startContainer))) {
if (range && (item === range.startContainer || item.contains(range.startContainer))) {
// 正在编辑的块不能进行更新
} else {
item.outerHTML = operation.data.replace("<wbr>", "");
@ -1026,7 +1026,7 @@ export const turnsIntoTransaction = (options: {
hasEmbedBlock = true;
}
if (item.nextElementSibling && selectsElement[index + 1] &&
(item.nextElementSibling === selectsElement[index + 1])) {
item.nextElementSibling === selectsElement[index + 1]) {
isContinue = true;
} else if (index !== selectsElement.length - 1) {
isContinue = false;