Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-12 10:14:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source 
# Conflicts:
#	app/src/mobile/index.ts
This commit is contained in:
Vanessa 2026-02-10 19:58:07 +08:00
commit 7812533d64
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/CONTRIBUTING.md vendored
View file

@ -7,7 +7,7 @@
## NPM dependencies
Install pnpm: `npm install -g pnpm@10.28.2`
Install pnpm: `npm install -g pnpm@10.29.2`
<details>
<summary>For China mainland</summary>

2
.github/CONTRIBUTING_zh_CN.md vendored
View file

@ -7,7 +7,7 @@
## NPM 依赖
安装 pnpm：`npm install -g pnpm@10.28.2`
安装 pnpm：`npm install -g pnpm@10.29.2`
<details>
<summary>适用于中国大陆</summary>

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

@ -439,12 +439,14 @@ export const showKeyboardToolbar = () => {
}
const range = getSelection().getRangeAt(0);
const editor = getCurrentEditor();
if (editor && editor.protyle.wysiwyg.element.contains(range.startContainer)) {
editor.protyle.element.parentElement.style.paddingBottom = "48px";
if (editor) {
if (editor.protyle.wysiwyg.element.contains(range.startContainer)) {
editor.protyle.element.parentElement.style.paddingBottom = "48px";
}
editor.protyle.app.plugins.forEach(item => {
item.eventBus.emit("mobile-keyboard-show");
});
}
getCurrentEditor().protyle.app.plugins.forEach(item => {
item.eventBus.emit("mobile-keyboard-show");
});
setTimeout(() => {
const contentElement = hasClosestByClassName(range.startContainer, "protyle-content", true);
if (contentElement) {
@ -475,14 +477,14 @@ export const hideKeyboardToolbar = () => {
const editor = getCurrentEditor();
if (editor) {
editor.protyle.element.parentElement.style.paddingBottom = "";
editor.protyle.app.plugins.forEach(item => {
item.eventBus.emit("mobile-keyboard-hide");
});
}
const modelElement = document.getElementById("model");
if (modelElement.style.transform === "translateY(0px)") {
modelElement.style.paddingBottom = "";
}
getCurrentEditor().protyle.app.plugins.forEach(item => {
item.eventBus.emit("mobile-keyboard-hide");
});
};
export const activeBlur = () => {