Skip to content

Remove TextInlineImageNativeComponent in JS #55434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NickGerleman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove TextInlineImageNativeComponent in JS #55434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions packages/react-native/Libraries/Image/Image.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import type {AbstractImageAndroid, ImageAndroid} from './ImageTypes.flow';

import flattenStyle from '../StyleSheet/flattenStyle';
import StyleSheet from '../StyleSheet/StyleSheet';
import TextAncestorContext from '../Text/TextAncestorContext';
import ImageAnalyticsTagContext from './ImageAnalyticsTagContext';
import {
unstable_getImageComponentDecorator,
Expand All @@ -30,7 +29,6 @@ import NativeImageLoaderAndroid, {
type ImageSize,
} from './NativeImageLoaderAndroid';
import resolveAssetSource from './resolveAssetSource';
import TextInlineImageNativeComponent from './TextInlineImageNativeComponent';
import * as React from 'react';
import {use} from 'react';

Expand Down Expand Up @@ -309,24 +307,12 @@ let BaseImage: AbstractImageAndroid = ({

const actualRef = useWrapRefWithImageAttachedCallbacks(forwardedRef);

const hasTextAncestor = use(TextAncestorContext);
const analyticTag = use(ImageAnalyticsTagContext);
if (analyticTag !== null) {
nativeProps.internal_analyticTag = analyticTag;
}

return hasTextAncestor ? (
<TextInlineImageNativeComponent
// $FlowFixMe[incompatible-type]
style={style_}
resizeMode={resizeMode_}
headers={headers_}
src={sources_}
ref={actualRef}
/>
) : (
<ImageViewNativeComponent {...nativeProps} ref={actualRef} />
);
return <ImageViewNativeComponent {...nativeProps} ref={actualRef} />;
};

let _BaseImage = BaseImage;
Expand Down
49 changes: 0 additions & 49 deletions packages/react-native/Libraries/Image/TextInlineImageNativeComponent.js
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions ...eact-native/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ std::string componentNameByReactViewName(std::string viewName) {
return "Paragraph";
}

// TODO T63839307: remove this condition after deleting TextInlineImage from
// old renderer code
if (viewName == "TextInlineImage") {
return "Image";
}
if (viewName == "VirtualText") {
return "Text";
}
Expand Down
Loading