Skip to content

Commit d181ba1

Browse files
lidord-wixlidord-wix
committed
Merge branch 'master' into release
2 parents b42ab25 + 1dfa285 commit d181ba1

File tree

17 files changed

+332
-355
lines changed

17 files changed

+332
-355
lines changed

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

Lines changed: 56 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,6 @@ exports[`AvatarScreen renders screen 1`] = `
819819
"width": 50,
820820
}
821821
}
822-
height={50}
823822
onError={[Function]}
824823
source={
825824
Object {
@@ -830,6 +829,12 @@ exports[`AvatarScreen renders screen 1`] = `
830829
Array [
831830
undefined,
832831
undefined,
832+
Object {
833+
"width": 50,
834+
},
835+
Object {
836+
"height": 50,
837+
},
833838
undefined,
834839
undefined,
835840
undefined,
@@ -856,7 +861,6 @@ exports[`AvatarScreen renders screen 1`] = `
856861
]
857862
}
858863
testID="undefined.image"
859-
width={50}
860864
/>
861865
<View
862866
accessibilityLabel="badge"
@@ -1049,7 +1053,6 @@ exports[`AvatarScreen renders screen 1`] = `
10491053
"width": 40,
10501054
}
10511055
}
1052-
height={40}
10531056
onError={[Function]}
10541057
source={
10551058
Object {
@@ -1060,6 +1063,12 @@ exports[`AvatarScreen renders screen 1`] = `
10601063
Array [
10611064
undefined,
10621065
undefined,
1066+
Object {
1067+
"width": 40,
1068+
},
1069+
Object {
1070+
"height": 40,
1071+
},
10631072
undefined,
10641073
undefined,
10651074
undefined,
@@ -1086,7 +1095,6 @@ exports[`AvatarScreen renders screen 1`] = `
10861095
]
10871096
}
10881097
testID="undefined.image"
1089-
width={40}
10901098
/>
10911099
<View
10921100
accessibilityLabel="badge"
@@ -1290,7 +1298,6 @@ exports[`AvatarScreen renders screen 1`] = `
12901298
accessibilityRole="image"
12911299
accessible={false}
12921300
assetGroup="icons"
1293-
height={60}
12941301
onError={[Function]}
12951302
onLoad={[Function]}
12961303
source={
@@ -1302,6 +1309,12 @@ exports[`AvatarScreen renders screen 1`] = `
13021309
Array [
13031310
undefined,
13041311
undefined,
1312+
Object {
1313+
"width": 60,
1314+
},
1315+
Object {
1316+
"height": 60,
1317+
},
13051318
undefined,
13061319
undefined,
13071320
undefined,
@@ -1333,7 +1346,6 @@ exports[`AvatarScreen renders screen 1`] = `
13331346
]
13341347
}
13351348
testID="undefined.image"
1336-
width={60}
13371349
/>
13381350
</View>
13391351
</View>
@@ -1460,7 +1472,6 @@ exports[`AvatarScreen renders screen 1`] = `
14601472
"width": 70,
14611473
}
14621474
}
1463-
height={70}
14641475
onError={[Function]}
14651476
source={
14661477
Object {
@@ -1471,6 +1482,12 @@ exports[`AvatarScreen renders screen 1`] = `
14711482
Array [
14721483
undefined,
14731484
undefined,
1485+
Object {
1486+
"width": 70,
1487+
},
1488+
Object {
1489+
"height": 70,
1490+
},
14741491
undefined,
14751492
undefined,
14761493
undefined,
@@ -1497,7 +1514,6 @@ exports[`AvatarScreen renders screen 1`] = `
14971514
]
14981515
}
14991516
testID="undefined.image"
1500-
width={70}
15011517
/>
15021518
<View
15031519
accessibilityLabel="badge"
@@ -1690,7 +1706,6 @@ exports[`AvatarScreen renders screen 1`] = `
16901706
"width": 60,
16911707
}
16921708
}
1693-
height={60}
16941709
onError={[Function]}
16951710
source={
16961711
Object {
@@ -1701,6 +1716,12 @@ exports[`AvatarScreen renders screen 1`] = `
17011716
Array [
17021717
undefined,
17031718
undefined,
1719+
Object {
1720+
"width": 60,
1721+
},
1722+
Object {
1723+
"height": 60,
1724+
},
17041725
undefined,
17051726
undefined,
17061727
undefined,
@@ -1727,7 +1748,6 @@ exports[`AvatarScreen renders screen 1`] = `
17271748
]
17281749
}
17291750
testID="undefined.image"
1730-
width={60}
17311751
/>
17321752
<View
17331753
accessibilityLabel="badge"
@@ -1827,6 +1847,8 @@ exports[`AvatarScreen renders screen 1`] = `
18271847
undefined,
18281848
undefined,
18291849
undefined,
1850+
undefined,
1851+
undefined,
18301852
false,
18311853
Object {
18321854
"backgroundColor": "#FFC50D",
@@ -1962,7 +1984,6 @@ exports[`AvatarScreen renders screen 1`] = `
19621984
"width": 48,
19631985
}
19641986
}
1965-
height={48}
19661987
onError={[Function]}
19671988
source={
19681989
Object {
@@ -1973,6 +1994,12 @@ exports[`AvatarScreen renders screen 1`] = `
19731994
Array [
19741995
undefined,
19751996
undefined,
1997+
Object {
1998+
"width": 48,
1999+
},
2000+
Object {
2001+
"height": 48,
2002+
},
19762003
undefined,
19772004
undefined,
19782005
undefined,
@@ -1999,7 +2026,6 @@ exports[`AvatarScreen renders screen 1`] = `
19992026
]
20002027
}
20012028
testID="undefined.image"
2002-
width={48}
20032029
/>
20042030
</View>
20052031
</View>
@@ -2162,7 +2188,6 @@ exports[`AvatarScreen renders screen 1`] = `
21622188
"width": 50,
21632189
}
21642190
}
2165-
height={50}
21662191
onError={[Function]}
21672192
onLoadEnd={[Function]}
21682193
onLoadStart={[Function]}
@@ -2175,6 +2200,12 @@ exports[`AvatarScreen renders screen 1`] = `
21752200
Array [
21762201
undefined,
21772202
undefined,
2203+
Object {
2204+
"width": 50,
2205+
},
2206+
Object {
2207+
"height": 50,
2208+
},
21782209
undefined,
21792210
undefined,
21802211
undefined,
@@ -2201,7 +2232,6 @@ exports[`AvatarScreen renders screen 1`] = `
22012232
]
22022233
}
22032234
testID="undefined.image"
2204-
width={50}
22052235
/>
22062236
</View>
22072237
</View>
@@ -2364,7 +2394,6 @@ exports[`AvatarScreen renders screen 1`] = `
23642394
"width": 50,
23652395
}
23662396
}
2367-
height={50}
23682397
onError={[Function]}
23692398
onLoadEnd={[Function]}
23702399
onLoadStart={[Function]}
@@ -2377,6 +2406,12 @@ exports[`AvatarScreen renders screen 1`] = `
23772406
Array [
23782407
undefined,
23792408
undefined,
2409+
Object {
2410+
"width": 50,
2411+
},
2412+
Object {
2413+
"height": 50,
2414+
},
23802415
undefined,
23812416
undefined,
23822417
undefined,
@@ -2403,7 +2438,6 @@ exports[`AvatarScreen renders screen 1`] = `
24032438
]
24042439
}
24052440
testID="undefined.image"
2406-
width={50}
24072441
/>
24082442
</View>
24092443
</View>
@@ -2529,7 +2563,6 @@ exports[`AvatarScreen renders screen 1`] = `
25292563
"width": 50,
25302564
}
25312565
}
2532-
height={50}
25332566
onError={[Function]}
25342567
source={
25352568
Object {
@@ -2540,6 +2573,12 @@ exports[`AvatarScreen renders screen 1`] = `
25402573
Array [
25412574
undefined,
25422575
undefined,
2576+
Object {
2577+
"width": 50,
2578+
},
2579+
Object {
2580+
"height": 50,
2581+
},
25432582
undefined,
25442583
undefined,
25452584
undefined,
@@ -2566,7 +2605,6 @@ exports[`AvatarScreen renders screen 1`] = `
25662605
]
25672606
}
25682607
testID="undefined.image"
2569-
width={50}
25702608
/>
25712609
</View>
25722610
</View>

‎demo/src/screens/componentScreens/ImageScreen.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ class ImageScreen extends Component<{}, State> {
121121
cover={cover}
122122
overlayType={overlayType !== 'none' ? overlayType : undefined}
123123
overlayIntensity={overlayIntensity}
124-
style={!cover && {width: DEFAULT_SIZE, height: DEFAULT_SIZE}}
124+
// style={!cover && {width: DEFAULT_SIZE, height: DEFAULT_SIZE}}
125+
width={!cover ? DEFAULT_SIZE : undefined}
126+
height={!cover ? DEFAULT_SIZE : undefined}
125127
customOverlayContent={this.renderOverlayContent()}
126128
{...{[`margin-${margin}`]: true}}
127129
/>

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
},
1616
"scripts": {
1717
"start": "watchman watch-del-all && export DEV_MODE=true && react-native start",
18+
"start:web": "npm --prefix webDemo run start",
1819
"ios": "react-native run-ios",
1920
"android": "react-native run-android",
2021
"iPad": "react-native run-ios --simulator='iPad Pro (9.7 inch)'",

‎src/components/avatar/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ const Avatar = forwardRef<any, AvatarProps>((props: AvatarProps, ref: React.Forw
336336
};
337337

338338
const renderRibbon = () => {
339-
if (ribbonLabel) {
339+
if (!customRibbon && ribbonLabel) {
340340
return (
341341
<View style={_ribbonStyle}>
342342
<Text numberOfLines={1} text100 $textDefaultLight style={ribbonLabelStyle}>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -904,6 +904,8 @@ exports[`Button container size should have no padding of button is an icon butto
904904
undefined,
905905
undefined,
906906
undefined,
907+
undefined,
908+
undefined,
907909
false,
908910
Array [
909911
Object {
@@ -1818,6 +1820,8 @@ exports[`Button icon should apply color on icon 1`] = `
18181820
undefined,
18191821
undefined,
18201822
undefined,
1823+
undefined,
1824+
undefined,
18211825
false,
18221826
Array [
18231827
Object {
@@ -1875,6 +1879,8 @@ exports[`Button icon should apply color on icon 2`] = `
18751879
undefined,
18761880
undefined,
18771881
undefined,
1882+
undefined,
1883+
undefined,
18781884
false,
18791885
Array [
18801886
Object {
@@ -1932,6 +1938,8 @@ exports[`Button icon should include custom iconStyle provided as a prop 1`] = `
19321938
undefined,
19331939
undefined,
19341940
undefined,
1941+
undefined,
1942+
undefined,
19351943
false,
19361944
Array [
19371945
Object {
@@ -1994,6 +2002,8 @@ exports[`Button icon should return icon style according to different variations
19942002
undefined,
19952003
undefined,
19962004
undefined,
2005+
undefined,
2006+
undefined,
19972007
false,
19982008
Array [
19992009
Object {
@@ -2051,6 +2061,8 @@ exports[`Button icon should return icon style according to different variations
20512061
undefined,
20522062
undefined,
20532063
undefined,
2064+
undefined,
2065+
undefined,
20542066
false,
20552067
Array [
20562068
Object {
@@ -2113,6 +2125,8 @@ exports[`Button icon should return icon style according to different variations
21132125
undefined,
21142126
undefined,
21152127
undefined,
2128+
undefined,
2129+
undefined,
21162130
false,
21172131
Array [
21182132
Object {
@@ -3115,6 +3129,8 @@ exports[`Button labelColor should return undefined color if this is an icon butt
31153129
undefined,
31163130
undefined,
31173131
undefined,
3132+
undefined,
3133+
undefined,
31183134
false,
31193135
Array [
31203136
Object {

‎src/components/image/index.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ class Image extends PureComponent<Props, State> {
208208
const {
209209
tintColor,
210210
style,
211+
width,
212+
height,
211213
supportRTL,
212214
cover,
213215
aspectRatio,
@@ -228,6 +230,8 @@ class Image extends PureComponent<Props, State> {
228230
style={[
229231
tintColor && {tintColor},
230232
shouldFlipRTL && styles.rtlFlipped,
233+
width && {width},
234+
height && {height},
231235
cover && styles.coverImage,
232236
this.isGif() && styles.gifImage,
233237
aspectRatio && {aspectRatio},

0 commit comments

Comments
 (0)