diff --git a/IntegrationTests/ImageSnapshotTest.js b/IntegrationTests/ImageSnapshotTest.js index 582d33da4..ccb232796 100644 --- a/IntegrationTests/ImageSnapshotTest.js +++ b/IntegrationTests/ImageSnapshotTest.js @@ -33,7 +33,6 @@ class ImageSnapshotTest extends React.Component<{}> { render() { return ( TestModule.verifySnapshot(this.done)} /> diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js index b0a9b86e3..ed7f113e9 100644 --- a/Libraries/Image/Image.ios.js +++ b/Libraries/Image/Image.ios.js @@ -352,11 +352,13 @@ const Image = createReactClass({ const source = resolveAssetSource(this.props.source) || { uri: undefined, width: undefined, height: undefined }; let sources; - let style = flattenStyle([styles.base, this.props.style]) || {}; + let style; if (Array.isArray(source)) { + style = flattenStyle([styles.base, this.props.style]) || {}; sources = source; } else { - const {uri} = source; + const {width, height, uri} = source; + style = flattenStyle([{width, height}, styles.base, this.props.style]) || {}; sources = [source]; if (uri === '') { diff --git a/Libraries/Image/RCTImageView.m b/Libraries/Image/RCTImageView.m index d16bebdcb..10b669eda 100644 --- a/Libraries/Image/RCTImageView.m +++ b/Libraries/Image/RCTImageView.m @@ -13,7 +13,6 @@ #import #import #import -#import #import #import @@ -108,22 +107,6 @@ static NSDictionary *onLoadParamsForSource(RCTImageSource *source) RCT_NOT_IMPLEMENTED(- (instancetype)init) -- (CGSize)intrinsicContentSize -{ - // The first `imageSource` defines intrinsic content size. - RCTImageSource *imageSource = _imageSources.firstObject; - if (!imageSource) { - return CGSizeZero; - } - - return imageSource.size; -} - -- (void)updateIntrinsicContentSize -{ - [_bridge.uiManager setIntrinsicContentSize:self.intrinsicContentSize forView:self]; -} - - (void)updateWithImage:(UIImage *)image { if (!image) { @@ -193,7 +176,6 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init) { if (![imageSources isEqual:_imageSources]) { _imageSources = [imageSources copy]; - [self updateIntrinsicContentSize]; _needsReload = YES; } } diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSliderExample_1-iOS10@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSliderExample_1-iOS10@2x.png index d7f5f7d7d..ecfd4e5ad 100644 Binary files a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSliderExample_1-iOS10@2x.png and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSliderExample_1-iOS10@2x.png differ diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSliderExample_1-iOS11@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSliderExample_1-iOS11@2x.png index 9c1be7acc..14ca53281 100644 Binary files a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSliderExample_1-iOS11@2x.png and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSliderExample_1-iOS11@2x.png differ diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSliderExample_1@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSliderExample_1@2x.png index 33090dc5c..5eb48aeb0 100644 Binary files a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSliderExample_1@2x.png and b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testSliderExample_1@2x.png differ diff --git a/RNTester/js/ImageExample.js b/RNTester/js/ImageExample.js index 148da2b2c..8d8587776 100644 --- a/RNTester/js/ImageExample.js +++ b/RNTester/js/ImageExample.js @@ -634,18 +634,6 @@ exports.examples = [ return ; }, }, - { - title: 'Intrinsic Content Size', - description: 'Images have intrinsic content size which respects ' + - 'to the first `source` image size.', - render: function() { - return ( - - - - ); - }, - }, { title: 'MultipleSourcesExample', description: diff --git a/RNTester/js/uie_thumb_big@2x.png b/RNTester/js/uie_thumb_big.png similarity index 100% rename from RNTester/js/uie_thumb_big@2x.png rename to RNTester/js/uie_thumb_big.png