From 8a202c082d61e7ab0c6211f2e8d6bd161a70932b Mon Sep 17 00:00:00 2001
From: nickbristow <richard.nick.bristow@gmail.com>
Date: Mon, 28 Oct 2024 16:59:48 -0400
Subject: [PATCH] working

---
 src/app/components/Carousel.tsx | 51 ++++++++++++---------------------
 src/app/globals.css             |  6 +++-
 src/app/page.tsx                |  2 +-
 3 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/src/app/components/Carousel.tsx b/src/app/components/Carousel.tsx
index d1e91db..94309ca 100644
--- a/src/app/components/Carousel.tsx
+++ b/src/app/components/Carousel.tsx
@@ -20,6 +20,8 @@ export default function MultiImageCarousel() {
   const [isDragging, setIsDragging] = useState(false);
   const [dragStartX, setDragStartX] = useState(0);
   const [dragOffset, setDragOffset] = useState(0);
+  const [finalOffset, setFinalOffset] = useState(0); // Stores the last offset when dragging stops
+  const [offsetType, setOffsetType] = useState('%'); // Stores the last offset when dragging stops
 
   const carouselRef = useRef(null);
 
@@ -27,15 +29,8 @@ export default function MultiImageCarousel() {
   const handleDragStart = (
     e: React.MouseEvent<HTMLDivElement> | React.TouchEvent<HTMLDivElement>,
   ) => {
-    let startX: number;
-
-    // Check if the event is a TouchEvent (touches exist on TouchEvent)
-    if ('touches' in e) {
-      startX = e.touches[0].clientX; // TouchEvent uses touches array
-    } else {
-      startX = e.pageX; // MouseEvent uses pageX
-    }
-
+    setOffsetType('px');
+    const startX = 'touches' in e ? e.touches[0].clientX : e.pageX;
     setDragStartX(startX);
     setIsDragging(true);
   };
@@ -45,40 +40,32 @@ export default function MultiImageCarousel() {
     e: React.MouseEvent<HTMLDivElement> | React.TouchEvent<HTMLDivElement>,
   ) => {
     if (!isDragging) return;
-    let currentX: number;
-    if ('touches' in e) {
-      currentX = e.touches[0].clientX;
-    } else {
-      currentX = e.pageX;
-    }
+
+    const currentX = 'touches' in e ? e.touches[0].clientX : e.pageX;
     setDragOffset(currentX - dragStartX);
   };
 
   // Handle drag end
   const handleDragEnd = () => {
-    if (Math.abs(dragOffset) > 50) {
-      if (dragOffset < 0) {
-        nextSlide();
-      } else {
-        prevSlide();
-      }
-    }
+    setFinalOffset(finalOffset + dragOffset); // Keep track of cumulative offset
     setIsDragging(false);
-    setDragOffset(0);
+    setDragOffset(0); // Reset drag offset after drag ends
+    // setFinalOffset(0);
   };
 
   const prevSlide = () => {
-    setCurrentIndex(currentIndex === 0 ? 0 : currentIndex - 1);
+    setOffsetType('%');
+    const newIndex = currentIndex === 0 ? 0 : currentIndex - 1;
+    setCurrentIndex(newIndex);
+    setFinalOffset(-newIndex * (100 / itemsPerView)); // Update finalOffset to reflect the new position
   };
 
   const nextSlide = () => {
-    const newIndex = currentIndex + 1;
-    setCurrentIndex(
-      newIndex > images.length - itemsPerView + 2
-        ? images.length - itemsPerView + 2
-        : newIndex,
-    );
-    // setCurrentIndex((currentIndex + 1) % (images.length - itemsPerView + 1));
+    setOffsetType('%');
+    const maxIndex = images.length - itemsPerView;
+    const newIndex = currentIndex < maxIndex ? currentIndex + 1 : maxIndex;
+    setCurrentIndex(newIndex);
+    setFinalOffset(-newIndex * (100 / itemsPerView)); // Update finalOffset to reflect the new position
   };
 
   return (
@@ -100,7 +87,7 @@ export default function MultiImageCarousel() {
         <div
           className="carousel"
           style={{
-            transform: `translateX(calc(-${(currentIndex / images.length) * 100}% + ${dragOffset}px))`,
+            transform: `translateX(calc(${finalOffset}${offsetType} + ${dragOffset}${offsetType}))`,
             width: `${(images.length / itemsPerView) * 100}%`,
             transition: isDragging ? 'none' : 'transform 0.5s ease-in-out',
           }}
diff --git a/src/app/globals.css b/src/app/globals.css
index 9caecb8..84d418a 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -135,7 +135,7 @@ p {
 }
 
 .carousel-item {
-  min-width: calc(100% / 5); /* Adjust based on number of visible items */
+  min-width: calc(100% / 7); /* Adjust based on number of visible items */
   flex: 1 0 auto;
   padding: 0 10px;
 }
@@ -181,3 +181,7 @@ p {
 .next {
   right: 10px;
 }
+
+.max-width-100 {
+  max-width: 100%;
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 27bcc9f..9e74f68 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -43,7 +43,7 @@ export default async function Home() {
         </div>
       </section>
       <section className="usa-section">
-        <div className="grid-container">
+        <div className="grid-container padding-x-0 max-width-100">
           <Grid row>
             <Grid col={12} className="flex-center">
               {MarkdownContent('homepage/section_4.md')}