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

🎨 Improve breadcrumb in embed blocks https://github.com/siyuan-note/siyuan/issues/13099

Browse source
This commit is contained in:
Daniel 2024-11-10 11:51:59 +08:00
parent 01415b4821
commit 14f5570558
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/backlink.go
View file

@ -220,7 +220,7 @@ func buildBacklink(refID string, refTree *parse.Tree, keywords []string, luteEng
dom := renderBlockDOMByNodes(renderNodes, luteEngine)
var blockPaths []*BlockPath
if (nil != n.Parent && ast.NodeDocument != n.Parent.Type) || (ast.NodeHeading != n.Type && 0 < treenode.HeadingLevel(n)) {
blockPaths = buildBlockBreadcrumb(n, nil)
blockPaths = buildBlockBreadcrumb(n, nil, false)
}
if 1 > len(blockPaths) {
blockPaths = []*BlockPath{}

2
kernel/model/block.go
View file

@ -887,7 +887,7 @@ func getEmbeddedBlock(trees map[string]*parse.Tree, sqlBlock *sql.Block, heading
}
if breadcrumb {
blockPaths = buildBlockBreadcrumb(def, nil)
blockPaths = buildBlockBreadcrumb(def, nil, true)
}
if 1 > len(blockPaths) {
blockPaths = []*BlockPath{}

6
kernel/model/blockinfo.go
View file

@ -416,11 +416,11 @@ func BuildBlockBreadcrumb(id string, excludeTypes []string) (ret []*BlockPath, e
return
}
ret = buildBlockBreadcrumb(node, excludeTypes)
ret = buildBlockBreadcrumb(node, excludeTypes, false)
return
}
func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string) (ret []*BlockPath) {
func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string, isEmbedBlock bool) (ret []*BlockPath) {
ret = []*BlockPath{}
if nil == node {
return
@ -481,7 +481,7 @@ func buildBlockBreadcrumb(node *ast.Node, excludeTypes []string) (ret []*BlockPa
name = strings.ReplaceAll(name, editor.Caret, "")
name = util.EscapeHTML(name)
if parent == node {
if !isEmbedBlock && parent == node {
name = ""
}