From a0dc3ed61dd2bea3628697ddddeeac593fb780cb Mon Sep 17 00:00:00 2001 From: Lachlan Kermode Date: Mon, 4 Feb 2019 10:06:26 +0000 Subject: [PATCH] lint --- src/components/Card.jsx | 3 +-- src/components/CardStack.jsx | 47 ++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/components/Card.jsx b/src/components/Card.jsx index 31978fb..5b27314 100644 --- a/src/components/Card.jsx +++ b/src/components/Card.jsx @@ -177,5 +177,4 @@ class Card extends React.Component { } // The ref to each card will be used in CardStack for programmatic scrolling -export default React.forwardRef((props, ref) => ); - +export default React.forwardRef((props, ref) => ) diff --git a/src/components/CardStack.jsx b/src/components/CardStack.jsx index 9f23157..c23a83c 100644 --- a/src/components/CardStack.jsx +++ b/src/components/CardStack.jsx @@ -6,15 +6,14 @@ import Card from './Card.jsx' import copy from '../js/data/copy.json' class CardStack extends React.Component { - - constructor() { + constructor () { super() this.refs = {} this.refCardStack = React.createRef() this.refCardStackContent = React.createRef() } - componentDidUpdate() { + componentDidUpdate () { const isNarrative = !!this.props.narrative if (isNarrative) { @@ -22,34 +21,34 @@ class CardStack extends React.Component { } } - scrollToCard() { + scrollToCard () { const duration = 500 const element = this.refCardStack.current const cardScroll = this.refs[this.props.narrative.current].current.offsetTop - 20 - let start = element.scrollTop; - let change = cardScroll - start; - let currentTime = 0; - const increment = 20; + let start = element.scrollTop + let change = cardScroll - start + let currentTime = 0 + const increment = 20 - //t = current time - //b = start value - //c = change in value - //d = duration + // t = current time + // b = start value + // c = change in value + // d = duration Math.easeInOutQuad = function (t, b, c, d) { - t /= d / 2; - if (t < 1) return c / 2 * t * t + b; - t--; - return - c / 2 * (t * (t - 2) - 1) + b; - }; + t /= d / 2 + if (t < 1) return c / 2 * t * t + b + t -= 1 + return -c / 2 * (t * (t - 2) - 1) + b + } - const animateScroll = function() { - currentTime += increment; - const val = Math.easeInOutQuad(currentTime, start, change, duration); - element.scrollTop = val; - if (currentTime < duration) setTimeout(animateScroll, increment); - }; - animateScroll(); + const animateScroll = function () { + currentTime += increment + const val = Math.easeInOutQuad(currentTime, start, change, duration) + element.scrollTop = val + if (currentTime < duration) setTimeout(animateScroll, increment) + } + animateScroll() } renderCards (events, selections) {