From 60fdf02112ff403d4b2c117dc03139b4f10931db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= <hello@flayks.com>
Date: Mon, 6 Apr 2020 12:14:48 +0200
Subject: [PATCH] Photo: Tweak reveal animations and fix horizontal scroll

- Photo number doesn't jumps anymore (now reveals based on photo not the number)
- Properly reveal title locations lines
- Optimize code
---
 src/animations/Photo.js          | 73 ++++++++++++++++++--------------
 src/molecules/Photo.svelte       | 22 +++++-----
 src/style/molecules/_photo.scss  |  9 +++-
 src/style/organisms/_photos.scss | 13 +++---
 4 files changed, 67 insertions(+), 50 deletions(-)

diff --git a/src/animations/Photo.js b/src/animations/Photo.js
index 8b83b66..b850902 100644
--- a/src/animations/Photo.js
+++ b/src/animations/Photo.js
@@ -2,30 +2,40 @@ import anime from 'animejs'
 import ScrollOut from 'scroll-out'
 import imagesLoaded from 'imagesloaded'
 import { throttle, parallaxAnime } from 'utils/functions'
+import { animDuration } from 'utils/store'
 
 
 /*
 ** Transition In
 */
 export const animateIn = scope => {
-    // Title (reveal on scroll)
-    const titleReveal = ScrollOut({
+    const tlLocation = anime.timeline({
+        easing: 'easeOutQuart',
+        duration: 1000,
+        autoplay: false
+    })
+    // Title
+    tlLocation.add({
+        targets: scope.querySelectorAll('.photo__location .line span'),
+        translateY: ['100%', 0],
+        delay: anime.stagger(120)
+    }, 200)
+    // Description
+    tlLocation.add({
+        targets: scope.querySelectorAll('.photo__location p'),
+        opacity: [0, 1],
+        duration: animDuration
+    }, 400)
+
+    // Reveal on scroll
+    const photoReveal = ScrollOut({
         once: true,
-        targets: scope.querySelector('h2'),
-        onShown (el) {
-            // Title reveal
-            anime({
-                targets: el.querySelectorAll('span'),
-                translateY: ['100%', 0],
-                easing: 'easeOutQuart',
-                duration: 1000,
-                delay: anime.stagger(120)
-            })
-        }
+        targets: scope,
+        onShown: () => tlLocation.restart()
     })
 
 
-    // Photo (reveal on scroll)
+    // Image (reveal on scroll)
     const photoImage = scope.querySelector('.photo__image')
     const photoAnim = anime.timeline({
         easing: 'easeOutQuart',
@@ -46,29 +56,30 @@ export const animateIn = scope => {
         const photoReveal = ScrollOut({
             once: true,
             targets: photoImage,
-            onShown: el => photoAnim.restart()
+            onShown: () => photoAnim.restart()
         })
     })
 
 
     // Number parallax on scroll
-    const nbParallaxMedia = window.matchMedia('(min-width: 768px)')
-    const nbParallax = matchMedia => {
+    const media768 = window.matchMedia('(min-width: 768px)')
+    const number = scope.querySelector('.photo__number')
+    const numberPallax = anime({
+        targets: number.querySelector('span'),
+        translateY: (window.innerWidth <= 768) ? ['0%', '20%'] : ['-20%', '20%'],
+        duration: 2000,
+        easing: 'linear',
+        autoplay: false
+    })
+    const numberPallaxScroll = matchMedia => {
         if (matchMedia.matches) {
             const scroll = ScrollOut({
-                targets: scope.querySelector('.photo__number span'),
-                onShown (el) {
-                    const translate = anime({
-                        targets: el,
-                        translateY: (window.innerWidth <= 768) ? ['0%', '20%'] : ['-15%', '15%'],
-                        duration: 2000,
-                        easing: 'linear',
-                        autoplay: false
-                    })
-                    window.addEventListener('scroll', throttle(() => parallaxAnime(el, translate), 50))
-                    requestAnimationFrame(() => parallaxAnime(el, translate))
+                targets: scope,
+                onShown: (el) => {
+                    window.addEventListener('scroll', throttle(() => parallaxAnime(el, numberPallax), 50))
+                    requestAnimationFrame(() => parallaxAnime(el, numberPallax))
                 },
-                onHidden () {
+                onHidden: () => {
                     if (parallaxAnime) window.removeEventListener('scroll', parallaxAnime)
                 }
             })
@@ -76,6 +87,6 @@ export const animateIn = scope => {
     }
 
     // Listen on screen size to run the function
-    nbParallaxMedia.addListener(nbParallax)
-    nbParallax(nbParallaxMedia)
+    media768.addListener(numberPallax)
+    numberPallaxScroll(media768)
 }
diff --git a/src/molecules/Photo.svelte b/src/molecules/Photo.svelte
index 33a0ba8..9a0d352 100644
--- a/src/molecules/Photo.svelte
+++ b/src/molecules/Photo.svelte
@@ -37,8 +37,11 @@
     <div class="photo__location wrap">
         <div class="wrapper">
             <h2 class="title-location">
-                <span>{name.split(', ')[0]},</span>
-                <span>{name.split(', ')[1]}</span>
+                {#each name.split(', ') as line, i}
+                <span class="line">
+                    <span>{name.split(', ')[i]},</span>
+                </span>
+                {/each}
             </h2>
             <p class="style-caps">{location.region}, {location.country.name}</p>
         </div>
@@ -48,20 +51,15 @@
         <div class="align">
             <a href="/viewer/{location.country.slug}/{location.slug}/{photo.slug}" sapper-noscroll>
                 <picture class="photo__picture">
-                    <source media="(min-width: 992px)" data-srcset={getThumbnail(private_hash, 1300)}>
+                    <source media="(min-width: 992px)" data-srcset={getThumbnail(private_hash, 1200)}>
                     <source media="(min-width: 768px)" data-srcset={getThumbnail(private_hash, 992)}>
                     <source media="(min-width: 500px)" data-srcset={getThumbnail(private_hash, 650)}>
                     <source media="(min-width: 300px)" data-srcset={getThumbnail(private_hash, 400)}>
-                    {#if layout === 'list'}
-                    <img src="data:image/png;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="
-                        alt={imgAlt}
+                    <img src={layout === 'list' ? 'data:image/png;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=' : getThumbnail(private_hash, 900)}
                         width={defaultWidth} height={defaultHeight}
-                        class="lazyload">
-                    {:else}
-                    <img src="{getThumbnail(private_hash, 900)}"
-                         alt={imgAlt}
-                         width={defaultWidth} height={defaultHeight}>
-                    {/if}
+                        alt={imgAlt}
+                        class:lazyload={layout === 'list'}
+                    />
                 </picture>
             </a>
             <time class="photo__date" datetime={formatDate(date, 'DATETIME')}>
diff --git a/src/style/molecules/_photo.scss b/src/style/molecules/_photo.scss
index d779953..75ddf95 100644
--- a/src/style/molecules/_photo.scss
+++ b/src/style/molecules/_photo.scss
@@ -15,13 +15,18 @@
 
         h2 {
             text-align: left;
-            overflow: hidden;
 
             @include breakpoint (xs) {
                 font-size: rem(40px);
             }
+        }
+        .line {
+            overflow: hidden;
+            padding-bottom: 3px;
+            display: block;
 
             span {
+                position: relative;
                 display: block;
                 will-change: transform;
             }
@@ -29,6 +34,7 @@
         p {
             color: $color-lightgray;
             margin-top: 16px;
+            will-change: opacity;
         }
     }
 
@@ -143,6 +149,7 @@
         user-select: none;
 
         span {
+            position: relative;
             display: block;
             will-change: transform;
         }
diff --git a/src/style/organisms/_photos.scss b/src/style/organisms/_photos.scss
index 06c341f..18b49dc 100644
--- a/src/style/organisms/_photos.scss
+++ b/src/style/organisms/_photos.scss
@@ -53,15 +53,10 @@
     .photo {
         position: relative;
         z-index: 4;
-        margin-bottom: 88px;
-
-        @include breakpoint (sm) {
-            margin-bottom: 120px;
-        }
 
         // Last photo doesn't need spacing
         &:last-child {
-            margin-bottom: 0;
+            padding-bottom: 0;
         }
     }
 
@@ -79,6 +74,12 @@
 
         // Photo
         .photo {
+            padding-bottom: 80px;
+
+            @include breakpoint (sm) {
+                padding-bottom: 120px;
+            }
+
             // Even photos
             &:nth-child(even) {
                 @include breakpoint (sm) {