Skip to content

Commit 5fa1a40

Browse files
authored
borderRadius is passed to image style (#3148)
1 parent 32049ef commit 5fa1a40

File tree

4 files changed

+23
-1
lines changed

4 files changed

+23
-1
lines changed

demo/src/screens/__tests__/__snapshots__/AvatarScreen.spec.js.snap

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,7 @@ exports[`AvatarScreen renders screen 1`] = `
944944
undefined,
945945
undefined,
946946
undefined,
947+
undefined,
947948
false,
948949
[
949950
{
@@ -1199,6 +1200,7 @@ exports[`AvatarScreen renders screen 1`] = `
11991200
undefined,
12001201
undefined,
12011202
undefined,
1203+
undefined,
12021204
false,
12031205
[
12041206
{
@@ -1467,6 +1469,7 @@ exports[`AvatarScreen renders screen 1`] = `
14671469
undefined,
14681470
undefined,
14691471
undefined,
1472+
undefined,
14701473
false,
14711474
[
14721475
[
@@ -1659,6 +1662,7 @@ exports[`AvatarScreen renders screen 1`] = `
16591662
undefined,
16601663
undefined,
16611664
undefined,
1665+
undefined,
16621666
false,
16631667
[
16641668
{
@@ -1914,6 +1918,7 @@ exports[`AvatarScreen renders screen 1`] = `
19141918
undefined,
19151919
undefined,
19161920
undefined,
1921+
undefined,
19171922
false,
19181923
[
19191924
{
@@ -2039,6 +2044,7 @@ exports[`AvatarScreen renders screen 1`] = `
20392044
undefined,
20402045
undefined,
20412046
undefined,
2047+
undefined,
20422048
false,
20432049
{
20442050
"backgroundColor": "#FFC50D",
@@ -2213,6 +2219,7 @@ exports[`AvatarScreen renders screen 1`] = `
22132219
undefined,
22142220
undefined,
22152221
undefined,
2222+
undefined,
22162223
false,
22172224
[
22182225
{
@@ -2441,6 +2448,7 @@ exports[`AvatarScreen renders screen 1`] = `
24412448
undefined,
24422449
undefined,
24432450
undefined,
2451+
undefined,
24442452
false,
24452453
[
24462454
{
@@ -2669,6 +2677,7 @@ exports[`AvatarScreen renders screen 1`] = `
26692677
undefined,
26702678
undefined,
26712679
undefined,
2680+
undefined,
26722681
false,
26732682
[
26742683
{
@@ -2855,6 +2864,7 @@ exports[`AvatarScreen renders screen 1`] = `
28552864
undefined,
28562865
undefined,
28572866
undefined,
2867+
undefined,
28582868
false,
28592869
[
28602870
{

demo/src/screens/__tests__/__snapshots__/TextFieldScreen.spec.js.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2770,6 +2770,7 @@ exports[`TextField Screen renders screen 1`] = `
27702770
undefined,
27712771
undefined,
27722772
undefined,
2773+
undefined,
27732774
false,
27742775
[
27752776
{
@@ -3443,6 +3444,7 @@ exports[`TextField Screen renders screen 1`] = `
34433444
undefined,
34443445
undefined,
34453446
undefined,
3447+
undefined,
34463448
false,
34473449
[
34483450
{

src/components/button/__tests__/__snapshots__/index.spec.js.snap

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,7 @@ exports[`Button container size should have no padding of button is an icon butto
11341134
undefined,
11351135
undefined,
11361136
undefined,
1137+
undefined,
11371138
false,
11381139
[
11391140
{
@@ -2266,6 +2267,7 @@ exports[`Button icon should apply color on icon 1`] = `
22662267
undefined,
22672268
undefined,
22682269
undefined,
2270+
undefined,
22692271
false,
22702272
[
22712273
{
@@ -2342,6 +2344,7 @@ exports[`Button icon should apply color on icon 2`] = `
23422344
undefined,
23432345
undefined,
23442346
undefined,
2347+
undefined,
23452348
false,
23462349
[
23472350
{
@@ -2418,6 +2421,7 @@ exports[`Button icon should include custom iconStyle provided as a prop 1`] = `
24182421
undefined,
24192422
undefined,
24202423
undefined,
2424+
undefined,
24212425
false,
24222426
[
24232427
{
@@ -2499,6 +2503,7 @@ exports[`Button icon should return icon style according to different variations
24992503
undefined,
25002504
undefined,
25012505
undefined,
2506+
undefined,
25022507
false,
25032508
[
25042509
{
@@ -2575,6 +2580,7 @@ exports[`Button icon should return icon style according to different variations
25752580
undefined,
25762581
undefined,
25772582
undefined,
2583+
undefined,
25782584
false,
25792585
[
25802586
{
@@ -2651,6 +2657,7 @@ exports[`Button icon should return icon style according to different variations
26512657
undefined,
26522658
undefined,
26532659
undefined,
2660+
undefined,
26542661
false,
26552662
[
26562663
{
@@ -3901,6 +3908,7 @@ exports[`Button labelColor should return undefined color if this is an icon butt
39013908
undefined,
39023909
undefined,
39033910
undefined,
3911+
undefined,
39043912
false,
39053913
[
39063914
{

src/components/image/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ class Image extends PureComponent<Props, State> {
233233
customOverlayContent,
234234
modifiers,
235235
recorderTag,
236+
borderRadius,
236237
...others
237238
} = this.props;
238239
const shouldFlipRTL = supportRTL && Constants.isRTL;
@@ -247,6 +248,7 @@ class Image extends PureComponent<Props, State> {
247248
shouldFlipRTL && styles.rtlFlipped,
248249
width && {width},
249250
height && {height},
251+
borderRadius && {borderRadius},
250252
cover && styles.coverImage,
251253
this.isGif() && styles.gifImage,
252254
aspectRatio && {aspectRatio},
@@ -270,7 +272,7 @@ class Image extends PureComponent<Props, State> {
270272
intensity={overlayIntensity}
271273
color={overlayColor}
272274
customContent={customOverlayContent}
273-
borderRadius={others?.borderRadius}
275+
borderRadius={borderRadius}
274276
/>
275277
)}
276278
</ImageView>

0 commit comments

Comments
 (0)