Skip to content
Open
Show file tree
Hide file tree
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
34 changes: 21 additions & 13 deletions package/src/Slider.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {useEffect, useState} from 'react';
import React, {useEffect, useMemo, useState} from 'react';
import {
Image,
Platform,
Expand Down Expand Up @@ -239,11 +239,15 @@ const SliderComponent = (
const defaultStep = (maximumValue - minimumValue) / stepResolution;
const stepLength = step || defaultStep;

const options = Array.from(
{
length: (step ? defaultStep : stepResolution) + 1,
},
(_, index) => minimumValue + index * stepLength,
const options = useMemo(
() =>
Array.from(
{
length: (step ? defaultStep : stepResolution) + 1,
},
(_, index) => minimumValue + index * stepLength,
),
[step, defaultStep, stepResolution, minimumValue, stepLength],
);

const defaultStyle =
Expand Down Expand Up @@ -284,6 +288,16 @@ const SliderComponent = (

const passedValue = Number.isNaN(value) || !value ? undefined : value;

const resolvedThumbImage = useMemo(
() =>
Platform.OS === 'web'
? props.thumbImage
: props.StepMarker || !props.thumbImage
? undefined
: Image.resolveAssetSource(props.thumbImage as ImageSourcePropType),
[props.thumbImage, props.StepMarker],
);

useEffect(() => {
if (lowerLimit >= upperLimit) {
console.warn(
Expand Down Expand Up @@ -320,13 +334,7 @@ const SliderComponent = (
lowerLimit={lowerLimit}
upperLimit={upperLimit}
accessibilityState={_accessibilityState}
thumbImage={
Platform.OS === 'web'
? props.thumbImage
: props.StepMarker || !props.thumbImage
? undefined
: Image.resolveAssetSource(props.thumbImage as ImageSourcePropType)
}
thumbImage={resolvedThumbImage}
ref={forwardedRef}
style={[
sliderStyle,
Expand Down
2 changes: 1 addition & 1 deletion package/src/components/StepsIndicator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const StepsIndicator = ({
};
}, [sliderWidth]);

const values = isLTR ? options.reverse() : options;
const values = isLTR ? options.slice().reverse() : options;

const renderStepIndicator = useCallback(
(i: number, index: number) => {
Expand Down