Skip to content

Add another way to pass image URL to the component #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2022
Merged

Add another way to pass image URL to the component #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 15 additions & 7 deletions src/ImageSlider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@ import ImageSliderNavigation, { ImageSliderNavDirection, ImageSliderNavStyle } f
import ImageSliderBullets from './ImageSliderBullets';
import useSlideIndex from './hooks/useSlideIndex';

type URLObject = {
url: string;
};

const getURLValueFromImages = (images: URLObject[] | string[], index: number) => {
return (images as URLObject[])[index]?.url || (images as string[])[index];
};

export type SimpleImageSliderProps = {
width: number | string;
height: number | string;
images: Array<{ url: string }>;
images: URLObject[] | string[];
style?: React.CSSProperties;
showNavs: boolean;
showBullets: boolean;
Expand Down Expand Up @@ -59,8 +67,8 @@ const SimpleImageSlider: React.FC<SimpleImageSliderProps> = ({
autoPlay,
autoPlayDelay: autoPlayDelay + slideDuration
});
const [currentSliderStyle, setCurrentSlideStyle] = useState(styles.getImageSlide(images[0].url, slideDuration, 0, useGPURender));
const [nextSliderStyle, setNextSliderStyle] = useState(styles.getImageSlide(images[1]?.url, slideDuration, 1, useGPURender));
const [currentSliderStyle, setCurrentSlideStyle] = useState(styles.getImageSlide(getURLValueFromImages(images, 0), slideDuration, 0, useGPURender));
const [nextSliderStyle, setNextSliderStyle] = useState(styles.getImageSlide(getURLValueFromImages(images, 1), slideDuration, 1, useGPURender));
const isSlidingRef = useRef(false);

const handleClick = useCallback(
Expand Down Expand Up @@ -100,8 +108,8 @@ const SimpleImageSlider: React.FC<SimpleImageSliderProps> = ({
return;
}

const currentUrl: string = images[getNextLoopingIdx(isRightDirection ? slideIdx - 1 : slideIdx + 1)].url;
const nextUrl: string = images[slideIdx].url;
const currentUrl: string = getURLValueFromImages(images, getNextLoopingIdx(isRightDirection ? slideIdx - 1 : slideIdx + 1));
const nextUrl: string = getURLValueFromImages(images, slideIdx);
const currentOffsetX: 1 | -1 = isRightDirection ? -1 : 1;
const nextReadyOffsetX: 1 | -1 = isRightDirection ? 1 : -1;

Expand All @@ -116,8 +124,8 @@ const SimpleImageSlider: React.FC<SimpleImageSliderProps> = ({

const handleSlideEnd = useCallback(() => {
isSlidingRef.current = false;
ImagePreLoader.load(images[slideIdx + 2]?.url);
setCurrentSlideStyle(styles.getImageSlide(images[slideIdx].url, 0, 0, useGPURender));
ImagePreLoader.load(getURLValueFromImages(images, slideIdx + 2));
setCurrentSlideStyle(styles.getImageSlide(getURLValueFromImages(images, slideIdx), 0, 0, useGPURender));
onCompleteSlide?.(slideIdx + 1, images.length);
}, [onCompleteSlide, slideIdx]);

Expand Down