Merge pull request danielearwicker#35 from creately/fix-ampersand

Fix ampersand
dhrleandro · Jul 15, 2019 · c7e8178 · c7e8178
2 parents 26dcc9f + 61d91eb
commit c7e8178
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@creately/carota",
   "author": "Daniel Earwicker (dan@earwicker.com)",
   "description": "Simple, flexible rich text rendering/editing on HTML Canvas",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/danielearwicker/carota.git"

diff --git a/src/doc.js b/src/doc.js
@@ -150,7 +150,10 @@ var prototype = node.derive({
                         baseline: line.baseline,
                         left,
                         content: {
-                            text: text.run.text.trim() + '&#160;'.repeat( word.space.length ),
+                            // replace( /&(?!#?[a-z0-9]+;)/, '&amp;' ) is to replace ampersand char with '&amp;'
+                            // as  `&` can't be rendered in an SVG text
+                            // The regex explainer https://regex101.com/r/4vhX9N/1
+                            text: text.run.text.trim().replace( /&(?!#?[a-z0-9]+;)/, '&amp;' ) + '&#160;'.repeat( word.space.length ),
                             size: text.run.size || this.defaultFormatting.size,
                             font: text.run.font || this.defaultFormatting.font,
                             color: text.run.color || this.defaultFormatting.color,