mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-16 22:50:13 +01:00
This commit is contained in:
parent
d11ed21f06
commit
4fe40c9fd5
2 changed files with 17 additions and 10 deletions
|
|
@ -132,10 +132,10 @@ export const initBlockPopover = (app: App) => {
|
|||
if (tip && !aElement.classList.contains("b3-tooltips")) {
|
||||
// https://github.com/siyuan-note/siyuan/issues/11294
|
||||
try {
|
||||
showTooltip(decodeURIComponent(tip), aElement, tooltipClass);
|
||||
showTooltip(decodeURIComponent(tip), aElement, tooltipClass, event);
|
||||
} catch (e) {
|
||||
// https://ld246.com/article/1718235737991
|
||||
showTooltip(tip, aElement, tooltipClass);
|
||||
showTooltip(tip, aElement, tooltipClass, event);
|
||||
}
|
||||
event.stopPropagation();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,18 +1,26 @@
|
|||
import {isMobile} from "../util/functions";
|
||||
|
||||
export const showTooltip = (message: string, target: Element, tooltipClass?: string) => {
|
||||
export const showTooltip = (message: string, target: Element, tooltipClass?: string, event?: MouseEvent) => {
|
||||
if (isMobile()) {
|
||||
return;
|
||||
}
|
||||
let targetRect = target.getBoundingClientRect();
|
||||
if (target.getAttribute("data-inline-memo-content") && target.getClientRects().length > 1) {
|
||||
let lastWidth = 0;
|
||||
Array.from(target.getClientRects()).forEach(item => {
|
||||
if (item.width > lastWidth) {
|
||||
targetRect = item;
|
||||
}
|
||||
lastWidth = item.width;
|
||||
});
|
||||
if (event) {
|
||||
Array.from(target.getClientRects()).forEach(item => {
|
||||
if (event.clientY >= item.top - 3 && event.clientY <= item.bottom) {
|
||||
targetRect = item;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
Array.from(target.getClientRects()).forEach(item => {
|
||||
if (item.width > lastWidth) {
|
||||
targetRect = item;
|
||||
}
|
||||
lastWidth = item.width;
|
||||
});
|
||||
}
|
||||
}
|
||||
if (targetRect.height === 0 || !message) {
|
||||
hideTooltip();
|
||||
|
|
@ -25,7 +33,6 @@ export const showTooltip = (message: string, target: Element, tooltipClass?: str
|
|||
// 避免原本的 top 和 left 影响计算
|
||||
messageElement.removeAttribute("style");
|
||||
|
||||
|
||||
const position = target.getAttribute("data-position");
|
||||
const parentRect = target.parentElement.getBoundingClientRect();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue