mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Cleanup fixImageSrcDimensionPropagation and remove duplicate setting of src and source (#56108)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/56108 Feature flag was just added for gating while rolling out, no regressions found. Also removing duplicate setting of `src` prop, which was introduced in D54000899. Changelog: [Internal] Reviewed By: alanleedev Differential Revision: D96727336 fbshipit-source-id: 964faf5c4019f3c86a36d67d58bf34aef3910436
This commit is contained in:
1 parent
0b7f031c51
commit
455c49c6ba
4 files changed
+24
-71
No files matched your search
@@ -12,10 +12,8 @@ import type {HostInstance} from '../../src/private/types/HostInstance';
|
||||
import type {ImageStyleProp} from '../StyleSheet/StyleSheet';
|
||||
import type {RootTag} from '../Types/RootTagTypes';
|
||||
import type {ImageProps} from './ImageProps';
|
||||
import type {ImageSourceHeaders} from './ImageSourceUtils';
|
||||
import type {AbstractImageAndroid, ImageAndroid} from './ImageTypes.flow';
|
||||
|
||||
import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags';
|
||||
import flattenStyle from '../StyleSheet/flattenStyle';
|
||||
import StyleSheet from '../StyleSheet/StyleSheet';
|
||||
import ImageAnalyticsTagContext from './ImageAnalyticsTagContext';
|
||||
@@ -196,55 +194,37 @@ let BaseImage: AbstractImageAndroid = ({
|
||||
);
|
||||
}
|
||||
|
||||
let style_: ImageStyleProp;
|
||||
let sources_;
|
||||
let headers_: ?ImageSourceHeaders;
|
||||
const nativeProps = restProps as {
|
||||
...React.PropsOf<ImageViewNativeComponent>,
|
||||
};
|
||||
|
||||
if (Array.isArray(source_)) {
|
||||
const {
|
||||
headers: sourceHeaders,
|
||||
width: sourceWidth,
|
||||
height: sourceHeight,
|
||||
} = source_[0];
|
||||
headers_ = sourceHeaders;
|
||||
// Default to the first source's width and height if only one is provided
|
||||
if (ReactNativeFeatureFlags.fixImageSrcDimensionPropagation()) {
|
||||
style_ = [
|
||||
source_.length === 1 && {width: sourceWidth, height: sourceHeight},
|
||||
styles.base,
|
||||
style,
|
||||
];
|
||||
} else {
|
||||
style_ = [styles.base, style];
|
||||
if (sourceHeaders != null) {
|
||||
nativeProps.headers = sourceHeaders;
|
||||
}
|
||||
sources_ = source_;
|
||||
// Default to the first source's width and height if only one is provided
|
||||
nativeProps.style = [
|
||||
source_.length === 1 && {width: sourceWidth, height: sourceHeight},
|
||||
styles.base,
|
||||
style,
|
||||
];
|
||||
nativeProps.source = source_;
|
||||
} else {
|
||||
const {uri, width: sourceWidth, height: sourceHeight} = source_;
|
||||
if (uri === '') {
|
||||
console.warn('source.uri should not be an empty string');
|
||||
}
|
||||
style_ = [
|
||||
nativeProps.style = [
|
||||
{width: sourceWidth ?? width, height: sourceHeight ?? height},
|
||||
styles.base,
|
||||
style,
|
||||
];
|
||||
sources_ = [source_];
|
||||
}
|
||||
|
||||
const nativeProps = restProps as {
|
||||
...React.PropsOf<ImageViewNativeComponent>,
|
||||
};
|
||||
|
||||
// Both iOS and C++ sides expect to have "source" prop, whereas on Android it's "src"
|
||||
// (for historical reasons). So in the latter case we populate both "src" and "source",
|
||||
// in order to have a better alignment between platforms in the future.
|
||||
// TODO: `src` should be eventually removed from the API on Android.
|
||||
nativeProps.src = sources_;
|
||||
nativeProps.source = sources_;
|
||||
|
||||
nativeProps.style = style_;
|
||||
|
||||
if (headers_ != null) {
|
||||
nativeProps.headers = headers_;
|
||||
nativeProps.source = [source_];
|
||||
}
|
||||
|
||||
if (onLoadStart != null) {
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*
|
||||
* @flow strict-local
|
||||
* @fantom_flags fixImageSrcDimensionPropagation:*
|
||||
* @format
|
||||
*/
|
||||
|
||||
@@ -13,7 +12,6 @@ import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
|
||||
|
||||
import type {AccessibilityProps, HostInstance} from 'react-native';
|
||||
|
||||
import * as ReactNativeFeatureFlags from '../../../src/private/featureflags/ReactNativeFeatureFlags';
|
||||
import * as Fantom from '@react-native/fantom';
|
||||
import * as React from 'react';
|
||||
import {createRef} from 'react';
|
||||
@@ -477,23 +475,14 @@ describe('<Image>', () => {
|
||||
.getRenderedOutput({props: ['source', 'width', 'height']})
|
||||
.toJSX(),
|
||||
).toEqual(
|
||||
ReactNativeFeatureFlags.fixImageSrcDimensionPropagation() ? (
|
||||
<rn-image
|
||||
source-scale="1"
|
||||
source-type="remote"
|
||||
source-size="{40, 40}"
|
||||
source-uri="https://reactnative.dev/img/tiny_logo.png"
|
||||
width="40"
|
||||
height="40"
|
||||
/>
|
||||
) : (
|
||||
<rn-image
|
||||
source-scale="1"
|
||||
source-type="remote"
|
||||
source-size="{40, 40}"
|
||||
source-uri="https://reactnative.dev/img/tiny_logo.png"
|
||||
/>
|
||||
),
|
||||
<rn-image
|
||||
source-scale="1"
|
||||
source-type="remote"
|
||||
source-size="{40, 40}"
|
||||
source-uri="https://reactnative.dev/img/tiny_logo.png"
|
||||
width="40"
|
||||
height="40"
|
||||
/>,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1076,16 +1076,6 @@ const definitions: FeatureFlagDefinitions = {
|
||||
},
|
||||
ossReleaseStage: 'none',
|
||||
},
|
||||
fixImageSrcDimensionPropagation: {
|
||||
defaultValue: true,
|
||||
metadata: {
|
||||
description:
|
||||
'Fix image dimensions not being passed through when src is used',
|
||||
expectedReleaseValue: true,
|
||||
purpose: 'release',
|
||||
},
|
||||
ossReleaseStage: 'none',
|
||||
},
|
||||
fixVirtualizeListCollapseWindowSize: {
|
||||
defaultValue: false,
|
||||
metadata: {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*
|
||||
* @generated SignedSource<<8c2aa180526563dbaaeb91f1428e0c77>>
|
||||
* @generated SignedSource<<d929e85924c23746edd258449cdb2d42>>
|
||||
* @flow strict
|
||||
* @noformat
|
||||
*/
|
||||
@@ -34,7 +34,6 @@ export type ReactNativeFeatureFlagsJsOnly = $ReadOnly<{
|
||||
deferFlatListFocusChangeRenderUpdate: Getter<boolean>,
|
||||
disableMaintainVisibleContentPosition: Getter<boolean>,
|
||||
externalElementInspectionEnabled: Getter<boolean>,
|
||||
fixImageSrcDimensionPropagation: Getter<boolean>,
|
||||
fixVirtualizeListCollapseWindowSize: Getter<boolean>,
|
||||
isLayoutAnimationEnabled: Getter<boolean>,
|
||||
shouldUseAnimatedObjectForTransform: Getter<boolean>,
|
||||
@@ -170,11 +169,6 @@ export const disableMaintainVisibleContentPosition: Getter<boolean> = createJava
|
||||
*/
|
||||
export const externalElementInspectionEnabled: Getter<boolean> = createJavaScriptFlagGetter('externalElementInspectionEnabled', true);
|
||||
|
||||
/**
|
||||
* Fix image dimensions not being passed through when src is used
|
||||
*/
|
||||
export const fixImageSrcDimensionPropagation: Getter<boolean> = createJavaScriptFlagGetter('fixImageSrcDimensionPropagation', true);
|
||||
|
||||
/**
|
||||
* Fixing an edge case where the current window size is not properly calculated with fast scrolling. Window size collapsed to 1 element even if windowSize more than the current amount of elements
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user