From e6578a39bfe55402955761091ace3e1d6ee1a2f3 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Wed, 20 Nov 2024 10:51:42 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/pull/13206 --- app/src/protyle/render/av/action.ts | 25 ++++++++++++------------- app/src/protyle/render/av/row.ts | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/src/protyle/render/av/action.ts b/app/src/protyle/render/av/action.ts index 907beb23c..88cca8a8f 100644 --- a/app/src/protyle/render/av/action.ts +++ b/app/src/protyle/render/av/action.ts @@ -43,20 +43,9 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle if (!blockElement) { return false; } - const setPageSizeElement = hasClosestByAttribute(event.target, "data-type", "set-page-size"); - if (setPageSizeElement) { - setPageSize({ - target: event.target, - protyle, - avID: blockElement.getAttribute("data-av-id"), - nodeElement: blockElement - }); - event.preventDefault(); - event.stopPropagation(); - return true; - } + const loadMoreElement = hasClosestByAttribute(event.target, "data-type", "av-load-more"); - if (loadMoreElement) { + if (loadMoreElement && !hasClosestByAttribute(event.target, "data-type", "set-page-size")) { (blockElement.querySelector(".av__row--footer") as HTMLElement).style.transform = ""; blockElement.removeAttribute("data-render"); blockElement.dataset.pageSize = (parseInt(blockElement.dataset.pageSize) + parseInt(blockElement.querySelector('[data-type="set-page-size"]').getAttribute("data-size"))).toString(); @@ -193,6 +182,16 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle event.preventDefault(); event.stopPropagation(); return true; + } else if (type === "set-page-size") { + setPageSize({ + target, + protyle, + avID: blockElement.getAttribute("data-av-id"), + nodeElement: blockElement + }); + event.preventDefault(); + event.stopPropagation(); + return true; } else if (type === "av-add-bottom") { insertRows(blockElement, protyle, 1, blockElement.querySelector(".av__row--util").previousElementSibling.getAttribute("data-id") || ""); event.preventDefault(); diff --git a/app/src/protyle/render/av/row.ts b/app/src/protyle/render/av/row.ts index 51ccb947f..d0e84de7a 100644 --- a/app/src/protyle/render/av/row.ts +++ b/app/src/protyle/render/av/row.ts @@ -149,7 +149,7 @@ ${getTypeByCellElement(item) === "block" ? ' data-detached="true"' : ""}>