Merge branch 'master' into percentage-props-refactor-ios

This commit is contained in:
Horcrux
2017-01-20 14:59:14 +08:00
60 changed files with 44 additions and 4733 deletions
+16
View File
@@ -17,6 +17,22 @@ class TSpan extends Shape {
textAnchor: PropTypes.oneOf(['start', 'middle', 'end'])
};
static childContextTypes = {
isInAParentText: React.PropTypes.bool
};
getChildContext() {
return {
isInAParentText: true
};
};
getContextTypes() {
return {
isInAParentText: React.PropTypes.bool
};
};
setNativeProps = (...args) => {
this.root.setNativeProps(...args);
};
+16
View File
@@ -17,6 +17,22 @@ class Text extends Shape {
textAnchor: PropTypes.oneOf(['start', 'middle', 'end'])
};
static childContextTypes = {
isInAParentText: React.PropTypes.bool
};
getChildContext() {
return {
isInAParentText: true
};
};
getContextTypes() {
return {
isInAParentText: React.PropTypes.bool
};
};
setNativeProps = (...args) => {
this.root.setNativeProps(...args);
};