Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/components/segmentedControl/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ const SegmentedControl = (props: SegmentedControlProps) => {
const onLayout = useCallback((index: number, event: LayoutChangeEvent) => {
const {x, width, height} = event.nativeEvent.layout;
segmentsStyle.value[index] = {x, width};
segmentedControlHeight.value = height - 2 * BORDER_WIDTH;
segmentedControlHeight.value = height + 2 * BORDER_WIDTH;
segmentsCounter.current++;

if (segmentsCounter.current === segments?.length) {
Expand All @@ -148,9 +148,11 @@ const SegmentedControl = (props: SegmentedControlProps) => {

const animatedStyle = useAnimatedStyle(() => {
if (segmentsStyle.value.length !== 0) {
const inset = withTiming(segmentsStyle.value[animatedSelectedIndex.value].x, TIMING_CONFIG);
const width = withTiming(segmentsStyle.value[animatedSelectedIndex.value].width - 2 * BORDER_WIDTH,
TIMING_CONFIG);
const isFirstElementSelected = animatedSelectedIndex.value === 0;
const isLastElementSelected = animatedSelectedIndex.value === segmentsStyle.value.length - 1;
const xOffset = isFirstElementSelected ? -2 : isLastElementSelected ? 2 : 0;
const inset = withTiming(segmentsStyle.value[animatedSelectedIndex.value].x + xOffset, TIMING_CONFIG);
const width = withTiming(segmentsStyle.value[animatedSelectedIndex.value].width * BORDER_WIDTH, TIMING_CONFIG);
const height = segmentedControlHeight.value;
return Constants.isRTL ? {width, right: inset, height} : {width, left: inset, height};
}
Expand Down