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

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

Browse source
This commit is contained in:
Vanessa 2022-11-22 01:22:54 +08:00
commit 5f5d70740e
5 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/menus/protyle.ts
View file

@ -19,7 +19,7 @@ import {transaction, updateTransaction} from "../protyle/wysiwyg/transaction";
import {openMenu} from "./commonMenuItem";
import {fetchPost} from "../util/fetch";
import {Constants} from "../constants";
import {readText, writeText} from "../protyle/util/compatibility";
import {copyPlainText, readText, writeText} from "../protyle/util/compatibility";
import {preventScroll} from "../protyle/scroll/preventScroll";
import {onGet} from "../protyle/util/onGet";
import {getAllModels} from "../layout/getAll";
@ -296,7 +296,7 @@ export const contentMenu = (protyle: IProtyle, nodeElement: Element) => {
cloneContents.querySelectorAll('[data-type="backslash"]').forEach(item => {
item.firstElementChild.remove();
});
writeText(cloneContents.textContent);
copyPlainText(cloneContents.textContent);
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({

6
app/src/protyle/gutter/index.ts
View file

@ -3,7 +3,7 @@ import {getIconByType} from "../../editor/getIcon";
import {iframeMenu, setFold, tableMenu, videoMenu, zoomOut} from "../../menus/protyle";
import {MenuItem} from "../../menus/Menu";
import {copySubMenu, openAttr, openWechatNotify} from "../../menus/commonMenuItem";
import {updateHotkeyTip, writeText} from "../util/compatibility";
import {copyPlainText, updateHotkeyTip, writeText} from "../util/compatibility";
import {
transaction,
turnsIntoOneTransaction, turnsIntoTransaction,
@ -591,7 +591,7 @@ export class Gutter {
html += cloneNode.textContent + "\n";
});
});
writeText(html.trimEnd());
copyPlainText(html.trimEnd());
}
}, {
label: window.siyuan.languages.copy + " HTML",
@ -966,7 +966,7 @@ export class Gutter {
});
text += cloneNode.textContent + "\n";
});
writeText(text.trimEnd());
copyPlainText(text.trimEnd());
}
}, {
label: window.siyuan.languages.copy + " HTML",

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

@ -1,5 +1,6 @@
import {focusByRange} from "./selection";
import {fetchPost} from "../../util/fetch";
import {Constants} from "../../constants";
export const openByMobile = (uri: string) => {
if (!uri) {
@ -59,6 +60,11 @@ export const writeText = async (text: string) => {
}
};
export const copyPlainText = async (text: string) => {
text = text.replace(new RegExp(Constants.ZWSP, "g"), ""); // `复制纯文本` 时移除所有零宽空格 https://github.com/siyuan-note/siyuan/issues/6674
await writeText(text);
};
// 用户 iPhone 点击延迟/需要双击的处理
export const getEventName = () => {
if (navigator.userAgent.indexOf("iPhone") > -1) {

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

@ -1,5 +1,5 @@
import {hideElements} from "../ui/hideElements";
import {getEventName, isCtrl, isMac, writeText} from "../util/compatibility";
import {copyPlainText, getEventName, isCtrl, isMac, writeText} from "../util/compatibility";
import {
focusBlock,
focusByRange,
@ -1372,7 +1372,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
html += cloneNode.textContent + "\n";
});
});
writeText(html.trimEnd());
copyPlainText(html.trimEnd());
} else {
const cloneContents = range.cloneContents();
cloneContents.querySelectorAll('[data-type="backslash"]').forEach(item => {

8
kernel/model/transaction.go
View file

@ -40,9 +40,11 @@ import (
)
func IsFoldHeading(transactions *[]*Transaction) bool {
if 1 == len(*transactions) && 1 == len((*transactions)[0].DoOperations) {
if op := (*transactions)[0].DoOperations[0]; "foldHeading" == op.Action {
return true
for _, tx := range *transactions {
for _, op := range tx.DoOperations {
if "foldHeading" == op.Action {
return true
}
}
}
return false