🎨 Protyle Improve image width setting siyuan-note/siyuan#12516

88250 · Dec 1, 2024 · 35cc811 · 35cc811
1 parent 638ecbd
commit 35cc811
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 7 deletions.
diff --git a/javascript/lute.min.js b/javascript/lute.min.js
diff --git a/javascript/lute.min.js.map b/javascript/lute.min.js.map
diff --git a/parse/inline_html.go b/parse/inline_html.go
@@ -610,7 +610,17 @@ func SetSpanIAL(node *ast.Node, n *html.Node) {
 		if style := util.DomAttrValue(n.Parent, "style"); "" != style {
 			if insertedIAL {
 				m := Tokens2IAL(node.Next.Tokens)
-				m = append(m, []string{"style", style})
+				merged := false
+				for _, kv := range m {
+					if "style" == kv[0] {
+						kv[1] = kv[1] + style
+						merged = true
+						break
+					}
+				}
+				if !merged {
+					m = append(m, []string{"style", style})
+				}
 				node.Next.Tokens = IAL2Tokens(m)
 				node.SetIALAttr("style", style)
 				node.KramdownIAL = m

diff --git a/render/protyle_renderer.go b/render/protyle_renderer.go
@@ -1264,7 +1264,20 @@ func (r *ProtyleRenderer) renderImage(node *ast.Node, entering bool) ast.WalkSta
 		r.Tag("/span", nil, false)
 		attrs = [][]string{}
 		if style := node.IALAttr("style"); "" != style {
-			attrs = append(attrs, []string{"style", style})
+			styles := strings.Split(style, ";")
+			var width string
+			for _, s := range styles {
+				if strings.Contains(s, "width") {
+					width = s
+					break
+				}
+			}
+			width = strings.ReplaceAll(width, "vw", "%")
+			width = strings.TrimSpace(width)
+			if "" != width {
+				width += ";"
+				attrs = append(attrs, []string{"style", width})
+			}
 		}
 		r.Tag("span", attrs, false)
 		r.Tag("span", [][]string{{"class", "protyle-action protyle-icons"}}, false)
@@ -1291,6 +1304,22 @@ func (r *ProtyleRenderer) renderImage(node *ast.Node, entering bool) ast.WalkSta
 			titleTokens = title.Tokens
 			attrs = append(attrs, []string{"title", r.escapeRefText(string(titleTokens))})
 		}
+		if style := node.IALAttr("style"); "" != style {
+			styles := strings.Split(style, ";")
+			var width string
+			for _, s := range styles {
+				if strings.Contains(s, "width") {
+					width = s
+				}
+			}
+			style = strings.ReplaceAll(style, width+";", "")
+			style = strings.ReplaceAll(style, "flex: 0 0 auto;", "")
+			style = strings.ReplaceAll(style, "display: block;", "")
+			style = strings.TrimSpace(style)
+			if "" != style {
+				attrs = append(attrs, []string{"style", style})
+			}
+		}
 		r.Tag("img", attrs, true)
 
 		buf := r.Writer.Bytes()