0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 fix https://github.com/siyuan-note/siyuan/issues/11075

Browse source
This commit is contained in:
Vanessa 2024-04-18 11:15:52 +08:00
parent 16d40cf9ae
commit 06a095bce1
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/protyle/render/av/action.ts
View file

@ -33,10 +33,13 @@ import * as dayjs from "dayjs";
import {openCalcMenu} from "./calc";
import {avRender} from "./render";
import {addView, openViewMenu} from "./view";
import {isOnlyMeta, openByMobile, writeText} from "../../util/compatibility";
import {isOnlyMeta, writeText} from "../../util/compatibility";
import {openSearchAV} from "./relation";
export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLElement }) => {
if (isOnlyMeta(event)) {
return false;
}
const blockElement = hasClosestBlock(event.target);
if (!blockElement) {
return false;

14
app/src/protyle/wysiwyg/index.ts
View file

@ -2195,7 +2195,7 @@ export class WYSIWYG {
}
const embedItemElement = hasClosestByClassName(event.target, "protyle-wysiwyg__embed");
if (embedItemElement) {
if (embedItemElement && !ctrlIsPressed) {
const embedId = embedItemElement.getAttribute("data-id");
checkFold(embedId, (zoomIn, action) => {
/// #if MOBILE
@ -2288,7 +2288,7 @@ export class WYSIWYG {
}
const languageElement = hasClosestByClassName(event.target, "protyle-action__language");
if (languageElement && !protyle.disabled) {
if (languageElement && !protyle.disabled && !ctrlIsPressed) {
protyle.toolbar.showCodeLanguage(protyle, languageElement);
event.stopPropagation();
event.preventDefault();
@ -2311,6 +2311,8 @@ export class WYSIWYG {
clientX: event.clientX + 4,
clientY: event.clientY
});
event.stopPropagation();
return;
} else if (actionElement.parentElement.classList.contains("li")) {
const actionId = actionElement.parentElement.getAttribute("data-node-id");
if (event.altKey && !protyle.disabled) {
@ -2367,9 +2369,9 @@ export class WYSIWYG {
}
}
}
event.stopPropagation();
return;
}
event.stopPropagation();
return;
}
const selectElement = hasClosestByClassName(event.target, "hr") ||
@ -2599,6 +2601,10 @@ export class WYSIWYG {
if (ctrlIsPressed && range.toString() === "") {
let ctrlElement = hasClosestBlock(event.target);
if (ctrlElement) {
const embedBlockElement = hasClosestByAttribute(ctrlElement, "data-type", "NodeBlockQueryEmbed");
if (embedBlockElement) {
ctrlElement = embedBlockElement;
}
ctrlElement = getTopAloneElement(ctrlElement) as HTMLElement;
if (ctrlElement.classList.contains("protyle-wysiwyg--select")) {
ctrlElement.classList.remove("protyle-wysiwyg--select");