Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 22:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Improve fold heading editing https://github.com/siyuan-note/siyuan/issues/15848

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-09-23 23:22:18 +08:00
parent 58f72678ae
commit be233229a9
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 73 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

41
kernel/model/transaction.go
View file

@ -1255,10 +1255,16 @@ func (tx *Transaction) doInsert(operation *Operation) (ret *TxErr) {
}
node.InsertAfter(insertedNode)
if treenode.IsUnderFoldedHeading(insertedNode) {
// 保持在标题下的折叠状态
insertedNode.SetIALAttr("fold", "1")
insertedNode.SetIALAttr("heading-fold", "1")
if parentFoldedHeading := treenode.GetParentFoldedHeading(insertedNode); nil != parentFoldedHeading {
ast.Walk(insertedNode, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering || !n.IsBlock() {
return ast.WalkContinue
}
n.SetIALAttr("fold", "1")
n.SetIALAttr("heading-fold", "1")
return ast.WalkContinue
})
}
} else {
node = treenode.GetNodeInTree(tree, operation.ParentID)
@ -1510,14 +1516,23 @@ func (tx *Transaction) doUpdate(operation *Operation) (ret *TxErr) {
oldNode.InsertAfter(updatedNode)
oldNode.Unlink()
if treenode.IsUnderFoldedHeading(updatedNode) {
// 保持在标题下的折叠状态
updatedNode.SetIALAttr("fold", "1")
updatedNode.SetIALAttr("heading-fold", "1")
parentFoldedHeading := treenode.GetParentFoldedHeading(updatedNode)
if nil != parentFoldedHeading {
children := treenode.HeadingChildren(parentFoldedHeading)
for _, child := range children {
ast.Walk(child, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering || !n.IsBlock() {
return ast.WalkContinue
}
n.SetIALAttr("fold", "1")
n.SetIALAttr("heading-fold", "1")
return ast.WalkContinue
})
}
}
createdUpdated(updatedNode)
tx.nodes[updatedNode.ID] = updatedNode
if err = tx.writeTree(tree); err != nil {
return &TxErr{code: TxErrCodeWriteTree, msg: err.Error(), id: id}
@ -1544,6 +1559,14 @@ func (tx *Transaction) doUpdate(operation *Operation) (ret *TxErr) {
}
}
}
if oldNode.HeadingLevel != updatedNode.HeadingLevel {
// 编辑折叠标题下方块，并且这个块的标题层级发生了变化（比如从 H2 变为 H3 或者从标题块变成段落块），则刷新所有编辑器以保持一致性
go func() {
tx.WaitForCommit()
ReloadProtyle(tree.ID)
}()
}
return
}