Skip to content

Commit bd47a3e

Browse files
rozelerozele
committed
Merge branch 'fbmaster' into staging
2 parents fc0a896 + b642a65 commit bd47a3e

File tree

137 files changed

+985
-2256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+985
-2256
lines changed

‎Movies/MovieCell.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1313
*
1414
* @flow
15+
* @providesModule MovieCell
1516
*/
1617
'use strict';
1718

‎Movies/MovieScreen.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1313
*
1414
* @flow
15+
* @providesModule MovieScreen
1516
*/
1617
'use strict';
1718

‎Movies/SearchScreen.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1313
*
1414
* @flow
15+
* @providesModule SearchScreen
1516
*/
1617
'use strict';
1718

@@ -122,15 +123,6 @@ var SearchScreen = React.createClass({
122123

123124
fetch(this._urlForQueryAndPage(query, 1))
124125
.then((response) => response.json())
125-
.catch((error) => {
126-
LOADING[query] = false;
127-
resultsCache.dataForQuery[query] = undefined;
128-
129-
this.setState({
130-
dataSource: this.getDataSource([]),
131-
isLoading: false,
132-
});
133-
})
134126
.then((responseData) => {
135127
LOADING[query] = false;
136128
resultsCache.totalForQuery[query] = responseData.total;
@@ -147,6 +139,15 @@ var SearchScreen = React.createClass({
147139
dataSource: this.getDataSource(responseData.movies),
148140
});
149141
})
142+
.catch((error) => {
143+
LOADING[query] = false;
144+
resultsCache.dataForQuery[query] = undefined;
145+
146+
this.setState({
147+
dataSource: this.getDataSource([]),
148+
isLoading: false,
149+
});
150+
})
150151
.done();
151152
},
152153

‎Movies/android/app/BUCK

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
include_defs('//ReactAndroid/DEFS')
1+
include_defs("//ReactAndroid/DEFS")
22

33
android_binary(
4-
name = 'app',
5-
manifest = 'src/main/AndroidManifest.xml',
6-
keystore = '//keystores:debug',
7-
deps = [
8-
':movies-lib',
9-
],
4+
name = "app",
5+
keystore = "//keystores:debug",
6+
manifest = "src/main/AndroidManifest.xml",
7+
deps = [
8+
":movies-lib",
9+
],
1010
)
1111

1212
android_library(
13-
name = 'movies-lib',
14-
srcs = glob(['src/main/java/**/*.java']),
15-
deps = [
16-
':res',
17-
react_native_dep('third-party/java/jsr-305:jsr-305'),
18-
react_native_target('java/com/facebook/react:react'),
19-
react_native_target('java/com/facebook/react/modules/core:core'),
20-
react_native_target('java/com/facebook/react/shell:shell'),
21-
react_native_target('jni/prebuilt:android-jsc'),
22-
# .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
23-
react_native_target('jni/prebuilt:reactnative-libs'),
24-
],
13+
name = "movies-lib",
14+
srcs = glob(["src/main/java/**/*.java"]),
15+
deps = [
16+
":res",
17+
react_native_dep("third-party/java/jsr-305:jsr-305"),
18+
react_native_target("java/com/facebook/react:react"),
19+
react_native_target("java/com/facebook/react/modules/core:core"),
20+
react_native_target("java/com/facebook/react/shell:shell"),
21+
react_native_target("jni/prebuilt:android-jsc"),
22+
# .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
23+
react_native_target("jni/prebuilt:reactnative-libs"),
24+
],
2525
)
2626

2727
android_resource(
28-
name = 'res',
29-
res = 'src/main/res',
30-
package = 'com.facebook.react.movies',
28+
name = "res",
29+
package = "com.facebook.react.movies",
30+
res = "src/main/res",
3131
)

‎Movies/getImageSource.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1313
*
1414
* @flow
15+
* @providesModule getImageSource
1516
*/
1617
'use strict';
1718

‎Movies/getStyleFromScore.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1313
*
1414
* @flow
15+
* @providesModule getStyleFromScore
1516
*/
1617
'use strict';
1718

‎Movies/getTextFromScore.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1313
*
1414
* @flow
15+
* @providesModule getTextFromScore
1516
*/
1617
'use strict';
1718

‎TicTacToe/android/app/BUCK

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
include_defs('//ReactAndroid/DEFS')
1+
include_defs("//ReactAndroid/DEFS")
22

33
android_binary(
4-
name = 'app',
5-
manifest = 'src/main/AndroidManifest.xml',
6-
keystore = '//keystores:debug',
7-
deps = [
8-
':tictactoe-lib',
9-
],
4+
name = "app",
5+
keystore = "//keystores:debug",
6+
manifest = "src/main/AndroidManifest.xml",
7+
deps = [
8+
":tictactoe-lib",
9+
],
1010
)
1111

1212
android_library(
13-
name = 'tictactoe-lib',
14-
srcs = glob(['src/main/java/**/*.java']),
15-
deps = [
16-
':res',
17-
react_native_dep('third-party/java/jsr-305:jsr-305'),
18-
react_native_target('java/com/facebook/react:react'),
19-
react_native_target('java/com/facebook/react/modules/core:core'),
20-
react_native_target('java/com/facebook/react/shell:shell'),
21-
react_native_target('jni/prebuilt:android-jsc'),
22-
# .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
23-
react_native_target('jni/prebuilt:reactnative-libs'),
24-
],
13+
name = "tictactoe-lib",
14+
srcs = glob(["src/main/java/**/*.java"]),
15+
deps = [
16+
":res",
17+
react_native_dep("third-party/java/jsr-305:jsr-305"),
18+
react_native_target("java/com/facebook/react:react"),
19+
react_native_target("java/com/facebook/react/modules/core:core"),
20+
react_native_target("java/com/facebook/react/shell:shell"),
21+
react_native_target("jni/prebuilt:android-jsc"),
22+
# .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
23+
react_native_target("jni/prebuilt:reactnative-libs"),
24+
],
2525
)
2626

2727
android_resource(
28-
name = 'res',
29-
res = 'src/main/res',
30-
package = 'com.facebook.react.tictactoe',
28+
name = "res",
29+
package = "com.facebook.react.tictactoe",
30+
res = "src/main/res",
3131
)

‎UIExplorer/UIExplorer.xcodeproj/project.pbxproj

+14-14
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
2D4BD8E31DA2E20D005AC8A8 /* RCTShadowViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 138D6A161B53CD440074A87E /* RCTShadowViewTests.m */; };
8585
2D4BD8E41DA2E20D005AC8A8 /* RCTUIManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFAB1B21F5E400C1F8F2 /* RCTUIManagerTests.m */; };
8686
2D4BD8E51DA2E20D005AC8A8 /* RCTComponentPropsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BCE84E1C9C209600DD7AAD /* RCTComponentPropsTests.m */; };
87-
2D4BD8E61DA2E20D005AC8A8 /* TestBundle.js in Resources */ = {isa = PBXBuildFile; fileRef = 3DD981D51D33C6FB007DC7BE /* TestBundle.js */; };
87+
2D4BD8E61DA2E20D005AC8A8 /* UIExplorerUnitTestsBundle.js in Resources */ = {isa = PBXBuildFile; fileRef = 3DD981D51D33C6FB007DC7BE /* UIExplorerUnitTestsBundle.js */; };
8888
2D4BD8E71DA2E20D005AC8A8 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14D6D7101B220EB3001FB087 /* libOCMock.a */; };
8989
2D8C2E321DA40403000EE098 /* RCTMultipartStreamReaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 001BFCE31D838343008E587E /* RCTMultipartStreamReaderTests.m */; };
9090
2DD323DC1DA2DDBF000FE1B8 /* FlexibleSizeExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */; };
@@ -100,7 +100,7 @@
100100
2DD323E71DA2DE3F000FE1B8 /* libRCTSettings-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323C81DA2DD8B000FE1B8 /* libRCTSettings-tvOS.a */; };
101101
2DD323E81DA2DE3F000FE1B8 /* libRCTText-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D01DA2DD8B000FE1B8 /* libRCTText-tvOS.a */; };
102102
2DD323E91DA2DE3F000FE1B8 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D51DA2DD8B000FE1B8 /* libRCTWebSocket-tvOS.a */; };
103-
2DD323EA1DA2DE3F000FE1B8 /* libReact-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D91DA2DD8B000FE1B8 /* libReact-tvOS.a */; };
103+
2DD323EA1DA2DE3F000FE1B8 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D91DA2DD8B000FE1B8 /* libReact.a */; };
104104
3578590A1B28D2CF00341EDB /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 357859011B28D2C500341EDB /* libRCTLinking.a */; };
105105
39AA31A41DC1DFDC000F7EBB /* RCTUnicodeDecodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 39AA31A31DC1DFDC000F7EBB /* RCTUnicodeDecodeTests.m */; };
106106
3D05746D1DE6008900184BB4 /* libRCTPushNotification-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D05746C1DE6008900184BB4 /* libRCTPushNotification-tvOS.a */; };
@@ -111,7 +111,7 @@
111111
3D302F221DF8285100D6DDAE /* libRCTImage-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323BB1DA2DD8B000FE1B8 /* libRCTImage-tvOS.a */; };
112112
3D56F9F11D6F6E9B00F53A06 /* UIExplorerBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3D13F83E1D6F6AE000E69E0E /* UIExplorerBundle.bundle */; };
113113
3DB99D0C1BA0340600302749 /* UIExplorerIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB99D0B1BA0340600302749 /* UIExplorerIntegrationTests.m */; };
114-
3DD981D61D33C6FB007DC7BE /* TestBundle.js in Resources */ = {isa = PBXBuildFile; fileRef = 3DD981D51D33C6FB007DC7BE /* TestBundle.js */; };
114+
3DD981D61D33C6FB007DC7BE /* UIExplorerUnitTestsBundle.js in Resources */ = {isa = PBXBuildFile; fileRef = 3DD981D51D33C6FB007DC7BE /* UIExplorerUnitTestsBundle.js */; };
115115
68FF44381CF6111500720EFD /* RCTBundleURLProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 68FF44371CF6111500720EFD /* RCTBundleURLProviderTests.m */; };
116116
834C36EC1AF8DED70019C93C /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 834C36D21AF8DA610019C93C /* libRCTSettings.a */; };
117117
83636F8F1B53F22C009F943E /* RCTUIManagerScenarioTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 83636F8E1B53F22C009F943E /* RCTUIManagerScenarioTests.m */; };
@@ -440,7 +440,7 @@
440440
3D299BAE1D33EBFA00FA1057 /* RCTLoggingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTLoggingTests.m; sourceTree = "<group>"; };
441441
3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "legacy_image@2x.png"; path = "UIExplorer/legacy_image@2x.png"; sourceTree = "<group>"; };
442442
3DB99D0B1BA0340600302749 /* UIExplorerIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIExplorerIntegrationTests.m; sourceTree = "<group>"; };
443-
3DD981D51D33C6FB007DC7BE /* TestBundle.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = TestBundle.js; sourceTree = "<group>"; };
443+
3DD981D51D33C6FB007DC7BE /* UIExplorerUnitTestsBundle.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = UIExplorerUnitTestsBundle.js; sourceTree = "<group>"; };
444444
58005BE41ABA80530062E044 /* RCTTest.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTTest.xcodeproj; path = ../../Libraries/RCTTest/RCTTest.xcodeproj; sourceTree = "<group>"; };
445445
68FF44371CF6111500720EFD /* RCTBundleURLProviderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBundleURLProviderTests.m; sourceTree = "<group>"; };
446446
83636F8E1B53F22C009F943E /* RCTUIManagerScenarioTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUIManagerScenarioTests.m; sourceTree = "<group>"; };
@@ -513,7 +513,7 @@
513513
isa = PBXFrameworksBuildPhase;
514514
buildActionMask = 2147483647;
515515
files = (
516-
2DD323EA1DA2DE3F000FE1B8 /* libReact-tvOS.a in Frameworks */,
516+
2DD323EA1DA2DE3F000FE1B8 /* libReact.a in Frameworks */,
517517
2DD323E31DA2DE3F000FE1B8 /* libRCTAnimation-tvOS.a in Frameworks */,
518518
3D302F221DF8285100D6DDAE /* libRCTImage-tvOS.a in Frameworks */,
519519
2DD323E51DA2DE3F000FE1B8 /* libRCTLinking-tvOS.a in Frameworks */,
@@ -685,7 +685,7 @@
685685
13BCE84E1C9C209600DD7AAD /* RCTComponentPropsTests.m */,
686686
39AA31A31DC1DFDC000F7EBB /* RCTUnicodeDecodeTests.m */,
687687
143BC57E1B21E18100462512 /* Info.plist */,
688-
3DD981D51D33C6FB007DC7BE /* TestBundle.js */,
688+
3DD981D51D33C6FB007DC7BE /* UIExplorerUnitTestsBundle.js */,
689689
14D6D7101B220EB3001FB087 /* libOCMock.a */,
690690
14D6D7011B220AE3001FB087 /* OCMock */,
691691
);
@@ -725,7 +725,7 @@
725725
isa = PBXGroup;
726726
children = (
727727
14AADF041AC3DB95002390C9 /* libReact.a */,
728-
2DD323D91DA2DD8B000FE1B8 /* libReact-tvOS.a */,
728+
2DD323D91DA2DD8B000FE1B8 /* libReact.a */,
729729
3D3C08811DE3424E00C268FA /* libyoga.a */,
730730
3D3C08831DE3424E00C268FA /* libyoga-tvOS.a */,
731731
3D05748C1DE6008900184BB4 /* libcxxreact.a */,
@@ -1241,10 +1241,10 @@
12411241
remoteRef = 2DD323D41DA2DD8B000FE1B8 /* PBXContainerItemProxy */;
12421242
sourceTree = BUILT_PRODUCTS_DIR;
12431243
};
1244-
2DD323D91DA2DD8B000FE1B8 /* libReact-tvOS.a */ = {
1244+
2DD323D91DA2DD8B000FE1B8 /* libReact.a */ = {
12451245
isa = PBXReferenceProxy;
12461246
fileType = archive.ar;
1247-
path = "libReact-tvOS.a";
1247+
path = libReact.a;
12481248
remoteRef = 2DD323D81DA2DD8B000FE1B8 /* PBXContainerItemProxy */;
12491249
sourceTree = BUILT_PRODUCTS_DIR;
12501250
};
@@ -1272,7 +1272,7 @@
12721272
3D05748E1DE6008900184BB4 /* libcxxreact-tvOS.a */ = {
12731273
isa = PBXReferenceProxy;
12741274
fileType = archive.ar;
1275-
path = "libcxxreact-tvOS.a";
1275+
path = libcxxreact.a;
12761276
remoteRef = 3D05748D1DE6008900184BB4 /* PBXContainerItemProxy */;
12771277
sourceTree = BUILT_PRODUCTS_DIR;
12781278
};
@@ -1286,7 +1286,7 @@
12861286
3D0574921DE6008900184BB4 /* libjschelpers-tvOS.a */ = {
12871287
isa = PBXReferenceProxy;
12881288
fileType = archive.ar;
1289-
path = "libjschelpers-tvOS.a";
1289+
path = libjschelpers.a;
12901290
remoteRef = 3D0574911DE6008900184BB4 /* PBXContainerItemProxy */;
12911291
sourceTree = BUILT_PRODUCTS_DIR;
12921292
};
@@ -1300,7 +1300,7 @@
13001300
3D3C08831DE3424E00C268FA /* libyoga-tvOS.a */ = {
13011301
isa = PBXReferenceProxy;
13021302
fileType = archive.ar;
1303-
path = "libyoga-tvOS.a";
1303+
path = libyoga.a;
13041304
remoteRef = 3D3C08821DE3424E00C268FA /* PBXContainerItemProxy */;
13051305
sourceTree = BUILT_PRODUCTS_DIR;
13061306
};
@@ -1332,7 +1332,7 @@
13321332
isa = PBXResourcesBuildPhase;
13331333
buildActionMask = 2147483647;
13341334
files = (
1335-
3DD981D61D33C6FB007DC7BE /* TestBundle.js in Resources */,
1335+
3DD981D61D33C6FB007DC7BE /* UIExplorerUnitTestsBundle.js in Resources */,
13361336
);
13371337
runOnlyForDeploymentPostprocessing = 0;
13381338
};
@@ -1375,7 +1375,7 @@
13751375
isa = PBXResourcesBuildPhase;
13761376
buildActionMask = 2147483647;
13771377
files = (
1378-
2D4BD8E61DA2E20D005AC8A8 /* TestBundle.js in Resources */,
1378+
2D4BD8E61DA2E20D005AC8A8 /* UIExplorerUnitTestsBundle.js in Resources */,
13791379
);
13801380
runOnlyForDeploymentPostprocessing = 0;
13811381
};

‎UIExplorer/UIExplorer/NativeExampleViews/FlexibleSizeExampleView.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ - (void)layoutSubviews
101101
- (void)rootViewDidChangeIntrinsicSize:(RCTRootView *)rootView
102102
{
103103
CGRect newFrame = rootView.frame;
104-
newFrame.size = rootView.intrinsicSize;
104+
newFrame.size = rootView.intrinsicContentSize;
105105

106106
if (!_sizeUpdated) {
107107
_sizeUpdated = TRUE;

0 commit comments

Comments
 (0)