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

♻️ fix https://github.com/siyuan-note/siyuan/issues/12077

Browse source
This commit is contained in:
Vanessa 2024-07-25 17:55:25 +08:00
parent 73e2ce44e9
commit c6d2d629e8
16 changed files with 98 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/util/backForward.ts
View file

@ -1,4 +1,4 @@
import {hasClosestBlock, hasClosestByAttribute} from "../protyle/util/hasClosest";
import {hasClosestBlock, isInEmbedBlock} from "../protyle/util/hasClosest";
import {getContenteditableElement} from "../protyle/wysiwyg/getBlock";
import {focusByOffset, focusByRange, getSelectionOffset} from "../protyle/util/selection";
import {hideElements} from "../protyle/ui/hideElements";
@ -97,7 +97,7 @@ const focusStack = async (app: App, stack: IBackStack) => {
focusByOffset(protyle.title.editElement, stack.position.start, stack.position.end);
} else {
Array.from(protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${stack.id}"]`)).find((item: HTMLElement) => {
if (!hasClosestByAttribute(item, "data-type", "NodeBlockQueryEmbed")) {
if (!isInEmbedBlock(item)) {
blockElement = item;
return true;
}
@ -122,7 +122,7 @@ const focusStack = async (app: App, stack: IBackStack) => {
return true;
}
Array.from(stack.protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${stack.id}"]`)).find((item: HTMLElement) => {
if (!hasClosestByAttribute(item, "data-type", "NodeBlockQueryEmbed")) {
if (!isInEmbedBlock(item)) {
blockElement = item;
return true;
}
@ -165,7 +165,7 @@ const focusStack = async (app: App, stack: IBackStack) => {
protyle: stack.protyle,
afterCB() {
Array.from(stack.protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${stack.id}"]`)).find((item: HTMLElement) => {
if (!hasClosestByAttribute(item, "data-type", "NodeBlockQueryEmbed")) {
if (!isInEmbedBlock(item)) {
blockElement = item;
return true;
}
@ -193,7 +193,7 @@ const focusStack = async (app: App, stack: IBackStack) => {
isPushBack: false,
callback: () => {
Array.from(stack.protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${stack.id}"]`)).find((item: HTMLElement) => {
if (!hasClosestByAttribute(item, "data-type", "NodeBlockQueryEmbed")) {
if (!isInEmbedBlock(item)) {
blockElement = item;
return true;
}