Skip to content

Commit d54bc5a

Browse files
inimagaOSBotify
authored andcommitted
Merge pull request #78466 from situchan/revert-74023-fix/map-preview-resize
Revert "Fix map preview resizing issue after edit causing partial area rendering" (cherry picked from commit 75234df) (cherry-picked to staging by marcaaron)
1 parent 350641e commit d54bc5a

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

src/components/ImageWithLoading.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ function ImageWithLoading({
3636
resizeMode,
3737
onLoad,
3838
onLayout,
39-
style,
4039
...rest
4140
}: ImageWithSizeLoadingProps) {
4241
const styles = useThemeStyles();
@@ -86,7 +85,7 @@ function ImageWithLoading({
8685
<Image
8786
// eslint-disable-next-line react/jsx-props-no-spreading
8887
{...rest}
89-
style={[styles.w100, styles.h100, style]}
88+
style={[styles.w100, styles.h100]}
9089
onLoadStart={() => {
9190
if (isLoadedRef.current ?? isLoading) {
9291
return;

src/components/ReceiptImage/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ function ReceiptImage({
235235
lastUpdateWidthTimestampRef.current = e.timeStamp;
236236
}}
237237
source={typeof source === 'string' ? {uri: source} : source}
238-
style={styles.flex1}
238+
style={[style ?? [styles.w100, styles.h100], styles.overflowHidden]}
239239
isAuthTokenRequired={!!isAuthTokenRequired}
240240
loadingIconSize={loadingIconSize}
241241
loadingIndicatorStyles={loadingIndicatorStyles}

src/styles/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5471,7 +5471,6 @@ const staticStyles = (theme: ThemeColors) =>
54715471
flexibleHeight: {
54725472
height: 'auto',
54735473
minHeight: 200,
5474-
flex: 1,
54755474
},
54765475

54775476
receiptCellLoadingContainer: {

0 commit comments

Comments
 (0)