From 92c4d428890b7d6dca3f6b8b6a134eaf017cb55b Mon Sep 17 00:00:00 2001
From: Azita Rahimi <a.rahimi@inova-agency.net>
Date: Sat, 11 Jul 2026 14:55:04 +0330
Subject: [PATCH] pic position + scroll fix

---
 src/assets/css/portfolio-responsive.css |   4 -
 src/assets/css/portfolio.css            |   2 +-
 src/assets/js/portfolio.js              | 163 ++++++++++++++++--------
 3 files changed, 111 insertions(+), 58 deletions(-)

diff --git a/src/assets/css/portfolio-responsive.css b/src/assets/css/portfolio-responsive.css
index eaad452..7392080 100644
--- a/src/assets/css/portfolio-responsive.css
+++ b/src/assets/css/portfolio-responsive.css
@@ -66,10 +66,6 @@
     width: 100%;
   }
 
-  .media {
-    width: auto;
-  }
-
   .result-section-box[data-card-count='4'] {
     grid-template-columns: repeat(2, minmax(0, 1fr));
   }
diff --git a/src/assets/css/portfolio.css b/src/assets/css/portfolio.css
index f299630..92bfc06 100644
--- a/src/assets/css/portfolio.css
+++ b/src/assets/css/portfolio.css
@@ -1791,7 +1791,7 @@ textarea {
   overflow: hidden;
 }
 .media {
-  height: 100%;
+  height: 669px;
   width: 100%;
   object-fit: cover;
   object-position: center;
diff --git a/src/assets/js/portfolio.js b/src/assets/js/portfolio.js
index 935f0e1..9345a30 100644
--- a/src/assets/js/portfolio.js
+++ b/src/assets/js/portfolio.js
@@ -669,68 +669,57 @@ function goToSlide(index) {
   }, 600);
 }
 
-showcase.addEventListener('wheel', function(e) {
-  const currentTime = new Date().getTime();
-  const isAtEnd = currentSlideIndex === totalSlides - 1;
-  const isAtStart = currentSlideIndex === 0;
+let isSectionPinned = false;
 
-  if ((e.deltaY > 0 && !isAtEnd) || (e.deltaY < 0 && !isAtStart)) {
-    e.preventDefault();
+const observer = new IntersectionObserver(
+  (entries) => {
+    entries.forEach((entry) => {
+      isSectionPinned = entry.isIntersecting;
+    });
+  },
+  {
+    threshold: 0.1, 
   }
+);
 
-  if (isAnimating || (currentTime - lastScrollTime < scrollCooldown)) {
-    return;
-  }
-  
-  if (Math.abs(e.deltaY) < 10) return; 
+observer.observe(showcase);
 
-  if (e.deltaY > 0) {
-    if (!isAtEnd) {
-      lastScrollTime = currentTime;
-      goToSlide(currentSlideIndex + 1);
+showcase.addEventListener(
+  'wheel',
+  function (e) {
+    const currentTime = new Date().getTime();
+    const isAtEnd = currentSlideIndex === totalSlides - 1;
+    const isAtStart = currentSlideIndex === 0;
+
+    const rect = showcase.getBoundingClientRect();
+
+    if (e.deltaY > 0 && rect.top > 5) {
+      return; 
     }
-  } else {
-    if (!isAtStart) {
-      lastScrollTime = currentTime;
-      goToSlide(currentSlideIndex - 1);
+
+    if (e.deltaY < 0 && rect.bottom < window.innerHeight - 5) {
+      return;
     }
-  }
-}, { passive: false });
 
-showcase.addEventListener('touchstart', function(e) {
-  touchStartY = e.touches[0].clientY;
-  touchStartX = e.touches[0].clientX;
-}, { passive: true });
-
-showcase.addEventListener('touchmove', function(e) {
-  if (!touchStartY) return;
-
-  const currentTouchY = e.touches[0].clientY;
-  const currentTouchX = e.touches[0].clientX;
+    if (isAtStart && e.deltaY < 0 && rect.top >= -5) {
+      return;
+    }
   
-  const diffY = touchStartY - currentTouchY;
-  const diffX = touchStartX - currentTouchX;
+    if (isAtEnd && e.deltaY > 0 && rect.bottom <= window.innerHeight + 5) {
+      return;
+    }
 
-  if (Math.abs(diffX) > Math.abs(diffY)) {
-    return;
-  }
+    if ((e.deltaY > 0 && !isAtEnd) || (e.deltaY < 0 && !isAtStart)) {
+      e.preventDefault();
+    }
 
-  const isAtEnd = currentSlideIndex === totalSlides - 1;
-  const isAtStart = currentSlideIndex === 0;
+    if (isAnimating || currentTime - lastScrollTime < scrollCooldown) {
+      return;
+    }
 
-  if ((diffY > 0 && !isAtEnd) || (diffY < 0 && !isAtStart)) {
-    if (e.cancelable) e.preventDefault();
-  } else {
-    return; 
-  }
+    if (Math.abs(e.deltaY) < 10) return;
 
-  const currentTime = new Date().getTime();
-  if (isAnimating || (currentTime - lastScrollTime < scrollCooldown)) {
-    return;
-  }
-
-  if (Math.abs(diffY) > 50) {
-    if (diffY > 0) {
+    if (e.deltaY > 0) {
       if (!isAtEnd) {
         lastScrollTime = currentTime;
         goToSlide(currentSlideIndex + 1);
@@ -741,9 +730,77 @@ showcase.addEventListener('touchmove', function(e) {
         goToSlide(currentSlideIndex - 1);
       }
     }
-    touchStartY = currentTouchY; 
-  }
-}, { passive: false });
+  },
+  { passive: false }
+);
+showcase.addEventListener('touchstart', function(e) {
+  touchStartY = e.touches[0].clientY;
+  touchStartX = e.touches[0].clientX;
+}, { passive: true });
+
+showcase.addEventListener(
+  'touchmove',
+  function (e) {
+    if (!touchStartY) return;
+
+    const currentTouchY = e.touches[0].clientY;
+    const currentTouchX = e.touches[0].clientX;
+
+    const diffY = touchStartY - currentTouchY;
+    const diffX = touchStartX - currentTouchX;
+
+    if (Math.abs(diffX) > Math.abs(diffY)) {
+      return;
+    }
+
+    const rect = showcase.getBoundingClientRect();
+
+    if (diffY > 0 && rect.top > 5) {
+      return;
+    }
+
+    if (diffY < 0 && rect.bottom < window.innerHeight - 5) {
+      return;
+    }
+
+    const isAtEnd = currentSlideIndex === totalSlides - 1;
+    const isAtStart = currentSlideIndex === 0;
+
+    if (isAtStart && diffY < 0 && rect.top >= -5) {
+      return;
+    }
+    if (isAtEnd && diffY > 0 && rect.bottom <= window.innerHeight + 5) {
+      return;
+    }
+
+    if ((diffY > 0 && !isAtEnd) || (diffY < 0 && !isAtStart)) {
+      if (e.cancelable) e.preventDefault();
+    } else {
+      return;
+    }
+
+    const currentTime = new Date().getTime();
+    if (isAnimating || currentTime - lastScrollTime < scrollCooldown) {
+      return;
+    }
+
+    if (Math.abs(diffY) > 50) {
+      if (diffY > 0) {
+        if (!isAtEnd) {
+          lastScrollTime = currentTime;
+          goToSlide(currentSlideIndex + 1);
+        }
+      } else {
+        if (!isAtStart) {
+          lastScrollTime = currentTime;
+          goToSlide(currentSlideIndex - 1);
+        }
+      }
+      touchStartY = currentTouchY;
+    }
+  },
+  { passive: false }
+);
 
 showcase.addEventListener('touchend', function() {
   touchStartY = 0;