Update package.json and React.podspec to 0.7.1

The old name was deprecated and spits out a bunch of annoying log
messages now.

See https://github.com/babel/babel/commit/c0fd4c1f9e0b18231f585c4fa793e4cb0e01aed1

.eslintignore

@@ -1,3 +1,5 @@
-**/node_modules/**/.*js
+# node_modules ignored by default
+
 **/staticBundle.js
 **/main.js
+Libraries/vendor/**/*

.eslintrc

@@ -1,8 +1,19 @@
 {
+  "parser": "babel-eslint",
+
+  "ecmaFeatures": {
+    "jsx": true
+  },
+
   "env": {
+    "es6": true,
     "jasmine": true,
   },
 
+  "plugins": [
+    "react"
+  ],
+
   // Map from global var to bool specifying if it can be redefined
   "globals": {
     "__DEV__": true,
@@ -16,6 +27,7 @@
     "document": false,
     "escape": false,
     "exports": false,
+    "fetch": false,
     "global": false,
     "jest": false,
     "Map": true,
@@ -35,10 +47,10 @@
   },
 
   "rules": {
+    "comma-dangle": 0,               // disallow trailing commas in object literals
     "no-cond-assign": 1,             // disallow assignment in conditional expressions
     "no-console": 0,                 // disallow use of console (off by default in the node environment)
     "no-constant-condition": 0,      // disallow use of constant expressions in conditions
-    "no-comma-dangle": 0,            // disallow trailing commas in object literals
     "no-control-regex": 1,           // disallow control characters in regular expressions
     "no-debugger": 1,                // disallow use of debugger
     "no-dupe-keys": 1,               // disallow duplicate keys when creating object literals
@@ -106,6 +118,7 @@
     "no-warning-comments": 0,        // disallow usage of configurable warning terms in comments": 1,                        // e.g. TODO or FIXME (off by default)
     "no-with": 1,                    // disallow use of the with statement
     "radix": 1,                      // require use of the second argument for parseInt() (off by default)
+    "semi-spacing": 1,	             // require a space after a semi-colon
     "vars-on-top": 0,                // requires to declare all vars on top of their containing scope (off by default)
     "wrap-iife": 0,                  // require immediate function invocation to be wrapped in parentheses (off by default)
     "yoda": 1,                       // require or disallow Yoda conditions
@@ -167,7 +180,7 @@
     "no-underscore-dangle": 0,       // disallow dangling underscores in identifiers
     "no-wrap-func": 1,               // disallow wrapping of non-IIFE statements in parens
     "no-mixed-spaces-and-tabs": 1,   // disallow mixed spaces and tabs for indentation
-    "quotes": [1, "single"],         // specify whether double or single quotes should be used
+    "quotes": [1, "single", "avoid-escape"], // specify whether double or single quotes should be used
     "quote-props": 0,                // require quotes around object literal property names (off by default)
     "semi": 1,                       // require or disallow use of semicolons instead of ASI
     "sort-vars": 0,                  // sort variables within the same declaration block (off by default)
@@ -176,7 +189,7 @@
     "space-in-parens": 0,            // require or disallow spaces inside parentheses (off by default)
     "space-infix-ops": 1,            // require spaces around operators
     "space-return-throw-case": 1,    // require a space after return, throw, and case
-    "space-unary-word-ops": 1,       // require a space around word operators such as typeof (off by default)
+    "space-unary-ops": [1, { "words": true, "nonwords": false }], // require or disallow spaces before/after unary operators (words on by default, nonwords off by default)
     "max-nested-callbacks": 0,       // specify the maximum depth callbacks can be nested (off by default)
     "one-var": 0,                    // allow just one var statement per function (off by default)
     "wrap-regex": 0,                 // require regex literals to be wrapped in parentheses (off by default)
@@ -189,6 +202,22 @@
     "max-params": 0,                 // limits the number of parameters that can be used in the function declaration. (off by default)
     "max-statements": 0,             // specify the maximum number of statement allowed in a function (off by default)
     "no-bitwise": 1,                 // disallow use of bitwise operators (off by default)
-    "no-plusplus": 0                 // disallow use of unary operators, ++ and -- (off by default)
+    "no-plusplus": 0,                // disallow use of unary operators, ++ and -- (off by default)
+
+    "react/display-name": 0,
+    "react/jsx-boolean-value": 0,
+    "react/jsx-quotes": [1, "double", "avoid-escape"],
+    "react/jsx-no-undef": 1,
+    "react/jsx-sort-props": 0,
+    "react/jsx-uses-react": 0,
+    "react/jsx-uses-vars": 1,
+    "react/no-did-mount-set-state": [1, "allow-in-func"],
+    "react/no-did-update-set-state": [1, "allow-in-func"],
+    "react/no-multi-comp": 0,
+    "react/no-unknown-property": 0,
+    "react/prop-types": 0,
+    "react/react-in-jsx-scope": 0,
+    "react/self-closing-comp": 1,
+    "react/wrap-multilines": 0
   }
 }

.flowconfig

@@ -16,13 +16,13 @@
 .*/node_modules/react-tools/src/event/EventPropagators.js
 
 # Ignore commoner tests
-.*/node_modules/react-tools/node_modules/commoner/test/.*
+.*/node_modules/commoner/test/.*
 
 # See https://github.com/facebook/flow/issues/442
 .*/react-tools/node_modules/commoner/lib/reader.js
 
 # Ignore jest
-.*/react-native/node_modules/jest-cli/.*
+.*/node_modules/jest-cli/.*
 
 # Ignore Website
 .*/website/.*
@@ -36,5 +36,13 @@ Examples/UIExplorer/ImageMocks.js
 [options]
 module.system=haste
 
+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\\)*\\$FlowFixedInNextDeploy
+
 [version]
-0.10.0
+0.12.0

.gitignore

@@ -27,3 +27,4 @@ project.xcworkspace
 
 # Node
 node_modules
+*.log

.travis.yml

@@ -1,18 +1,28 @@
 language: objective-c
 
+osx_image: beta-xcode6.3
+
 cache:
-  directories:
-  - node_modules
+    directories:
+        - node_modules
+        - .nvm
 
 before_install:
   - brew update
 install:
-  - brew reinstall flow xctool
+  - brew reinstall flow xctool nvm
+  - mkdir -p .nvm
+  - cp $(brew --prefix nvm)/nvm-exec .nvm/
+  - export NVM_DIR=.nvm
+  - source $(brew --prefix nvm)/nvm.sh
+  - nvm install v0.10
   - npm config set spin=false
   - npm install
 
 script:
 - |
+  nvm use v0.10
+
   if [ "$TEST_TYPE" = objc ]
   then
 

CONTRIBUTING.md

@@ -19,11 +19,11 @@ The core team will be monitoring for pull requests. When we get one, we'll run s
 1. Fork the repo and create your branch from `master`.
 2. If you've added code that should be tested, add tests!
 3. If you've changed APIs, update the documentation.
-4. Ensure the test suite passes.
-5. Make sure your code lints - we've done our best to make sure these rules match our internal linting guidelines.
+4. Ensure tests pass on Travis.
+5. Make sure your code lints (`node linter.js <files touched>`).
 6. If you haven't already, complete the CLA.
 
-### Contributor License Agreement ("CLA")
+### Contributor License Agreement (CLA)
 
 In order to accept your pull request, we need you to submit a CLA. You only need to do this once, so if you've done this for another Facebook open source project, you're good to go. If you are submitting a pull request for the first time, just let us know that you have completed the CLA and we can cross-check with your GitHub username.
 
@@ -37,7 +37,7 @@ We will be using GitHub Issues for our public bugs. We will keep a close eye on
 
 ### Reporting New Issues
 
-The best way to get your bug fixed is to provide a reduced test case.
+The best way to get your bug fixed is to provide a reduced test case. Please provide either a public repository with a runnable example or a [React Native Playground](https://rnplay.org/) snippet.
 
 ### Security Bugs
 

Examples/2048/2048.xcodeproj/project.pbxproj

@@ -159,7 +159,7 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = Facebook;
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "2048" */;
@@ -271,6 +271,7 @@
 					"/Users/sahrens/src/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/Libraries/Animation/build/Debug-iphoneos",
 				);
 				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = 2048;
 			};
 			name = Debug;
@@ -291,6 +292,7 @@
 					"/Users/sahrens/src/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/Libraries/Animation/build/Debug-iphoneos",
 				);
 				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = 2048;
 			};
 			name = Release;
@@ -315,6 +317,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;

Examples/2048/2048/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.facebook.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -22,6 +22,11 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>

Examples/2048/Game2048.js

@@ -150,7 +150,7 @@ class Game2048 extends React.Component {
   startX: number;
   startY: number;
 
-  constructor(props) {
+  constructor(props: {}) {
     super(props);
     this.state = {
       board: new GameBoard(),

Examples/Movies/MovieCell.js

@@ -34,8 +34,14 @@ var MovieCell = React.createClass({
     var criticsScore = this.props.movie.ratings.critics_score;
     return (
       <View>
-        <TouchableHighlight onPress={this.props.onSelect}>
+        <TouchableHighlight
+          onPress={this.props.onSelect}
+          onShowUnderlay={this.props.onHighlight}
+          onHideUnderlay={this.props.onUnhighlight}>
           <View style={styles.row}>
+            {/* $FlowIssue #7363964 - There's a bug in Flow where you cannot
+              * omit a property or set it to undefined if it's inside a shape,
+              * even if it isn't required */}
             <Image
               source={getImageSource(this.props.movie, 'det')}
               style={styles.cellImage}
@@ -54,7 +60,6 @@ var MovieCell = React.createClass({
             </View>
           </View>
         </TouchableHighlight>
-        <View style={styles.cellBorder} />
       </View>
     );
   }

Examples/Movies/MovieScreen.js

@@ -34,6 +34,9 @@ var MovieScreen = React.createClass({
     return (
       <ScrollView contentContainerStyle={styles.contentContainer}>
         <View style={styles.mainSection}>
+          {/* $FlowIssue #7363964 - There's a bug in Flow where you cannot
+            * omit a property or set it to undefined if it's inside a shape,
+            * even if it isn't required */}
           <Image
             source={getImageSource(this.props.movie, 'det')}
             style={styles.detailsImage}

Examples/Movies/Movies.xcodeproj/project.pbxproj

@@ -16,6 +16,7 @@
 		140D9B661AC36C42004F25EE /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14312D241AC3654D00CDC950 /* libRCTLinking.a */; };
 		14A2D4421AC3E43800CC738A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14A2D4411AC3E41A00CC738A /* libReact.a */; };
 		58C5726B1AA6239E00CDF9C8 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C5725B1AA6236500CDF9C8 /* libRCTText.a */; };
+		67C95F201B0E64A30040BCE2 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67C95F1E1B0E647A0040BCE2 /* libRCTWebSocket.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -54,6 +55,13 @@
 			remoteGlobalIDString = 58B5119B1A9E6C1200147676;
 			remoteInfo = RCTText;
 		};
+		67C95F1D1B0E647A0040BCE2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 67C95F151B0E647A0040BCE2 /* RCTWebSocket.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3C86DF461ADF2C930047B81A;
+			remoteInfo = RCTWebSocket;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -69,6 +77,7 @@
 		14312D1E1AC3654D00CDC950 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = ../../Libraries/LinkingIOS/RCTLinking.xcodeproj; sourceTree = "<group>"; };
 		14A2D43C1AC3E41A00CC738A /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../../React/React.xcodeproj; sourceTree = "<group>"; };
 		587650F61A9EB120008B8F17 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = SOURCE_ROOT; };
+		67C95F151B0E647A0040BCE2 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../../Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -76,6 +85,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				67C95F201B0E64A30040BCE2 /* libRCTWebSocket.a in Frameworks */,
 				14A2D4421AC3E43800CC738A /* libReact.a in Frameworks */,
 				140D9B661AC36C42004F25EE /* libRCTLinking.a in Frameworks */,
 				1341801E1AA91750003F314A /* libRCTNetwork.a in Frameworks */,
@@ -135,6 +145,7 @@
 		58C571FC1AA6124500CDF9C8 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
+				67C95F151B0E647A0040BCE2 /* RCTWebSocket.xcodeproj */,
 				14A2D43C1AC3E41A00CC738A /* React.xcodeproj */,
 				14312D1E1AC3654D00CDC950 /* RCTLinking.xcodeproj */,
 				134180151AA91740003F314A /* RCTNetwork.xcodeproj */,
@@ -152,6 +163,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		67C95F161B0E647A0040BCE2 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				67C95F1E1B0E647A0040BCE2 /* libRCTWebSocket.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
@@ -228,6 +247,10 @@
 					ProductGroup = 58C572571AA6236500CDF9C8 /* Products */;
 					ProjectRef = 587650F61A9EB120008B8F17 /* RCTText.xcodeproj */;
 				},
+				{
+					ProductGroup = 67C95F161B0E647A0040BCE2 /* Products */;
+					ProjectRef = 67C95F151B0E647A0040BCE2 /* RCTWebSocket.xcodeproj */;
+				},
 				{
 					ProductGroup = 14A2D43D1AC3E41A00CC738A /* Products */;
 					ProjectRef = 14A2D43C1AC3E41A00CC738A /* React.xcodeproj */;
@@ -276,6 +299,13 @@
 			remoteRef = 58C5725A1AA6236500CDF9C8 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		67C95F1E1B0E647A0040BCE2 /* libRCTWebSocket.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRCTWebSocket.a;
+			remoteRef = 67C95F1D1B0E647A0040BCE2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */

Examples/Movies/Movies/Info.plist

@@ -47,5 +47,11 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+  <key>NSAppTransportSecurity</key>
+  <dict>
+    <!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/-->
+    <key>NSAllowsArbitraryLoads</key>
+    <true/>
+  </dict>
 </dict>
 </plist>

Examples/Movies/Movies/main.m

@@ -17,6 +17,6 @@
 
 int main(int argc, char * argv[]) {
   @autoreleasepool {
-      return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
   }
 }

Examples/Movies/SearchScreen.js

@@ -77,12 +77,14 @@ var SearchScreen = React.createClass({
     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
       );
@@ -237,10 +239,31 @@ var SearchScreen = React.createClass({
     return <ActivityIndicatorIOS style={styles.scrollSpinner} />;
   },
 
-  renderRow: function(movie: Object)  {
+  renderSeparator: function(
+    sectionID: number | string,
+    rowID: number | string,
+    adjacentRowHighlighted: boolean
+  ) {
+    var style = styles.rowSeparator;
+    if (adjacentRowHighlighted) {
+        style = [style, styles.rowSeparatorHide];
+    }
+    return (
+      <View key={"SEP_" + sectionID + "_" + rowID}  style={style}/>
+    );
+  },
+
+  renderRow: function(
+    movie: Object,
+    sectionID: number | string,
+    rowID: number | string,
+    highlightRowFunc: (sectionID: ?number | string, rowID: ?number | string) => void,
+  ) {
     return (
       <MovieCell
         onSelect={() => this.selectMovie(movie)}
+        onHighlight={() => highlightRowFunc(sectionID, rowID)}
+        onUnhighlight={() => highlightRowFunc(null, null)}
         movie={movie}
       />
     );
@@ -254,12 +277,13 @@ var SearchScreen = React.createClass({
       /> :
       <ListView
         ref="listview"
+        renderSeparator={this.renderSeparator}
         dataSource={this.state.dataSource}
         renderFooter={this.renderFooter}
         renderRow={this.renderRow}
         onEndReached={this.onEndReached}
         automaticallyAdjustContentInsets={false}
-        keyboardDismissMode="onDrag"
+        keyboardDismissMode="on-drag"
         keyboardShouldPersistTaps={true}
         showsVerticalScrollIndicator={false}
       />;
@@ -352,6 +376,14 @@ var styles = StyleSheet.create({
   scrollSpinner: {
     marginVertical: 20,
   },
+  rowSeparator: {
+    backgroundColor: 'rgba(0, 0, 0, 0.1)',
+    height: 1,
+    marginLeft: 4,
+  },
+  rowSeparatorHide: {
+    opacity: 0.0,
+  },
 });
 
 module.exports = SearchScreen;

Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj

@@ -7,10 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		00481BE81AC0C86700671115 /* libRCTWebSocketDebugger.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00481BE61AC0C7FA00671115 /* libRCTWebSocketDebugger.a */; };
 		008F07F31AC5B25A0029DE68 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 008F07F21AC5B25A0029DE68 /* main.jsbundle */; };
 		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
-		00C302E61ABCBA2D00DB3ED1 /* libRCTAdSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302B41ABCB8E700DB3ED1 /* libRCTAdSupport.a */; };
 		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
 		00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
 		00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
@@ -18,6 +16,7 @@
 		00E356F31AD99517003FC87E /* SampleAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* SampleAppTests.m */; };
 		133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
 		139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
+		139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
@@ -27,13 +26,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		00481BE51AC0C7FA00671115 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
-			remoteInfo = RCTWebSocketDebugger;
-		};
 		00C302AB1ABCB8CE00DB3ED1 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
@@ -41,13 +33,6 @@
 			remoteGlobalIDString = 134814201AA4EA6300B7C361;
 			remoteInfo = RCTActionSheet;
 		};
-		00C302B31ABCB8E700DB3ED1 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 00C302AF1ABCB8E700DB3ED1 /* RCTAdSupport.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
-			remoteInfo = RCTAdSupport;
-		};
 		00C302B91ABCB90400DB3ED1 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
@@ -90,6 +75,13 @@
 			remoteGlobalIDString = 134814201AA4EA6300B7C361;
 			remoteInfo = RCTSettings;
 		};
+		139FDEF31B06529B00C62182 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3C86DF461ADF2C930047B81A;
+			remoteInfo = RCTWebSocket;
+		};
 		146834031AC3E56700842450 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
@@ -114,10 +106,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocketDebugger.xcodeproj; path = ../../Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj; sourceTree = "<group>"; };
 		008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = iOS/main.jsbundle; sourceTree = "<group>"; };
 		00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<group>"; };
-		00C302AF1ABCB8E700DB3ED1 /* RCTAdSupport.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAdSupport.xcodeproj; path = ../../Libraries/AdSupport/RCTAdSupport.xcodeproj; sourceTree = "<group>"; };
 		00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = ../../Libraries/Geolocation/RCTGeolocation.xcodeproj; sourceTree = "<group>"; };
 		00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../../Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; };
 		00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../../Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; };
@@ -126,6 +116,7 @@
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* SampleAppTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SampleAppTests.m; sourceTree = "<group>"; };
 		139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = ../../Libraries/Settings/RCTSettings.xcodeproj; sourceTree = "<group>"; };
+		139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../../Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* SampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = iOS/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = iOS/AppDelegate.m; sourceTree = "<group>"; };
@@ -151,30 +142,21 @@
 			buildActionMask = 2147483647;
 			files = (
 				146834051AC3E58100842450 /* libReact.a in Frameworks */,
-				139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
-				00481BE81AC0C86700671115 /* libRCTWebSocketDebugger.a in Frameworks */,
 				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
-				00C302E61ABCBA2D00DB3ED1 /* libRCTAdSupport.a in Frameworks */,
 				00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
 				00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
 				133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
 				00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */,
-				00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
+				139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
 				832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
+				00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
+				139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		00481BDC1AC0C7FA00671115 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				00481BE61AC0C7FA00671115 /* libRCTWebSocketDebugger.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		00C302A81ABCB8CE00DB3ED1 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -183,14 +165,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		00C302B01ABCB8E700DB3ED1 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				00C302B41ABCB8E700DB3ED1 /* libRCTAdSupport.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		00C302B61ABCB90400DB3ED1 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -248,6 +222,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		139FDEE71B06529A00C62182 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				139FDEF41B06529B00C62182 /* libRCTWebSocket.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		13B07FAE1A68108700A75B9A /* SampleApp */ = {
 			isa = PBXGroup;
 			children = (
@@ -283,7 +265,6 @@
 			children = (
 				146833FF1AC3E56700842450 /* React.xcodeproj */,
 				00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
-				00C302AF1ABCB8E700DB3ED1 /* RCTAdSupport.xcodeproj */,
 				00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
 				00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
 				78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
@@ -291,7 +272,7 @@
 				139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */,
 				832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
 				00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
-				00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */,
+				139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -394,10 +375,6 @@
 					ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
 					ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
 				},
-				{
-					ProductGroup = 00C302B01ABCB8E700DB3ED1 /* Products */;
-					ProjectRef = 00C302AF1ABCB8E700DB3ED1 /* RCTAdSupport.xcodeproj */;
-				},
 				{
 					ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
 					ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
@@ -427,8 +404,8 @@
 					ProjectRef = 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */;
 				},
 				{
-					ProductGroup = 00481BDC1AC0C7FA00671115 /* Products */;
-					ProjectRef = 00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */;
+					ProductGroup = 139FDEE71B06529A00C62182 /* Products */;
+					ProjectRef = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
 				},
 				{
 					ProductGroup = 146834001AC3E56700842450 /* Products */;
@@ -444,13 +421,6 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		00481BE61AC0C7FA00671115 /* libRCTWebSocketDebugger.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTWebSocketDebugger.a;
-			remoteRef = 00481BE51AC0C7FA00671115 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -458,13 +428,6 @@
 			remoteRef = 00C302AB1ABCB8CE00DB3ED1 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		00C302B41ABCB8E700DB3ED1 /* libRCTAdSupport.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTAdSupport.a;
-			remoteRef = 00C302B31ABCB8E700DB3ED1 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -500,6 +463,13 @@
 			remoteRef = 139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		139FDEF41B06529B00C62182 /* libRCTWebSocket.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRCTWebSocket.a;
+			remoteRef = 139FDEF31B06529B00C62182 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		146834041AC3E56700842450 /* libReact.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -630,7 +600,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../React/**",
 				);
-				INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist";
+				INFOPLIST_FILE = "iOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = SampleApp;
@@ -646,7 +616,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../React/**",
 				);
-				INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist";
+				INFOPLIST_FILE = "iOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = SampleApp;

Examples/SampleApp/SampleAppTests/SampleAppTests.m

@@ -50,18 +50,15 @@
     redboxError = [[RCTRedBox sharedInstance] currentErrorMessage];
 
     foundElement = [self findSubviewInView:vc.view matching:^BOOL(UIView *view) {
-      if ([view respondsToSelector:@selector(attributedText)]) {
-        NSString *text = [(id)view attributedText].string;
-        if ([text isEqualToString:TEXT_TO_LOOK_FOR]) {
-          return YES;
-        }
+      if ([view.accessibilityLabel isEqualToString:TEXT_TO_LOOK_FOR]) {
+        return YES;
       }
       return NO;
     }];
   }
 
   XCTAssertNil(redboxError, @"RedBox error: %@", redboxError);
-  XCTAssertTrue(foundElement, @"Cound't find element with text '%@' in %d seconds", TEXT_TO_LOOK_FOR, TIMEOUT_SECONDS);
+  XCTAssertTrue(foundElement, @"Couldn't find element with text '%@' in %d seconds", TEXT_TO_LOOK_FOR, TIMEOUT_SECONDS);
 }
 
 

Examples/SampleApp/_flowconfig

@@ -16,7 +16,7 @@
 .*/node_modules/react-tools/src/event/EventPropagators.js
 
 # Ignore commoner tests
-.*/node_modules/react-tools/node_modules/commoner/test/.*
+.*/node_modules/commoner/test/.*
 
 # See https://github.com/facebook/flow/issues/442
 .*/react-tools/node_modules/commoner/lib/reader.js
@@ -31,3 +31,6 @@ node_modules/react-native/Libraries/react-native/react-native-interface.js
 
 [options]
 module.system=haste
+
+[version]
+0.12.0

Examples/SampleApp/iOS/Info.plist

@@ -38,5 +38,11 @@
 	<false/>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string></string>
+  <key>NSAppTransportSecurity</key>
+  <dict>
+    <!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/-->
+    <key>NSAllowsArbitraryLoads</key>
+    <true/>
+  </dict>
 </dict>
 </plist>

Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj

@@ -159,7 +159,7 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = Facebook;
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "TicTacToe" */;
@@ -268,6 +268,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = TicTacToe;
 			};
 			name = Debug;
@@ -285,6 +286,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = TicTacToe;
 			};
 			name = Release;
@@ -309,6 +311,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;

Examples/TicTacToe/TicTacToe.xcodeproj/xcshareddata/xcschemes/TicTacToe.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -38,6 +38,8 @@
             ReferencedContainer = "container:TicTacToe.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -47,8 +49,10 @@
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
@@ -66,7 +70,8 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"

Examples/TicTacToe/TicTacToe/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.facebook.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -36,5 +36,11 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>NSAppTransportSecurity</key>
+  <dict>
+    <!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/-->
+    <key>NSAllowsArbitraryLoads</key>
+    <true/>
+  </dict>
 </dict>
 </plist>

Examples/TicTacToe/TicTacToe/main.m

@@ -17,6 +17,6 @@
 
 int main(int argc, char * argv[]) {
   @autoreleasepool {
-      return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
   }
 }

Examples/TicTacToe/TicTacToeApp.js

@@ -118,6 +118,17 @@ var Cell = React.createClass({
     }
   },
 
+  imageStyle() {
+    switch (this.props.player) {
+      case 1:
+        return styles.imageX;
+      case 2:
+        return styles.imageO;
+      default:
+        return {};
+    }
+  },
+
   textContents() {
     switch (this.props.player) {
       case 1:
@@ -147,7 +158,7 @@ var Cell = React.createClass({
         underlayColor="transparent"
         activeOpacity={0.5}>
         <View style={[styles.cell, this.cellStyle()]}>
-          <Image source={{uri: this.imageContents()}} />
+          <Image source={{uri: this.imageContents()}} style={this.imageStyle()}/>
         </View>
       </TouchableHighlight>
     );
@@ -293,6 +304,17 @@ var styles = StyleSheet.create({
     color: '#b9dc2f',
   },
 
+  // CELL IMAGE
+
+  imageX: {
+    width: 34,
+    height: 42,
+  },
+  imageO: {
+    width: 45,
+    height: 41,
+  },
+
   // GAME OVER
 
   overlay: {

Examples/UIExplorer/AccessibilityIOSExample.js

@@ -0,0 +1,65 @@
+/**
+ * The examples provided by Facebook are for non-commercial testing and
+ * evaluation purposes only.
+ *
+ * Facebook reserves all rights not expressly granted.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
+ * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @flow
+ */
+'use strict';
+
+var React = require('react-native');
+var {
+  Text,
+  View,
+} = React;
+
+var AccessibilityIOSExample = React.createClass({
+  render() {
+    return (
+      <View>
+        <View
+          onAccessibilityTap={() => alert('onAccessibilityTap success')}
+          accessible={true}>
+          <Text>
+            Accessibility normal tap example
+          </Text>
+        </View>
+        <View onMagicTap={() => alert('onMagicTap success')}
+              accessible={true}>
+          <Text>
+            Accessibility magic tap example
+          </Text>
+        </View>
+        <View accessibilityLabel="Some announcement"
+              accessible={true}>
+          <Text>
+            Accessibility label example
+          </Text>
+        </View>
+        <View accessibilityTraits={["button", "selected"]}
+              accessible={true}>
+          <Text>
+            Accessibility traits example
+          </Text>
+        </View>
+      </View>
+    );
+  },
+});
+
+exports.title = 'AccessibilityIOS';
+exports.description = 'Interface to show iOS\' accessibility samples';
+exports.examples = [
+  {
+    title: 'Accessibility elements',
+    render(): ReactElement { return <AccessibilityIOSExample />; }
+  },
+];

Examples/UIExplorer/AlertIOSExample.js

@@ -95,9 +95,98 @@ exports.examples = [{
         </TouchableHighlight>
       </View>
     );
-  },
+  }
+},
+{
+  title: 'Prompt',
+  render(): React.Component {
+    return <PromptExample />
+  }
 }];
 
+class PromptExample extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.promptResponse = this.promptResponse.bind(this);
+    this.state = {
+      promptValue: undefined,
+    };
+
+    this.title = 'Type a value';
+    this.defaultValue = 'Default value';
+    this.buttons = [{
+      text: 'Custom cancel',
+    }, {
+      text: 'Custom OK',
+      onPress: this.promptResponse
+    }];
+  }
+
+  render() {
+    return (
+      <View>
+        <Text style={{marginBottom: 10}}>
+          <Text style={{fontWeight: 'bold'}}>Prompt value:</Text> {this.state.promptValue}
+        </Text>
+
+        <TouchableHighlight
+          style={styles.wrapper}
+          onPress={this.prompt.bind(this, this.title, this.promptResponse)}>
+
+          <View style={styles.button}>
+            <Text>
+              prompt with title & callback
+            </Text>
+          </View>
+        </TouchableHighlight>
+
+        <TouchableHighlight
+          style={styles.wrapper}
+          onPress={this.prompt.bind(this, this.title, this.buttons)}>
+
+          <View style={styles.button}>
+            <Text>
+              prompt with title & custom buttons
+            </Text>
+          </View>
+        </TouchableHighlight>
+
+        <TouchableHighlight
+          style={styles.wrapper}
+          onPress={this.prompt.bind(this, this.title, this.defaultValue, this.promptResponse)}>
+
+          <View style={styles.button}>
+            <Text>
+              prompt with title, default value & callback
+            </Text>
+          </View>
+        </TouchableHighlight>
+
+        <TouchableHighlight
+          style={styles.wrapper}
+          onPress={this.prompt.bind(this, this.title, this.defaultValue, this.buttons)}>
+
+          <View style={styles.button}>
+            <Text>
+              prompt with title, default value & custom buttons
+            </Text>
+          </View>
+        </TouchableHighlight>
+      </View>
+    );
+  }
+
+  prompt() {
+    // Flow's apply support is broken: #7035621
+    ((AlertIOS.prompt: any).apply: any)(AlertIOS, arguments);
+  }
+
+  promptResponse(promptValue) {
+    this.setState({ promptValue });
+  }
+}
+
 var styles = StyleSheet.create({
   wrapper: {
     borderRadius: 5,

Examples/UIExplorer/AppStateIOSExample.js

@@ -28,13 +28,19 @@ var AppStateSubscription = React.createClass({
     return {
       appState: AppStateIOS.currentState,
       previousAppStates: [],
+      memoryWarnings: 0,
     };
   },
   componentDidMount: function() {
     AppStateIOS.addEventListener('change', this._handleAppStateChange);
+    AppStateIOS.addEventListener('memoryWarning', this._handleMemoryWarning);
   },
   componentWillUnmount: function() {
     AppStateIOS.removeEventListener('change', this._handleAppStateChange);
+    AppStateIOS.removeEventListener('memoryWarning', this._handleMemoryWarning);
+  },
+  _handleMemoryWarning: function() {
+    this.setState({memoryWarnings: this.state.memoryWarnings + 1})
   },
   _handleAppStateChange: function(appState) {
     var previousAppStates = this.state.previousAppStates.slice();
@@ -45,6 +51,13 @@ var AppStateSubscription = React.createClass({
     });
   },
   render() {
+    if (this.props.showMemoryWarnings) {
+      return (
+        <View>
+          <Text>{this.state.memoryWarnings}</Text>
+        </View>
+      );
+    }
     if (this.props.showCurrentOnly) {
       return (
         <View>
@@ -77,4 +90,9 @@ exports.examples = [
     title: 'Previous states:',
     render(): ReactElement { return <AppStateSubscription showCurrentOnly={false} />; }
   },
+  {
+    title: 'Memory Warnings',
+    description: "In the simulator, hit Shift+Command+M to simulate a memory warning.",
+    render(): ReactElement { return <AppStateSubscription showMemoryWarnings={true} />; }
+  },
 ];

Examples/UIExplorer/BorderExample.js

@@ -68,6 +68,29 @@ var styles = StyleSheet.create({
     borderLeftWidth: 40,
     borderLeftColor: 'blue',
   },
+  border6: {
+    borderTopWidth: 10,
+    borderTopColor: 'red',
+    borderRightWidth: 20,
+    borderRightColor: 'yellow',
+    borderBottomWidth: 30,
+    borderBottomColor: 'green',
+    borderLeftWidth: 40,
+    borderLeftColor: 'blue',
+
+    borderTopLeftRadius: 100,
+  },
+  border7: {
+    borderWidth: 10,
+    borderColor: 'rgba(255,0,0,0.5)',
+    borderRadius: 30,
+    overflow: 'hidden',
+  },
+  border7_inner: {
+    backgroundColor: 'blue',
+    width: 100,
+    height: 100
+  },
 });
 
 exports.title = 'Border';
@@ -115,4 +138,22 @@ exports.examples = [
       return <View style={[styles.box, styles.border5]} />;
     }
   },
+  {
+    title: 'Custom Borders',
+    description: 'border*Width & border*Color',
+    render() {
+      return <View style={[styles.box, styles.border6]} />;
+    }
+  },
+  {
+    title: 'Custom Borders',
+    description: 'borderRadius & clipping',
+    render() {
+      return (
+        <View style={[styles.box, styles.border7]}>
+          <View style={styles.border7_inner} />
+        </View>
+      );
+    }
+  },
 ];

Examples/UIExplorer/CameraRollView.ios.js

@@ -59,6 +59,16 @@ var propTypes = {
    * imagesPerRow: Number of images to be shown in each row.
    */
   imagesPerRow: React.PropTypes.number,
+
+   /**
+   * The asset type, one of 'Photos', 'Videos' or 'All'
+   */
+  assetType: React.PropTypes.oneOf([
+    'Photos',
+    'Videos',
+    'All',
+  ]),
+
 };
 
 var CameraRollView = React.createClass({
@@ -69,6 +79,7 @@ var CameraRollView = React.createClass({
       groupTypes: 'SavedPhotos',
       batchSize: 5,
       imagesPerRow: 1,
+      assetType: 'Photos',
       renderImage: function(asset) {
         var imageSize = 150;
         var imageStyle = [styles.image, {width: imageSize, height: imageSize}];
@@ -89,6 +100,7 @@ var CameraRollView = React.createClass({
       assets: ([]: Array<Image>),
       groupTypes: this.props.groupTypes,
       lastCursor: (null : ?string),
+      assetType: this.props.assetType,
       noMore: false,
       loadingMore: false,
       dataSource: ds,
@@ -124,7 +136,8 @@ var CameraRollView = React.createClass({
 
     var fetchParams: Object = {
       first: this.props.batchSize,
-      groupTypes: this.props.groupTypes
+      groupTypes: this.props.groupTypes,
+      assetType: this.props.assetType,
     };
     if (this.state.lastCursor) {
       fetchParams.after = this.state.lastCursor;

Examples/UIExplorer/DatePickerIOSExample.js

@@ -125,6 +125,7 @@ var Heading = React.createClass({
   }
 });
 
+exports.displayName = (undefined: ?string);
 exports.title = '<DatePickerIOS>';
 exports.description = 'Select dates and times using the native UIDatePicker.';
 exports.examples = [

Examples/UIExplorer/ExampleTypes.js

@@ -0,0 +1,29 @@
+/**
+ * The examples provided by Facebook are for non-commercial testing and
+ * evaluation purposes only.
+ *
+ * Facebook reserves all rights not expressly granted.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
+ * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @providesModule ExampleTypes
+ * @flow
+ */
+
+export type Example = {
+  title: string,
+  render: () => ?ReactElement<any, any, any>,
+  description?: string,
+};
+
+export type ExampleModule = {
+  title: string;
+  description: string;
+  examples: Array<Example>;
+  external?: bool;
+};

Examples/UIExplorer/GeolocationExample.js

@@ -50,8 +50,8 @@ var GeolocationExample = React.createClass({
   componentDidMount: function() {
     navigator.geolocation.getCurrentPosition(
       (initialPosition) => this.setState({initialPosition}),
-      (error) => console.error(error),
-      {enableHighAccuracy: true, timeout: 100, maximumAge: 1000}
+      (error) => alert(error.message),
+      {enableHighAccuracy: true, timeout: 20000, maximumAge: 1000}
     );
     this.watchID = navigator.geolocation.watchPosition((lastPosition) => {
       this.setState({lastPosition});

Examples/UIExplorer/ImageExample.js

@@ -25,6 +25,7 @@ var {
 
 var ImageCapInsetsExample = require('./ImageCapInsetsExample');
 
+exports.displayName = (undefined: ?string);
 exports.framework = 'React';
 exports.title = '<Image>';
 exports.description = 'Base component for displaying different types of images.';

Examples/UIExplorer/ImageMocks.js

@@ -16,26 +16,36 @@
 'use strict';
 
 declare module 'image!story-background' {
+  /* $FlowIssue #7387208 - There's a flow bug preventing this type from flowing
+   * into a proptype shape */
   declare var uri: string;
   declare var isStatic: boolean;
 }
 
 declare module 'image!uie_comment_highlighted' {
+  /* $FlowIssue #7387208 - There's a flow bug preventing this type from flowing
+   * into a proptype shape */
   declare var uri: string;
   declare var isStatic: boolean;
 }
 
 declare module 'image!uie_comment_normal' {
+  /* $FlowIssue #7387208 - There's a flow bug preventing this type from flowing
+   * into a proptype shape */
   declare var uri: string;
   declare var isStatic: boolean;
 }
 
 declare module 'image!uie_thumb_normal' {
+  /* $FlowIssue #7387208 - There's a flow bug preventing this type from flowing
+   * into a proptype shape */
   declare var uri: string;
   declare var isStatic: boolean;
 }
 
 declare module 'image!uie_thumb_selected' {
+  /* $FlowIssue #7387208 - There's a flow bug preventing this type from flowing
+   * into a proptype shape */
   declare var uri: string;
   declare var isStatic: boolean;
 }

Examples/UIExplorer/MapViewExample.js

@@ -29,7 +29,7 @@ var regionText = {
   longitude: '0',
   latitudeDelta: '0',
   longitudeDelta: '0',
-}
+};
 
 var MapRegionInput = React.createClass({
 
@@ -163,12 +163,12 @@ var MapViewExample = React.createClass({
           style={styles.map}
           onRegionChange={this._onRegionChange}
           onRegionChangeComplete={this._onRegionChangeComplete}
-          region={this.state.mapRegion}
-          annotations={this.state.annotations}
+          region={this.state.mapRegion || undefined}
+          annotations={this.state.annotations || undefined}
         />
         <MapRegionInput
           onChange={this._onRegionInputChanged}
-          region={this.state.mapRegionInput}
+          region={this.state.mapRegionInput || undefined}
         />
       </View>
     );
@@ -236,6 +236,7 @@ var styles = StyleSheet.create({
   },
 });
 
+exports.displayName = (undefined: ?string);
 exports.title = '<MapView>';
 exports.description = 'Base component to display maps';
 exports.examples = [

Examples/UIExplorer/Navigator/NavigationBarSample.js

@@ -92,6 +92,31 @@ function newRandomRoute() {
 
 var NavigationBarSample = React.createClass({
 
+  componentWillMount: function() {
+    var navigator = this.props.navigator;
+
+    var callback = (event) => {
+      console.log(
+        `NavigationBarSample : event ${event.type}`,
+        {
+          route: JSON.stringify(event.data.route),
+          target: event.target,
+          type: event.type,
+        }
+      );
+    };
+
+    // Observe focus change events from this component.
+    this._listeners = [
+      navigator.navigationContext.addListener('willfocus', callback),
+      navigator.navigationContext.addListener('didfocus', callback),
+    ];
+  },
+
+  componentWillUnmount: function() {
+    this._listeners && this._listeners.forEach(listener => listener.remove());
+  },
+
   render: function() {
     return (
       <Navigator

Examples/UIExplorer/Navigator/NavigatorExample.js

@@ -132,6 +132,7 @@ var TabBarExample = React.createClass({
   render: function() {
     return (
       <Navigator
+        ref={this._setNavigatorRef}
         style={styles.container}
         initialRoute={{ message: "First Scene", }}
         renderScene={this.renderScene}
@@ -145,6 +146,34 @@ var TabBarExample = React.createClass({
     );
   },
 
+
+  componentWillUnmount: function() {
+    this._listeners && this._listeners.forEach(listener => listener.remove());
+  },
+
+  _setNavigatorRef: function(navigator) {
+    if (navigator !== this._navigator) {
+      this._navigator = navigator;
+
+      if (navigator) {
+        var callback = (event) => {
+          console.log(
+            `TabBarExample: event ${event.type}`,
+            {
+              route: JSON.stringify(event.data.route),
+              target: event.target,
+              type: event.type,
+            }
+          );
+        };
+        // Observe focus change events from the owner.
+        this._listeners = [
+          navigator.navigationContext.addListener('willfocus', callback),
+          navigator.navigationContext.addListener('didfocus', callback),
+        ];
+      }
+    }
+  },
 });
 
 var styles = StyleSheet.create({

Examples/UIExplorer/NavigatorIOSColorsExample.js

@@ -45,7 +45,7 @@ var NavigatorIOSColors = React.createClass({
 
   render: function() {
     // Set StatusBar with light contents to get better contrast
-    StatusBarIOS.setStyle(StatusBarIOS.Style['lightContent']);
+    StatusBarIOS.setStyle('light-content');
 
     return (
       <NavigatorIOS
@@ -55,7 +55,7 @@ var NavigatorIOSColors = React.createClass({
           title: '<NavigatorIOS>',
           rightButtonTitle: 'Done',
           onRightButtonPress: () => {
-            StatusBarIOS.setStyle(StatusBarIOS.Style['default']);
+            StatusBarIOS.setStyle('default');
             this.props.onExampleExit();
           },
           passProps: {

Examples/UIExplorer/NetInfoExample.js

@@ -29,13 +29,13 @@ var ReachabilitySubscription = React.createClass({
     };
   },
   componentDidMount: function() {
-    NetInfo.reachabilityIOS.addEventListener(
+    NetInfo.addEventListener(
       'change',
       this._handleReachabilityChange
     );
   },
   componentWillUnmount: function() {
-    NetInfo.reachabilityIOS.removeEventListener(
+    NetInfo.removeEventListener(
       'change',
       this._handleReachabilityChange
     );
@@ -63,16 +63,16 @@ var ReachabilityCurrent = React.createClass({
     };
   },
   componentDidMount: function() {
-    NetInfo.reachabilityIOS.addEventListener(
+    NetInfo.addEventListener(
       'change',
       this._handleReachabilityChange
     );
-    NetInfo.reachabilityIOS.fetch().done(
+    NetInfo.fetch().done(
       (reachability) => { this.setState({reachability}); }
     );
   },
   componentWillUnmount: function() {
-    NetInfo.reachabilityIOS.removeEventListener(
+    NetInfo.removeEventListener(
       'change',
       this._handleReachabilityChange
     );

Examples/UIExplorer/PanResponderExample.js

@@ -27,7 +27,7 @@ var CIRCLE_COLOR = 'blue';
 var CIRCLE_HIGHLIGHT_COLOR = 'green';
 
 
-var NavigatorIOSExample = React.createClass({
+var PanResponderExample = React.createClass({
 
   statics: {
     title: 'PanResponder Sample',
@@ -133,4 +133,4 @@ var styles = StyleSheet.create({
   },
 });
 
-module.exports = NavigatorIOSExample;
+module.exports = PanResponderExample;

Examples/UIExplorer/PickerIOSExample.js

@@ -112,6 +112,7 @@ var PickerExample = React.createClass({
   },
 });
 
+exports.displayName = (undefined: ?string);
 exports.title = '<PickerIOS>';
 exports.description = 'Render lists of selectable options with UIPickerView.';
 exports.examples = [

Examples/UIExplorer/PointerEventsExample.js

@@ -181,7 +181,13 @@ var BoxOnlyExample = React.createClass({
   }
 });
 
-var exampleClasses = [
+type ExampleClass = {
+  Component: ReactClass<any, any, any>,
+  title: string,
+  description: string,
+};
+
+var exampleClasses: Array<ExampleClass> = [
   {
     Component: NoneExample,
     title: '`none`',

Examples/UIExplorer/ProgressViewIOSExample.js

@@ -0,0 +1,84 @@
+/**
+ * The examples provided by Facebook are for non-commercial testing and
+ * evaluation purposes only.
+ *
+ * Facebook reserves all rights not expressly granted.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
+ * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @flow
+ */
+'use strict';
+
+var React = require('react-native');
+var {
+  ProgressViewIOS,
+  StyleSheet,
+  View,
+} = React;
+var TimerMixin = require('react-timer-mixin');
+
+var ProgressViewExample = React.createClass({
+  mixins: [TimerMixin],
+
+  getInitialState() {
+    return {
+      progress: 0,
+    };
+  },
+
+  componentDidMount() {
+    this.updateProgress();
+  },
+
+  updateProgress() {
+    var progress = this.state.progress + 0.01;
+    this.setState({ progress });
+    this.requestAnimationFrame(() => this.updateProgress());
+  },
+
+  getProgress(offset) {
+    var progress = this.state.progress + offset;
+    return Math.sin(progress % Math.PI) % 1;
+  },
+
+  render() {
+    return (
+      <View style={styles.container}>
+        <ProgressViewIOS style={styles.progressView} progress={this.getProgress(0)}/>
+        <ProgressViewIOS style={styles.progressView} progressTintColor="purple" progress={this.getProgress(0.2)}/>
+        <ProgressViewIOS style={styles.progressView} progressTintColor="red" progress={this.getProgress(0.4)}/>
+        <ProgressViewIOS style={styles.progressView} progressTintColor="orange" progress={this.getProgress(0.6)}/>
+        <ProgressViewIOS style={styles.progressView} progressTintColor="yellow" progress={this.getProgress(0.8)}/>
+      </View>
+    );
+  },
+});
+
+exports.displayName = (undefined: ?string);
+exports.framework = 'React';
+exports.title = 'ProgressViewIOS';
+exports.description = 'ProgressViewIOS';
+exports.examples = [{
+  title: 'ProgressViewIOS',
+  render() {
+    return (
+      <ProgressViewExample/>
+    );
+  }
+}];
+
+var styles = StyleSheet.create({
+  container: {
+    marginTop: -20,
+    backgroundColor: 'transparent',
+  },
+  progressView: {
+    marginTop: 20,
+  }
+});

Examples/UIExplorer/ScrollViewExample.js

@@ -23,6 +23,7 @@ var {
   Image
 } = React;
 
+exports.displayName = (undefined: ?string);
 exports.title = '<ScrollView>';
 exports.description = 'Component that enables scrolling through child components';
 exports.examples = [

Examples/UIExplorer/StatusBarIOSExample.js

@@ -32,11 +32,11 @@ exports.examples = [{
   render() {
     return (
       <View>
-        {Object.keys(StatusBarIOS.Style).map((key) =>
+        {['default', 'light-content'].map((style) =>
           <TouchableHighlight style={styles.wrapper}
-            onPress={() => StatusBarIOS.setStyle(StatusBarIOS.Style[key])}>
+            onPress={() => StatusBarIOS.setStyle(style)}>
             <View style={styles.button}>
-              <Text>setStyle(StatusBarIOS.Style.{key})</Text>
+              <Text>setStyle('{style}')</Text>
             </View>
           </TouchableHighlight>
         )}
@@ -48,11 +48,11 @@ exports.examples = [{
   render() {
     return (
       <View>
-        {Object.keys(StatusBarIOS.Style).map((key) =>
+        {['default', 'light-content'].map((style) =>
           <TouchableHighlight style={styles.wrapper}
-            onPress={() => StatusBarIOS.setStyle(StatusBarIOS.Style[key], true)}>
+            onPress={() => StatusBarIOS.setStyle(style, true)}>
             <View style={styles.button}>
-              <Text>setStyle(StatusBarIOS.Style.{key}, true)</Text>
+              <Text>setStyle('{style}', true)</Text>
             </View>
           </TouchableHighlight>
         )}
@@ -64,18 +64,18 @@ exports.examples = [{
   render() {
     return (
       <View>
-        {Object.keys(StatusBarIOS.Animation).map((key) =>
+        {['none', 'fade', 'slide'].map((animation) =>
           <View>
             <TouchableHighlight style={styles.wrapper}
-              onPress={() => StatusBarIOS.setHidden(true, StatusBarIOS.Animation[key])}>
+              onPress={() => StatusBarIOS.setHidden(true, animation)}>
               <View style={styles.button}>
-                <Text>setHidden(true, StatusBarIOS.Animation.{key})</Text>
+                <Text>setHidden(true, '{animation}')</Text>
               </View>
             </TouchableHighlight>
             <TouchableHighlight style={styles.wrapper}
-              onPress={() => StatusBarIOS.setHidden(false, StatusBarIOS.Animation[key])}>
+              onPress={() => StatusBarIOS.setHidden(false, animation)}>
               <View style={styles.button}>
-                <Text>setHidden(false, StatusBarIOS.Animation.{key})</Text>
+                <Text>setHidden(false, '{animation}')</Text>
               </View>
             </TouchableHighlight>
           </View>

Examples/UIExplorer/TabBarIOSExample.js

@@ -48,7 +48,9 @@ var TabBarExample = React.createClass({
 
   render: function() {
     return (
-      <TabBarIOS>
+      <TabBarIOS
+        tintColor="black"
+        barTintColor="#3abeff">
         <TabBarIOS.Item
           title="Blue Tab"
           selected={this.state.selectedTab === 'blueTab'}
@@ -78,7 +80,7 @@ var TabBarExample = React.createClass({
             this.setState({
               selectedTab: 'greenTab',
               presses: this.state.presses + 1
-            }); 
+            });
           }}>
           {this._renderContent('#21551C', 'Green Tab')}
         </TabBarIOS.Item>

Examples/UIExplorer/TextExample.ios.js

@@ -25,7 +25,7 @@ var {
 var Entity = React.createClass({
   render: function() {
     return (
-      <Text style={styles.entity}>
+      <Text style={{fontWeight: '500', color: '#527fe4'}}>
         {this.props.children}
       </Text>
     );
@@ -34,7 +34,12 @@ var Entity = React.createClass({
 
 var AttributeToggler = React.createClass({
   getInitialState: function() {
-    return {fontWeight: '500', fontSize: 15};
+    return {fontWeight: 'bold', fontSize: 15};
+  },
+  toggleWeight: function() {
+    this.setState({
+      fontWeight: this.state.fontWeight === 'bold' ? 'normal' : 'bold'
+    });
   },
   increaseSize: function() {
     this.setState({
@@ -42,22 +47,26 @@ var AttributeToggler = React.createClass({
     });
   },
   render: function() {
-    var curStyle = {fontSize: this.state.fontSize};
+    var curStyle = {fontWeight: this.state.fontWeight, fontSize: this.state.fontSize};
     return (
-      <Text>
+      <View>
         <Text style={curStyle}>
           Tap the controls below to change attributes.
         </Text>
         <Text>
-          See how it will even work on{' '}
-          <Text style={curStyle}>
-            this nested text
-          </Text>
-          <Text onPress={this.increaseSize}>
-            {'>> Increase Size <<'}
-          </Text>
+          <Text>See how it will even work on <Text style={curStyle}>this nested text</Text></Text>
         </Text>
-      </Text>
+        <Text
+          style={{backgroundColor: '#ffaaaa', marginTop: 5}}
+          onPress={this.toggleWeight}>
+          Toggle Weight
+        </Text>
+        <Text
+          style={{backgroundColor: '#aaaaff', marginTop: 5}}
+          onPress={this.increaseSize}>
+          Increase Size
+        </Text>
+      </View>
     );
   }
 });
@@ -206,6 +215,12 @@ exports.examples = [
   render: function() {
     return (
       <View>
+        <Text>
+          auto (default) - english LTR
+        </Text>
+        <Text>
+          أحب اللغة العربية auto (default) - arabic RTL
+        </Text>
         <Text style={{textAlign: 'left'}}>
           left left left left left left left left left left left left left left left
         </Text>
@@ -215,6 +230,31 @@ exports.examples = [
         <Text style={{textAlign: 'right'}}>
           right right right right right right right right right right right right right
         </Text>
+        <Text style={{textAlign: 'justify'}}>
+          justify: this text component's contents are laid out with "textAlign: justify"
+          and as you can see all of the lines except the last one span the
+          available width of the parent container.
+        </Text>
+      </View>
+    );
+  },
+}, {
+  title: 'Letter Spacing',
+  render: function() {
+    return (
+      <View>
+        <Text style={{letterSpacing: 0}}>
+          letterSpacing = 0
+        </Text>
+        <Text style={{letterSpacing: 2, marginTop: 5}}>
+          letterSpacing = 2
+        </Text>
+        <Text style={{letterSpacing: 9, marginTop: 5}}>
+          letterSpacing = 9
+        </Text>
+        <Text style={{letterSpacing: -1, marginTop: 5}}>
+          letterSpacing = -1
+        </Text>
       </View>
     );
   },
@@ -257,43 +297,21 @@ exports.examples = [
   description: 'backgroundColor is inherited from all types of views.',
   render: function() {
     return (
-      <View style={{backgroundColor: 'yellow'}}>
-        <Text>
-          Yellow background inherited from View parent,
-          <Text style={{backgroundColor: '#ffaaaa'}}>
-            {' '}red background,
-            <Text style={{backgroundColor: '#aaaaff'}}>
-              {' '}blue background,
-              <Text>
-                {' '}inherited blue background,
-                <Text style={{backgroundColor: '#aaffaa'}}>
-                  {' '}nested green background.
-                </Text>
+      <Text style={{backgroundColor: 'yellow'}}>
+        Yellow container background,
+        <Text style={{backgroundColor: '#ffaaaa'}}>
+          {' '}red background,
+          <Text style={{backgroundColor: '#aaaaff'}}>
+            {' '}blue background,
+            <Text>
+              {' '}inherited blue background,
+              <Text style={{backgroundColor: '#aaffaa'}}>
+                {' '}nested green background.
               </Text>
             </Text>
           </Text>
         </Text>
-      </View>
-    );
-  },
-}, {
-  title: 'containerBackgroundColor attribute',
-  render: function() {
-    return (
-      <View>
-        <View style={{flexDirection: 'row', height: 85}}>
-          <View style={{backgroundColor: '#ffaaaa', width: 150}} />
-          <View style={{backgroundColor: '#aaaaff', width: 150}} />
-        </View>
-        <Text style={[styles.backgroundColorText, {top: -80}]}>
-          Default containerBackgroundColor (inherited) + backgroundColor wash
-        </Text>
-        <Text style={[
-          styles.backgroundColorText,
-          {top: -70, containerBackgroundColor: 'transparent'}]}>
-          {"containerBackgroundColor: 'transparent' + backgroundColor wash"}
-        </Text>
-      </View>
+      </Text>
     );
   },
 }, {
@@ -302,13 +320,13 @@ exports.examples = [
     return (
       <View>
         <Text numberOfLines={1}>
-          Maximum of one line no matter now much I write here. If I keep writing it{"'"}ll just truncate after one line
+          Maximum of one line, no matter how much I write here. If I keep writing, it{"'"}ll just truncate after one line.
         </Text>
         <Text numberOfLines={2} style={{marginTop: 20}}>
-          Maximum of two lines no matter now much I write here. If I keep writing it{"'"}ll just truncate after two lines
+          Maximum of two lines, no matter how much I write here. If I keep writing, it{"'"}ll just truncate after two lines.
         </Text>
         <Text style={{marginTop: 20}}>
-          No maximum lines specified no matter now much I write here. If I keep writing it{"'"}ll just keep going and going
+          No maximum lines specified, no matter how much I write here. If I keep writing, it{"'"}ll just keep going and going.
         </Text>
       </View>
     );
@@ -317,11 +335,8 @@ exports.examples = [
 
 var styles = StyleSheet.create({
   backgroundColorText: {
-    left: 5,
+    margin: 5,
+    marginBottom: 0,
     backgroundColor: 'rgba(100, 100, 100, 0.3)'
   },
-  entity: {
-    fontWeight: '500',
-    color: '#527fe4',
-  },
 });

Examples/UIExplorer/TextInputExample.js

@@ -133,6 +133,7 @@ var styles = StyleSheet.create({
   },
 });
 
+exports.displayName = (undefined: ?string);
 exports.title = '<TextInput>';
 exports.description = 'Single and multi-line text inputs.';
 exports.examples = [
@@ -387,7 +388,7 @@ exports.examples = [
             <View style={styles.multilineChild}/>
           </TextInput>
         </View>
-      )
+      );
     }
   }
 ];

Examples/UIExplorer/TouchableExample.js

@@ -26,6 +26,7 @@ var {
   View,
 } = React;
 
+exports.displayName = (undefined: ?string);
 exports.title = '<Touchable*> and onPress';
 exports.examples = [
 {
@@ -75,6 +76,14 @@ exports.examples = [
   render: function(): ReactElement {
     return <TouchableFeedbackEvents />;
   },
+}, {
+  title: 'Touchable delay for events',
+  description: '<Touchable*> components also accept delayPressIn, ' +
+    'delayPressOut, and delayLongPress as props. These props impact the ' +
+    'timing of feedback events.',
+  render: function(): ReactElement {
+    return <TouchableDelayEvents />;
+  },
 }];
 
 var TextOnPressBox = React.createClass({
@@ -148,6 +157,44 @@ var TouchableFeedbackEvents = React.createClass({
   },
 });
 
+var TouchableDelayEvents = React.createClass({
+  getInitialState: function() {
+    return {
+      eventLog: [],
+    };
+  },
+  render: function() {
+    return (
+      <View>
+        <View style={[styles.row, {justifyContent: 'center'}]}>
+        <TouchableOpacity
+          style={styles.wrapper}
+          onPress={() => this._appendEvent('press')}
+          delayPressIn={400}
+          onPressIn={() => this._appendEvent('pressIn - 400ms delay')}
+          delayPressOut={1000}
+          onPressOut={() => this._appendEvent('pressOut - 1000ms delay')}
+          delayLongPress={800}
+          onLongPress={() => this._appendEvent('longPress - 800ms delay')}>
+          <Text style={styles.button}>
+            Press Me
+          </Text>
+        </TouchableOpacity>
+      </View>
+        <View style={styles.eventLogBox}>
+          {this.state.eventLog.map((e, ii) => <Text key={ii}>{e}</Text>)}
+        </View>
+      </View>
+    );
+  },
+  _appendEvent: function(eventName) {
+    var limit = 6;
+    var eventLog = this.state.eventLog.slice(0, limit - 1);
+    eventLog.unshift(eventName);
+    this.setState({eventLog});
+  },
+});
+
 var heartImage = {uri: 'https://pbs.twimg.com/media/BlXBfT3CQAA6cVZ.png:small'};
 
 var styles = StyleSheet.create({

Examples/UIExplorer/TransformExample.js

@@ -0,0 +1,159 @@
+/**
+ * Copyright 2004-present Facebook. All Rights Reserved.
+ *
+ * @providesModule TransformExample
+ */
+'use strict';
+
+var React = require('React');
+
+var StyleSheet = require('StyleSheet');
+var TimerMixin = require('react-timer-mixin');
+var UIExplorerBlock = require('UIExplorerBlock');
+var UIExplorerPage = require('UIExplorerPage');
+var View = require('View');
+
+var TransformExample = React.createClass({
+
+  mixins: [TimerMixin],
+
+  getInitialState() {
+    return {
+      interval: this.setInterval(this._update, 800),
+      pulse: false,
+    };
+  },
+
+  render() {
+    return (
+      <UIExplorerPage title="Transforms">
+        <UIExplorerBlock title="foo bar">
+          <View style={{height: 500}}>
+            <View style={styles.box1} />
+            <View style={styles.box2} />
+            <View style={styles.box3step1} />
+            <View style={styles.box3step2} />
+            <View style={styles.box3step3} />
+            <View style={styles.box4} />
+            <View style={[
+              styles.box5,
+              this.state.pulse ? styles.box5Transform : null
+            ]} />
+          </View>
+        </UIExplorerBlock>
+      </UIExplorerPage>
+    );
+  },
+
+  _update() {
+    this.setState({
+      pulse: !this.state.pulse,
+    });
+  },
+
+});
+
+var styles = StyleSheet.create({
+  box1: {
+    left: 0,
+    backgroundColor: 'green',
+    height: 50,
+    position: 'absolute',
+    top: 0,
+    transform: [
+      {translateX: 100},
+      {translateY: 50},
+      {rotate: '30deg'},
+      {scaleX: 2},
+      {scaleY: 2},
+    ],
+    width: 50,
+  },
+  box2: {
+    left: 0,
+    backgroundColor: 'purple',
+    height: 50,
+    position: 'absolute',
+    top: 0,
+    transform: [
+      {scaleX: 2},
+      {scaleY: 2},
+      {translateX: 100},
+      {translateY: 50},
+      {rotate: '30deg'},
+    ],
+    width: 50,
+  },
+  box3step1: {
+    left: 0,
+    backgroundColor: '#ffb6c1', // lightpink
+    height: 50,
+    position: 'absolute',
+    top: 0,
+    transform: [
+      {rotate: '30deg'},
+    ],
+    width: 50,
+  },
+  box3step2: {
+    left: 0,
+    backgroundColor: '#ff69b4', //hotpink
+    height: 50,
+    opacity: 0.5,
+    position: 'absolute',
+    top: 0,
+    transform: [
+      {rotate: '30deg'},
+      {scaleX: 2},
+      {scaleY: 2},
+    ],
+    width: 50,
+  },
+  box3step3: {
+    left: 0,
+    backgroundColor: '#ff1493', // deeppink
+    height: 50,
+    opacity: 0.5,
+    position: 'absolute',
+    top: 0,
+    transform: [
+      {rotate: '30deg'},
+      {scaleX: 2},
+      {scaleY: 2},
+      {translateX: 100},
+      {translateY: 50},
+    ],
+    width: 50,
+  },
+  box4: {
+    left: 0,
+    backgroundColor: '#ff8c00', // darkorange
+    height: 50,
+    position: 'absolute',
+    top: 0,
+    transform: [
+      {translate: [200, 350]},
+      {scale: 2.5},
+      {rotate: '-0.2rad'},
+    ],
+    width: 100,
+  },
+  box5: {
+    backgroundColor: '#800000', // maroon
+    height: 50,
+    position: 'absolute',
+    right: 0,
+    top: 0,
+    width: 50,
+  },
+  box5Transform: {
+    transform: [
+      {translate: [-50, 35]},
+      {rotate: '50deg'},
+      {scale: 2},
+    ],
+  },
+});
+
+
+module.exports = TransformExample;

Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj

@@ -7,40 +7,50 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		004D28A31AAF61C70097A701 /* UIExplorerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 004D28A21AAF61C70097A701 /* UIExplorerTests.m */; };
-		00D2771A1AB8C3E100DC1E48 /* libRCTWebSocketDebugger.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00D277131AB8C2C700DC1E48 /* libRCTWebSocketDebugger.a */; };
 		13417FE91AA91432003F314A /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FE81AA91428003F314A /* libRCTImage.a */; };
 		134180011AA9153C003F314A /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FEF1AA914B8003F314A /* libRCTText.a */; };
 		1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1341802B1AA91779003F314A /* libRCTNetwork.a */; };
 		134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1344545A1AAFCAAE003F0779 /* libRCTAdSupport.a */; };
 		134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 134A8A251AACED6A00945AAE /* libRCTGeolocation.a */; };
+		139FDEDB1B0651FB00C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDED91B0651EA00C62182 /* libRCTWebSocket.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
+		141FC1211B222EBB004D5FFB /* IntegrationTestsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 141FC1201B222EBB004D5FFB /* IntegrationTestsTests.m */; };
+		143BC5A11B21E45C00462512 /* UIExplorerIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 143BC5A01B21E45C00462512 /* UIExplorerIntegrationTests.m */; };
+		144D21241B2204C5006DB32B /* RCTClippingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 144D21231B2204C5006DB32B /* RCTClippingTests.m */; };
 		147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 147CED4B1AB34F8C00DA3E4C /* libRCTActionSheet.a */; };
+		1497CFAC1B21F5E400C1F8F2 /* RCTAllocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFA41B21F5E400C1F8F2 /* RCTAllocationTests.m */; };
+		1497CFAD1B21F5E400C1F8F2 /* RCTBridgeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFA51B21F5E400C1F8F2 /* RCTBridgeTests.m */; };
+		1497CFAE1B21F5E400C1F8F2 /* RCTContextExecutorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFA61B21F5E400C1F8F2 /* RCTContextExecutorTests.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+		1497CFAF1B21F5E400C1F8F2 /* RCTConvert_NSURLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFA71B21F5E400C1F8F2 /* RCTConvert_NSURLTests.m */; };
+		1497CFB01B21F5E400C1F8F2 /* RCTConvert_UIFontTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFA81B21F5E400C1F8F2 /* RCTConvert_UIFontTests.m */; };
+		1497CFB11B21F5E400C1F8F2 /* RCTEventDispatcherTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFA91B21F5E400C1F8F2 /* RCTEventDispatcherTests.m */; };
+		1497CFB21B21F5E400C1F8F2 /* RCTSparseArrayTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFAA1B21F5E400C1F8F2 /* RCTSparseArrayTests.m */; };
+		1497CFB31B21F5E400C1F8F2 /* RCTUIManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFAB1B21F5E400C1F8F2 /* RCTUIManagerTests.m */; };
 		14AADF051AC3DBB1002390C9 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14AADF041AC3DB95002390C9 /* libReact.a */; };
+		14B6DA821B276C5900BF4DD1 /* libRCTTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58005BEE1ABA80530062E044 /* libRCTTest.a */; };
+		14D6D7111B220EB3001FB087 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14D6D7101B220EB3001FB087 /* libOCMock.a */; };
+		14D6D71E1B2222EF001FB087 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 147CED4B1AB34F8C00DA3E4C /* libRCTActionSheet.a */; };
+		14D6D71F1B2222EF001FB087 /* libRCTAdSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1344545A1AAFCAAE003F0779 /* libRCTAdSupport.a */; };
+		14D6D7201B2222EF001FB087 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 134A8A251AACED6A00945AAE /* libRCTGeolocation.a */; };
+		14D6D7211B2222EF001FB087 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FE81AA91428003F314A /* libRCTImage.a */; };
+		14D6D7221B2222EF001FB087 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1341802B1AA91779003F314A /* libRCTNetwork.a */; };
+		14D6D7231B2222EF001FB087 /* libRCTPushNotification.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14DC67F11AB71876001358AB /* libRCTPushNotification.a */; };
+		14D6D7241B2222EF001FB087 /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 834C36D21AF8DA610019C93C /* libRCTSettings.a */; };
+		14D6D7251B2222EF001FB087 /* libRCTTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58005BEE1ABA80530062E044 /* libRCTTest.a */; };
+		14D6D7261B2222EF001FB087 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FEF1AA914B8003F314A /* libRCTText.a */; };
+		14D6D7271B2222EF001FB087 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; };
+		14D6D7281B2222EF001FB087 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDED91B0651EA00C62182 /* libRCTWebSocket.a */; };
+		14D6D7291B2222EF001FB087 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14AADF041AC3DB95002390C9 /* libReact.a */; };
 		14DC67F41AB71881001358AB /* libRCTPushNotification.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14DC67F11AB71876001358AB /* libRCTPushNotification.a */; };
-		58005BF21ABA80A60062E044 /* libRCTTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58005BEE1ABA80530062E044 /* libRCTTest.a */; };
+		3578590A1B28D2CF00341EDB /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 357859011B28D2C500341EDB /* libRCTLinking.a */; };
 		834C36EC1AF8DED70019C93C /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 834C36D21AF8DA610019C93C /* libRCTSettings.a */; };
 		D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		004D28A41AAF61C70097A701 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
-			remoteInfo = UIExplorer;
-		};
-		00D277121AB8C2C700DC1E48 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 00D2770E1AB8C2C700DC1E48 /* RCTWebSocketDebugger.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
-			remoteInfo = RCTWebSocketDebugger;
-		};
 		13417FE71AA91428003F314A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 13417FE31AA91428003F314A /* RCTImage.xcodeproj */;
@@ -76,6 +86,20 @@
 			remoteGlobalIDString = 134814201AA4EA6300B7C361;
 			remoteInfo = RCTGeolocation;
 		};
+		139FDED81B0651EA00C62182 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 139FDECA1B0651EA00C62182 /* RCTWebSocket.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3C86DF461ADF2C930047B81A;
+			remoteInfo = RCTWebSocket;
+		};
+		143BC59B1B21E3E100462512 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
+			remoteInfo = UIExplorer;
+		};
 		147CED4A1AB34F8C00DA3E4C /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */;
@@ -97,6 +121,13 @@
 			remoteGlobalIDString = 134814201AA4EA6300B7C361;
 			remoteInfo = RCTPushNotification;
 		};
+		357859001B28D2C500341EDB /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 357858F81B28D2C400341EDB /* RCTLinking.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 134814201AA4EA6300B7C361;
+			remoteInfo = RCTLinking;
+		};
 		58005BED1ABA80530062E044 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 58005BE41ABA80530062E044 /* RCTTest.xcodeproj */;
@@ -121,15 +152,13 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		004D289E1AAF61C70097A701 /* UIExplorerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UIExplorerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		004D28A11AAF61C70097A701 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		004D28A21AAF61C70097A701 /* UIExplorerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIExplorerTests.m; sourceTree = "<group>"; };
-		00D2770E1AB8C2C700DC1E48 /* RCTWebSocketDebugger.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocketDebugger.xcodeproj; path = ../../Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj; sourceTree = "<group>"; };
+		004D289E1AAF61C70097A701 /* UIExplorerUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UIExplorerUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		13417FE31AA91428003F314A /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../../Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; };
 		13417FEA1AA914B8003F314A /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; };
 		134180261AA91779003F314A /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../../Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; };
 		134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAdSupport.xcodeproj; path = ../../Libraries/AdSupport/RCTAdSupport.xcodeproj; sourceTree = "<group>"; };
 		134A8A201AACED6A00945AAE /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = ../../Libraries/Geolocation/RCTGeolocation.xcodeproj; sourceTree = "<group>"; };
+		139FDECA1B0651EA00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../../Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* UIExplorer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UIExplorer.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = UIExplorer/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = UIExplorer/AppDelegate.m; sourceTree = "<group>"; };
@@ -138,9 +167,40 @@
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = UIExplorer/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = UIExplorer/main.m; sourceTree = "<group>"; };
 		13CC9D481AEED2B90020D1C2 /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = ../../Libraries/Settings/RCTSettings.xcodeproj; sourceTree = "<group>"; };
+		141FC1201B222EBB004D5FFB /* IntegrationTestsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IntegrationTestsTests.m; sourceTree = "<group>"; };
+		143BC57E1B21E18100462512 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		143BC5811B21E18100462512 /* testLayoutExampleSnapshot_1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "testLayoutExampleSnapshot_1@2x.png"; sourceTree = "<group>"; };
+		143BC5821B21E18100462512 /* testSliderExampleSnapshot_1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "testSliderExampleSnapshot_1@2x.png"; sourceTree = "<group>"; };
+		143BC5831B21E18100462512 /* testSwitchExampleSnapshot_1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "testSwitchExampleSnapshot_1@2x.png"; sourceTree = "<group>"; };
+		143BC5841B21E18100462512 /* testTabBarExampleSnapshot_1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "testTabBarExampleSnapshot_1@2x.png"; sourceTree = "<group>"; };
+		143BC5851B21E18100462512 /* testTextExampleSnapshot_1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "testTextExampleSnapshot_1@2x.png"; sourceTree = "<group>"; };
+		143BC5861B21E18100462512 /* testViewExampleSnapshot_1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "testViewExampleSnapshot_1@2x.png"; sourceTree = "<group>"; };
+		143BC5951B21E3E100462512 /* UIExplorerIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UIExplorerIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		143BC5981B21E3E100462512 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		143BC5A01B21E45C00462512 /* UIExplorerIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIExplorerIntegrationTests.m; sourceTree = "<group>"; };
+		144D21231B2204C5006DB32B /* RCTClippingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTClippingTests.m; sourceTree = "<group>"; };
+		1497CFA41B21F5E400C1F8F2 /* RCTAllocationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAllocationTests.m; sourceTree = "<group>"; };
+		1497CFA51B21F5E400C1F8F2 /* RCTBridgeTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBridgeTests.m; sourceTree = "<group>"; };
+		1497CFA61B21F5E400C1F8F2 /* RCTContextExecutorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTContextExecutorTests.m; sourceTree = "<group>"; };
+		1497CFA71B21F5E400C1F8F2 /* RCTConvert_NSURLTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTConvert_NSURLTests.m; sourceTree = "<group>"; };
+		1497CFA81B21F5E400C1F8F2 /* RCTConvert_UIFontTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTConvert_UIFontTests.m; sourceTree = "<group>"; };
+		1497CFA91B21F5E400C1F8F2 /* RCTEventDispatcherTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTEventDispatcherTests.m; sourceTree = "<group>"; };
+		1497CFAA1B21F5E400C1F8F2 /* RCTSparseArrayTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSparseArrayTests.m; sourceTree = "<group>"; };
+		1497CFAB1B21F5E400C1F8F2 /* RCTUIManagerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUIManagerTests.m; sourceTree = "<group>"; };
 		14AADEFF1AC3DB95002390C9 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../../React/React.xcodeproj; sourceTree = "<group>"; };
+		14D6D7021B220AE3001FB087 /* NSNotificationCenter+OCMAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+OCMAdditions.h"; sourceTree = "<group>"; };
+		14D6D7031B220AE3001FB087 /* OCMArg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMArg.h; sourceTree = "<group>"; };
+		14D6D7041B220AE3001FB087 /* OCMConstraint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMConstraint.h; sourceTree = "<group>"; };
+		14D6D7051B220AE3001FB087 /* OCMLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMLocation.h; sourceTree = "<group>"; };
+		14D6D7061B220AE3001FB087 /* OCMMacroState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMMacroState.h; sourceTree = "<group>"; };
+		14D6D7071B220AE3001FB087 /* OCMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMock.h; sourceTree = "<group>"; };
+		14D6D7081B220AE3001FB087 /* OCMockObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMockObject.h; sourceTree = "<group>"; };
+		14D6D7091B220AE3001FB087 /* OCMRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMRecorder.h; sourceTree = "<group>"; };
+		14D6D70A1B220AE3001FB087 /* OCMStubRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMStubRecorder.h; sourceTree = "<group>"; };
+		14D6D7101B220EB3001FB087 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = "<group>"; };
 		14DC67E71AB71876001358AB /* RCTPushNotification.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTPushNotification.xcodeproj; path = ../../Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj; sourceTree = "<group>"; };
 		14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<group>"; };
+		357858F81B28D2C400341EDB /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = ../../Libraries/LinkingIOS/RCTLinking.xcodeproj; sourceTree = "<group>"; };
 		58005BE41ABA80530062E044 /* RCTTest.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTTest.xcodeproj; path = ../../Libraries/RCTTest/RCTTest.xcodeproj; sourceTree = "<group>"; };
 		D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -150,6 +210,19 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				14D6D71E1B2222EF001FB087 /* libRCTActionSheet.a in Frameworks */,
+				14D6D71F1B2222EF001FB087 /* libRCTAdSupport.a in Frameworks */,
+				14D6D7201B2222EF001FB087 /* libRCTGeolocation.a in Frameworks */,
+				14D6D7211B2222EF001FB087 /* libRCTImage.a in Frameworks */,
+				14D6D7221B2222EF001FB087 /* libRCTNetwork.a in Frameworks */,
+				14D6D7231B2222EF001FB087 /* libRCTPushNotification.a in Frameworks */,
+				14D6D7241B2222EF001FB087 /* libRCTSettings.a in Frameworks */,
+				14D6D7251B2222EF001FB087 /* libRCTTest.a in Frameworks */,
+				14D6D7261B2222EF001FB087 /* libRCTText.a in Frameworks */,
+				14D6D7271B2222EF001FB087 /* libRCTVibration.a in Frameworks */,
+				14D6D7281B2222EF001FB087 /* libRCTWebSocket.a in Frameworks */,
+				14D6D7291B2222EF001FB087 /* libReact.a in Frameworks */,
+				14D6D7111B220EB3001FB087 /* libOCMock.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -157,49 +230,32 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				834C36EC1AF8DED70019C93C /* libRCTSettings.a in Frameworks */,
 				14AADF051AC3DBB1002390C9 /* libReact.a in Frameworks */,
-				00D2771A1AB8C3E100DC1E48 /* libRCTWebSocketDebugger.a in Frameworks */,
-				58005BF21ABA80A60062E044 /* libRCTTest.a in Frameworks */,
-				D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */,
-				14DC67F41AB71881001358AB /* libRCTPushNotification.a in Frameworks */,
 				147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */,
 				134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */,
 				134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */,
-				1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */,
-				134180011AA9153C003F314A /* libRCTText.a in Frameworks */,
 				13417FE91AA91432003F314A /* libRCTImage.a in Frameworks */,
+				3578590A1B28D2CF00341EDB /* libRCTLinking.a in Frameworks */,
+				1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */,
+				14DC67F41AB71881001358AB /* libRCTPushNotification.a in Frameworks */,
+				834C36EC1AF8DED70019C93C /* libRCTSettings.a in Frameworks */,
+				134180011AA9153C003F314A /* libRCTText.a in Frameworks */,
+				D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */,
+				139FDEDB1B0651FB00C62182 /* libRCTWebSocket.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		143BC5921B21E3E100462512 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				14B6DA821B276C5900BF4DD1 /* libRCTTest.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		004D289F1AAF61C70097A701 /* UIExplorerTests */ = {
-			isa = PBXGroup;
-			children = (
-				004D28A21AAF61C70097A701 /* UIExplorerTests.m */,
-				004D28A01AAF61C70097A701 /* Supporting Files */,
-			);
-			path = UIExplorerTests;
-			sourceTree = "<group>";
-		};
-		004D28A01AAF61C70097A701 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				004D28A11AAF61C70097A701 /* Info.plist */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		00D2770F1AB8C2C700DC1E48 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				00D277131AB8C2C700DC1E48 /* libRCTWebSocketDebugger.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		1316A21D1AA397F400C0188E /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
@@ -209,12 +265,13 @@
 				134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */,
 				134A8A201AACED6A00945AAE /* RCTGeolocation.xcodeproj */,
 				13417FE31AA91428003F314A /* RCTImage.xcodeproj */,
+				357858F81B28D2C400341EDB /* RCTLinking.xcodeproj */,
 				134180261AA91779003F314A /* RCTNetwork.xcodeproj */,
 				13CC9D481AEED2B90020D1C2 /* RCTSettings.xcodeproj */,
 				58005BE41ABA80530062E044 /* RCTTest.xcodeproj */,
 				13417FEA1AA914B8003F314A /* RCTText.xcodeproj */,
-				00D2770E1AB8C2C700DC1E48 /* RCTWebSocketDebugger.xcodeproj */,
 				D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */,
+				139FDECA1B0651EA00C62182 /* RCTWebSocket.xcodeproj */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -259,6 +316,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		139FDECB1B0651EA00C62182 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				139FDED91B0651EA00C62182 /* libRCTWebSocket.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		13B07FAE1A68108700A75B9A /* UIExplorer */ = {
 			isa = PBXGroup;
 			children = (
@@ -272,6 +337,65 @@
 			name = UIExplorer;
 			sourceTree = "<group>";
 		};
+		143BC57C1B21E18100462512 /* UIExplorerUnitTests */ = {
+			isa = PBXGroup;
+			children = (
+				1497CFA41B21F5E400C1F8F2 /* RCTAllocationTests.m */,
+				1497CFA51B21F5E400C1F8F2 /* RCTBridgeTests.m */,
+				144D21231B2204C5006DB32B /* RCTClippingTests.m */,
+				1497CFA61B21F5E400C1F8F2 /* RCTContextExecutorTests.m */,
+				1497CFA71B21F5E400C1F8F2 /* RCTConvert_NSURLTests.m */,
+				1497CFA81B21F5E400C1F8F2 /* RCTConvert_UIFontTests.m */,
+				1497CFA91B21F5E400C1F8F2 /* RCTEventDispatcherTests.m */,
+				1497CFAA1B21F5E400C1F8F2 /* RCTSparseArrayTests.m */,
+				1497CFAB1B21F5E400C1F8F2 /* RCTUIManagerTests.m */,
+				143BC57E1B21E18100462512 /* Info.plist */,
+				14D6D7101B220EB3001FB087 /* libOCMock.a */,
+				14D6D7011B220AE3001FB087 /* OCMock */,
+				143BC57F1B21E18100462512 /* ReferenceImages */,
+			);
+			path = UIExplorerUnitTests;
+			sourceTree = "<group>";
+		};
+		143BC57F1B21E18100462512 /* ReferenceImages */ = {
+			isa = PBXGroup;
+			children = (
+				143BC5801B21E18100462512 /* Examples-UIExplorer-UIExplorerApp */,
+			);
+			path = ReferenceImages;
+			sourceTree = "<group>";
+		};
+		143BC5801B21E18100462512 /* Examples-UIExplorer-UIExplorerApp */ = {
+			isa = PBXGroup;
+			children = (
+				143BC5811B21E18100462512 /* testLayoutExampleSnapshot_1@2x.png */,
+				143BC5821B21E18100462512 /* testSliderExampleSnapshot_1@2x.png */,
+				143BC5831B21E18100462512 /* testSwitchExampleSnapshot_1@2x.png */,
+				143BC5841B21E18100462512 /* testTabBarExampleSnapshot_1@2x.png */,
+				143BC5851B21E18100462512 /* testTextExampleSnapshot_1@2x.png */,
+				143BC5861B21E18100462512 /* testViewExampleSnapshot_1@2x.png */,
+			);
+			path = "Examples-UIExplorer-UIExplorerApp";
+			sourceTree = "<group>";
+		};
+		143BC5961B21E3E100462512 /* UIExplorerIntegrationTests */ = {
+			isa = PBXGroup;
+			children = (
+				141FC1201B222EBB004D5FFB /* IntegrationTestsTests.m */,
+				143BC5A01B21E45C00462512 /* UIExplorerIntegrationTests.m */,
+				143BC5971B21E3E100462512 /* Supporting Files */,
+			);
+			path = UIExplorerIntegrationTests;
+			sourceTree = "<group>";
+		};
+		143BC5971B21E3E100462512 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				143BC5981B21E3E100462512 /* Info.plist */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
 		147CED471AB34F8C00DA3E4C /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -288,6 +412,29 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		14D6D6EA1B2205C0001FB087 /* OCMock */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = OCMock;
+			sourceTree = "<group>";
+		};
+		14D6D7011B220AE3001FB087 /* OCMock */ = {
+			isa = PBXGroup;
+			children = (
+				14D6D7021B220AE3001FB087 /* NSNotificationCenter+OCMAdditions.h */,
+				14D6D7031B220AE3001FB087 /* OCMArg.h */,
+				14D6D7041B220AE3001FB087 /* OCMConstraint.h */,
+				14D6D7051B220AE3001FB087 /* OCMLocation.h */,
+				14D6D7061B220AE3001FB087 /* OCMMacroState.h */,
+				14D6D7071B220AE3001FB087 /* OCMock.h */,
+				14D6D7081B220AE3001FB087 /* OCMockObject.h */,
+				14D6D7091B220AE3001FB087 /* OCMRecorder.h */,
+				14D6D70A1B220AE3001FB087 /* OCMStubRecorder.h */,
+			);
+			path = OCMock;
+			sourceTree = "<group>";
+		};
 		14DC67E81AB71876001358AB /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -296,6 +443,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		357858F91B28D2C400341EDB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				357859011B28D2C500341EDB /* libRCTLinking.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		58005BE51ABA80530062E044 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -317,7 +472,9 @@
 			children = (
 				13B07FAE1A68108700A75B9A /* UIExplorer */,
 				1316A21D1AA397F400C0188E /* Libraries */,
-				004D289F1AAF61C70097A701 /* UIExplorerTests */,
+				143BC57C1B21E18100462512 /* UIExplorerUnitTests */,
+				143BC5961B21E3E100462512 /* UIExplorerIntegrationTests */,
+				14D6D6EA1B2205C0001FB087 /* OCMock */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 			);
 			indentWidth = 2;
@@ -328,7 +485,8 @@
 			isa = PBXGroup;
 			children = (
 				13B07F961A680F5B00A75B9A /* UIExplorer.app */,
-				004D289E1AAF61C70097A701 /* UIExplorerTests.xctest */,
+				004D289E1AAF61C70097A701 /* UIExplorerUnitTests.xctest */,
+				143BC5951B21E3E100462512 /* UIExplorerIntegrationTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -344,9 +502,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		004D289D1AAF61C70097A701 /* UIExplorerTests */ = {
+		004D289D1AAF61C70097A701 /* UIExplorerUnitTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 004D28AD1AAF61C70097A701 /* Build configuration list for PBXNativeTarget "UIExplorerTests" */;
+			buildConfigurationList = 004D28AD1AAF61C70097A701 /* Build configuration list for PBXNativeTarget "UIExplorerUnitTests" */;
 			buildPhases = (
 				004D289A1AAF61C70097A701 /* Sources */,
 				004D289B1AAF61C70097A701 /* Frameworks */,
@@ -355,11 +513,10 @@
 			buildRules = (
 			);
 			dependencies = (
-				004D28A51AAF61C70097A701 /* PBXTargetDependency */,
 			);
-			name = UIExplorerTests;
+			name = UIExplorerUnitTests;
 			productName = UIExplorerTests;
-			productReference = 004D289E1AAF61C70097A701 /* UIExplorerTests.xctest */;
+			productReference = 004D289E1AAF61C70097A701 /* UIExplorerUnitTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 		13B07F861A680F5B00A75B9A /* UIExplorer */ = {
@@ -379,17 +536,38 @@
 			productReference = 13B07F961A680F5B00A75B9A /* UIExplorer.app */;
 			productType = "com.apple.product-type.application";
 		};
+		143BC5941B21E3E100462512 /* UIExplorerIntegrationTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 143BC59D1B21E3E100462512 /* Build configuration list for PBXNativeTarget "UIExplorerIntegrationTests" */;
+			buildPhases = (
+				143BC5911B21E3E100462512 /* Sources */,
+				143BC5921B21E3E100462512 /* Frameworks */,
+				143BC5931B21E3E100462512 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				143BC59C1B21E3E100462512 /* PBXTargetDependency */,
+			);
+			name = UIExplorerIntegrationTests;
+			productName = UIExplorerIntegrationTests;
+			productReference = 143BC5951B21E3E100462512 /* UIExplorerIntegrationTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = Facebook;
 				TargetAttributes = {
 					004D289D1AAF61C70097A701 = {
 						CreatedOnToolsVersion = 6.1.1;
+					};
+					143BC5941B21E3E100462512 = {
+						CreatedOnToolsVersion = 6.3.2;
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
 				};
@@ -422,6 +600,10 @@
 					ProductGroup = 13417FE41AA91428003F314A /* Products */;
 					ProjectRef = 13417FE31AA91428003F314A /* RCTImage.xcodeproj */;
 				},
+				{
+					ProductGroup = 357858F91B28D2C400341EDB /* Products */;
+					ProjectRef = 357858F81B28D2C400341EDB /* RCTLinking.xcodeproj */;
+				},
 				{
 					ProductGroup = 134180271AA91779003F314A /* Products */;
 					ProjectRef = 134180261AA91779003F314A /* RCTNetwork.xcodeproj */;
@@ -447,8 +629,8 @@
 					ProjectRef = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
 				},
 				{
-					ProductGroup = 00D2770F1AB8C2C700DC1E48 /* Products */;
-					ProjectRef = 00D2770E1AB8C2C700DC1E48 /* RCTWebSocketDebugger.xcodeproj */;
+					ProductGroup = 139FDECB1B0651EA00C62182 /* Products */;
+					ProjectRef = 139FDECA1B0651EA00C62182 /* RCTWebSocket.xcodeproj */;
 				},
 				{
 					ProductGroup = 14AADF001AC3DB95002390C9 /* Products */;
@@ -458,19 +640,13 @@
 			projectRoot = "";
 			targets = (
 				13B07F861A680F5B00A75B9A /* UIExplorer */,
-				004D289D1AAF61C70097A701 /* UIExplorerTests */,
+				004D289D1AAF61C70097A701 /* UIExplorerUnitTests */,
+				143BC5941B21E3E100462512 /* UIExplorerIntegrationTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		00D277131AB8C2C700DC1E48 /* libRCTWebSocketDebugger.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRCTWebSocketDebugger.a;
-			remoteRef = 00D277121AB8C2C700DC1E48 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		13417FE81AA91428003F314A /* libRCTImage.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -506,6 +682,13 @@
 			remoteRef = 134A8A241AACED6A00945AAE /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		139FDED91B0651EA00C62182 /* libRCTWebSocket.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRCTWebSocket.a;
+			remoteRef = 139FDED81B0651EA00C62182 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		147CED4B1AB34F8C00DA3E4C /* libRCTActionSheet.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -527,6 +710,13 @@
 			remoteRef = 14DC67F01AB71876001358AB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		357859011B28D2C500341EDB /* libRCTLinking.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRCTLinking.a;
+			remoteRef = 357859001B28D2C500341EDB /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		58005BEE1ABA80530062E044 /* libRCTTest.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -567,6 +757,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		143BC5931B21E3E100462512 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -574,7 +771,15 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				004D28A31AAF61C70097A701 /* UIExplorerTests.m in Sources */,
+				1497CFB01B21F5E400C1F8F2 /* RCTConvert_UIFontTests.m in Sources */,
+				144D21241B2204C5006DB32B /* RCTClippingTests.m in Sources */,
+				1497CFB21B21F5E400C1F8F2 /* RCTSparseArrayTests.m in Sources */,
+				1497CFAF1B21F5E400C1F8F2 /* RCTConvert_NSURLTests.m in Sources */,
+				1497CFAE1B21F5E400C1F8F2 /* RCTContextExecutorTests.m in Sources */,
+				1497CFAD1B21F5E400C1F8F2 /* RCTBridgeTests.m in Sources */,
+				1497CFB11B21F5E400C1F8F2 /* RCTEventDispatcherTests.m in Sources */,
+				1497CFB31B21F5E400C1F8F2 /* RCTUIManagerTests.m in Sources */,
+				1497CFAC1B21F5E400C1F8F2 /* RCTAllocationTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -587,13 +792,22 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		143BC5911B21E3E100462512 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				141FC1211B222EBB004D5FFB /* IntegrationTestsTests.m in Sources */,
+				143BC5A11B21E45C00462512 /* UIExplorerIntegrationTests.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		004D28A51AAF61C70097A701 /* PBXTargetDependency */ = {
+		143BC59C1B21E3E100462512 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 13B07F861A680F5B00A75B9A /* UIExplorer */;
-			targetProxy = 004D28A41AAF61C70097A701 /* PBXContainerItemProxy */;
+			targetProxy = 143BC59B1B21E3E100462512 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -613,47 +827,61 @@
 		004D28A61AAF61C70097A701 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
 				);
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages\\\"\"",
-					"$(inherited)",
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../React/**",
+					"$(SRCROOT)/UIExplorerUnitTests/**",
 				);
-				INFOPLIST_FILE = UIExplorerTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				INFOPLIST_FILE = UIExplorerUnitTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/UIExplorerUnitTests",
+				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					XCTest,
+					"-ObjC",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIExplorer.app/UIExplorer";
 			};
 			name = Debug;
 		};
 		004D28A71AAF61C70097A701 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../React/**",
+					"$(SRCROOT)/UIExplorerUnitTests/**",
 				);
-				INFOPLIST_FILE = UIExplorerTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				INFOPLIST_FILE = UIExplorerUnitTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/UIExplorerUnitTests",
+				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					XCTest,
+					"-ObjC",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIExplorer.app/UIExplorer";
 			};
 			name = Release;
 		};
@@ -669,9 +897,10 @@
 					"$(SRCROOT)/../../React/**",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/UIExplorer/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.internal.uiexplorer.local;
 				PRODUCT_NAME = UIExplorer;
 			};
 			name = Debug;
@@ -687,13 +916,69 @@
 					"$(SRCROOT)/../../React/**",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/UIExplorer/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.internal.uiexplorer.local;
 				PRODUCT_NAME = UIExplorer;
 			};
 			name = Release;
 		};
+		143BC59E1B21E3E100462512 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+				);
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/$(PROJECT_NAME)IntegrationTests/ReferenceImages\\\"\"",
+				);
+				INFOPLIST_FILE = UIExplorerIntegrationTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					XCTest,
+					"-ObjC",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.React.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIExplorer.app/UIExplorer";
+			};
+			name = Debug;
+		};
+		143BC59F1B21E3E100462512 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+				);
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = UIExplorerIntegrationTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					XCTest,
+					"-ObjC",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.React.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIExplorer.app/UIExplorer";
+			};
+			name = Release;
+		};
 		83CBBA201A601CBA00E9B192 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -702,18 +987,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_ASSIGN_ENUM = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -723,10 +1013,16 @@
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
+				GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES;
+				GCC_WARN_STRICT_SELECTOR_MATCH = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNKNOWN_PRAGMAS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -737,6 +1033,10 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				WARNING_CFLAGS = (
+					"-Wextra",
+					"-Wall",
+				);
 			};
 			name = Debug;
 		};
@@ -748,12 +1048,16 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_ASSIGN_ENUM = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -763,10 +1067,16 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
+				GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES;
+				GCC_WARN_STRICT_SELECTOR_MATCH = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNKNOWN_PRAGMAS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -777,13 +1087,17 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
+				WARNING_CFLAGS = (
+					"-Wextra",
+					"-Wall",
+				);
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		004D28AD1AAF61C70097A701 /* Build configuration list for PBXNativeTarget "UIExplorerTests" */ = {
+		004D28AD1AAF61C70097A701 /* Build configuration list for PBXNativeTarget "UIExplorerUnitTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				004D28A61AAF61C70097A701 /* Debug */,
@@ -801,6 +1115,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		143BC59D1B21E3E100462512 /* Build configuration list for PBXNativeTarget "UIExplorerIntegrationTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				143BC59E1B21E3E100462512 /* Debug */,
+				143BC59F1B21E3E100462512 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "UIExplorer" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
-   version = "1.3">
+   LastUpgradeVersion = "0700"
+   version = "1.8">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -22,15 +22,29 @@
          </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForRunning = "NO"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
+            buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "004D289D1AAF61C70097A701"
-               BuildableName = "UIExplorerTests.xctest"
-               BlueprintName = "UIExplorerTests"
+               BuildableName = "UIExplorerUnitTests.xctest"
+               BlueprintName = "UIExplorerUnitTests"
+               ReferencedContainer = "container:UIExplorer.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "143BC5941B21E3E100462512"
+               BuildableName = "UIExplorerIntegrationTests.xctest"
+               BlueprintName = "UIExplorerIntegrationTests"
                ReferencedContainer = "container:UIExplorer.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -47,8 +61,18 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "004D289D1AAF61C70097A701"
-               BuildableName = "UIExplorerTests.xctest"
-               BlueprintName = "UIExplorerTests"
+               BuildableName = "UIExplorerUnitTests.xctest"
+               BlueprintName = "UIExplorerUnitTests"
+               ReferencedContainer = "container:UIExplorer.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "143BC5941B21E3E100462512"
+               BuildableName = "UIExplorerIntegrationTests.xctest"
+               BlueprintName = "UIExplorerIntegrationTests"
                ReferencedContainer = "container:UIExplorer.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -62,6 +86,8 @@
             ReferencedContainer = "container:UIExplorer.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -71,6 +97,7 @@
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

Examples/UIExplorer/UIExplorer/AppDelegate.m

@@ -18,7 +18,7 @@
 
 @implementation AppDelegate
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+- (BOOL)application:(__unused UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   NSURL *jsCodeLocation;
 
@@ -36,7 +36,7 @@
    * on the same Wi-Fi network.
    */
 
-  jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/Examples/UIExplorer/UIExplorerApp.includeRequire.runModule.bundle?dev=true"];
+  jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/Examples/UIExplorer/UIExplorerApp.ios.includeRequire.runModule.bundle?dev=true"];
 
   /**
    * OPTION 2
@@ -50,6 +50,10 @@
 
 //  jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 
+#if RUNNING_ON_CI
+   jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#endif
+
   RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
                                                       moduleName:@"UIExplorerApp"
                                                    launchOptions:launchOptions];

Examples/UIExplorer/UIExplorer/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -3,37 +3,37 @@
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "uie_icon@2x.png",
+      "filename" : "Icon-Small@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "uie_icon@2x-1.png",
+      "filename" : "Icon-Small@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "uie_icon@2x-2.png",
+      "filename" : "Icon-40@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "uie_icon@2x-3.png",
+      "filename" : "Icon-40@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "uie_icon@2x-5.png",
+      "filename" : "Icon-60@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "uie_icon@2x-4.png",
+      "filename" : "Icon-60@3x.png",
       "scale" : "3x"
     }
   ],
@@ -41,4 +41,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

Examples/UIExplorer/UIExplorer/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.facebook.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -22,6 +22,8 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>You need to add NSLocationWhenInUseUsageDescription key in Info.plist to enable geolocation, otherwise it is going to *fail silently*!</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -34,9 +36,13 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>You need to add NSLocationWhenInUseUsageDescription key in Info.plist to enable geolocation, otherwise it is going to *fail silently*!</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>NSAppTransportSecurity</key>
+  <dict>
+    <!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/-->
+    <key>NSAllowsArbitraryLoads</key>
+    <true/>
+  </dict>
 </dict>
 </plist>

Examples/UIExplorer/UIExplorer/main.m

@@ -17,6 +17,6 @@
 
 int main(int argc, char * argv[]) {
   @autoreleasepool {
-      return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
   }
 }

Examples/UIExplorer/UIExplorerApp.android.js

@@ -0,0 +1,125 @@
+/**
+ * The examples provided by Facebook are for non-commercial testing and
+ * evaluation purposes only.
+ *
+ * Facebook reserves all rights not expressly granted.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
+ * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @providesModule UIExplorerApp
+ * @flow
+ */
+'use strict';
+
+var React = require('react-native');
+var Dimensions = require('Dimensions');
+var DrawerLayoutAndroid = require('DrawerLayoutAndroid');
+var ToolbarAndroid = require('ToolbarAndroid');
+var UIExplorerList = require('./UIExplorerList');
+var {
+  StyleSheet,
+  View,
+} = React;
+
+var DRAWER_WIDTH_LEFT = 56;
+
+var UIExplorerApp = React.createClass({
+
+  getInitialState: function() {
+    return {
+      example: {
+        title: 'UIExplorer',
+        component: this._renderHome(),
+      },
+    };
+  },
+
+  render: function() {
+    return (
+      <DrawerLayoutAndroid
+        drawerPosition={DrawerLayoutAndroid.positions.Left}
+        drawerWidth={Dimensions.get('window').width - DRAWER_WIDTH_LEFT}
+        ref={(drawer) => { this.drawer = drawer; }}
+        renderNavigationView={this._renderNavigationView}>
+        {this._renderNavigation()}
+      </DrawerLayoutAndroid>
+      );
+  },
+
+  _renderNavigationView: function() {
+    return (
+      <UIExplorerList
+        onSelectExample={this.onSelectExample}
+        isInDrawer={true}
+      />
+    );
+  },
+
+  onSelectExample: function(example) {
+    this.drawer.closeDrawer();
+    if (example.title === 'UIExplorer') {
+      example.component = this._renderHome();
+    }
+    this.setState({
+      example: {
+        title: example.title,
+        component: example.component,
+      },
+    });
+  },
+
+  _renderHome: function() {
+    var onSelectExample = this.onSelectExample;
+    return React.createClass({
+      render: function() {
+        return (
+          <UIExplorerList
+            onSelectExample={onSelectExample}
+            isInDrawer={false}
+          />
+        );
+      }
+    });
+  },
+
+  _renderNavigation: function() {
+    var Component = this.state.example.component;
+    return (
+      <View style={styles.container}>
+        <ToolbarAndroid
+          logo={require('image!launcher_icon')}
+          navIcon={require('image!ic_menu_black_24dp')}
+          onIconClicked={() => this.drawer.openDrawer()}
+          style={styles.toolbar}
+          title={this.state.example.title}
+        />
+        <Component />
+      </View>
+    );
+  },
+
+});
+
+var styles = StyleSheet.create({
+  messageText: {
+    fontSize: 17,
+    fontWeight: '500',
+    padding: 15,
+    marginTop: 50,
+    marginLeft: 15,
+  },
+  container: {
+    flex: 1,
+  },
+  toolbar: {
+    backgroundColor: '#E9EAED',
+    height: 56,
+  },
+});
+
+module.exports = UIExplorerApp;

Examples/UIExplorer/UIExplorerApp.ios.js

@@ -43,22 +43,22 @@ var UIExplorerApp = React.createClass({
         />
       );
     }
-    return (
-      <NavigatorIOS
-        style={styles.container}
-        initialRoute={{
-          title: 'UIExplorer',
-          component: UIExplorerList,
-          passProps: {
-            onExternalExampleRequested: (example) => {
-              this.setState({ openExternalExample: example, });
-            },
-          }
-        }}
-        itemWrapperStyle={styles.itemWrapper}
-        tintColor='#008888'
-      />
-    );
+      return (
+        <NavigatorIOS
+          style={styles.container}
+          initialRoute={{
+            title: 'UIExplorer',
+            component: UIExplorerList,
+            passProps: {
+              onExternalExampleRequested: (example) => {
+                this.setState({ openExternalExample: example, });
+              },
+            }
+          }}
+          itemWrapperStyle={styles.itemWrapper}
+          tintColor="#008888"
+        />
+      );
   }
 });
 

Examples/UIExplorer/UIExplorerBlock.js

@@ -69,20 +69,15 @@ var styles = StyleSheet.create({
     overflow: 'hidden',
   },
   titleContainer: {
-    borderWidth: 0.5,
-    borderRadius: 2.5,
-    borderColor: '#d6d7da',
+    borderBottomWidth: 0.5,
+    borderTopLeftRadius: 3,
+    borderTopRightRadius: 2.5,
+    borderBottomColor: '#d6d7da',
     backgroundColor: '#f6f7f8',
     paddingHorizontal: 10,
     paddingVertical: 5,
   },
-  titleRow: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    backgroundColor: 'transparent',
-  },
   titleText: {
-    backgroundColor: 'transparent',
     fontSize: 14,
     fontWeight: '500',
   },
@@ -100,8 +95,7 @@ var styles = StyleSheet.create({
     height: 8,
   },
   children: {
-    backgroundColor: 'transparent',
-    padding: 10,
+    margin: 10,
   }
 });
 

Examples/UIExplorer/UIExplorerIntegrationTests/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.facebook.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Examples/UIExplorer/UIExplorerIntegrationTests/IntegrationTestsTests.m

@@ -25,16 +25,13 @@
 
 - (void)setUp
 {
-#ifdef __LP64__
-  RCTAssert(!__LP64__, @"Tests should be run on 32-bit device simulators (e.g. iPhone 5)");
+#if __LP64__
+  RCTAssert(false, @"Tests should be run on 32-bit device simulators (e.g. iPhone 5)");
 #endif
-  NSString *version = [[UIDevice currentDevice] systemVersion];
-  RCTAssert([version integerValue] == 8, @"Tests should be run on iOS 8.x, found %@", version);
-  _runner = RCTInitRunnerForApp(@"IntegrationTests/IntegrationTestsApp");
 
-  // If tests have changes, set recordMode = YES below and run the affected
-  // tests on an iPhone5, iOS 8.1 simulator.
-  _runner.recordMode = NO;
+  NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
+  RCTAssert(version.majorVersion == 8 || version.minorVersion == 3, @"Tests should be run on iOS 8.3, found %zd.%zd.%zd", version.majorVersion, version.minorVersion, version.patchVersion);
+  _runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerIntegrationTests/js/IntegrationTestsApp");
 }
 
 #pragma mark Logic Tests
@@ -52,8 +49,7 @@
   expectErrorBlock:nil];
 }
 
-// TODO: this seems to stall forever - figure out why
-- (void)DISABLED_testTheTester_ExpectError
+- (void)testTheTester_ExpectError
 {
   [_runner runTest:_cmd
             module:@"IntegrationTestHarnessTest"
@@ -71,21 +67,28 @@
   [_runner runTest:_cmd module:@"AsyncStorageTest"];
 }
 
-- (void)testLayoutEvents
+- (void)DISABLED_testLayoutEvents // #7149037
 {
   [_runner runTest:_cmd module:@"LayoutEventsTest"];
 }
 
+- (void)testAppEvents
+{
+  [_runner runTest:_cmd module:@"AppEventsTest"];
+}
+
+- (void)testPromises
+{
+  [_runner runTest:_cmd module:@"PromiseTest"];
+}
+
 #pragma mark Snapshot Tests
 
 - (void)testSimpleSnapshot
 {
+  // If tests have changes, set recordMode = YES below and re-run
+  _runner.recordMode = NO;
   [_runner runTest:_cmd module:@"SimpleSnapshotTest"];
 }
 
-- (void)testZZZ_NotInRecordMode
-{
-  RCTAssert(_runner.recordMode == NO, @"Don't forget to turn record mode back to NO before commit.");
-}
-
 @end

Examples/UIExplorer/UIExplorerIntegrationTests/UIExplorerIntegrationTests.m

@@ -0,0 +1,57 @@
+/**
+ * The examples provided by Facebook are for non-commercial testing and
+ * evaluation purposes only.
+ *
+ * Facebook reserves all rights not expressly granted.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
+ * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
+
+#import <RCTTest/RCTTestRunner.h>
+
+#import "RCTAssert.h"
+#import "RCTRedBox.h"
+#import "RCTRootView.h"
+
+@interface UIExplorerTests : XCTestCase
+{
+  RCTTestRunner *_runner;
+}
+
+@end
+
+@implementation UIExplorerTests
+
+- (void)setUp
+{
+#ifdef __LP64__
+  RCTAssert(!__LP64__, @"Snapshot tests should be run on 32-bit device simulators (e.g. iPhone 5)");
+#endif
+  NSString *version = [[UIDevice currentDevice] systemVersion];
+  RCTAssert([version isEqualToString:@"8.3"], @"Snapshot tests should be run on iOS 8.3, found %@", version);
+  _runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerApp.ios");
+}
+
+#define RCT_SNAPSHOT_TEST(name, reRecord) \
+- (void)test##name##Snapshot              \
+{                                         \
+  _runner.recordMode |= reRecord;         \
+  [_runner runTest:_cmd module:@#name];   \
+}
+
+RCT_SNAPSHOT_TEST(ViewExample, NO)
+RCT_SNAPSHOT_TEST(LayoutExample, NO)
+RCT_SNAPSHOT_TEST(TextExample, NO)
+RCT_SNAPSHOT_TEST(SwitchExample, NO)
+RCT_SNAPSHOT_TEST(SliderExample, NO)
+RCT_SNAPSHOT_TEST(TabBarExample, NO)
+
+@end

Examples/UIExplorer/UIExplorerIntegrationTests/js/AppEventsTest.js

@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule AppEventsTest
+ * @flow
+ */
+'use strict';
+
+var React = require('react-native');
+var {
+  NativeAppEventEmitter,
+  NativeModules,
+  StyleSheet,
+  Text,
+  View,
+} = React;
+var TestModule = NativeModules.TestModule || NativeModules.SnapshotTestManager;
+
+var deepDiffer = require('deepDiffer');
+
+var TEST_PAYLOAD = {foo: 'bar'};
+
+var AppEventsTest = React.createClass({
+  getInitialState: function() {
+    return {sent: 'none', received: 'none'};
+  },
+  componentDidMount: function() {
+    NativeAppEventEmitter.addListener('testEvent', this.receiveEvent);
+    var event = {data: TEST_PAYLOAD, ts: Date.now()};
+    TestModule.sendAppEvent('testEvent', event);
+    this.setState({sent: event});
+  },
+  receiveEvent: function(event: any) {
+    if (deepDiffer(event.data, TEST_PAYLOAD)) {
+      throw new Error('Received wrong event: ' + JSON.stringify(event));
+    }
+    var elapsed = (Date.now() - event.ts) + 'ms';
+    this.setState({received: event, elapsed}, TestModule.markTestCompleted);
+  },
+  render: function() {
+    return (
+      <View style={styles.container}>
+        <Text>
+          {JSON.stringify(this.state, null, '  ')}
+        </Text>
+      </View>
+    );
+  }
+});
+
+AppEventsTest.displayName = 'AppEventsTest';
+
+var styles = StyleSheet.create({
+  container: {
+    margin: 40,
+  },
+});
+
+module.exports = AppEventsTest;

Examples/UIExplorer/UIExplorerIntegrationTests/js/AsyncStorageTest.js

@@ -16,12 +16,19 @@ var {
   View,
 } = React;
 
+var deepDiffer = require('deepDiffer');
+
 var DEBUG = false;
 
 var KEY_1 = 'key_1';
 var VAL_1 = 'val_1';
 var KEY_2 = 'key_2';
 var VAL_2 = 'val_2';
+var KEY_MERGE = 'key_merge';
+var VAL_MERGE_1 = {'foo': 1, 'bar': {'hoo': 1, 'boo': 1}, 'moo': {'a': 3}};
+var VAL_MERGE_2 = {'bar': {'hoo': 2}, 'baz': 2, 'moo': {'a': 3}};
+var VAL_MERGE_EXPECT =
+  {'foo': 1, 'bar': {'hoo': 2, 'boo': 1}, 'baz': 2, 'moo': {'a': 3}};
 
 // setup in componentDidMount
 var done;
@@ -40,20 +47,24 @@ function expectTrue(condition, message) {
 
 function expectEqual(lhs, rhs, testname) {
   expectTrue(
-    lhs === rhs,
-    'Error in test ' + testname + ': expected ' + rhs + ', got ' + lhs
+    !deepDiffer(lhs, rhs),
+    'Error in test ' + testname + ': expected\n' + JSON.stringify(rhs) +
+      '\ngot\n' + JSON.stringify(lhs)
   );
 }
 
-function expectAsyncNoError(err) {
-  expectTrue(err === null, 'Unexpected Async error: ' + JSON.stringify(err));
+function expectAsyncNoError(place, err) {
+  if (err instanceof Error) {
+    err = err.message;
+  }
+  expectTrue(err === null, 'Unexpected error in ' + place + ': ' + JSON.stringify(err));
 }
 
 function testSetAndGet() {
   AsyncStorage.setItem(KEY_1, VAL_1, (err1) => {
-    expectAsyncNoError(err1);
+    expectAsyncNoError('testSetAndGet/setItem', err1);
     AsyncStorage.getItem(KEY_1, (err2, result) => {
-      expectAsyncNoError(err2);
+      expectAsyncNoError('testSetAndGet/getItem', err2);
       expectEqual(result, VAL_1, 'testSetAndGet setItem');
       updateMessage('get(key_1) correctly returned ' + result);
       runTestCase('should get null for missing key', testMissingGet);
@@ -63,7 +74,7 @@ function testSetAndGet() {
 
 function testMissingGet() {
   AsyncStorage.getItem(KEY_2, (err, result) => {
-    expectAsyncNoError(err);
+    expectAsyncNoError('testMissingGet/setItem', err);
     expectEqual(result, null, 'testMissingGet');
     updateMessage('missing get(key_2) correctly returned ' + result);
     runTestCase('check set twice results in a single key', testSetTwice);
@@ -74,7 +85,7 @@ function testSetTwice() {
   AsyncStorage.setItem(KEY_1, VAL_1, ()=>{
     AsyncStorage.setItem(KEY_1, VAL_1, ()=>{
       AsyncStorage.getItem(KEY_1, (err, result) => {
-        expectAsyncNoError(err);
+        expectAsyncNoError('testSetTwice/setItem', err);
         expectEqual(result, VAL_1, 'testSetTwice');
         updateMessage('setTwice worked as expected');
         runTestCase('test removeItem', testRemoveItem);
@@ -87,31 +98,31 @@ function testRemoveItem() {
   AsyncStorage.setItem(KEY_1, VAL_1, ()=>{
     AsyncStorage.setItem(KEY_2, VAL_2, ()=>{
       AsyncStorage.getAllKeys((err, result) => {
-        expectAsyncNoError(err);
+        expectAsyncNoError('testRemoveItem/getAllKeys', err);
         expectTrue(
           result.indexOf(KEY_1) >= 0 && result.indexOf(KEY_2) >= 0,
           'Missing KEY_1 or KEY_2 in ' + '(' + result + ')'
         );
         updateMessage('testRemoveItem - add two items');
-        AsyncStorage.removeItem(KEY_1, (err) => {
-          expectAsyncNoError(err);
+        AsyncStorage.removeItem(KEY_1, (err2) => {
+          expectAsyncNoError('testRemoveItem/removeItem', err2);
           updateMessage('delete successful ');
-          AsyncStorage.getItem(KEY_1, (err, result) => {
-            expectAsyncNoError(err);
+          AsyncStorage.getItem(KEY_1, (err3, result2) => {
+            expectAsyncNoError('testRemoveItem/getItem', err3);
             expectEqual(
-              result,
+              result2,
               null,
               'testRemoveItem: key_1 present after delete'
             );
             updateMessage('key properly removed ');
-            AsyncStorage.getAllKeys((err, result2) => {
-             expectAsyncNoError(err);
+            AsyncStorage.getAllKeys((err4, result3) => {
+             expectAsyncNoError('testRemoveItem/getAllKeys', err4);
              expectTrue(
-               result2.indexOf(KEY_1) === -1,
-               'Unexpected: KEY_1 present in ' + result2
+               result3.indexOf(KEY_1) === -1,
+               'Unexpected: KEY_1 present in ' + result3
              );
-             updateMessage('proper length returned.\nDone!');
-             done();
+             updateMessage('proper length returned.');
+             runTestCase('should merge values', testMerge);
             });
           });
         });
@@ -120,6 +131,21 @@ function testRemoveItem() {
   });
 }
 
+function testMerge() {
+  AsyncStorage.setItem(KEY_MERGE, JSON.stringify(VAL_MERGE_1), (err1) => {
+    expectAsyncNoError('testMerge/setItem', err1);
+    AsyncStorage.mergeItem(KEY_MERGE, JSON.stringify(VAL_MERGE_2), (err2) => {
+      expectAsyncNoError('testMerge/mergeItem', err2);
+      AsyncStorage.getItem(KEY_MERGE, (err3, result) => {
+        expectAsyncNoError('testMerge/setItem', err3);
+        expectEqual(JSON.parse(result), VAL_MERGE_EXPECT, 'testMerge');
+        updateMessage('objects deeply merged\nDone!');
+        done();
+      });
+    });
+  });
+}
+
 var AsyncStorageTest = React.createClass({
   getInitialState() {
     return {
@@ -150,4 +176,6 @@ var AsyncStorageTest = React.createClass({
   }
 });
 
+AsyncStorageTest.displayName = 'AsyncStorageTest';
+
 module.exports = AsyncStorageTest;

Examples/UIExplorer/UIExplorerIntegrationTests/js/IntegrationTestHarnessTest.js

@@ -59,4 +59,6 @@ var IntegrationTestHarnessTest = React.createClass({
   }
 });
 
+IntegrationTestHarnessTest.displayName = 'IntegrationTestHarnessTest';
+
 module.exports = IntegrationTestHarnessTest;

Examples/UIExplorer/UIExplorerIntegrationTests/js/IntegrationTestsApp.js

@@ -26,7 +26,9 @@ var TESTS = [
   require('./TimersTest'),
   require('./AsyncStorageTest'),
   require('./LayoutEventsTest'),
+  require('./AppEventsTest'),
   require('./SimpleSnapshotTest'),
+  require('./PromiseTest'),
 ];
 
 TESTS.forEach(

Examples/UIExplorer/UIExplorerIntegrationTests/js/LayoutEventsTest.js

@@ -164,4 +164,6 @@ var styles = StyleSheet.create({
   },
 });
 
+LayoutEventsTest.displayName = 'LayoutEventsTest';
+
 module.exports = LayoutEventsTest;

Examples/UIExplorer/UIExplorerIntegrationTests/js/PromiseTest.js

@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule PromiseTest
+ */
+'use strict';
+
+var RCTTestModule = require('NativeModules').TestModule;
+var React = require('react-native');
+
+var PromiseTest = React.createClass({
+
+  shouldResolve: false,
+  shouldReject: false,
+
+  componentDidMount() {
+    Promise.all([
+      this.testShouldResolve(),
+      this.testShouldReject(),
+    ]).then(() => RCTTestModule.markTestPassed(
+      this.shouldResolve && this.shouldReject
+    ));
+  },
+
+  testShouldResolve() {
+    return RCTTestModule
+      .shouldResolve()
+      .then(() => this.shouldResolve = true)
+      .catch(() => this.shouldResolve = false);
+  },
+
+  testShouldReject() {
+    return RCTTestModule
+      .shouldReject()
+      .then(() => this.shouldReject = false)
+      .catch(() => this.shouldReject = true);
+  },
+
+  render() {
+    return <React.View />;
+  }
+
+});
+
+PromiseTest.displayName = 'PromiseTest';
+
+module.exports = PromiseTest;

Examples/UIExplorer/UIExplorerIntegrationTests/js/SimpleSnapshotTest.js

@@ -24,8 +24,8 @@ var SimpleSnapshotTest = React.createClass({
     requestAnimationFrame(() => TestModule.verifySnapshot(this.done));
   },
 
-  done() {
-    TestModule.markTestCompleted();
+  done(success) {
+    TestModule.markTestPassed(success);
   },
 
   render() {
@@ -53,4 +53,6 @@ var styles = StyleSheet.create({
   },
 });
 
+SimpleSnapshotTest.displayName = 'SimpleSnapshotTest';
+
 module.exports = SimpleSnapshotTest;

Examples/UIExplorer/UIExplorerIntegrationTests/js/TimersTest.js

@@ -152,4 +152,6 @@ var styles = StyleSheet.create({
   },
 });
 
+TimersTest.displayName = 'TimersTest';
+
 module.exports = TimersTest;

Examples/UIExplorer/UIExplorerList.js

@@ -20,6 +20,7 @@ var {
   AppRegistry,
   ListView,
   PixelRatio,
+  Platform,
   StyleSheet,
   Text,
   TextInput,
@@ -30,51 +31,71 @@ var {
 var { TestModule } = React.addons;
 var Settings = require('Settings');
 
+import type { ExampleModule } from 'ExampleTypes';
+
 var createExamplePage = require('./createExamplePage');
 
-var COMPONENTS = [
-  require('./ActivityIndicatorIOSExample'),
-  require('./DatePickerIOSExample'),
-  require('./ImageExample'),
-  require('./ListViewExample'),
-  require('./ListViewPagingExample'),
-  require('./MapViewExample'),
-  require('./Navigator/NavigatorExample'),
-  require('./NavigatorIOSColorsExample'),
-  require('./NavigatorIOSExample'),
-  require('./PickerIOSExample'),
-  require('./ScrollViewExample'),
-  require('./SegmentedControlIOSExample'),
-  require('./SliderIOSExample'),
-  require('./SwitchIOSExample'),
-  require('./TabBarIOSExample'),
-  require('./TextExample.ios'),
-  require('./TextInputExample'),
-  require('./TouchableExample'),
+var COMMON_COMPONENTS = [
   require('./ViewExample'),
   require('./WebViewExample'),
 ];
 
-var APIS = [
-  require('./ActionSheetIOSExample'),
-  require('./AdSupportIOSExample'),
-  require('./AlertIOSExample'),
-  require('./AppStateIOSExample'),
-  require('./AsyncStorageExample'),
-  require('./BorderExample'),
-  require('./CameraRollExample.ios'),
+var COMMON_APIS = [
   require('./GeolocationExample'),
-  require('./LayoutEventsExample'),
   require('./LayoutExample'),
-  require('./NetInfoExample'),
   require('./PanResponderExample'),
   require('./PointerEventsExample'),
-  require('./PushNotificationIOSExample'),
-  require('./StatusBarIOSExample'),
-  require('./TimerExample'),
-  require('./VibrationIOSExample'),
 ];
 
+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([
+    require('./AccessibilityIOSExample'),
+    require('./ActionSheetIOSExample'),
+    require('./AdSupportIOSExample'),
+    require('./AlertIOSExample'),
+    require('./AppStateIOSExample'),
+    require('./AsyncStorageExample'),
+    require('./BorderExample'),
+    require('./CameraRollExample.ios'),
+    require('./LayoutEventsExample'),
+    require('./NetInfoExample'),
+    require('./PushNotificationIOSExample'),
+    require('./StatusBarIOSExample'),
+    require('./TimerExample'),
+    require('./VibrationIOSExample'),
+    require('./XHRExample'),
+  ]);
+
+} else if (Platform.OS === 'android') {
+  var COMPONENTS = COMMON_COMPONENTS.concat([
+  ]);
+
+  var APIS = COMMON_APIS.concat([
+  ]);
+}
+
 var ds = new ListView.DataSource({
   rowHasChanged: (r1, r2) => r1 !== r2,
   sectionHeaderHasChanged: (h1, h2) => h1 !== h2,
@@ -94,7 +115,7 @@ COMPONENTS.concat(APIS).forEach((Example) => {
         // View is still blank after first RAF :\
         global.requestAnimationFrame(() =>
           global.requestAnimationFrame(() => TestModule.verifySnapshot(
-            TestModule.markTestCompleted
+            TestModule.markTestPassed
           )
         ));
       },
@@ -107,16 +128,24 @@ COMPONENTS.concat(APIS).forEach((Example) => {
   }
 });
 
-class UIExplorerList extends React.Component {
+type Props = {
+  navigator: Array<{title: string, component: ReactClass<any,any,any>}>,
+  onExternalExampleRequested: Function,
+  onSelectExample: Function,
+  isInDrawer: bool,
+};
 
-  constructor(props) {
+class UIExplorerList extends React.Component {
+  props: Props;
+
+  constructor(props: Props) {
     super(props);
     this.state = {
       dataSource: ds.cloneWithRowsAndSections({
         components: COMPONENTS,
         apis: APIS,
       }),
-      searchText: Settings.get('searchText'),
+      searchText: Platform.OS === 'ios' ? Settings.get('searchText') : '',
     };
   }
 
@@ -125,8 +154,12 @@ class UIExplorerList extends React.Component {
   }
 
   render() {
-    return (
-      <View style={styles.listContainer}>
+    if (Platform.OS === 'ios' ||
+      (Platform.OS === 'android' && !this.props.isInDrawer)) {
+      var platformTextInputStyle =
+        Platform.OS === 'ios' ? styles.searchTextInputIOS :
+        Platform.OS === 'android' ? styles.searchTextInputAndroid : {};
+      var textInput = (
         <View style={styles.searchRow}>
           <TextInput
             autoCapitalize="none"
@@ -134,22 +167,38 @@ class UIExplorerList extends React.Component {
             clearButtonMode="always"
             onChangeText={this._search.bind(this)}
             placeholder="Search..."
-            style={styles.searchTextInput}
+            style={[styles.searchTextInput, platformTextInputStyle]}
             value={this.state.searchText}
           />
-        </View>
+        </View>);
+    }
+
+    var homePage;
+    if (Platform.OS === 'android' && this.props.isInDrawer) {
+      homePage = this._renderRow({
+        title: 'UIExplorer',
+        description: 'List of examples',
+      }, -1);
+    }
+
+    return (
+      <View style={styles.listContainer}>
+        {textInput}
+        {homePage}
         <ListView
           style={styles.list}
           dataSource={this.state.dataSource}
           renderRow={this._renderRow.bind(this)}
           renderSectionHeader={this._renderSectionHeader}
+          keyboardShouldPersistTaps={true}
           automaticallyAdjustContentInsets={false}
+          keyboardDismissMode="on-drag"
         />
       </View>
     );
   }
 
-  _renderSectionHeader(data, section) {
+  _renderSectionHeader(data: any, section: string) {
     return (
       <View style={styles.sectionHeader}>
         <Text style={styles.sectionHeaderTitle}>
@@ -159,7 +208,7 @@ class UIExplorerList extends React.Component {
     );
   }
 
-  _renderRow(example, i) {
+  _renderRow(example: any, i: number) {
     return (
       <View key={i}>
         <TouchableHighlight onPress={() => this._onPressRow(example)}>
@@ -177,7 +226,7 @@ class UIExplorerList extends React.Component {
     );
   }
 
-  _search(text) {
+  _search(text: mixed) {
     var regex = new RegExp(text, 'i');
     var filter = (component) => regex.test(component.title);
 
@@ -191,16 +240,23 @@ class UIExplorerList extends React.Component {
     Settings.set({searchText: text});
   }
 
-  _onPressRow(example) {
+  _onPressRow(example: any) {
     if (example.external) {
       this.props.onExternalExampleRequested(example);
       return;
     }
     var Component = makeRenderable(example);
-    this.props.navigator.push({
-      title: Component.title,
-      component: Component,
-    });
+    if (Platform.OS === 'ios') {
+      this.props.navigator.push({
+        title: Component.title,
+        component: Component,
+      });
+    } else if (Platform.OS === 'android') {
+      this.props.onSelectExample({
+        title: Component.title,
+        component: Component,
+      });
+    }
   }
 }
 
@@ -253,9 +309,14 @@ var styles = StyleSheet.create({
     borderColor: '#cccccc',
     borderRadius: 3,
     borderWidth: 1,
-    height: 30,
     paddingLeft: 8,
   },
+  searchTextInputIOS: {
+    height: 30,
+  },
+  searchTextInputAndroid: {
+    padding: 2,
+  },
 });
 
 module.exports = UIExplorerList;

Examples/UIExplorer/UIExplorerPage.js

@@ -37,9 +37,9 @@ var UIExplorerPage = React.createClass({
     var ContentWrapper;
     var wrapperProps = {};
     if (this.props.noScroll) {
-      ContentWrapper = View;
+      ContentWrapper = (View: ReactClass<any, any, any>);
     } else {
-      ContentWrapper = ScrollView;
+      ContentWrapper = (ScrollView: ReactClass<any, any, any>);
       wrapperProps.keyboardShouldPersistTaps = true;
       wrapperProps.keyboardDismissMode = 'interactive';
     }

Examples/UIExplorer/UIExplorerTests/UIExplorerTests.m

@@ -1,127 +0,0 @@
-/**
- * The examples provided by Facebook are for non-commercial testing and
- * evaluation purposes only.
- *
- * Facebook reserves all rights not expressly granted.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
- * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-#import <XCTest/XCTest.h>
-
-#import <RCTTest/RCTTestRunner.h>
-
-#import "RCTAssert.h"
-#import "RCTRedBox.h"
-#import "RCTRootView.h"
-
-#define TIMEOUT_SECONDS 240
-
-@interface UIExplorerTests : XCTestCase
-{
-  RCTTestRunner *_runner;
-}
-
-@end
-
-@implementation UIExplorerTests
-
-- (void)setUp
-{
-#ifdef __LP64__
-  RCTAssert(!__LP64__, @"Snapshot tests should be run on 32-bit device simulators (e.g. iPhone 5)");
-#endif
-  NSString *version = [[UIDevice currentDevice] systemVersion];
-  RCTAssert([version isEqualToString:@"8.1"], @"Snapshot tests should be run on iOS 8.1, found %@", version);
-  _runner = RCTInitRunnerForApp(@"Examples/UIExplorer/UIExplorerApp");
-
-  // If tests have changes, set recordMode = YES below and run the affected
-  // tests on an iPhone5, iOS 8.1 simulator.
-  _runner.recordMode = NO;
-}
-
-- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test
-{
-  if (test(view)) {
-    return YES;
-  }
-  for (UIView *subview in [view subviews]) {
-    if ([self findSubviewInView:subview matching:test]) {
-      return YES;
-    }
-  }
-  return NO;
-}
-
-// Make sure this test runs first because the other tests will tear out the rootView
-- (void)testAAA_RootViewLoadsAndRenders
-{
-  UIViewController *vc = [UIApplication sharedApplication].delegate.window.rootViewController;
-  RCTAssert([vc.view isKindOfClass:[RCTRootView class]], @"This test must run first.");
-  NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
-  BOOL foundElement = NO;
-  NSString *redboxError = nil;
-
-  while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) {
-    [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
-    [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
-
-    redboxError = [[RCTRedBox sharedInstance] currentErrorMessage];
-    foundElement = [self findSubviewInView:vc.view matching:^(UIView *view) {
-      if ([view respondsToSelector:@selector(attributedText)]) {
-        NSString *text = [(id)view attributedText].string;
-        if ([text isEqualToString:@"<View>"]) {
-          return YES;
-        }
-      }
-      return NO;
-    }];
-  }
-
-  XCTAssertNil(redboxError, @"RedBox error: %@", redboxError);
-  XCTAssertTrue(foundElement, @"Cound't find element with '<View>' text in %d seconds", TIMEOUT_SECONDS);
-}
-
-- (void)testViewExampleSnapshot
-{
-  [_runner runTest:_cmd module:@"ViewExample"];
-}
-
-- (void)testLayoutExampleSnapshot
-{
-  [_runner runTest:_cmd module:@"LayoutExample"];
-}
-
-- (void)testTextExampleSnapshot
-{
-  [_runner runTest:_cmd module:@"TextExample"];
-}
-
-- (void)testSwitchExampleSnapshot
-{
-  [_runner runTest:_cmd module:@"SwitchExample"];
-}
-
-- (void)testSliderExampleSnapshot
-{
-  [_runner runTest:_cmd module:@"SliderExample"];
-}
-
-- (void)testTabBarExampleSnapshot
-{
-  [_runner runTest:_cmd module:@"TabBarExample"];
-}
-
-// Make sure this test runs last
-- (void)testZZZ_NotInRecordMode
-{
-  RCTAssert(_runner.recordMode == NO, @"Don't forget to turn record mode back to NO before commit.");
-}
-
-@end

Examples/UIExplorer/UIExplorerUnitTests/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.facebook.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Examples/UIExplorer/UIExplorerUnitTests/LayoutSubviewsOrderingTest.m

@@ -0,0 +1,79 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
+
+#import <OCMock/OCMock.h>
+
+@interface LayoutSubviewsOrderingTest : XCTestCase
+
+@end
+
+@implementation LayoutSubviewsOrderingTest
+
+/**
+ * This test exists to insure that didLayoutSubviews is always called immediately after layoutSubviews for a VC:View
+ * pair. In Catalyst we have multiple levels of ViewController containment, and we rely on this ordering
+ * to insure that layoutGuides are set on RKViewControllers before Views further down in the heirarchy have
+ * their layoutSubviews called (and need to use the aforementioned layoutGuides)
+ */
+- (void)testLayoutSubviewsOrdering
+{
+  // create some Views and ViewControllers
+  UIViewController *parentVC = [[UIViewController alloc] init];
+  UIView *parentView = [[UIView alloc] init];
+  UIViewController *childVC = [[UIViewController alloc] init];
+  UIView *childView = [[UIView alloc] init];
+
+  // The ordering we expect is:
+  //   parentView::layoutSubviews
+  //   parentVC::didLayoutSubviews
+  //   childView::layoutSubviews
+  //   childVC::didLayoutSubviews
+
+  id parentViewMock = [OCMockObject partialMockForObject:parentView];
+  id parentVCMock = [OCMockObject partialMockForObject:parentVC];
+  id childViewMock = [OCMockObject partialMockForObject:childView];
+  id childVCMock = [OCMockObject partialMockForObject:childVC];
+
+  __block int layoutOrderCount = 0;
+  [[[parentViewMock stub] andDo:^(NSInvocation *inv) {
+    if (layoutOrderCount < 4) {
+      layoutOrderCount++;
+      XCTAssertEqual(layoutOrderCount, 1, @"Expect parentView::layoutSubviews to be called first");
+    }
+  }] layoutSubviews];
+  [[[parentVCMock stub] andDo:^(NSInvocation *inv) {
+    if (layoutOrderCount < 4) {
+      layoutOrderCount++;
+      XCTAssertEqual(layoutOrderCount, 2, @"Expect parentVC::viewDidLayoutSubviews to be called 2nd");
+    }
+  }] viewDidLayoutSubviews];
+  [[[childViewMock stub] andDo:^(NSInvocation *inv) {
+    if (layoutOrderCount < 4) {
+      layoutOrderCount++;
+      XCTAssertEqual(layoutOrderCount, 3, @"Expect childView::layoutSubviews to be called 3rd");
+    }
+  }] layoutSubviews];
+  [[[childVCMock stub] andDo:^(NSInvocation *inv) {
+    if (layoutOrderCount < 4) {
+      layoutOrderCount++;
+      XCTAssertEqual(layoutOrderCount, 4, @"Expect childVC::viewDidLayoutSubviews to be called last");
+      [childVCMock stopMocking];
+    }
+  }] viewDidLayoutSubviews];
+
+  // setup View heirarchy and force layout
+  parentVC.view = parentView;
+  childVC.view = childView;
+  [parentVC addChildViewController:childVC];
+  [childVC didMoveToParentViewController:parentVC];
+  [parentView addSubview:childView];
+
+  [childViewMock setNeedsLayout];
+  [parentViewMock layoutIfNeeded];
+
+  XCTAssertEqual(layoutOrderCount, 4, @"Expect layoutSubviews/viewDidLayoutSubviews to be called");
+}
+
+@end

Examples/UIExplorer/UIExplorerUnitTests/OCMock/NSNotificationCenter+OCMAdditions.h

@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2009-2014 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@class OCObserverMockObject;
+
+
+@interface NSNotificationCenter(OCMAdditions)
+
+- (void)addMockObserver:(OCObserverMockObject *)notificationObserver name:(NSString *)notificationName object:(id)notificationSender;
+
+@end

Examples/UIExplorer/UIExplorerUnitTests/OCMock/OCMArg.h

@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2009-2014 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface OCMArg : NSObject 
+
+// constraining arguments
+
++ (id)any;
++ (SEL)anySelector;
++ (void *)anyPointer;
++ (id __autoreleasing *)anyObjectRef;
++ (id)isNil;
++ (id)isNotNil;
++ (id)isEqual:(id)value;
++ (id)isNotEqual:(id)value;
++ (id)isKindOfClass:(Class)cls;
++ (id)checkWithSelector:(SEL)selector onObject:(id)anObject;
++ (id)checkWithBlock:(BOOL (^)(id obj))block;
+
+// manipulating arguments
+
++ (id *)setTo:(id)value;
++ (void *)setToValue:(NSValue *)value;
+
+// internal use only
+
++ (id)resolveSpecialValues:(NSValue *)value;
+
+@end
+
+#define OCMOCK_ANY [OCMArg any]
+
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+  #define OCMOCK_VALUE(variable) \
+    ({ __typeof__(variable) __v = (variable); [NSValue value:&__v withObjCType:@encode(__typeof__(__v))]; })
+#else
+  #define OCMOCK_VALUE(variable) [NSValue value:&variable withObjCType:@encode(__typeof__(variable))]
+#endif