From 508adb298e42bae3b2717b47801f48e46b4b886f Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sun, 12 Jul 2020 15:27:21 +0200
Subject: [PATCH] chore(components): Handle escaped quotes for React render.
 See #437

---
 packages/components/src/Draft/Text/index.js       | 5 +++--
 packages/components/src/Draft/TextOnPath/index.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/components/src/Draft/Text/index.js b/packages/components/src/Draft/Text/index.js
index ecf2c120d62..bbf8f12508a 100644
--- a/packages/components/src/Draft/Text/index.js
+++ b/packages/components/src/Draft/Text/index.js
@@ -8,7 +8,7 @@ const Text = (props) => {
   for (let string of props.point.attributes.getAsArray('data-text')) {
     if (strings[props.language]['plugin.' + string])
       translated += strings[props.language]['plugin.' + string]
-    else translated += string
+    else translated += string.toString().replace(/&quot;/g, '"')
     translated += ' '
   }
   // Handle muti-line text
@@ -18,13 +18,14 @@ const Text = (props) => {
     text.push(<tspan key={'tspan-' + key}>{lines.shift()}</tspan>)
     for (let line of lines) {
       key++
+      console.log('multi', line, typeof line)
       text.push(
         <tspan
           key={'tspan-' + key}
           x={props.point.x}
           dy={props.point.attributes.get('data-text-lineheight') || 12}
         >
-          {line}
+          {line.toString().replace(/&quot;/g, '"')}
         </tspan>
       )
     }
diff --git a/packages/components/src/Draft/TextOnPath/index.js b/packages/components/src/Draft/TextOnPath/index.js
index 9d92e7d8cac..1ca8cf13c85 100644
--- a/packages/components/src/Draft/TextOnPath/index.js
+++ b/packages/components/src/Draft/TextOnPath/index.js
@@ -8,7 +8,7 @@ const TextOnPath = (props) => {
   for (let string of props.path.attributes.getAsArray('data-text')) {
     if (strings[props.language]['plugin.' + string])
       translated += strings[props.language]['plugin.' + string]
-    else translated += string
+    else translated += string.toString().replace(/&quot;/g, '"')
     translated += ' '
   }
   let textPathProps = {