Skip to content

Commit 5e33f9b

Browse files
committed
Merge branch 'master' into release
2 parents 2e455ed + f54b476 commit 5e33f9b

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
22.13.1

src/components/avatar/index.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,13 @@ const Avatar = forwardRef<any, AvatarProps>((props: AvatarProps, ref: React.Forw
360360
>
361361
<View testID={`${testID}.container`} style={textContainerStyle}>
362362
{!_.isUndefined(text) && (
363-
<Text numberOfLines={1} ellipsizeMode={labelEllipsizeMode} style={textStyle} testID={`${testID}.label`}>
363+
<Text
364+
numberOfLines={1}
365+
ellipsizeMode={labelEllipsizeMode}
366+
style={textStyle}
367+
testID={`${testID}.label`}
368+
accessibilityLabel={accessibilityProps?.accessibilityLabel}
369+
>
364370
{text}
365371
</Text>
366372
)}

src/components/carousel/index.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ class Carousel extends Component<CarouselProps, CarouselState> {
447447
<PageControl
448448
size={size}
449449
spacing={spacing}
450-
containerStyle={containerStyle}
450+
containerStyle={[containerStyle, Constants.isRTL && Constants.isIOS && styles.flip]}
451451
inactiveColor={inactiveColor}
452452
color={color}
453453
{...others}
@@ -550,6 +550,9 @@ const styles = StyleSheet.create({
550550
top: 12,
551551
right: 12
552552
},
553+
flip: {
554+
transform: [{scaleX: -1}]
555+
},
553556
pageControlContainerStyle: {
554557
position: 'absolute',
555558
bottom: 16,

0 commit comments

Comments
 (0)