From 7ec1fe7178f568c40df1a116a8788bb10a07b781 Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Mon, 29 Jun 2020 11:41:18 +0800
Subject: [PATCH] Use anime.timeline

---
 layout/_scripts/noscript.njk                  |  7 +-
 source/css/_common/outline/footer/footer.styl |  6 ++
 source/css/_common/outline/header/header.styl |  2 +-
 source/css/_schemes/Pisces/_sidebar.styl      |  8 +-
 source/js/motion.js                           | 95 +++++++++----------
 source/js/next-boot.js                        |  1 +
 6 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/layout/_scripts/noscript.njk b/layout/_scripts/noscript.njk
index 10f6f4f..4515f45 100644
--- a/layout/_scripts/noscript.njk
+++ b/layout/_scripts/noscript.njk
@@ -2,16 +2,17 @@
   <style>
   body { margin-top: 2rem; }
 
-  .use-motion .header-inner,
+  .use-motion .header,
   .use-motion .site-brand-container .toggle,
   .use-motion .menu-item,
-  .sidebar-inner,
+  .use-motion .sidebar,
   .use-motion .post-block,
   .use-motion .pagination,
   .use-motion .comments,
   .use-motion .post-header,
   .use-motion .post-body,
-  .use-motion .collection-header { opacity: initial; }
+  .use-motion .collection-header,
+  .use-motion .footer { opacity: initial; }
 
   .use-motion .site-title,
   .use-motion .site-subtitle,
diff --git a/source/css/_common/outline/footer/footer.styl b/source/css/_common/outline/footer/footer.styl
index e7a8b62..f7b9cd4 100644
--- a/source/css/_common/outline/footer/footer.styl
+++ b/source/css/_common/outline/footer/footer.styl
@@ -19,6 +19,12 @@
   main-container();
 }
 
+.use-motion {
+  .footer {
+    opacity: 0;
+  }
+}
+
 @keyframes icon-animate {
   0%, 100% {
     transform: scale(1);
diff --git a/source/css/_common/outline/header/header.styl b/source/css/_common/outline/header/header.styl
index dc12c74..3d63eca 100644
--- a/source/css/_common/outline/header/header.styl
+++ b/source/css/_common/outline/header/header.styl
@@ -24,7 +24,7 @@
 }
 
 .use-motion {
-  .header-inner, .site-brand-container .toggle {
+  .header, .site-brand-container .toggle {
     opacity: 0;
   }
 }
diff --git a/source/css/_schemes/Pisces/_sidebar.styl b/source/css/_schemes/Pisces/_sidebar.styl
index 14f50e0..87c2a63 100644
--- a/source/css/_schemes/Pisces/_sidebar.styl
+++ b/source/css/_schemes/Pisces/_sidebar.styl
@@ -11,6 +11,10 @@
   +tablet-mobile() {
     display: none;
   }
+
+  if (hexo-config('motion.enable') && hexo-config('motion.transition.sidebar')) {
+    opacity: 0;
+  }
 }
 
 .sidebar-toggle {
@@ -23,10 +27,6 @@
   box-shadow: $box-shadow;
   box-sizing: border-box;
   color: var(--text-color);
-
-  if (hexo-config('motion.enable') && hexo-config('motion.transition.sidebar')) {
-    opacity: 0;
-  }
 }
 
 .site-state-item a {
diff --git a/source/js/motion.js b/source/js/motion.js
index 752c65d..ccd7492 100644
--- a/source/js/motion.js
+++ b/source/js/motion.js
@@ -29,56 +29,39 @@ NexT.motion.integrator = {
 NexT.motion.middleWares = {
   logo: function(integrator) {
     const sequence = [];
-    const header = document.querySelector('.header-inner');
-    const image = document.querySelector('.custom-logo-image');
-    const title = document.querySelector('.site-title');
-    const subtitle = document.querySelector('.site-subtitle');
-    const toggle = document.querySelectorAll('.site-brand-container .toggle');
-    const logoLine = document.querySelectorAll('.logo-line');
 
-    function getMistLineSettings(element) {
-      Velocity.hook(element, 'scaleX', 0);
-      sequence.push({
-        e: element,
-        p: {
-          scaleX: 1
-        },
-        o: {
-          duration     : 500,
-          sequenceQueue: false
-        }
-      });
+    function getMistLineSettings(targets) {
+      sequence.push([{
+        targets,
+        scaleX  : [0, 1],
+        duration: 500
+      }, '-=200']);
     }
 
-    function pushToSequence(element) {
-      sequence.push({
-        e: element,
-        p: {
-          opacity: 1,
-          top    : 0
-        },
-        o: {
-          duration: 200
-        }
-      });
+    function pushToSequence(targets, sequenceQueue = false) {
+      sequence.push([{
+        targets,
+        opacity: 1,
+        top    : 0
+      }, sequenceQueue ? '-=200' : '-=0']);
     }
 
-    header && pushToSequence(header);
-    CONFIG.scheme === 'Mist' && logoLine.length && getMistLineSettings(logoLine);
-    CONFIG.scheme === 'Muse' && image && pushToSequence(image);
-    title && pushToSequence(title);
-    subtitle && pushToSequence(subtitle);
-    toggle.length && pushToSequence(toggle);
-    (CONFIG.scheme === 'Pisces' || CONFIG.scheme === 'Gemini') && image && pushToSequence(image);
+    pushToSequence('.header');
+    CONFIG.scheme === 'Mist' && getMistLineSettings('.logo-line');
+    CONFIG.scheme === 'Muse' && pushToSequence('.custom-logo-image');
+    pushToSequence('.site-title');
+    pushToSequence('.site-brand-container .toggle', true);
+    pushToSequence('.site-subtitle');
+    (CONFIG.scheme === 'Pisces' || CONFIG.scheme === 'Gemini') && pushToSequence('.custom-logo-image');
 
-    if (sequence.length > 0) {
-      sequence[sequence.length - 1].o.complete = function() {
-        integrator.next();
-      };
-      Velocity.RunSequence(sequence);
-    } else {
+    sequence[sequence.length - 1][0].complete = function() {
       integrator.next();
-    }
+    };
+    const timeline = window.anime.timeline({
+      duration: 200,
+      easing  : 'linear'
+    });
+    sequence.forEach(item => timeline.add(...item));
 
     if (CONFIG.motion.async) {
       integrator.next();
@@ -128,16 +111,16 @@ NexT.motion.middleWares = {
         }
       };
 
-      if (CONFIG.motion.transition.post_block) {
+      if (postBlockTransition) {
         Velocity(postBlock, 'transition.' + postBlockTransition, postMotionOptions);
       }
-      if (CONFIG.motion.transition.post_header) {
+      if (postHeaderTransition) {
         Velocity(postHeader, 'transition.' + postHeaderTransition, postMotionOptions);
       }
-      if (CONFIG.motion.transition.post_body) {
+      if (postBodyTransition) {
         Velocity(postBody, 'transition.' + postBodyTransition, postMotionOptions);
       }
-      if (CONFIG.motion.transition.coll_header) {
+      if (collHeaderTransition) {
         Velocity(collHeader, 'transition.' + collHeaderTransition, postMotionOptions);
       }
     }
@@ -147,15 +130,25 @@ NexT.motion.middleWares = {
   },
 
   sidebar: function(integrator) {
-    const sidebarAffix = document.querySelector('.sidebar-inner');
-    const sidebarAffixTransition = CONFIG.motion.transition.sidebar;
+    const sidebar = document.querySelector('.sidebar');
+    const sidebarTransition = CONFIG.motion.transition.sidebar;
     // Only for Pisces | Gemini.
-    if (sidebarAffixTransition && (CONFIG.scheme === 'Pisces' || CONFIG.scheme === 'Gemini')) {
-      Velocity(sidebarAffix, 'transition.' + sidebarAffixTransition, {
+    if (sidebarTransition && (CONFIG.scheme === 'Pisces' || CONFIG.scheme === 'Gemini')) {
+      Velocity(sidebar, 'transition.' + sidebarTransition, {
         display : null,
         duration: 200
       });
     }
     integrator.next();
+  },
+
+  footer: function(integrator) {
+    const footer = document.querySelector('.footer');
+    Velocity(footer, {
+      opacity: 1
+    }, {
+      duration: 200
+    });
+    integrator.next();
   }
 };
diff --git a/source/js/next-boot.js b/source/js/next-boot.js
index b5a79bb..67225fb 100644
--- a/source/js/next-boot.js
+++ b/source/js/next-boot.js
@@ -99,6 +99,7 @@ NexT.boot.motion = function() {
       .add(NexT.motion.middleWares.menu)
       .add(NexT.motion.middleWares.postList)
       .add(NexT.motion.middleWares.sidebar)
+      .add(NexT.motion.middleWares.footer)
       .bootstrap();
   }
   NexT.utils.updateSidebarPosition();