Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-05 16:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

✨ https://github.com/siyuan-note/siyuan/issues/7518

Browse source
This commit is contained in:
Vanessa 2023-03-03 15:53:21 +08:00
parent bb4419d65f
commit 87147096b7
3 changed files with 37 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/assets/scss/mobile.scss
View file

@ -271,6 +271,16 @@
padding: 4px;
height: 32px;
}
&.keyboard__svg--close {
height: 12px;
background-color: var(--b3-theme-on-surface-light);
width: 12px;
padding: 4px;
border-radius: 10px;
margin: 10px;
color: var(--b3-theme-on-primary);
}
}
}
}

37
app/src/mobile/util/keyboardToolbar.ts
View file

@ -45,12 +45,13 @@ export const renderKeyboardToolbar = () => {
const range = getSelection().getRangeAt(0);
let html = ""
if (hasClosestByClassName(range.startContainer, "protyle-wysiwyg", true)) {
const protyle = window.siyuan.mobile.editor.protyle;
html = `<button data-type="add"><svg><use xlink:href="#iconAdd"></use></svg></button>
<button data-type="indent"><svg class="keyboard__svg--big"><use xlink:href="#iconBIU"></use></svg></button>
<button data-type="goinline"><svg class="keyboard__svg--big"><use xlink:href="#iconBIU"></use></svg></button>
<button data-type="indent"><svg><use xlink:href="#iconTrashcan"></use></svg></button>
<span class="keyboard__split"></span>
<button data-type="undo"><svg><use xlink:href="#iconUndo"></use></svg></button>
<button data-type="redo"><svg><use xlink:href="#iconRedo"></use></svg></button>
<button ${protyle.undo.undoStack.length === 0 ? "disabled" : ""} data-type="undo"><svg><use xlink:href="#iconUndo"></use></svg></button>
<button ${protyle.undo.redoStack.length === 0 ? "disabled" : ""} data-type="redo"><svg><use xlink:href="#iconRedo"></use></svg></button>
<button data-type="redo"><svg><use xlink:href="#iconFont"></use></svg></button>
<button data-type="redo"><svg><use xlink:href="#iconMore"></use></svg></button>
<span class="keyboard__split"></span>
@ -65,7 +66,7 @@ export const renderKeyboardToolbar = () => {
document.getElementById("keyboardToolbar").innerHTML = `<div class="fn__flex-1">
<div class="${selectText ? "fn__none " : ""}keyboard__dynamic">${html}</div>
<div class="${selectText ? "" : "fn__none "}keyboard__dynamic">
<button data-type="indent"><svg><use xlink:href="#iconBack"></use></svg></button>
<button data-type="goback"><svg><use xlink:href="#iconBack"></use></svg></button>
<button data-type="indent"><svg><use xlink:href="#iconRef"></use></svg></button>
<button data-type="block-ref"<use xlink:href="#iconRef"></use></svg></button>
<button data-type="a"><svg><use xlink:href="#iconLink"></use></svg></button>
@ -83,7 +84,7 @@ export const renderKeyboardToolbar = () => {
<button data-type="tag"><svg><use xlink:href="#iconTags"></use></svg></button>
<button data-type="inline-math"><svg><use xlink:href="#iconMath"></use></svg></button>
<button data-type="inline-memo"><svg><use xlink:href="#iconM"></use></svg></button>
<button data-type="indent"><svg><use xlink:href="#iconClose"></use></svg></button>
<button data-type="goback"><svg class="keyboard__svg--close"><use xlink:href="#iconClose"></use></svg></button>
</div>
</div>
<span class="keyboard__split"></span>
@ -109,7 +110,7 @@ export const initKeyboardToolbar = () => {
toolbarElement.addEventListener("click", (event) => {
const target = event.target as HTMLElement;
const buttonElement = hasClosestByMatchTag(target, "BUTTON");
if (!buttonElement || !window.siyuan.mobile.editor) {
if (!buttonElement) {
return;
}
event.preventDefault();
@ -119,7 +120,7 @@ export const initKeyboardToolbar = () => {
hideKeyboard();
return;
}
if (window.siyuan.mobile.editor.protyle.disabled) {
if (window.siyuan.config.readonly || window.siyuan.config.editor.readOnly || !window.siyuan.mobile.editor) {
return;
}
const protyle = window.siyuan.mobile.editor.protyle;
@ -131,17 +132,29 @@ export const initKeyboardToolbar = () => {
protyle.undo.redo(protyle);
return;
}
let range: Range;
if (getSelection().rangeCount > 0) {
range = getSelection().getRangeAt(0);
}
if (!range || (range && !protyle.wysiwyg.element.contains(range.startContainer))) {
if (type === "goback") {
const dynamicElements = document.querySelectorAll("#keyboardToolbar .keyboard__dynamic")
dynamicElements[0].classList.remove("fn__none")
dynamicElements[1].classList.add("fn__none")
return;
}
if (type === "goinline") {
const dynamicElements = document.querySelectorAll("#keyboardToolbar .keyboard__dynamic")
dynamicElements[1].classList.remove("fn__none")
dynamicElements[0].classList.add("fn__none")
return;
}
if (getSelection().rangeCount === 0) {
return;
}
const range = getSelection().getRangeAt(0);
const nodeElement = hasClosestBlock(range.startContainer);
if (!nodeElement) {
return;
}
// inline element
// block element
if (type === "up") {
moveToUp(protyle, nodeElement, range);

4
app/src/protyle/undo/index.ts
View file

@ -15,8 +15,8 @@ interface IOperations {
export class Undo {
private hasUndo = false;
private redoStack: IOperations[];
private undoStack: IOperations[];
public redoStack: IOperations[];
public undoStack: IOperations[];
constructor() {
this.redoStack = [];