Skip to content

Commit e91e9ef

Browse files
committed
Fix issue for Android on rn63 - when passing null as tintColor to an image, the image is not displayed (#1055)
1 parent fec7d5a commit e91e9ef

File tree

2 files changed

+9
-25
lines changed

2 files changed

+9
-25
lines changed

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

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -855,9 +855,7 @@ exports[`Button container size should have no padding of button is an icon butto
855855
source={14}
856856
style={
857857
Array [
858-
Object {
859-
"tintColor": undefined,
860-
},
858+
undefined,
861859
undefined,
862860
undefined,
863861
undefined,
@@ -1662,9 +1660,7 @@ exports[`Button icon should apply color on icon 1`] = `
16621660
source={12}
16631661
style={
16641662
Array [
1665-
Object {
1666-
"tintColor": undefined,
1667-
},
1663+
undefined,
16681664
undefined,
16691665
undefined,
16701666
undefined,
@@ -1716,9 +1712,7 @@ exports[`Button icon should apply color on icon 2`] = `
17161712
source={12}
17171713
style={
17181714
Array [
1719-
Object {
1720-
"tintColor": undefined,
1721-
},
1715+
undefined,
17221716
undefined,
17231717
undefined,
17241718
undefined,
@@ -1770,9 +1764,7 @@ exports[`Button icon should include custom iconStyle provided as a prop 1`] = `
17701764
source={12}
17711765
style={
17721766
Array [
1773-
Object {
1774-
"tintColor": undefined,
1775-
},
1767+
undefined,
17761768
undefined,
17771769
undefined,
17781770
undefined,
@@ -1829,9 +1821,7 @@ exports[`Button icon should return icon style according to different variations
18291821
source={12}
18301822
style={
18311823
Array [
1832-
Object {
1833-
"tintColor": undefined,
1834-
},
1824+
undefined,
18351825
undefined,
18361826
undefined,
18371827
undefined,
@@ -1883,9 +1873,7 @@ exports[`Button icon should return icon style according to different variations
18831873
source={12}
18841874
style={
18851875
Array [
1886-
Object {
1887-
"tintColor": undefined,
1888-
},
1876+
undefined,
18891877
undefined,
18901878
undefined,
18911879
undefined,
@@ -1937,9 +1925,7 @@ exports[`Button icon should return icon style according to different variations
19371925
source={12}
19381926
style={
19391927
Array [
1940-
Object {
1941-
"tintColor": undefined,
1942-
},
1928+
undefined,
19431929
undefined,
19441930
undefined,
19451931
undefined,
@@ -2892,9 +2878,7 @@ exports[`Button labelColor should return undefined color if this is an icon butt
28922878
source={12}
28932879
style={
28942880
Array [
2895-
Object {
2896-
"tintColor": undefined,
2897-
},
2881+
undefined,
28982882
undefined,
28992883
undefined,
29002884
undefined,

src/components/image/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class Image extends PureComponent<Props> {
133133
// @ts-ignore
134134
<ImageView
135135
style={[
136-
{tintColor},
136+
tintColor && {tintColor},
137137
shouldFlipRTL && styles.rtlFlipped,
138138
cover && styles.coverImage,
139139
this.isGif() && styles.gifImage,

0 commit comments

Comments
 (0)