React/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2024-11-21 22:10:14 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Unify defaultSource and defaultSrc ImageProp (#47710)
Some checks are pending
Label closed PR as merged and leave a comment / comment-and-label (push) Waiting to run
Details
Publish Bumped Packages / publish_bumped_packages (push) Waiting to run
Details
Update node modules cache / update_node_modules_cache (push) Waiting to run
Details

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/47710

There is Android code that supports remapping `defaultSrc` -> `defaultSource` for `ImageNativeComponent`.
The docs reference this prop as `defaultSource`: https://reactnative.dev/docs/next/image#defaultsource
It is not referenced as `defaultSrc` anywhere. Let's unify it as `defaultSource` across both platforms.
Changelog: [Internal]

Reviewed By: javache

Differential Revision: D65819218

fbshipit-source-id: 0f468e2327ad07285a45e4c9f5e33d74da411c74
This commit is contained in:
Dmitry Rykun 2024-11-19 11:21:22 -08:00 committed by Facebook GitHub Bot
parent 6f1cf004fa
commit abeee154d5
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/react-native/Libraries/Image/Image.android.js
View File

@ -133,7 +133,6 @@ let BaseImage: AbstractImageAndroid = React.forwardRef(
width: undefined, width: undefined,
height: undefined, height: undefined,
}; };
const defaultSource = resolveAssetSource(props.defaultSource);
const loadingIndicatorSource = resolveAssetSource( const loadingIndicatorSource = resolveAssetSource(
props.loadingIndicatorSource, props.loadingIndicatorSource,
); );
@ -179,7 +178,6 @@ let BaseImage: AbstractImageAndroid = React.forwardRef(
/* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
* when making Flow check .android.js files. */ * when making Flow check .android.js files. */
headers: (source?.[0]?.headers || source?.headers: ?{[string]: string}), headers: (source?.[0]?.headers || source?.headers: ?{[string]: string}),
defaultSrc: defaultSource ? defaultSource.uri : null,
loadingIndicatorSrc: loadingIndicatorSource loadingIndicatorSrc: loadingIndicatorSource
? loadingIndicatorSource.uri ? loadingIndicatorSource.uri
: null, : null,

4
packages/react-native/Libraries/Image/ImageViewNativeComponent.js vendored
View File

@ -82,6 +82,9 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig =
}, },
validAttributes: { validAttributes: {
blurRadius: true, blurRadius: true,
defaultSource: {
process: require('./resolveAssetSource'),
},
internal_analyticTag: true, internal_analyticTag: true,
resizeMethod: true, resizeMethod: true,
resizeMode: true, resizeMode: true,
@ -100,7 +103,6 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig =
borderRadius: true, borderRadius: true,
headers: true, headers: true,
shouldNotifyLoadEvents: true, shouldNotifyLoadEvents: true,
defaultSrc: true,
overlayColor: { overlayColor: {
process: require('../StyleSheet/processColor').default, process: require('../StyleSheet/processColor').default,
}, },

3
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.kt
View File

@ -124,8 +124,7 @@ public constructor(
} }
} }
// In JS this is Image.props.defaultSource @ReactProp(name = "defaultSource")
@ReactProp(name = "defaultSrc")
public fun setDefaultSource(view: ReactImageView, source: String?) { public fun setDefaultSource(view: ReactImageView, source: String?) {
view.setDefaultSource(source) view.setDefaultSource(source)
} }