mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-21 17:10:12 +01:00
🚨
This commit is contained in:
parent
a8f183a99f
commit
5befacdda9
10 changed files with 11 additions and 13 deletions
|
|
@ -230,7 +230,7 @@ export const keymap = {
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
search(value: string, keymapString: string) {
|
search(value: string, keymapString: string) {
|
||||||
const keymapListElement = keymap.element.querySelector("#keymapList")
|
const keymapListElement = keymap.element.querySelector("#keymapList");
|
||||||
keymapListElement.querySelectorAll(".b3-list-item--hide-action > .b3-list-item__text").forEach(item => {
|
keymapListElement.querySelectorAll(".b3-list-item--hide-action > .b3-list-item__text").forEach(item => {
|
||||||
const liElement = item.parentElement;
|
const liElement = item.parentElement;
|
||||||
let matchedKeymap = false;
|
let matchedKeymap = false;
|
||||||
|
|
|
||||||
|
|
@ -426,7 +426,7 @@ export class Files extends Model {
|
||||||
item.style.opacity = "";
|
item.style.opacity = "";
|
||||||
// https://github.com/siyuan-note/siyuan/issues/11587
|
// https://github.com/siyuan-note/siyuan/issues/11587
|
||||||
if (index === 0) {
|
if (index === 0) {
|
||||||
const airaLabelElement = item.querySelector(".ariaLabel")
|
const airaLabelElement = item.querySelector(".ariaLabel");
|
||||||
showTooltip(airaLabelElement.getAttribute("aria-label"), airaLabelElement);
|
showTooltip(airaLabelElement.getAttribute("aria-label"), airaLabelElement);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,6 @@ import {emitOpenMenu} from "../../plugin/EventBus";
|
||||||
import {insertAttrViewBlockAnimation} from "../render/av/row";
|
import {insertAttrViewBlockAnimation} from "../render/av/row";
|
||||||
import {avContextmenu, duplicateCompletely} from "../render/av/action";
|
import {avContextmenu, duplicateCompletely} from "../render/av/action";
|
||||||
import {getPlainText} from "../util/paste";
|
import {getPlainText} from "../util/paste";
|
||||||
import {Menu} from "../../plugin/Menu";
|
|
||||||
import {addEditorToDatabase} from "../render/av/addToDatabase";
|
import {addEditorToDatabase} from "../render/av/addToDatabase";
|
||||||
import {processClonePHElement} from "../render/util";
|
import {processClonePHElement} from "../render/util";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ const getHotkeyOrMarker = (hotkey: string, marker: string) => {
|
||||||
} else {
|
} else {
|
||||||
return `<span class="b3-list-item__meta">${marker}</span>`;
|
return `<span class="b3-list-item__meta">${marker}</span>`;
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export const hintSlash = (key: string, protyle: IProtyle) => {
|
export const hintSlash = (key: string, protyle: IProtyle) => {
|
||||||
const allList: IHintData[] = [{
|
const allList: IHintData[] = [{
|
||||||
|
|
|
||||||
|
|
@ -274,7 +274,7 @@ class="fn__flex-1 fn__flex${["url", "text", "number", "email", "phone", "block"]
|
||||||
targetElement.classList.add("dragover__top");
|
targetElement.classList.add("dragover__top");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
let counter = 0
|
let counter = 0;
|
||||||
element.addEventListener("dragleave", () => {
|
element.addEventListener("dragleave", () => {
|
||||||
counter--;
|
counter--;
|
||||||
if (counter === 0) {
|
if (counter === 0) {
|
||||||
|
|
|
||||||
|
|
@ -469,7 +469,7 @@ export const openMenuPanel = (options: {
|
||||||
}
|
}
|
||||||
dragoverElement = targetElement;
|
dragoverElement = targetElement;
|
||||||
});
|
});
|
||||||
let counter = 0
|
let counter = 0;
|
||||||
avPanelElement.addEventListener("dragleave", () => {
|
avPanelElement.addEventListener("dragleave", () => {
|
||||||
counter--;
|
counter--;
|
||||||
if (counter === 0) {
|
if (counter === 0) {
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,7 @@ export const initUI = (protyle: IProtyle) => {
|
||||||
// wysiwyg 元素下方点击无效果 https://github.com/siyuan-note/siyuan/issues/12009
|
// wysiwyg 元素下方点击无效果 https://github.com/siyuan-note/siyuan/issues/12009
|
||||||
if (protyle.disabled ||
|
if (protyle.disabled ||
|
||||||
(!event.target.classList.contains("protyle-content") && !event.target.classList.contains("protyle-wysiwyg"))) {
|
(!event.target.classList.contains("protyle-content") && !event.target.classList.contains("protyle-wysiwyg"))) {
|
||||||
return
|
return;
|
||||||
}
|
}
|
||||||
const lastRect = protyle.wysiwyg.element.lastElementChild.getBoundingClientRect();
|
const lastRect = protyle.wysiwyg.element.lastElementChild.getBoundingClientRect();
|
||||||
const range = document.createRange();
|
const range = document.createRange();
|
||||||
|
|
|
||||||
|
|
@ -1181,7 +1181,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
|
||||||
|
|
||||||
// 超级块中有a,b两个段落块,移动到 ab 之间的间隙 targetElement 会变为超级块,需修正为 a
|
// 超级块中有a,b两个段落块,移动到 ab 之间的间隙 targetElement 会变为超级块,需修正为 a
|
||||||
if (targetElement && (targetElement.classList.contains("bq") || targetElement.classList.contains("sb") || targetElement.classList.contains("list") || targetElement.classList.contains("li"))) {
|
if (targetElement && (targetElement.classList.contains("bq") || targetElement.classList.contains("sb") || targetElement.classList.contains("list") || targetElement.classList.contains("li"))) {
|
||||||
let prevElement = hasClosestBlock(document.elementFromPoint(point.x, point.y - 6))
|
let prevElement = hasClosestBlock(document.elementFromPoint(point.x, point.y - 6));
|
||||||
while (prevElement && targetElement.contains(prevElement)) {
|
while (prevElement && targetElement.contains(prevElement)) {
|
||||||
if (prevElement.nextElementSibling?.getAttribute("data-node-id")) {
|
if (prevElement.nextElementSibling?.getAttribute("data-node-id")) {
|
||||||
targetElement = prevElement;
|
targetElement = prevElement;
|
||||||
|
|
@ -1373,7 +1373,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
|
||||||
dragoverElement = targetElement;
|
dragoverElement = targetElement;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
let counter = 0
|
let counter = 0;
|
||||||
editorElement.addEventListener("dragleave", (event: DragEvent & { target: HTMLElement }) => {
|
editorElement.addEventListener("dragleave", (event: DragEvent & { target: HTMLElement }) => {
|
||||||
if (protyle.disabled) {
|
if (protyle.disabled) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
@ -1398,6 +1398,6 @@ const addDragover = (element: HTMLElement) => {
|
||||||
element.classList.contains("li") ||
|
element.classList.contains("li") ||
|
||||||
element.classList.contains("list") ||
|
element.classList.contains("list") ||
|
||||||
element.classList.contains("bq")) {
|
element.classList.contains("bq")) {
|
||||||
element.classList.add("dragover")
|
element.classList.add("dragover");
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,6 @@ import {dropEvent} from "../util/editorCommonEvent";
|
||||||
import {input} from "./input";
|
import {input} from "./input";
|
||||||
import {
|
import {
|
||||||
getContenteditableElement,
|
getContenteditableElement,
|
||||||
getLastBlock,
|
|
||||||
getNextBlock,
|
getNextBlock,
|
||||||
getTopAloneElement,
|
getTopAloneElement,
|
||||||
hasNextSibling,
|
hasNextSibling,
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ import {addLoading} from "../protyle/ui/initUI";
|
||||||
import {getIconByType} from "../editor/getIcon";
|
import {getIconByType} from "../editor/getIcon";
|
||||||
import {unicode2Emoji} from "../emoji";
|
import {unicode2Emoji} from "../emoji";
|
||||||
import {hasClosestByClassName} from "../protyle/util/hasClosest";
|
import {hasClosestByClassName} from "../protyle/util/hasClosest";
|
||||||
import {isNotCtrl, isMac, setStorageVal, updateHotkeyTip} from "../protyle/util/compatibility";
|
import {isNotCtrl, setStorageVal, updateHotkeyTip} from "../protyle/util/compatibility";
|
||||||
import {newFileByName} from "../util/newFile";
|
import {newFileByName} from "../util/newFile";
|
||||||
import {
|
import {
|
||||||
filterMenu,
|
filterMenu,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue