Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-24 10:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

📱 fix https://github.com/siyuan-note/siyuan/issues/9111

Browse source
This commit is contained in:
Vanessa 2023-09-07 09:58:07 +08:00
parent 28d75b4cec
commit 2bbc9fb74b
2 changed files with 97 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

91
app/src/boot/globalEvent/touch.ts Normal file
View file

@ -0,0 +1,91 @@
import {isIPad, isIPhone} from "../../protyle/util/compatibility";
import {hasClosestByAttribute, hasClosestByClassName, hasTopClosestByTag} from "../../protyle/util/hasClosest";
import {initFileMenu, initNavigationMenu} from "../../menus/navigation";
import {fileAnnotationRefMenu, linkMenu, refMenu, tagMenu} from "../../menus/protyle";
import {App} from "../../index";
import {Protyle} from "../../protyle";
import {getCurrentEditor} from "../../mobile/editor";
import {getInstanceById} from "../../layout/util";
import {Tab} from "../../layout/Tab";
import {Editor} from "../../editor";
import {hideTooltip} from "../../dialog/tooltip";
export const globalTouchEnd = (event: TouchEvent, yDiff: number, time: number, app: App) => {
const target = event.target as HTMLElement;
if (typeof yDiff === "undefined" && new Date().getTime() - time > 900) {
// ios 长按
// 文档树
const fileItemElement = hasClosestByAttribute(target, "data-type", "navigation-root") || hasClosestByAttribute(target, "data-type", "navigation-file");
if (fileItemElement) {
if (!window.siyuan.config.readonly && fileItemElement.dataset.type === "navigation-root") {
const menu = initNavigationMenu(app, fileItemElement);
if (isIPad()) {
const rect = fileItemElement.getBoundingClientRect()
menu.popup({x: rect.right, y: rect.bottom, h: rect.height})
hideTooltip()
} else {
window.siyuan.menus.menu.fullscreen("bottom");
}
} else if (fileItemElement.dataset.type === "navigation-file") {
const rootElement = hasTopClosestByTag(fileItemElement, "UL");
if (rootElement) {
const menu = initFileMenu(app, rootElement.dataset.url, fileItemElement.dataset.path, fileItemElement);
if (isIPad()) {
const rect = fileItemElement.getBoundingClientRect()
menu.popup({x: rect.right, y: rect.bottom, h: rect.height})
hideTooltip()
} else {
window.siyuan.menus.menu.fullscreen("bottom");
}
}
}
return true;
}
// 内元素弹出菜单
if (target.tagName === "SPAN" && !hasClosestByAttribute(target, "data-type", "NodeBlockQueryEmbed")) {
let editor: Protyle
if (isIPhone()) {
if (hasClosestByClassName(target, "protyle-wysiwyg")) {
editor = getCurrentEditor();
}
} else {
const tabContainerElement = hasClosestByClassName(target, "protyle", true)
if (tabContainerElement) {
const tab = getInstanceById(tabContainerElement.dataset.id);
if (tab instanceof Tab && tab.model instanceof Editor) {
editor = tab.model.editor
}
}
}
if (!editor) {
return false;
}
const types = (target.getAttribute("data-type") || "").split(" ");
if (types.includes("inline-memo")) {
editor.protyle.toolbar.showRender(editor.protyle, target);
}
if (editor.protyle.disabled) {
event.stopImmediatePropagation();
event.preventDefault();
return true;
}
if (types.includes("block-ref")) {
refMenu(editor.protyle, target);
return true;
}
if (types.includes("file-annotation-ref")) {
fileAnnotationRefMenu(editor.protyle, target);
return true;
}
if (types.includes("tag")) {
tagMenu(editor.protyle, target);
return true;
}
if (types.includes("a")) {
linkMenu(editor.protyle, target);
return true;
}
}
}
return false
}

51
app/src/mobile/util/touch.ts
View file

@ -7,11 +7,9 @@ import {
import {closePanel} from "./closePanel";
import {popMenu} from "../menu";
import {activeBlur, hideKeyboardToolbar} from "./keyboardToolbar";
import {getCurrentEditor} from "../editor";
import {fileAnnotationRefMenu, linkMenu, refMenu, tagMenu} from "../../menus/protyle";
import {isIPhone} from "../../protyle/util/compatibility";
import {initFileMenu, initNavigationMenu} from "../../menus/navigation";
import {App} from "../../index";
import {globalTouchEnd} from "../../boot/globalEvent/touch";
let clientX: number;
let clientY: number;
@ -32,49 +30,12 @@ const popSide = (render = true) => {
};
export const handleTouchEnd = (event: TouchEvent, app: App) => {
const editor = getCurrentEditor();
const target = event.target as HTMLElement;
if (typeof yDiff === "undefined" && new Date().getTime() - time > 900 && isIPhone()) {
// ios 长按行
// 文档树
const fileItemElement = hasClosestByAttribute(target, "data-type", "navigation-root") || hasClosestByAttribute(target, "data-type", "navigation-file");
if (fileItemElement) {
if (!window.siyuan.config.readonly && fileItemElement.dataset.type === "navigation-root") {
initNavigationMenu(app, fileItemElement);
window.siyuan.menus.menu.fullscreen("bottom");
} else if (fileItemElement.dataset.type === "navigation-file") {
const rootElement = hasTopClosestByTag(fileItemElement, "UL");
if (rootElement) {
initFileMenu(app, rootElement.dataset.url, fileItemElement.dataset.path, fileItemElement);
window.siyuan.menus.menu.fullscreen("bottom");
}
}
event.stopImmediatePropagation();
event.preventDefault();
return;
}
// 内元素弹出菜单
if (editor && hasClosestByClassName(target, "protyle-wysiwyg") &&
target.tagName === "SPAN" && !hasClosestByAttribute(target, "data-type", "NodeBlockQueryEmbed")) {
const types = (target.getAttribute("data-type") || "").split(" ");
if (types.includes("inline-memo")) {
editor.protyle.toolbar.showRender(editor.protyle, target);
}
if (editor.protyle.disabled) {
return;
}
if (types.includes("block-ref")) {
refMenu(editor.protyle, target);
} else if (types.includes("file-annotation-ref")) {
fileAnnotationRefMenu(editor.protyle, target);
} else if (types.includes("tag")) {
tagMenu(editor.protyle, target);
} else if (types.includes("a")) {
linkMenu(editor.protyle, target);
}
return;
}
if (isIPhone() && globalTouchEnd(event, yDiff, time, app)) {
event.stopImmediatePropagation();
event.preventDefault();
return;
}
const target = event.target as HTMLElement;
if (!clientX || !clientY || typeof yDiff === "undefined" ||
target.tagName === "AUDIO" ||
hasClosestByClassName(target, "b3-dialog", true) ||