diff --git a/lib/extract/extractText.js b/lib/extract/extractText.js index ab0f653c..b7e628d9 100644 --- a/lib/extract/extractText.js +++ b/lib/extract/extractText.js @@ -80,7 +80,7 @@ function parseDelta(delta) { } } -export default function(props, container, ref) { +export default function(props, container) { const { x, y, @@ -96,47 +96,34 @@ export default function(props, container, ref) { let { children } = props; let content = null; - let fontProps = extractFont(props); - if (props.parentFontProps) { - fontProps = Object.assign({}, props.parentFontProps, fontProps); - } if (typeof children === 'string' || typeof children === 'number') { const childrenString = children.toString(); if (container) { - children = {childrenString}; + children = {childrenString}; } else { content = childrenString; children = null; } - } else if (Children.count(children) >= 1 || Array.isArray(children)) { + } else if (Children.count(children) > 1 || Array.isArray(children)) { children = Children.map(children, child => { if (typeof child === 'string' || typeof child === 'number') { - return {child.toString()}; + return {child.toString()}; } else { - //return child; - return React.cloneElement(child, { - parentFontProps: fontProps - }); + return child; } }); } - let posY = null; - if (fontProps.fontSize) { - posY = (parseFloat(y || 0) - parseFloat(fontProps.fontSize || 0)).toString(); - } else if (y) { - posY = y.toString(); - } return { textAnchor: anchors[textAnchor] || 0, - font: fontProps, + font: extractFont(props), children, content, deltaX, deltaY, startOffset: (startOffset || 0).toString(), positionX: _.isNil(x) ? null : x.toString(), - positionY: posY + positionY: _.isNil(y) ? null : y.toString() }; }