zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2025-12-21 06:15:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert 6b95d1a

Browse Source
This commit is contained in:
Mikael Sand
2017-06-13 12:43:32 +03:00
parent 377cb7267f
commit e9747bee01
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/extract/extractText.js
View File

@@ -80,7 +80,7 @@ function parseDelta(delta) {
} }
} }
export default function(props, container, ref) { export default function(props, container) {
const { const {
x, x,
y, y,
@@ -96,47 +96,34 @@ export default function(props, container, ref) {
let { children } = props; let { children } = props;
let content = null; let content = null;
let fontProps = extractFont(props);
if (props.parentFontProps) {
fontProps = Object.assign({}, props.parentFontProps, fontProps);
}
if (typeof children === 'string' || typeof children === 'number') { if (typeof children === 'string' || typeof children === 'number') {
const childrenString = children.toString(); const childrenString = children.toString();
if (container) { if (container) {
children = <TSpan parentFontProps={fontProps}>{childrenString}</TSpan>; children = <TSpan>{childrenString}</TSpan>;
} else { } else {
content = childrenString; content = childrenString;
children = null; 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 => { children = Children.map(children, child => {
if (typeof child === 'string' || typeof child === 'number') { if (typeof child === 'string' || typeof child === 'number') {
return <TSpan parentFontProps={fontProps}>{child.toString()}</TSpan>; return <TSpan>{child.toString()}</TSpan>;
} else { } else {
//return child; return child;
return React.cloneElement(child, {
parentFontProps: fontProps
});
} }
}); });
} }
let posY = null;
if (fontProps.fontSize) {
posY = (parseFloat(y || 0) - parseFloat(fontProps.fontSize || 0)).toString();
} else if (y) {
posY = y.toString();
}
return { return {
textAnchor: anchors[textAnchor] || 0, textAnchor: anchors[textAnchor] || 0,
font: fontProps, font: extractFont(props),
children, children,
content, content,
deltaX, deltaX,
deltaY, deltaY,
startOffset: (startOffset || 0).toString(), startOffset: (startOffset || 0).toString(),
positionX: _.isNil(x) ? null : x.toString(), positionX: _.isNil(x) ? null : x.toString(),
positionY: posY positionY: _.isNil(y) ? null : y.toString()
}; };
} }