fix(paginate): merge 'md' into 'ui' realm

Signed-off-by: Isma <[email protected]>
gnolang · Sep 4, 2023 · 216c9ee · 216c9ee
1 parent eae6432
commit 216c9ee
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 126 deletions.
diff --git a/examples/gno.land/p/demo/md/md.gno b/examples/gno.land/p/demo/md/md.gno
diff --git a/examples/gno.land/p/demo/md/md_test.gno b/examples/gno.land/p/demo/md/md_test.gno
diff --git a/examples/gno.land/p/demo/paginate/paginate.gno b/examples/gno.land/p/demo/paginate/paginate.gno
@@ -4,7 +4,6 @@ import (
 	"strconv"
 
 	"gno.land/p/demo/avl"
-	"gno.land/p/demo/md"
 	"gno.land/p/demo/ui"
 )
 
@@ -33,7 +32,7 @@ func navigation(numPages int, current int, reverse bool, pageFn pageFn) string {
 		pageurl := pageFn(i, numPages, reverse)
 		link := ui.Link{
 			Text: strconv.Itoa(i),
-			URL:  md.EscMDURL(pageurl),
+			URL:  pageurl,
 		}
 		str += link.String(nil) + " "
 	}
@@ -42,7 +41,7 @@ func navigation(numPages int, current int, reverse bool, pageFn pageFn) string {
 			pageurl := pageFn(i, numPages, reverse)
 			link := ui.Link{
 				Text: strconv.Itoa(i),
-				URL:  md.EscMDURL(pageurl),
+				URL:  pageurl,
 			}
 			str += link.String(nil) + " "
 			i += 1
@@ -57,7 +56,7 @@ func navigation(numPages int, current int, reverse bool, pageFn pageFn) string {
 			pageurl := pageFn(i, numPages, reverse)
 			link := ui.Link{
 				Text: strconv.Itoa(i),
-				URL:  md.EscMDURL(pageurl),
+				URL:  pageurl,
 			}
 			str += link.String(nil) + " "
 		}
@@ -77,7 +76,7 @@ func navigation(numPages int, current int, reverse bool, pageFn pageFn) string {
 		pageurl := pageFn(i, numPages, reverse)
 		link := ui.Link{
 			Text: strconv.Itoa(i),
-			URL:  md.EscMDURL(pageurl),
+			URL:  pageurl,
 		}
 		str += link.String(nil) + " "
 	}
@@ -86,7 +85,7 @@ func navigation(numPages int, current int, reverse bool, pageFn pageFn) string {
 			pageurl := pageFn(i, numPages, reverse)
 			link := ui.Link{
 				Text: strconv.Itoa(i),
-				URL:  md.EscMDURL(pageurl),
+				URL:  pageurl,
 			}
 			str += link.String(nil) + " "
 		} else {
@@ -103,7 +102,7 @@ func navigation(numPages int, current int, reverse bool, pageFn pageFn) string {
 		pageurl := pageFn(i, numPages, reverse)
 		link := ui.Link{
 			Text: strconv.Itoa(i),
-			URL:  md.EscMDURL(pageurl),
+			URL:  pageurl,
 		}
 		str += link.String(nil) + " "
 	}

diff --git a/examples/gno.land/p/demo/ui/ui.gno b/examples/gno.land/p/demo/ui/ui.gno
@@ -109,7 +109,48 @@ func (l Link) String(dom DOM) string {
 		url = l.URL
 	}
 
-	return "[" + l.Text + "](" + url + ")"
+	return "[" + l.Text + "](" + escape(url) + ")"
+}
+
+var schars = map[string]string{
+	"%":  "%25",
+	" ":  "%20",
+	"!":  "%21",
+	"\"": "%22",
+	"#":  "%23",
+	"$":  "%24",
+	"&":  "%26",
+	"'":  "%27",
+	"(":  "%28",
+	")":  "%29",
+	"*":  "%2A",
+	"+":  "%2B",
+	",":  "%2C",
+	":":  "%3A",
+	";":  "%3B",
+	"<":  "%3C",
+	"=":  "%3D",
+	">":  "%3E",
+	"?":  "%3F",
+	"@":  "%40",
+	"[":  "%5B",
+	"\\": "%5C",
+	"]":  "%5D",
+	"^":  "%5E",
+	"_":  "%5F",
+	"`":  "%60",
+	"{":  "%7B",
+	"|":  "%7C",
+	"}":  "%7D",
+	"~":  "%7E",
+	"\n": "%0A",
+}
+
+func escape(s string) string {
+	for k, v := range schars {
+		s = strings.Replace(s, k, v, -1)
+	}
+	return s
 }
 
 type BulletList []DomStringer