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

🐛 fix https://github.com/siyuan-note/siyuan/issues/8426

Browse source
This commit is contained in:
Vanessa 2023-06-02 10:22:31 +08:00
parent d6cbafe11f
commit d538d27aad
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/src/mobile/util/MobileBackFoward.ts
View file

@ -26,9 +26,11 @@ const focusStack = (backStack: IBackStack) => {
setEditMode(protyle, "wysiwyg");
}
const startEndId = backStack.endId.split(Constants.ZWSP);
if (startEndId[0] === protyle.wysiwyg.element.firstElementChild.getAttribute("data-node-id") &&
startEndId[1] === protyle.wysiwyg.element.lastElementChild.getAttribute("data-node-id")) {
protyle.notebookId = backStack.data.notebookId;
protyle.path = backStack.data.path;
if (backStack.data.startId === protyle.wysiwyg.element.firstElementChild.getAttribute("data-node-id") &&
backStack.data.endId === protyle.wysiwyg.element.lastElementChild.getAttribute("data-node-id")) {
protyle.contentElement.scrollTo({
top: backStack.scrollTop,
behavior: "smooth"
@ -68,8 +70,8 @@ const focusStack = (backStack: IBackStack) => {
fetchPost("/api/filetree/getDoc", {
id: backStack.id,
startID: startEndId[0],
endID: startEndId[1],
startID: backStack.data.startId,
endID: backStack.data.endId,
}, getResponse => {
protyle.block.parentID = getResponse.data.parentID;
protyle.block.parent2ID = getResponse.data.parent2ID;
@ -102,7 +104,12 @@ export const pushBack = () => {
const protyle = getCurrentEditor().protyle;
window.siyuan.backStack.push({
id: protyle.block.showAll ? protyle.block.id : protyle.block.rootID,
endId: protyle.wysiwyg.element.firstElementChild.getAttribute("data-node-id") + Constants.ZWSP + protyle.wysiwyg.element.lastElementChild.getAttribute("data-node-id"),
data: {
startId: protyle.wysiwyg.element.firstElementChild.getAttribute("data-node-id"),
endId: protyle.wysiwyg.element.lastElementChild.getAttribute("data-node-id"),
notebookId: protyle.notebookId,
path: protyle.path,
},
scrollTop: protyle.contentElement.scrollTop,
callback: protyle.block.action,
zoomId: protyle.block.showAll ? protyle.block.id : undefined
@ -149,7 +156,12 @@ export const goBack = () => {
const protyle = editor.protyle;
forwardStack.push({
id: protyle.block.showAll ? protyle.block.id : protyle.block.rootID,
endId: protyle.wysiwyg.element.firstElementChild.getAttribute("data-node-id") + Constants.ZWSP + protyle.wysiwyg.element.lastElementChild.getAttribute("data-node-id"),
data: {
startId: protyle.wysiwyg.element.firstElementChild.getAttribute("data-node-id"),
endId: protyle.wysiwyg.element.lastElementChild.getAttribute("data-node-id"),
notebookId: protyle.notebookId,
path: protyle.path,
},
scrollTop: protyle.contentElement.scrollTop,
callback: protyle.block.action,
zoomId: protyle.block.showAll ? protyle.block.id : undefined

7
app/src/types/index.d.ts vendored
View file

@ -149,7 +149,12 @@ interface IPdfAnno {
interface IBackStack {
id: string,
endId?: string,
data?: {
startId: string,
endId: string
path: string
notebookId: string
},
scrollTop?: number,
callback?: string[],
position?: { start: number, end: number }