Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-29 11:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2022-06-18 20:19:31 +08:00
parent e18e9c2750
commit c14fc344c6
6 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/protyle/toolbar/index.ts
View file

@ -879,7 +879,7 @@ export class Toolbar {
}
/// #endif
if (event.key === "Escape" || matchHotKey("⌘Enter", event)) {
if (event.key === "Escape" || matchHotKey("⌘↩", event)) {
this.subElement.classList.add("fn__none");
this.subElement.querySelector('[data-type="pin"]').classList.remove("ft__primary");
if (renderElement.tagName === "SPAN") {

3
app/src/protyle/util/compatibility.ts
View file

@ -75,7 +75,8 @@ export const updateHotkeyTip = (hotkey: string) => {
}
hotkey = hotkey.replace("⌘", "Ctrl").replace("⇧", "Shift")
.replace("⌥", "Alt").replace("⇥", "Tab")
.replace("⌫", "Backspace").replace("⌦", "Delete");
.replace("⌫", "Backspace").replace("⌦", "Delete")
.replace("↩", "Enter");
if (hotkey.indexOf("Shift") > -1) {
hotkey = hotkey.replace(";", ":").replace("=", "+").replace("-", "_").replace(".", ">");
}

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

@ -686,7 +686,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
}
// 软换行
if (matchHotKey("⇧Enter", event) && range.toString() === "") {
if (matchHotKey("⇧↩", event) && range.toString() === "") {
let startElement = range.startContainer as HTMLElement;
const nextSibling = hasNextSibling(startElement) as Element;
// 图片之前软换行
@ -1309,9 +1309,9 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
if (matchHotKey(window.siyuan.config.keymap.editor.general.vLayout.custom, event)) {
event.preventDefault();
let selectsElement: HTMLElement[] = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select"));
if (selectsElement.length === 0) {
selectsElement = [nodeElement];
const selectsElement: HTMLElement[] = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select"));
if (selectsElement.length < 2) {
return;
}
turnsIntoTransaction({
protyle, selectsElement,
@ -1323,9 +1323,9 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
if (matchHotKey(window.siyuan.config.keymap.editor.general.hLayout.custom, event)) {
event.preventDefault();
let selectsElement: HTMLElement[] = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select"));
if (selectsElement.length === 0) {
selectsElement = [nodeElement];
const selectsElement: HTMLElement[] = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select"));
if (selectsElement.length < 2) {
return;
}
turnsIntoTransaction({
protyle, selectsElement,