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

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

Browse source
This commit is contained in:
Vanessa 2023-04-06 10:10:50 +08:00
parent a674f8fbec
commit 94aa8c8c3e
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -302,20 +302,23 @@
opacity: 0.38;
}
&.protyle-toolbar__item--current {
color: var(--b3-theme-primary);
&.protyle-toolbar__item--current svg {
background-color: var(--b3-list-hover);
}
svg {
height: 16px;
width: 16px;
float: left;
padding: 12px;
padding: 6px;
margin: 6px;
border-radius: 4px;
&.keyboard__svg--big {
width: 30px;
padding: 4px;
padding: 2px 6px;
height: 32px;
margin: 2px 6px;
}
}
}

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

@ -162,8 +162,11 @@ const showKeyboardToolbarUtil = (oldScrollTop: number) => {
};
const hideKeyboardToolbarUtil = () => {
document.getElementById("keyboardToolbar").style.height = "";
const toolbarElement = document.getElementById("keyboardToolbar")
toolbarElement.style.height = "";
window.siyuan.mobile.editor.protyle.element.style.marginBottom = "42px";
toolbarElement.querySelector('.keyboard__action[data-type="add"]').classList.remove("protyle-toolbar__item--current");
toolbarElement.querySelector('.keyboard__action[data-type="done"] use').setAttribute("xlink:href", "#iconKeyboardHide");
};
const renderKeyboardToolbar = () => {
@ -359,10 +362,15 @@ export const initKeyboardToolbar = () => {
}
event.preventDefault();
event.stopPropagation();
const range = getSelection().getRangeAt(0);
const type = buttonElement.getAttribute("data-type");
if (type === "done") {
activeBlur();
hideKeyboardToolbar();
if (toolbarElement.clientHeight > 100) {
focusByRange(range);
} else {
activeBlur();
hideKeyboardToolbar();
}
return;
}
if (window.siyuan.config.readonly || window.siyuan.config.editor.readOnly || !window.siyuan.mobile.editor) {
@ -378,7 +386,6 @@ export const initKeyboardToolbar = () => {
if (getSelection().rangeCount === 0) {
return;
}
const range = getSelection().getRangeAt(0);
const nodeElement = hasClosestBlock(range.startContainer);
if (!nodeElement) {
return;
@ -415,9 +422,15 @@ export const initKeyboardToolbar = () => {
focusByRange(range);
return;
} else if (type === "add") {
const oldScrollTop = window.siyuan.mobile.editor.protyle.contentElement.scrollTop;
renderSlashMenu(protyle, toolbarElement);
showKeyboardToolbarUtil(oldScrollTop);
if (buttonElement.classList.contains("protyle-toolbar__item--current")) {
focusByRange(range);
} else {
buttonElement.classList.add("protyle-toolbar__item--current");
toolbarElement.querySelector('.keyboard__action[data-type="done"] use').setAttribute("xlink:href", "#iconCloseRound");
const oldScrollTop = window.siyuan.mobile.editor.protyle.contentElement.scrollTop;
renderSlashMenu(protyle, toolbarElement);
showKeyboardToolbarUtil(oldScrollTop);
}
return;
} else if (type === "more") {
protyle.breadcrumb.showMenu(protyle, {