diff --git a/Libraries/Components/ScrollResponder.js b/Libraries/Components/ScrollResponder.js index bb283e1ce..009bbebb4 100644 --- a/Libraries/Components/ScrollResponder.js +++ b/Libraries/Components/ScrollResponder.js @@ -357,7 +357,7 @@ var ScrollResponderMixin = { * A helper function to zoom to a specific rect in the scrollview. * @param {object} rect Should have shape {x, y, w, h} */ - scrollResponderZoomTo: function(rect: { x: number; y: number; w: number; h: number; }) { + scrollResponderZoomTo: function(rect: { x: number; y: number; width: number; height: number; }) { RCTUIManagerDeprecated.zoomToRect(this.getNodeHandle(), rect); }, diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m index 3f8057d61..5fbc2d527 100644 --- a/React/Base/RCTConvert.m +++ b/React/Base/RCTConvert.m @@ -225,6 +225,7 @@ RCT_ENUM_CONVERTER(UIBarStyle, (@{ NSString *key = aliases[alias]; \ NSNumber *number = json[key]; \ if (number) { \ + RCTLogWarn(@"Using deprecated '%@' property for '%s'. Use '%@' instead.", alias, #type, key); \ ((NSMutableDictionary *)json)[key] = number; \ } \ } \ @@ -245,9 +246,9 @@ RCT_ENUM_CONVERTER(UIBarStyle, (@{ } RCT_CUSTOM_CONVERTER(CGFloat, CGFloat, [self double:json]) -RCT_CGSTRUCT_CONVERTER(CGPoint, (@[@"x", @"y"]), nil) +RCT_CGSTRUCT_CONVERTER(CGPoint, (@[@"x", @"y"]), (@{@"l": @"x", @"t": @"y"})) RCT_CGSTRUCT_CONVERTER(CGSize, (@[@"width", @"height"]), (@{@"w": @"width", @"h": @"height"})) -RCT_CGSTRUCT_CONVERTER(CGRect, (@[@"x", @"y", @"width", @"height"]), (@{@"w": @"width", @"h": @"height"})) +RCT_CGSTRUCT_CONVERTER(CGRect, (@[@"x", @"y", @"width", @"height"]), (@{@"l": @"x", @"t": @"y", @"w": @"width", @"h": @"height"})) RCT_CGSTRUCT_CONVERTER(UIEdgeInsets, (@[@"top", @"left", @"bottom", @"right"]), nil) RCT_ENUM_CONVERTER(CGLineJoin, (@{