Skip to content

Commit b864e7e

Browse files
committed
Revert "Merge branch 'master' into 0.58-stable"
This reverts commit 696bd89, reversing changes made to a525941.
1 parent 696bd89 commit b864e7e

File tree

135 files changed

+1209
-2517
lines changed

Some content is hidden

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

135 files changed

+1209
-2517
lines changed

.flowconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ untyped-import
101101
untyped-type-import
102102

103103
[version]
104-
^0.86.0
104+
^0.85.0

.flowconfig.android

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ untyped-import
101101
untyped-type-import
102102

103103
[version]
104-
^0.86.0
104+
^0.85.0

Libraries/Animated/src/nodes/AnimatedInterpolation.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,9 @@ class AnimatedInterpolation extends AnimatedWithChildren {
349349
__transformDataType(range: Array<any>) {
350350
// Change the string array type to number array
351351
// So we can reuse the same logic in iOS and Android platform
352+
/* $FlowFixMe(>=0.70.0 site=react_native_fb) This comment suppresses an
353+
* error found when Flow v0.70 was deployed. To see the error delete this
354+
* comment and run Flow. */
352355
return range.map(function(value) {
353356
if (typeof value !== 'string') {
354357
return value;

Libraries/CameraRoll/RCTImagePickerManager.m

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,6 @@
1616
#import <React/RCTRootView.h>
1717
#import <React/RCTUtils.h>
1818

19-
@interface RCTImagePickerController : UIImagePickerController
20-
21-
@property (nonatomic, assign) BOOL unmirrorFrontFacingCamera;
22-
23-
@end
24-
25-
@implementation RCTImagePickerController
26-
27-
@end
28-
2919
@interface RCTImagePickerManager () <UIImagePickerControllerDelegate, UINavigationControllerDelegate>
3020

3121
@end
@@ -41,22 +31,6 @@ @implementation RCTImagePickerManager
4131

4232
@synthesize bridge = _bridge;
4333

44-
- (id)init
45-
{
46-
if (self = [super init]) {
47-
[[NSNotificationCenter defaultCenter] addObserver:self
48-
selector:@selector(cameraChanged:)
49-
name:@"AVCaptureDeviceDidStartRunningNotification"
50-
object:nil];
51-
}
52-
return self;
53-
}
54-
55-
- (void)dealloc
56-
{
57-
[[NSNotificationCenter defaultCenter] removeObserver:self name:@"AVCaptureDeviceDidStartRunningNotification" object:nil];
58-
}
59-
6034
- (dispatch_queue_t)methodQueue
6135
{
6236
return dispatch_get_main_queue();
@@ -82,10 +56,9 @@ - (dispatch_queue_t)methodQueue
8256
return;
8357
}
8458

85-
RCTImagePickerController *imagePicker = [RCTImagePickerController new];
59+
UIImagePickerController *imagePicker = [UIImagePickerController new];
8660
imagePicker.delegate = self;
8761
imagePicker.sourceType = UIImagePickerControllerSourceTypeCamera;
88-
imagePicker.unmirrorFrontFacingCamera = [RCTConvert BOOL:config[@"unmirrorFrontFacingCamera"]];
8962

9063
if ([RCTConvert BOOL:config[@"videoMode"]]) {
9164
imagePicker.cameraCaptureMode = UIImagePickerControllerCameraCaptureModeVideo;
@@ -202,17 +175,4 @@ - (void)_dismissPicker:(UIImagePickerController *)picker args:(NSArray *)args
202175
}
203176
}
204177

205-
- (void)cameraChanged:(NSNotification *)notification
206-
{
207-
for (UIImagePickerController *picker in _pickers) {
208-
if ([picker isKindOfClass:[RCTImagePickerController class]]
209-
&& ((RCTImagePickerController *)picker).unmirrorFrontFacingCamera
210-
&& picker.cameraDevice == UIImagePickerControllerCameraDeviceFront) {
211-
picker.cameraViewTransform = CGAffineTransformScale(CGAffineTransformIdentity, -1, 1);
212-
} else {
213-
picker.cameraViewTransform = CGAffineTransformIdentity;
214-
}
215-
}
216-
}
217-
218178
@end

Libraries/Components/AppleTV/TVViewPropTypes.js

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,27 @@ export type TVParallaxPropertiesType = $ReadOnly<{|
1414
/**
1515
* If true, parallax effects are enabled. Defaults to true.
1616
*/
17-
enabled?: boolean,
17+
enabled: boolean,
1818

1919
/**
2020
* Defaults to 2.0.
2121
*/
22-
shiftDistanceX?: number,
22+
shiftDistanceX: number,
2323

2424
/**
2525
* Defaults to 2.0.
2626
*/
27-
shiftDistanceY?: number,
27+
shiftDistanceY: number,
2828

2929
/**
3030
* Defaults to 0.05.
3131
*/
32-
tiltAngle?: number,
32+
tiltAngle: number,
3333

3434
/**
3535
* Defaults to 1.0
3636
*/
37-
magnification?: number,
38-
39-
/**
40-
* Defaults to 1.0
41-
*/
42-
pressMagnification?: number,
43-
44-
/**
45-
* Defaults to 0.3
46-
*/
47-
pressDuration?: number,
48-
49-
/**
50-
* Defaults to 0.3
51-
*/
52-
pressDelay?: number,
37+
magnification: number,
5338
|}>;
5439

5540
/**

0 commit comments

Comments
 (0)