Skip to content

Commit

Permalink
🎨 Vditor 支持
Browse files Browse the repository at this point in the history 
重构 SV 模式 DOM
Vanessa219/vditor#580
  • Loading branch information
@88250
88250 committed Jul 14, 2020
1 parent 37d247d commit c31be7c
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 59 deletions.
4 changes: 2 additions & 2 deletions javascript/lute.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion javascript/lute.min.js.map
View file

Large diffs are not rendered by default.

124 changes: 79 additions & 45 deletions render/vditor_sv_renderer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@ type VditorSVRenderer struct {
nodeWriterStack []*bytes.Buffer // 节点输出缓冲栈
needRenderFootnotesDef bool
LastOut []byte // 最新输出的 newline 长度个字节
ListIndentSpaces int // 列表绝对缩进空格数
ListPadding int // 列表内部缩进空格数
}

var newline = []byte("<span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span>")
var NewlineSV = []byte("<span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span>")

func (r *VditorSVRenderer) WriteByte(c byte) {
r.Writer.WriteByte(c)
r.LastOut = append(r.LastOut, c)
if len(newline) < len(r.LastOut) {
r.LastOut = r.LastOut[len(r.LastOut)-len(newline):]
if 1024 < len(r.LastOut) {
r.LastOut = r.LastOut[512:]
}
}

func (r *VditorSVRenderer) Write(content []byte) {
if length := len(content); 0 < length {
r.Writer.Write(content)
r.LastOut = append(r.LastOut, content...)
if len(newline) < len(r.LastOut) {
r.LastOut = r.LastOut[len(r.LastOut)-len(newline):]
if 1024 < len(r.LastOut) {
r.LastOut = r.LastOut[512:]
}
}
}
Expand All @@ -56,16 +56,25 @@ func (r *VditorSVRenderer) WriteString(content string) {
if length := len(content); 0 < length {
r.Writer.WriteString(content)
r.LastOut = append(r.LastOut, content...)
if len(newline) < len(r.LastOut) {
r.LastOut = r.LastOut[len(r.LastOut)-len(newline):]
if 1024 < len(r.LastOut) {
r.LastOut = r.LastOut[512:]
}
}
}

func (r *VditorSVRenderer) Newline() {
if !bytes.Equal(newline, r.LastOut) {
r.Writer.Write(newline)
r.LastOut = newline
for {
if bytes.HasSuffix(r.LastOut, []byte("</span>")) {
r.LastOut = r.LastOut[:len(r.LastOut)-len("</span>")]
} else {
break
}
}

newline := NewlineSV[:len(NewlineSV)-len("</span>")*2]
if !bytes.HasSuffix(r.LastOut, newline) {
r.Writer.Write(NewlineSV)
r.LastOut = NewlineSV
}
}

Expand Down Expand Up @@ -195,19 +204,19 @@ func (r *VditorSVRenderer) RenderFootnotesDefs(context *parse.Context) []byte {
defContent := defRenderer.Render()
defLines := &bytes.Buffer{}
indentSpacesStr := `<span data-type="footnotes-space"> </span>`
lines := bytes.Split(defContent, newline)
lines := bytes.Split(defContent, NewlineSV)
for i, line := range lines {
if 0 == len(line) {
if !bytes.HasSuffix(defLines.Bytes(), newline) {
defLines.Write(newline)
if !bytes.HasSuffix(defLines.Bytes(), NewlineSV) {
defLines.Write(NewlineSV)
}
continue
}
if 0 < i {
defLines.WriteString(indentSpacesStr)
}
defLines.Write(line)
defLines.Write(newline)
defLines.Write(NewlineSV)
}
r.Write(defLines.Bytes())
r.Newline()
Expand Down Expand Up @@ -308,7 +317,7 @@ func (r *VditorSVRenderer) renderCodeBlockCloseMarker(node *ast.Node, entering b
r.tag("/span", nil, false)
r.Newline()
if !r.isLastNode(r.Tree.Root, node) {
r.Write(newline)
r.Write(NewlineSV)
}
return ast.WalkStop
}
Expand All @@ -330,6 +339,7 @@ func (r *VditorSVRenderer) renderCodeBlockOpenMarker(node *ast.Node, entering bo

func (r *VditorSVRenderer) renderCodeBlock(node *ast.Node, entering bool) ast.WalkStatus {
if entering {
r.renderListItemBlockPadding(node)
r.tag("span", [][]string{{"data-block", "0"}, {"data-type", "code-block"}}, false)
if !node.IsFencedCodeBlock {
r.tag("span", [][]string{{"data-type", "code-block-open-marker"}, {"class", "vditor-sv__marker"}}, false)
Expand Down Expand Up @@ -411,7 +421,7 @@ func (r *VditorSVRenderer) renderMathBlockCloseMarker(node *ast.Node, entering b
r.tag("/span", nil, false)
r.Newline()
if !r.isLastNode(r.Tree.Root, node) {
r.Write(newline)
r.Write(NewlineSV)
}
return ast.WalkStop
}
Expand All @@ -433,6 +443,7 @@ func (r *VditorSVRenderer) renderMathBlockOpenMarker(node *ast.Node, entering bo

func (r *VditorSVRenderer) renderMathBlock(node *ast.Node, entering bool) ast.WalkStatus {
if entering {
r.renderListItemBlockPadding(node)
r.tag("span", [][]string{{"data-block", "0"}, {"data-type", "math-block"}}, false)
} else {
r.WriteString("</span>")
Expand All @@ -453,11 +464,13 @@ func (r *VditorSVRenderer) renderTableHead(node *ast.Node, entering bool) ast.Wa
}

func (r *VditorSVRenderer) renderTable(node *ast.Node, entering bool) ast.WalkStatus {
r.renderListItemBlockPadding(node)

r.tag("span", [][]string{{"data-block", "0"}, {"data-type", "table"}}, false)
r.Write(node.Tokens)
r.Newline()
if !r.isLastNode(r.Tree.Root, node) {
r.Write(newline)
r.Write(NewlineSV)
}
r.tag("/span", nil, false)
return ast.WalkStop
Expand Down Expand Up @@ -611,14 +624,16 @@ func (r *VditorSVRenderer) renderLink(node *ast.Node, entering bool) ast.WalkSta
}

func (r *VditorSVRenderer) renderHTML(node *ast.Node, entering bool) ast.WalkStatus {
r.renderListItemBlockPadding(node)

r.tag("span", [][]string{{"data-type", "html-block"}, {"class", "vditor-sv__marker"}}, false)
r.tag("span", [][]string{{"class", "vditor-sv__marker"}}, false)
tokens := bytes.TrimSpace(node.Tokens)
r.Write(html.EscapeHTML(tokens))
r.WriteString("</span>")
r.Newline()
if !r.isLastNode(r.Tree.Root, node) {
r.Write(newline)
r.Write(NewlineSV)
}
r.WriteString("</span>")
return ast.WalkStop
Expand Down Expand Up @@ -648,14 +663,15 @@ func (r *VditorSVRenderer) renderDocument(node *ast.Node, entering bool) ast.Wal

func (r *VditorSVRenderer) renderParagraph(node *ast.Node, entering bool) ast.WalkStatus {
if entering {
r.renderListItemBlockPadding(node)
r.tag("span", [][]string{{"data-type", "p"}, {"data-block", "0"}}, false)
} else {
r.Newline()
grandparent := node.Parent.Parent
inTightList := nil != grandparent && ast.NodeList == grandparent.Type && grandparent.Tight
if !inTightList {
// 不在紧凑列表内则需要输出换行分段
r.Write(newline)
r.Write(NewlineSV)
}
r.tag("/span", nil, false)
}
Expand Down Expand Up @@ -801,21 +817,23 @@ func (r *VditorSVRenderer) renderBlockquote(node *ast.Node, entering bool) ast.W
r.Writer = &bytes.Buffer{}
r.nodeWriterStack = append(r.nodeWriterStack, r.Writer)
} else {
r.renderListItemBlockPadding(node)

writer := r.nodeWriterStack[len(r.nodeWriterStack)-1]
r.nodeWriterStack = r.nodeWriterStack[:len(r.nodeWriterStack)-1]

buf := writer.Bytes()
for {
if bytes.HasSuffix(buf, append(newline, []byte("</span>")...)) {
buf = bytes.TrimSuffix(buf, append(newline, []byte("</span>")...))
if bytes.HasSuffix(buf, append(NewlineSV, []byte("</span>")...)) {
buf = bytes.TrimSuffix(buf, append(NewlineSV, []byte("</span>")...))
buf = append(buf, []byte("</span>")...)
} else {
break
}
}
marker := []byte("<span data-type=\"blockquote-marker\" class=\"vditor-sv__marker\">&gt; </span>")
buf = append(marker, buf...)
buf = bytes.ReplaceAll(buf, newline, append(newline, []byte("<span data-type=\"blockquote-marker\" class=\"vditor-sv__marker\">&gt; </span>")...))
buf = bytes.ReplaceAll(buf, NewlineSV, append(NewlineSV, []byte("<span data-type=\"blockquote-marker\" class=\"vditor-sv__marker\">&gt; </span>")...))
writer.Reset()
writer.WriteString(`<span data-block="0" data-type="blockquote">`)
writer.Write(buf)
Expand All @@ -825,7 +843,7 @@ func (r *VditorSVRenderer) renderBlockquote(node *ast.Node, entering bool) ast.W
r.Writer.Reset()
r.Write(buf)
r.Newline()
r.Write(newline)
r.Write(NewlineSV)
r.WriteString("</span>")
}
return ast.WalkContinue
Expand All @@ -838,6 +856,8 @@ func (r *VditorSVRenderer) renderBlockquoteMarker(node *ast.Node, entering bool)
func (r *VditorSVRenderer) renderHeading(node *ast.Node, entering bool) ast.WalkStatus {
rootParent := ast.NodeDocument == node.Parent.Type
if entering {
r.renderListItemBlockPadding(node)

if rootParent {
r.tag("span", [][]string{{"data-block", "0"}, {"data-type", "heading"}}, false)
r.tag("span", [][]string{{"class", "h" + headingLevel[node.HeadingLevel:node.HeadingLevel+1]}}, false)
Expand All @@ -849,8 +869,8 @@ func (r *VditorSVRenderer) renderHeading(node *ast.Node, entering bool) ast.Walk
if rootParent {
r.tag("/span", nil, false)
}
r.Write(newline)
r.Write(newline)
r.Write(NewlineSV)
r.Write(NewlineSV)
if rootParent {
r.WriteString("</span>")
}
Expand All @@ -871,6 +891,8 @@ func (r *VditorSVRenderer) renderHeadingID(node *ast.Node, entering bool) ast.Wa

func (r *VditorSVRenderer) renderList(node *ast.Node, entering bool) ast.WalkStatus {
if entering {
r.ListPadding += node.ListData.Padding

var attrs [][]string
if node.Tight {
attrs = append(attrs, []string{"data-tight", "true"})
Expand Down Expand Up @@ -898,8 +920,10 @@ func (r *VditorSVRenderer) renderList(node *ast.Node, entering bool) ast.WalkSta
attrs = append(attrs, []string{"data-block", "0"})
r.tag("span", attrs, false)
} else {
r.Write(newline)
r.Write(NewlineSV)
r.tag("/span", nil, false)

r.ListPadding -= node.ListData.Padding
}
return ast.WalkContinue
}
Expand All @@ -908,37 +932,31 @@ func (r *VditorSVRenderer) renderListItem(node *ast.Node, entering bool) ast.Wal
if entering {
r.Writer = &bytes.Buffer{}
r.nodeWriterStack = append(r.nodeWriterStack, r.Writer)
if ast.NodeDocument != node.Parent.Parent.Type {
r.ListIndentSpaces += node.ListData.Padding
}
} else {
writer := r.nodeWriterStack[len(r.nodeWriterStack)-1]
r.nodeWriterStack = r.nodeWriterStack[:len(r.nodeWriterStack)-1]

indent := len(node.ListData.Marker) + 1
if 1 == node.ListData.Typ || (3 == node.ListData.Typ && 0 == node.ListData.BulletChar) {
indent++
}
indentSpaces := bytes.Repeat([]byte{lex.ItemSpace}, indent)
li := []byte(`<span data-type="li">`)
buf := writer.Bytes()
indentSpacesStr := `<span data-type="li-space">` + string(indentSpaces) + "</span>"
for {
if bytes.HasSuffix(buf, append(newline, []byte("</span>")...)) {
buf = bytes.TrimSuffix(buf, append(newline, []byte("</span>")...))
if bytes.HasSuffix(buf, append(NewlineSV, []byte("</span>")...)) {
buf = bytes.TrimSuffix(buf, append(NewlineSV, []byte("</span>")...))
buf = append(buf, []byte("</span>")...)
} else {
break
}
}
marginCount := r.ListPadding - node.Padding
margin := []byte(`<span data-type="padding">` + strings.Repeat(" ", marginCount) + "</span>")
li = append(li, margin...)
var markerStr string
if 1 == node.ListData.Typ || (3 == node.ListData.Typ && 0 == node.ListData.BulletChar) {
markerStr = strconv.Itoa(node.Num) + string(node.ListData.Delimiter)
} else {
markerStr = string(node.Marker)
}
marker := []byte(`<span data-type="li" data-space="` + strings.Repeat(" ", r.ListIndentSpaces) + `">` + `<span data-type="li-marker" class="vditor-sv__marker">` + markerStr + " </span>" )
buf = append(marker, buf...)
buf = bytes.ReplaceAll(buf, newline, append(newline, []byte(indentSpacesStr)...))
li = append(li, []byte(`<span data-type="li-marker" class="vditor-sv__marker">`+markerStr+" </span>")...)
buf = append(li, buf...)
writer.Reset()
writer.Write(buf)
r.nodeWriterStack[len(r.nodeWriterStack)-1].Write(buf)
Expand All @@ -948,13 +966,25 @@ func (r *VditorSVRenderer) renderListItem(node *ast.Node, entering bool) ast.Wal
r.Write(buf)
r.Newline()
r.tag("/span", nil, false)
if ast.NodeDocument != node.Parent.Parent.Type {
r.ListIndentSpaces -= node.ListData.Padding
}
}
return ast.WalkContinue
}

func (r *VditorSVRenderer) renderListItemBlockPadding(node *ast.Node) {
inList := node.ParentIs(ast.NodeListItem)
if !inList {
return
}

inFirstListItem := node.Parent.FirstChild == node
if inFirstListItem {
return
}

padding := []byte(`<span data-type="padding">` + strings.Repeat(" ", r.ListPadding) + "</span>")
r.Writer.Write(padding)
}

func (r *VditorSVRenderer) renderTaskListItemMarker(node *ast.Node, entering bool) ast.WalkStatus {
r.tag("span", [][]string{{"data-type", "task-marker"}, {"class", "vditor-sv__marker--bi"}}, false)
r.WriteByte(lex.ItemOpenBracket)
Expand All @@ -976,23 +1006,27 @@ func (r *VditorSVRenderer) renderTaskListItemMarker(node *ast.Node, entering boo
}

func (r *VditorSVRenderer) renderThematicBreak(node *ast.Node, entering bool) ast.WalkStatus {
r.renderListItemBlockPadding(node)

r.tag("span", [][]string{{"data-type", "thematic-break"}, {"class", "vditor-sv__marker"}}, false)
r.tag("span", [][]string{{"class", "vditor-sv__marker"}}, false)
r.WriteString("---")
r.tag("/span", nil, false)
r.Newline()
r.Write(newline)
r.Write(NewlineSV)
r.tag("/span", nil, false)
return ast.WalkStop
}

func (r *VditorSVRenderer) renderHardBreak(node *ast.Node, entering bool) ast.WalkStatus {
r.Newline()
r.renderListItemBlockPadding(node)
return ast.WalkStop
}

func (r *VditorSVRenderer) renderSoftBreak(node *ast.Node, entering bool) ast.WalkStatus {
r.Newline()
r.renderListItemBlockPadding(node)
return ast.WalkStop
}

Expand Down
Loading

0 comments on commit c31be7c

Please sign in to comment.