From c5886508ebdaf2be2f9215f3e84e8fbed3fa43dc Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 28 May 2020 20:50:53 -0500 Subject: [PATCH] Pull reduceMotion from Redux store --- .../features/ui/util/optional_motion.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/ui/util/optional_motion.js b/app/soapbox/features/ui/util/optional_motion.js index df3a8b54a..b1e7355d2 100644 --- a/app/soapbox/features/ui/util/optional_motion.js +++ b/app/soapbox/features/ui/util/optional_motion.js @@ -1,5 +1,20 @@ -import { reduceMotion } from '../../../initial_state'; +import React from 'react'; +import PropTypes from 'prop-types'; +import { connect } from 'react-redux'; import ReducedMotion from './reduced_motion'; import Motion from 'react-motion/lib/Motion'; +import { getSettings } from 'soapbox/actions/settings'; -export default reduceMotion ? ReducedMotion : Motion; +const mapStateToProps = state => ({ + reduceMotion: getSettings(state).get('reduceMotion'), +}); + +const OptionalMotion = props => ( + props.reduceMotion ? : +); + +OptionalMotion.propTypes = { + reduceMotion: PropTypes.bool, +}; + +export default connect(mapStateToProps)(OptionalMotion);