Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
1461e4a
[Packager] Allow user to specify a custom transformer file
johanneslumpe Jun 26, 2015
de020b4
[react-packager] Enable watchman fs crawl
Jun 26, 2015
19e3239
[Packager] Windows support for Packager - Blacklist changes
Jun 26, 2015
73b032a
[react-packager] Update sane to get a new version of fb-watchman (perf)
Jun 27, 2015
8708c35
Restructuring FBReactKit project: Part 2
nicklockwood Jun 28, 2015
7196445
[react_native] Update common UI examples
astreet Jun 29, 2015
c953aa7
[Executor] Make executor ID functions non-static to fix ASan
ide Jun 29, 2015
454b5f3
[React Native] Replace RCTCache with NSURLCache
Jun 29, 2015
cf6ff3f
#1562 Rename 'tick' to 'onTick' to pass iTunes Connect validation.
admmasters Jun 29, 2015
5552368
[react-native][jest] Sync to 0.5.x and update to io.js
DmitrySoshnikov Jun 30, 2015
9f22f67
[flow 0.13.1] Deploy to
jeffmo Jun 30, 2015
7d184ad
[react-packager] Use latest babel-core in place of babel (40% perf im…
Jun 30, 2015
e3225f3
[Bridge] Support nullability annotations in bridged methods
ide Jun 30, 2015
301c012
[Flow] Update flowconfig's version req to 0.13.1, fix Movies example …
ide Jun 30, 2015
d7ddff7
[ReactNative] Fix dev menu customization when JS fails to load
frantic Jul 1, 2015
14fef64
[ReactNative] expose missing haste modules through 'react-native' nod…
philikon Jul 1, 2015
5418cdf
[CocoaPods] Run `npm install --production` when installing React.podspec
ide Jul 1, 2015
776dc97
InteractionManager: remove dev timeout warnings
josephsavona Jul 1, 2015
44c587e
Updates from Wed 1 Jul
Jul 1, 2015
212bd22
[Tests] Update tests to run on io.js with the latest version of jest
ide May 23, 2015
7a8398b
[Flow] Update flowconfig's version req to 0.13.1, fix Movies example …
ide Jul 1, 2015
5aa2758
[Tests] Update tests to run on io.js with the latest version of jest
ide Jul 1, 2015
d161640
Update with required PRs
Jul 1, 2015
4886b3d
Merge branch 'flow-13' of https://github.com/ide/react-native into Up…
Jul 1, 2015
d0cb80c
Merge branch 'iojs-tests' of https://github.com/ide/react-native into…
Jul 1, 2015
b45e2ed
[react-packager] fix test
Jul 1, 2015
54825b3
[WebView]: Kill `shouldInjectAJAXHandler`, and add `injectedJavascrip…
Jul 2, 2015
13be945
Update with test fixes
Jul 2, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FixMe

suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-2]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-2]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-3]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-3]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy

[version]
0.12.0
0.13.1
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ install:
- cp $(brew --prefix nvm)/nvm-exec .nvm/
- export NVM_DIR=.nvm
- source $(brew --prefix nvm)/nvm.sh
- nvm install v0.10
- nvm install iojs-v2
- npm config set spin=false
- npm install

script:
- |
nvm use v0.10
nvm use iojs-v2

if [ "$TEST_TYPE" = objc ]
then
Expand Down
7 changes: 4 additions & 3 deletions Examples/Movies/SearchScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ var {
} = React;
var TimerMixin = require('react-timer-mixin');

var invariant = require('invariant');

var MovieCell = require('./MovieCell');
var MovieScreen = require('./MovieScreen');

Expand Down Expand Up @@ -73,18 +75,16 @@ var SearchScreen = React.createClass({
this.searchMovies('');
},

_urlForQueryAndPage: function(query: string, pageNumber: ?number): string {
_urlForQueryAndPage: function(query: string, pageNumber: number): string {
var apiKey = API_KEYS[this.state.queryNumber % API_KEYS.length];
if (query) {
return (
// $FlowFixMe(>=0.13.0) - pageNumber may be null or undefined
API_URL + 'movies.json?apikey=' + apiKey + '&q=' +
encodeURIComponent(query) + '&page_limit=20&page=' + pageNumber
);
} else {
// With no query, load latest movies
return (
// $FlowFixMe(>=0.13.0) - pageNumber may be null or undefined
API_URL + 'lists/movies/in_theaters.json?apikey=' + apiKey +
'&page_limit=20&page=' + pageNumber
);
Expand Down Expand Up @@ -176,6 +176,7 @@ var SearchScreen = React.createClass({
});

var page = resultsCache.nextPageNumberForQuery[query];
invariant(page != null, 'Next page number for "%s" is missing', query);
fetch(this._urlForQueryAndPage(query, page))
.then((response) => response.json())
.catch((error) => {
Expand Down
2 changes: 1 addition & 1 deletion Examples/SampleApp/_flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ node_modules/react-native/Libraries/react-native/react-native-interface.js
module.system=haste

[version]
0.12.0
0.13.1
3 changes: 2 additions & 1 deletion Examples/UIExplorer/ActionSheetIOSExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@

var React = require('react-native');
var {
ActionSheetIOS,
StyleSheet,
Text,
View,
} = React;
var ActionSheetIOS = require('ActionSheetIOS');

var BUTTONS = [
'Button Index: 0',
'Button Index: 1',
Expand Down
3 changes: 1 addition & 2 deletions Examples/UIExplorer/AdSupportIOSExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
*/
'use strict';

var AdSupportIOS = require('AdSupportIOS');

var React = require('react-native');
var {
AdSupportIOS,
StyleSheet,
Text,
View,
Expand Down
2 changes: 1 addition & 1 deletion Examples/UIExplorer/MapViewExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
'use strict';

var React = require('react-native');
var StyleSheet = require('StyleSheet');
var {
MapView,
StyleSheet,
Text,
TextInput,
View,
Expand Down
10 changes: 6 additions & 4 deletions Examples/UIExplorer/TransformExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
'use strict';

var React = require('React');
var {
StyleSheet,
View,
} = React;

var StyleSheet = require('StyleSheet');
var TimerMixin = require('react-timer-mixin');
var UIExplorerBlock = require('UIExplorerBlock');
var UIExplorerPage = require('UIExplorerPage');
var View = require('View');
var UIExplorerBlock = require('./UIExplorerBlock');
var UIExplorerPage = require('./UIExplorerPage');

var TransformExample = React.createClass({

Expand Down
10 changes: 6 additions & 4 deletions Examples/UIExplorer/UIExplorerApp.android.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@
'use strict';

var React = require('react-native');
var Dimensions = require('Dimensions');
var DrawerLayoutAndroid = require('DrawerLayoutAndroid');
var ToolbarAndroid = require('ToolbarAndroid');
var UIExplorerList = require('./UIExplorerList');
var {
Dimensions,
StyleSheet,
View,
} = React;
var UIExplorerList = require('./UIExplorerList');

// TODO: these should be exposed by the 'react-native' module.
var DrawerLayoutAndroid = require('DrawerLayoutAndroid');
var ToolbarAndroid = require('ToolbarAndroid');

var DRAWER_WIDTH_LEFT = 56;

Expand Down
18 changes: 9 additions & 9 deletions Examples/UIExplorer/UIExplorerList.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ var {
ListView,
PixelRatio,
Platform,
Settings,
StyleSheet,
Text,
TextInput,
Expand All @@ -29,13 +30,20 @@ var {
} = React;

var { TestModule } = React.addons;
var Settings = require('Settings');

import type { ExampleModule } from 'ExampleTypes';

var createExamplePage = require('./createExamplePage');

var COMMON_COMPONENTS = [
require('./ImageExample'),
require('./ListViewExample'),
require('./ListViewPagingExample'),
require('./MapViewExample'),
require('./Navigator/NavigatorExample'),
require('./ScrollViewExample'),
require('./TextInputExample'),
require('./TouchableExample'),
require('./ViewExample'),
require('./WebViewExample'),
];
Expand All @@ -51,23 +59,15 @@ if (Platform.OS === 'ios') {
var COMPONENTS = COMMON_COMPONENTS.concat([
require('./ActivityIndicatorIOSExample'),
require('./DatePickerIOSExample'),
require('./ImageExample'),
require('./ListViewExample'),
require('./ListViewPagingExample'),
require('./MapViewExample'),
require('./Navigator/NavigatorExample'),
require('./NavigatorIOSColorsExample'),
require('./NavigatorIOSExample'),
require('./PickerIOSExample'),
require('./ProgressViewIOSExample'),
require('./ScrollViewExample'),
require('./SegmentedControlIOSExample'),
require('./SliderIOSExample'),
require('./SwitchIOSExample'),
require('./TabBarIOSExample'),
require('./TextExample.ios'),
require('./TextInputExample'),
require('./TouchableExample'),
]);

var APIS = COMMON_APIS.concat([
Expand Down
1 change: 0 additions & 1 deletion Examples/UIExplorer/WebViewExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
'use strict';

var React = require('react-native');
var StyleSheet = require('StyleSheet');
var {
StyleSheet,
Text,
Expand Down
6 changes: 6 additions & 0 deletions Libraries/Components/Touchable/TouchableBounce.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ var Touchable = require('Touchable');
var merge = require('merge');
var onlyChild = require('onlyChild');

var invariant = require('invariant');
invariant(
AnimationExperimental || POPAnimation,
'Please add the RCTAnimationExperimental framework to your project, or add //Libraries/FBReactKit:RCTPOPAnimation to your BUCK file if running internally within Facebook.'
);

type State = {
animationID: ?number;
};
Expand Down
11 changes: 9 additions & 2 deletions Libraries/Components/WebView/WebView.ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ var NavigationType = {
other: RCTWebViewManager.NavigationType.Other,
};

var JSNavigationScheme = RCTWebViewManager.JSNavigationScheme;

type ErrorEvent = {
domain: any;
code: any;
Expand Down Expand Up @@ -75,6 +77,7 @@ var defaultRenderError = (errorDomain, errorCode, errorDesc) => (

var WebView = React.createClass({
statics: {
JSNavigationScheme: JSNavigationScheme,
NavigationType: NavigationType,
},

Expand All @@ -86,7 +89,6 @@ var WebView = React.createClass({
bounces: PropTypes.bool,
scrollEnabled: PropTypes.bool,
automaticallyAdjustContentInsets: PropTypes.bool,
shouldInjectAJAXHandler: PropTypes.bool,
contentInset: EdgeInsetsPropType,
onNavigationStateChange: PropTypes.func,
startInLoadingState: PropTypes.bool, // force WebView to show loadingView on first load
Expand All @@ -95,6 +97,11 @@ var WebView = React.createClass({
* Used for android only, JS is enabled by default for WebView on iOS
*/
javaScriptEnabledAndroid: PropTypes.bool,
/**
* Used for iOS only, sets the JS to be injected when the webpage loads.
*/
injectedJavascriptIOS: PropTypes.string,

/**
* Used for iOS only, sets whether the webpage scales to fit the view and the
* user can change the scale
Expand Down Expand Up @@ -152,9 +159,9 @@ var WebView = React.createClass({
style={webViewStyles}
url={this.props.url}
html={this.props.html}
injectedJavascriptIOS={this.props.injectedJavascriptIOS}
bounces={this.props.bounces}
scrollEnabled={this.props.scrollEnabled}
shouldInjectAJAXHandler={this.props.shouldInjectAJAXHandler}
contentInset={this.props.contentInset}
automaticallyAdjustContentInsets={this.props.automaticallyAdjustContentInsets}
onLoadingStart={this.onLoadingStart}
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Image/RCTImageDownloader.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ typedef void (^RCTImageDownloadBlock)(UIImage *image, NSError *error);

@interface RCTImageDownloader : NSObject

+ (instancetype)sharedInstance;
+ (RCTImageDownloader *)sharedInstance;

/**
* Downloads a block of raw data and returns it. Note that the callback block
Expand Down
Loading