From afbdb48ddfcbf87f91ff04559bf254c867055c81 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 21 Dec 2023 09:07:53 +0800 Subject: [PATCH] :rotating_light: --- app/src/protyle/gutter/index.ts | 18 +++++++++--------- app/src/protyle/render/av/render.ts | 1 - app/src/protyle/wysiwyg/transaction.ts | 8 ++++---- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts index 5ce77497e..6779b6e2c 100644 --- a/app/src/protyle/gutter/index.ts +++ b/app/src/protyle/gutter/index.ts @@ -62,8 +62,8 @@ export class Gutter { this.element.addEventListener("dragstart", (event: DragEvent & { target: HTMLElement }) => { hideTooltip(); const buttonElement = event.target.parentElement; - let selectIds: string[] = [] - let selectElements: Element[] = [] + let selectIds: string[] = []; + let selectElements: Element[] = []; let avElement: Element; if (buttonElement.dataset.rowId) { avElement = Array.from(protyle.wysiwyg.element.querySelectorAll(`.av[data-node-id="${buttonElement.dataset.nodeId}"]`)).find((item: HTMLElement) => { @@ -75,7 +75,7 @@ export class Gutter { avElement.querySelectorAll(".av__row--select:not(.av__row--header)").forEach(item => { selectIds.push(item.getAttribute("data-id")); selectElements.push(item); - }) + }); } else { selectIds = [buttonElement.getAttribute("data-node-id")]; selectElements = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select")); @@ -212,7 +212,7 @@ export class Gutter { if (!rowElement) { return; } - const blockElement = hasClosestBlock(rowElement) + const blockElement = hasClosestBlock(rowElement); if (!blockElement) { return; } @@ -358,7 +358,7 @@ export class Gutter { } Array.from(protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${buttonElement.getAttribute("data-node-id")}"]`)).find(item => { if (!hasClosestByAttribute(item.parentElement, "data-type", "NodeBlockQueryEmbed") && this.isMatchNode(item)) { - const rowItem = item.querySelector(`.av__row[data-id="${buttonElement.dataset.rowId}"]`) + const rowItem = item.querySelector(`.av__row[data-id="${buttonElement.dataset.rowId}"]`); Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--hl, av__row--hl")).forEach(hlItem => { if (!item.isSameNode(hlItem)) { hlItem.classList.remove("protyle-wysiwyg--hl"); @@ -1918,14 +1918,14 @@ export class Gutter { if (isShow) { type = nodeElement.getAttribute("data-type"); } - const dataNodeId = nodeElement.getAttribute("data-node-id") + const dataNodeId = nodeElement.getAttribute("data-node-id"); if (type === "NodeAttributeView" && target) { const rowElement = hasClosestByClassName(target, "av__row"); if (rowElement && !rowElement.classList.contains("av__row--header")) { element = rowElement; - html = `` + html = ``; if (!protyle.disabled) { - html = `${html}` + html = `${html}`; } break; } @@ -2001,7 +2001,7 @@ data-type="fold"> -1)) { diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index 7ee9910c2..a5aeab7a6 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -4,7 +4,6 @@ import {Constants} from "../../../constants"; import {popTextCell, renderCell} from "./cell"; import {unicode2Emoji} from "../../../emoji"; import {focusBlock} from "../../util/selection"; -import {isMac} from "../../util/compatibility"; import {hasClosestBlock, hasClosestByClassName} from "../../util/hasClosest"; import {stickyRow} from "./row"; import {getCalcValue} from "./calc"; diff --git a/app/src/protyle/wysiwyg/transaction.ts b/app/src/protyle/wysiwyg/transaction.ts index 6b1218bd3..50559ef2f 100644 --- a/app/src/protyle/wysiwyg/transaction.ts +++ b/app/src/protyle/wysiwyg/transaction.ts @@ -943,10 +943,10 @@ export const turnsIntoTransaction = (options: { let find = false; undoOperations.find(undoItem => { if (itemId === undoItem.id) { - find = true + find = true; return true; } - }) + }); if (!find) { doOperations.push({ action: "insert", @@ -958,9 +958,9 @@ export const turnsIntoTransaction = (options: { undoOperations.splice(0, 0, { action: "delete", id: itemId, - }) + }); } - }) + }); transaction(options.protyle, doOperations, undoOperations); processRender(options.protyle.wysiwyg.element); highlightRender(options.protyle.wysiwyg.element);