status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #180 from vjeux/update10 

Updates from Mon 23 Mar
This commit is contained in:
Christopher Chedeau 2015-03-23 10:16:59 -07:00
parent a738b49ae2 82461e04ab
commit 41e3de6aa6
33 changed files with 112 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Examples/Movies/MoviesApp.js
View File

@ -6,7 +6,7 @@
*/
'use strict';
var React = require('react-native/addons');
var React = require('react-native');
var {
AppRegistry,
NavigatorIOS,

9
Examples/UIExplorer/ActionSheetIOSExample.js
View File

@ -1,6 +1,7 @@
/**
* * Copyright 2004-present Facebook. All Rights Reserved.
* */
* Copyright 2004-present Facebook. All Rights Reserved.
* @flow
*/
'use strict';
var React = require('react-native');
@ -103,10 +104,10 @@ exports.description = 'Interface to show iOS\' action sheets';
exports.examples = [
{
title: 'Show Action Sheet',
render() { return <ActionSheetExample />; }
render(): ReactElement { return <ActionSheetExample />; }
},
{
title: 'Show Share Action Sheet',
render() { return <ShareActionSheetExample />; }
render(): ReactElement { return <ShareActionSheetExample />; }
}
];

3
Examples/UIExplorer/ActivityIndicatorExample.js
View File

@ -1,5 +1,6 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
* @flow
*/
'use strict';
@ -128,7 +129,7 @@ exports.examples = [
},
{
title: 'Start/stop',
render: function() {
render: function(): ReactElement {
return <ToggleAnimatingActivityIndicator />;
}
},

3
Examples/UIExplorer/AdSupportIOSExample.js
View File

@ -1,5 +1,6 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
* @flow
*/
'use strict';
@ -19,7 +20,7 @@ exports.description = 'Example of using the ad support API.';
exports.examples = [
{
title: 'Ad Support IOS',
render: function() {
render: function(): ReactElement {
return <AdSupportIOSExample />;
},
}

1
Examples/UIExplorer/AlertIOSExample.js
View File

@ -1,5 +1,6 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
* @flow
*/
'use strict';

1
Examples/UIExplorer/AppStateExample.js
View File

@ -1,5 +1,6 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
* @flow
*/
'use strict';

5
Examples/UIExplorer/AppStateIOSExample.js
View File

@ -2,6 +2,7 @@
* Copyright 2004-present Facebook. All Rights Reserved.
*
* @providesModule AppStateIOSExample
* @flow
*/
'use strict';
@ -60,10 +61,10 @@ exports.examples = [
{
title: 'Subscribed AppStateIOS:',
description: 'This changes according to the current state, so you can only ever see it rendered as "active"',
render() { return <AppStateSubscription showCurrentOnly={true} />; }
render(): ReactElement { return <AppStateSubscription showCurrentOnly={true} />; }
},
{
title: 'Previous states:',
render() { return <AppStateSubscription showCurrentOnly={false} />; }
render(): ReactElement { return <AppStateSubscription showCurrentOnly={false} />; }
},
];

3
Examples/UIExplorer/AsyncStorageExample.js
View File

@ -1,5 +1,6 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
* @flow
*/
'use strict';
@ -98,6 +99,6 @@ exports.description = 'Asynchronous local disk storage.';
exports.examples = [
{
title: 'Basics - getItem, setItem, removeItem',
render() { return <BasicStorageExample />; }
render(): ReactElement { return <BasicStorageExample />; }
},
];

3
Examples/UIExplorer/CameraRollExample.ios.js
View File

@ -1,5 +1,6 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
* @flow
*/
'use strict';
@ -108,6 +109,6 @@ exports.description = 'Example component that uses CameraRoll to list user\'s ph
exports.examples = [
{
title: 'Photos',
render() { return <CameraRollExample />; }
render(): ReactElement { return <CameraRollExample />; }
}
];

25
Examples/UIExplorer/CameraRollView.ios.js
View File

@ -2,6 +2,7 @@
* Copyright 2004-present Facebook. All Rights Reserved.
*
* @providesModule CameraRollView
* @flow
*/
'use strict';
@ -53,7 +54,7 @@ var propTypes = {
var CameraRollView = React.createClass({
propTypes: propTypes,
getDefaultProps: function() {
getDefaultProps: function(): Object {
return {
groupTypes: 'SavedPhotos',
batchSize: 5,
@ -75,9 +76,9 @@ var CameraRollView = React.createClass({
var ds = new ListView.DataSource({rowHasChanged: this._rowHasChanged});
return {
assets: [],
assets: ([]: Array<Image>),
groupTypes: this.props.groupTypes,
lastCursor: null,
lastCursor: (null : ?string),
noMore: false,
loadingMore: false,
dataSource: ds,
@ -99,21 +100,21 @@ var CameraRollView = React.createClass({
this.fetch();
},
componentWillReceiveProps: function(nextProps) {
componentWillReceiveProps: function(nextProps: {groupTypes?: string}) {
if (this.props.groupTypes !== nextProps.groupTypes) {
this.fetch(true);
}
},
_fetch: function(clear) {
_fetch: function(clear?: boolean) {
if (clear) {
this.setState(this.getInitialState(), this.fetch);
return;
}
var fetchParams = {
var fetchParams: Object = {
first: this.props.batchSize,
groupTypes: this.props.groupTypes,
groupTypes: this.props.groupTypes
};
if (this.state.lastCursor) {
fetchParams.after = this.state.lastCursor;
@ -126,7 +127,7 @@ var CameraRollView = React.createClass({
* Fetches more images from the camera roll. If clear is set to true, it will
* set the component to its initial state and re-fetch the images.
*/
fetch: function(clear) {
fetch: function(clear?: boolean) {
if (!this.state.loadingMore) {
this.setState({loadingMore: true}, () => { this._fetch(clear); });
}
@ -144,7 +145,7 @@ var CameraRollView = React.createClass({
);
},
_rowHasChanged: function(r1, r2) {
_rowHasChanged: function(r1: Array<Image>, r2: Array<Image>): boolean {
if (r1.length !== r2.length) {
return true;
}
@ -166,7 +167,7 @@ var CameraRollView = React.createClass({
},
// rowData is an array of images
_renderRow: function(rowData, sectionID, rowID) {
_renderRow: function(rowData: Array<Image>, sectionID: string, rowID: string) {
var images = rowData.map((image) => {
if (image === null) {
return null;
@ -181,9 +182,9 @@ var CameraRollView = React.createClass({
);
},
_appendAssets: function(data) {
_appendAssets: function(data: Object) {
var assets = data.edges;
var newState = { loadingMore: false };
var newState: Object = { loadingMore: false };
if (!data.page_info.has_next_page) {
newState.noMore = true;

3
Examples/UIExplorer/DatePickerExample.js
View File

@ -1,5 +1,6 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
* @flow
*/
'use strict';
@ -118,7 +119,7 @@ exports.description = 'Select dates and times using the native UIDatePicker.';
exports.examples = [
{
title: '<DatePickerIOS>',
render: function() {
render: function(): ReactElement {
return <DatePickerExample />;
},
}];

5
Examples/UIExplorer/GeolocationExample.js
View File

@ -1,5 +1,6 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
* @flow
*/
/* eslint no-console: 0 */
'use strict';
@ -19,13 +20,15 @@ exports.description = 'Examples of using the Geolocation API.';
exports.examples = [
{
title: 'navigator.geolocation',
render: function() {
render: function(): ReactElement {
return <GeolocationExample />;
},
}
];
var GeolocationExample = React.createClass({
watchID: (null: ?number),
getInitialState: function() {
return {
initialPosition: 'unknown',

1
Examples/UIExplorer/LayoutExample.js
View File

@ -1,5 +1,6 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
* @flow
*/
'use strict';

9
Examples/UIExplorer/ListViewSimpleExample.js
View File

@ -1,5 +1,6 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
* @flow
*/
'use strict';
@ -28,6 +29,8 @@ var ListViewSimpleExample = React.createClass({
};
},
_pressData: ({}: {[key: number]: boolean}),
componentWillMount: function() {
this._pressData = {};
},
@ -46,7 +49,7 @@ var ListViewSimpleExample = React.createClass({
);
},
_renderRow: function(rowData, sectionID, rowID) {
_renderRow: function(rowData: string, sectionID: number, rowID: number) {
var rowHash = Math.abs(hashCode(rowData));
var imgSource = {
uri: THUMB_URLS[rowHash % THUMB_URLS.length],
@ -66,7 +69,7 @@ var ListViewSimpleExample = React.createClass({
);
},
_genRows: function(pressData) {
_genRows: function(pressData: {[key: number]: boolean}): Array<string> {
var dataBlob = [];
for (var ii = 0; ii < 100; ii++) {
var pressedText = pressData[ii] ? ' (pressed)' : '';
@ -75,7 +78,7 @@ var ListViewSimpleExample = React.createClass({
return dataBlob;
},
_pressRow: function(rowID) {
_pressRow: function(rowID: number) {
this._pressData[rowID] = !this._pressData[rowID];
this.setState({dataSource: this.state.dataSource.cloneWithRows(
this._genRows(this._pressData)

2
Examples/UIExplorer/NavigatorIOSExample.js
View File

@ -3,7 +3,7 @@
*/
'use strict';
var React = require('react-native/addons');
var React = require('react-native');
var ViewExample = require('./ViewExample');
var {
PixelRatio,

2
Examples/UIExplorer/UIExplorerApp.js
View File

@ -5,7 +5,7 @@
*/
'use strict';
var React = require('react-native/addons');
var React = require('react-native');
var UIExplorerList = require('./UIExplorerList');
var {

2
Examples/UIExplorer/UIExplorerList.js
View File

@ -3,7 +3,7 @@
*/
'use strict';
var React = require('react-native/addons');
var React = require('react-native');
var {
ListView,
PixelRatio,

4
Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj
View File

@ -152,7 +152,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -186,7 +186,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;

4
Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj
View File

@ -157,7 +157,7 @@
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../../ReactKit/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -196,7 +196,7 @@
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../../ReactKit/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;

4
Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj
View File

@ -152,7 +152,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -186,7 +186,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;

4
Libraries/Image/RCTImage.xcodeproj/project.pbxproj
View File

@ -194,7 +194,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -228,7 +228,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;

4
Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj
View File

@ -158,7 +158,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -192,7 +192,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;

4
Libraries/Text/RCTText.xcodeproj/project.pbxproj
View File

@ -176,7 +176,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -210,7 +210,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;

2
Libraries/Utilities/AlertIOS.js
View File

@ -44,7 +44,7 @@ class AlertIOS {
static alert(
title: ?string,
message: ?string,
buttons: ?Array<{
buttons?: Array<{
text: ?string;
onPress: ?Function;
}>

4
Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj
View File

@ -157,7 +157,7 @@
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../../ReactKit/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -196,7 +196,7 @@
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../../ReactKit/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;

36
Libraries/react-native/addons.js vendored
View File

@ -1,36 +0,0 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
*
* @flow
*/
'use strict';
var LinkedStateMixin = require('LinkedStateMixin');
var ReactComponentWithPureRenderMixin = require('ReactComponentWithPureRenderMixin');
var ReactNative = require('react-native');
var ReactUpdates = require('ReactUpdates');
var cloneWithProps = require('cloneWithProps');
var update = require('update');
var addons = {
LinkedStateMixin: LinkedStateMixin,
PureRenderMixin: ReactComponentWithPureRenderMixin,
batchedUpdates: ReactUpdates.batchedUpdates,
cloneWithProps: cloneWithProps,
update: update,
Perf: undefined,
TestUtils: undefined,
};
if (__DEV__) {
addons.Perf = require('ReactDefaultPerf');
addons.TestUtils = require('ReactTestUtils');
}
var ReactNativeWithAddons = {
...ReactNative,
addons: addons,
};
module.exports = ReactNativeWithAddons;

5
Libraries/react-native/package.json
View File

@ -1,5 +0,0 @@
{
"name": "react-native",
"main": "react-native.js",
"directories": {".": ""}
}

28
Libraries/react-native/react-native.js vendored
View File

@ -5,9 +5,14 @@
*/
'use strict';
var ReactNative = {
...require('React'),
// Export React, plus some native additions.
//
// The use of Object.create/assign is to work around a Flow bug (#6560135).
// Once that is fixed, change this back to
//
// var ReactNative = {...require('React'), /* additions */}
//
var ReactNative = Object.assign(Object.create(require('React')), {
// Components
ActivityIndicatorIOS: require('ActivityIndicatorIOS'),
DatePickerIOS: require('DatePickerIOS'),
@ -45,7 +50,20 @@ var ReactNative = {
TimerMixin: require('TimerMixin'),
VibrationIOS: require('VibrationIOS'),
invariant: require('invariant'),
};
addons: {
batchedUpdates: require('ReactUpdates').batchedUpdates,
LinkedStateMixin: require('LinkedStateMixin'),
Perf: undefined,
PureRenderMixin: require('ReactComponentWithPureRenderMixin'),
TestUtils: undefined,
cloneWithProps: require('cloneWithProps'),
update: require('update'),
},
});
if (__DEV__) {
ReactNative.addons.Perf = require('ReactDefaultPerf');
ReactNative.addons.TestUtils = require('ReactTestUtils');
}
module.exports = ReactNative;

19
Libraries/vendor/core/clearImmediate.js vendored Normal file
View File

@ -0,0 +1,19 @@
/**
* @generated SignedSource<<4595f3986407fd02332cf9f5fc12e70f>>
*
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* !! This file is a check-in of a static_upstream project! !!
* !! !!
* !! You should not modify this file directly. Instead: !!
* !! 1) Use `fjs use-upstream` to temporarily replace this with !!
* !! the latest version from upstream. !!
* !! 2) Make your changes, test them, etc. !!
* !! 3) Use `fjs push-upstream` to copy your changes back to !!
* !! static_upstream. !!
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
*
* @providesModule clearImmediate
*/
module.exports = global.clearImmediate ||
require('ImmediateImplementation').clearImmediate;

4
ReactKit/ReactKit.xcodeproj/project.pbxproj
View File

@ -546,7 +546,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -581,7 +581,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;

2
ReactKit/Views/RCTScrollViewManager.m
View File

@ -67,7 +67,7 @@ RCT_REMAP_VIEW_PROPERTY(contentOffset, scrollView.contentOffset);
return;
}
CGSize size = ((id<RCTScrollableProtocol>)view).contentSize;
CGSize size = ((RCTScrollView *)view).scrollView.contentSize;
callback(@[@{
@"width" : @(size.width),
@"height" : @(size.height)

3
package.json
View File

@ -1,5 +1,5 @@
{
"name": "react-native-github",
"name": "react-native",
"version": "0.1.0",
"description": "Build native apps with React!",
"repository": {
@ -20,6 +20,7 @@
"source-map"
]
},
"main": "Libraries/react-native/react-native.js",
"scripts": {
"test": "jest",
"lint": "node linter.js Examples/",

2
packager/packager.js
View File

@ -72,6 +72,8 @@ console.log('\n' +
' ===============================================================\n'
);
console.log('Looking for JS files in\n ', options.projectRoots.join('\n '));
process.on('uncaughtException', function(e) {
console.error(e);
console.error(e.stack);