Skip to content

Commit

Permalink
Revert "Merge branch 'master' into 0.58-stable"
Browse files Browse the repository at this point in the history
This reverts commit 696bd89, reversing
changes made to a525941.
  • Loading branch information
grabbou committed Nov 22, 2018
1 parent 696bd89 commit b864e7e
Show file tree
Hide file tree
Showing 135 changed files with 1,209 additions and 2,517 deletions.
2 changes: 1 addition & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ untyped-import
untyped-type-import

[version]
^0.86.0
^0.85.0
2 changes: 1 addition & 1 deletion .flowconfig.android
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ untyped-import
untyped-type-import

[version]
^0.86.0
^0.85.0
3 changes: 3 additions & 0 deletions Libraries/Animated/src/nodes/AnimatedInterpolation.js
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,9 @@ class AnimatedInterpolation extends AnimatedWithChildren {
__transformDataType(range: Array<any>) {
// Change the string array type to number array
// So we can reuse the same logic in iOS and Android platform
/* $FlowFixMe(>=0.70.0 site=react_native_fb) This comment suppresses an
* error found when Flow v0.70 was deployed. To see the error delete this
* comment and run Flow. */
return range.map(function(value) {
if (typeof value !== 'string') {
return value;
Expand Down
42 changes: 1 addition & 41 deletions Libraries/CameraRoll/RCTImagePickerManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@
#import <React/RCTRootView.h>
#import <React/RCTUtils.h>

@interface RCTImagePickerController : UIImagePickerController

@property (nonatomic, assign) BOOL unmirrorFrontFacingCamera;

@end

@implementation RCTImagePickerController

@end

@interface RCTImagePickerManager () <UIImagePickerControllerDelegate, UINavigationControllerDelegate>

@end
Expand All @@ -41,22 +31,6 @@ @implementation RCTImagePickerManager

@synthesize bridge = _bridge;

- (id)init
{
if (self = [super init]) {
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(cameraChanged:)
name:@"AVCaptureDeviceDidStartRunningNotification"
object:nil];
}
return self;
}

- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self name:@"AVCaptureDeviceDidStartRunningNotification" object:nil];
}

- (dispatch_queue_t)methodQueue
{
return dispatch_get_main_queue();
Expand All @@ -82,10 +56,9 @@ - (dispatch_queue_t)methodQueue
return;
}

RCTImagePickerController *imagePicker = [RCTImagePickerController new];
UIImagePickerController *imagePicker = [UIImagePickerController new];
imagePicker.delegate = self;
imagePicker.sourceType = UIImagePickerControllerSourceTypeCamera;
imagePicker.unmirrorFrontFacingCamera = [RCTConvert BOOL:config[@"unmirrorFrontFacingCamera"]];

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

- (void)cameraChanged:(NSNotification *)notification
{
for (UIImagePickerController *picker in _pickers) {
if ([picker isKindOfClass:[RCTImagePickerController class]]
&& ((RCTImagePickerController *)picker).unmirrorFrontFacingCamera
&& picker.cameraDevice == UIImagePickerControllerCameraDeviceFront) {
picker.cameraViewTransform = CGAffineTransformScale(CGAffineTransformIdentity, -1, 1);
} else {
picker.cameraViewTransform = CGAffineTransformIdentity;
}
}
}

@end
25 changes: 5 additions & 20 deletions Libraries/Components/AppleTV/TVViewPropTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,42 +14,27 @@ export type TVParallaxPropertiesType = $ReadOnly<{|
/**
* If true, parallax effects are enabled. Defaults to true.
*/
enabled?: boolean,
enabled: boolean,

/**
* Defaults to 2.0.
*/
shiftDistanceX?: number,
shiftDistanceX: number,

/**
* Defaults to 2.0.
*/
shiftDistanceY?: number,
shiftDistanceY: number,

/**
* Defaults to 0.05.
*/
tiltAngle?: number,
tiltAngle: number,

/**
* Defaults to 1.0
*/
magnification?: number,

/**
* Defaults to 1.0
*/
pressMagnification?: number,

/**
* Defaults to 0.3
*/
pressDuration?: number,

/**
* Defaults to 0.3
*/
pressDelay?: number,
magnification: number,
|}>;

/**
Expand Down
Loading

0 comments on commit b864e7e

Please sign in to comment.