VSinerva/freesewing
1
0
Fork 0
Code Activity

chore(components): Handle escaped quotes for React render. See #437

Browse source
This commit is contained in:
Joost De Cock 2020-07-12 15:27:21 +02:00
parent d2bf45e63c
commit 508adb298e
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
packages/components/src/Draft/Text/index.js
View file

@ -8,7 +8,7 @@ const Text = (props) => {
for (let string of props.point.attributes.getAsArray('data-text')) { for (let string of props.point.attributes.getAsArray('data-text')) {
if (strings[props.language]['plugin.' + string]) if (strings[props.language]['plugin.' + string])
translated += strings[props.language]['plugin.' + string] translated += strings[props.language]['plugin.' + string]
else translated += string else translated += string.toString().replace(/"/g, '"')
translated += ' ' translated += ' '
} }
// Handle muti-line text // Handle muti-line text
@ -18,13 +18,14 @@ const Text = (props) => {
text.push(<tspan key={'tspan-' + key}>{lines.shift()}</tspan>) text.push(<tspan key={'tspan-' + key}>{lines.shift()}</tspan>)
for (let line of lines) { for (let line of lines) {
key++ key++
console.log('multi', line, typeof line)
text.push( text.push(
<tspan <tspan
key={'tspan-' + key} key={'tspan-' + key}
x={props.point.x} x={props.point.x}
dy={props.point.attributes.get('data-text-lineheight') || 12} dy={props.point.attributes.get('data-text-lineheight') || 12}
> >
{line} {line.toString().replace(/&quot;/g, '"')}
</tspan> </tspan>
) )
} }

2
packages/components/src/Draft/TextOnPath/index.js
View file

@ -8,7 +8,7 @@ const TextOnPath = (props) => {
for (let string of props.path.attributes.getAsArray('data-text')) { for (let string of props.path.attributes.getAsArray('data-text')) {
if (strings[props.language]['plugin.' + string]) if (strings[props.language]['plugin.' + string])
translated += strings[props.language]['plugin.' + string] translated += strings[props.language]['plugin.' + string]
else translated += string else translated += string.toString().replace(/&quot;/g, '"')
translated += ' ' translated += ' '
} }
let textPathProps = { let textPathProps = {