Merge pull request facebook#180 from vjeux/update10

Updates from Mon 23 Mar

Author: vjeux

Examples/Movies/MoviesApp.js

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

Examples/UIExplorer/ActionSheetIOSExample.js

@@ -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 />; }
   }
 ];

Examples/UIExplorer/ActivityIndicatorExample.js

@@ -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 />;
     }
   },

Examples/UIExplorer/AdSupportIOSExample.js

@@ -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 />;
     },
   }

Examples/UIExplorer/AlertIOSExample.js

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

Examples/UIExplorer/AppStateExample.js

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

Examples/UIExplorer/AppStateIOSExample.js

@@ -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} />; }
   },
 ];

Examples/UIExplorer/AsyncStorageExample.js

@@ -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 />; }
   },
 ];

Examples/UIExplorer/CameraRollExample.ios.js

@@ -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 />; }
   }
 ];

Examples/UIExplorer/CameraRollView.ios.js

@@ -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;