mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-04-28 12:15:37 +08:00
Updates from Fri 13 Mar
- [ReactNative] Oss ActionSheet | Tadeu Zagallo - [ReactNative] Fix ScrollView.scrollTo() | Christopher Chedeau - [catalyst|madman] fix location observer | Jiajie Zhu - [ReactNative] Remove keyboardDismissMode from static | Christopher Chedeau - [ReactNative] Fix RCTMapManager retaining cycle | Tadeu Zagallo - [ReactNative] Support loading sourcemaps from sourceMappingURL | Alex Kotliarskyi - [catalyst] set up directory specific rql transform | Bhuwan Khattar - [React Native] Add .done() to terminate promise chains | Ben Alpert - [React Native] add support for reading tracking bit | Owen Coutts
This commit is contained in:
@@ -100,6 +100,20 @@ var APIDoc = React.createClass({
|
||||
.join('\n');
|
||||
},
|
||||
|
||||
renderTypehint: function(typehint) {
|
||||
try {
|
||||
var typehint = JSON.parse(typehint);
|
||||
} catch(e) {
|
||||
return typehint;
|
||||
}
|
||||
|
||||
if (typehint.type === 'simple') {
|
||||
return typehint.value;
|
||||
}
|
||||
|
||||
return ':(' + JSON.stringify(typehint);
|
||||
},
|
||||
|
||||
renderMethod: function(method) {
|
||||
return (
|
||||
<div className="prop" key={method.name}>
|
||||
@@ -110,15 +124,10 @@ var APIDoc = React.createClass({
|
||||
{method.name}(
|
||||
<span className="propType">
|
||||
{method.params
|
||||
.map(function(param) {
|
||||
.map((param) => {
|
||||
var res = param.name;
|
||||
if (param.typehint) {
|
||||
try {
|
||||
var typehint = JSON.parse(param.typehint).value;
|
||||
} catch(e) {
|
||||
var typehint = param.typehint;
|
||||
}
|
||||
res += ': ' + typehint;
|
||||
res += ': ' + this.renderTypehint(param.typehint);
|
||||
}
|
||||
return res;
|
||||
})
|
||||
@@ -126,6 +135,9 @@ var APIDoc = React.createClass({
|
||||
</span>
|
||||
)
|
||||
</Header>
|
||||
{method.docblock && <Marked>
|
||||
{this.removeCommentsFromDocblock(method.docblock)}
|
||||
</Marked>}
|
||||
</div>
|
||||
);
|
||||
},
|
||||
|
||||
@@ -2,7 +2,7 @@ var docs = require('../react-docgen');
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
var slugify = require('../core/slugify');
|
||||
var jsDocs = require('../jsdocs/jsdocs.js')
|
||||
var jsDocs = require('../jsdocs/jsdocs.js');
|
||||
|
||||
function getNameFromPath(filepath) {
|
||||
var ext = null;
|
||||
@@ -41,7 +41,9 @@ var components = [
|
||||
'../Libraries/Text/ExpandingText.js',
|
||||
'../Libraries/Image/Image.ios.js',
|
||||
'../Libraries/Components/ListView/ListView.js',
|
||||
'../Libraries/Components/MapView/MapView.js',
|
||||
'../Libraries/Components/Navigation/NavigatorIOS.ios.js',
|
||||
'../Libraries/Picker/PickerIOS.ios.js',
|
||||
'../Libraries/Components/ScrollView/ScrollView.js',
|
||||
'../Libraries/Components/Slider/Slider.js',
|
||||
'../Libraries/Components/SwitchIOS/SwitchIOS.ios.js',
|
||||
@@ -55,8 +57,11 @@ var components = [
|
||||
];
|
||||
|
||||
var apis = [
|
||||
'../Libraries/AppRegistry/AppRegistry.js',
|
||||
'../Libraries/Animation/Animation.js',
|
||||
'../Libraries/AppRegistry/AppRegistry.js',
|
||||
'../Libraries/AppState/AppState.js',
|
||||
'../Libraries/AppStateIOS/AppStateIOS.ios.js',
|
||||
'../Libraries/Storage/AsyncStorage.ios.js',
|
||||
'../Libraries/CameraRoll/CameraRoll.js',
|
||||
'../Libraries/Animation/LayoutAnimation.js',
|
||||
'../Libraries/Utilities/PixelRatio.js',
|
||||
|
||||
Reference in New Issue
Block a user