Skip to content

Commit 1dfa285

Browse files
Inbal-TishInbal-Tish
authored
Image - fix width and height support bug (#2414)
* Image - fix width and height support bug * separating size props
1 parent 68d2425 commit 1dfa285

File tree

3 files changed

+47
-46
lines changed

3 files changed

+47
-46
lines changed

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

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -830,9 +830,11 @@ exports[`AvatarScreen renders screen 1`] = `
830830
undefined,
831831
undefined,
832832
Object {
833-
"height": 50,
834833
"width": 50,
835834
},
835+
Object {
836+
"height": 50,
837+
},
836838
undefined,
837839
undefined,
838840
undefined,
@@ -1062,9 +1064,11 @@ exports[`AvatarScreen renders screen 1`] = `
10621064
undefined,
10631065
undefined,
10641066
Object {
1065-
"height": 40,
10661067
"width": 40,
10671068
},
1069+
Object {
1070+
"height": 40,
1071+
},
10681072
undefined,
10691073
undefined,
10701074
undefined,
@@ -1306,9 +1310,11 @@ exports[`AvatarScreen renders screen 1`] = `
13061310
undefined,
13071311
undefined,
13081312
Object {
1309-
"height": 60,
13101313
"width": 60,
13111314
},
1315+
Object {
1316+
"height": 60,
1317+
},
13121318
undefined,
13131319
undefined,
13141320
undefined,
@@ -1477,9 +1483,11 @@ exports[`AvatarScreen renders screen 1`] = `
14771483
undefined,
14781484
undefined,
14791485
Object {
1480-
"height": 70,
14811486
"width": 70,
14821487
},
1488+
Object {
1489+
"height": 70,
1490+
},
14831491
undefined,
14841492
undefined,
14851493
undefined,
@@ -1709,9 +1717,11 @@ exports[`AvatarScreen renders screen 1`] = `
17091717
undefined,
17101718
undefined,
17111719
Object {
1712-
"height": 60,
17131720
"width": 60,
17141721
},
1722+
Object {
1723+
"height": 60,
1724+
},
17151725
undefined,
17161726
undefined,
17171727
undefined,
@@ -1833,10 +1843,8 @@ exports[`AvatarScreen renders screen 1`] = `
18331843
Array [
18341844
null,
18351845
undefined,
1836-
Object {
1837-
"height": undefined,
1838-
"width": undefined,
1839-
},
1846+
undefined,
1847+
undefined,
18401848
undefined,
18411849
undefined,
18421850
undefined,
@@ -1987,9 +1995,11 @@ exports[`AvatarScreen renders screen 1`] = `
19871995
undefined,
19881996
undefined,
19891997
Object {
1990-
"height": 48,
19911998
"width": 48,
19921999
},
2000+
Object {
2001+
"height": 48,
2002+
},
19932003
undefined,
19942004
undefined,
19952005
undefined,
@@ -2191,9 +2201,11 @@ exports[`AvatarScreen renders screen 1`] = `
21912201
undefined,
21922202
undefined,
21932203
Object {
2194-
"height": 50,
21952204
"width": 50,
21962205
},
2206+
Object {
2207+
"height": 50,
2208+
},
21972209
undefined,
21982210
undefined,
21992211
undefined,
@@ -2395,9 +2407,11 @@ exports[`AvatarScreen renders screen 1`] = `
23952407
undefined,
23962408
undefined,
23972409
Object {
2398-
"height": 50,
23992410
"width": 50,
24002411
},
2412+
Object {
2413+
"height": 50,
2414+
},
24012415
undefined,
24022416
undefined,
24032417
undefined,
@@ -2560,9 +2574,11 @@ exports[`AvatarScreen renders screen 1`] = `
25602574
undefined,
25612575
undefined,
25622576
Object {
2563-
"height": 50,
25642577
"width": 50,
25652578
},
2579+
Object {
2580+
"height": 50,
2581+
},
25662582
undefined,
25672583
undefined,
25682584
undefined,

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

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -900,10 +900,8 @@ exports[`Button container size should have no padding of button is an icon butto
900900
Array [
901901
undefined,
902902
undefined,
903-
Object {
904-
"height": undefined,
905-
"width": undefined,
906-
},
903+
undefined,
904+
undefined,
907905
undefined,
908906
undefined,
909907
undefined,
@@ -1818,10 +1816,8 @@ exports[`Button icon should apply color on icon 1`] = `
18181816
Array [
18191817
undefined,
18201818
undefined,
1821-
Object {
1822-
"height": undefined,
1823-
"width": undefined,
1824-
},
1819+
undefined,
1820+
undefined,
18251821
undefined,
18261822
undefined,
18271823
undefined,
@@ -1879,10 +1875,8 @@ exports[`Button icon should apply color on icon 2`] = `
18791875
Array [
18801876
undefined,
18811877
undefined,
1882-
Object {
1883-
"height": undefined,
1884-
"width": undefined,
1885-
},
1878+
undefined,
1879+
undefined,
18861880
undefined,
18871881
undefined,
18881882
undefined,
@@ -1940,10 +1934,8 @@ exports[`Button icon should include custom iconStyle provided as a prop 1`] = `
19401934
Array [
19411935
undefined,
19421936
undefined,
1943-
Object {
1944-
"height": undefined,
1945-
"width": undefined,
1946-
},
1937+
undefined,
1938+
undefined,
19471939
undefined,
19481940
undefined,
19491941
undefined,
@@ -2006,10 +1998,8 @@ exports[`Button icon should return icon style according to different variations
20061998
Array [
20071999
undefined,
20082000
undefined,
2009-
Object {
2010-
"height": undefined,
2011-
"width": undefined,
2012-
},
2001+
undefined,
2002+
undefined,
20132003
undefined,
20142004
undefined,
20152005
undefined,
@@ -2067,10 +2057,8 @@ exports[`Button icon should return icon style according to different variations
20672057
Array [
20682058
undefined,
20692059
undefined,
2070-
Object {
2071-
"height": undefined,
2072-
"width": undefined,
2073-
},
2060+
undefined,
2061+
undefined,
20742062
undefined,
20752063
undefined,
20762064
undefined,
@@ -2133,10 +2121,8 @@ exports[`Button icon should return icon style according to different variations
21332121
Array [
21342122
undefined,
21352123
undefined,
2136-
Object {
2137-
"height": undefined,
2138-
"width": undefined,
2139-
},
2124+
undefined,
2125+
undefined,
21402126
undefined,
21412127
undefined,
21422128
undefined,
@@ -3139,10 +3125,8 @@ exports[`Button labelColor should return undefined color if this is an icon butt
31393125
Array [
31403126
undefined,
31413127
undefined,
3142-
Object {
3143-
"height": undefined,
3144-
"width": undefined,
3145-
},
3128+
undefined,
3129+
undefined,
31463130
undefined,
31473131
undefined,
31483132
undefined,

‎src/components/image/index.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,8 @@ class Image extends PureComponent<Props, State> {
230230
style={[
231231
tintColor && {tintColor},
232232
shouldFlipRTL && styles.rtlFlipped,
233-
{width, height},
233+
width && {width},
234+
height && {height},
234235
cover && styles.coverImage,
235236
this.isGif() && styles.gifImage,
236237
aspectRatio && {aspectRatio},

0 commit comments

Comments
 (0)