Convert OptionalMotion and ReducedMotion to TypeScript

app/soapbox/features/ui/util/optional_motion.js

@@ -1,22 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Motion from 'react-motion/lib/Motion';
-import { connect } from 'react-redux';
-
-import { getSettings } from 'soapbox/actions/settings';
-
-import ReducedMotion from './reduced_motion';
-
-const mapStateToProps = state => ({
-  reduceMotion: getSettings(state).get('reduceMotion'),
-});
-
-const OptionalMotion = props => (
-  props.reduceMotion ? <ReducedMotion {...props} /> : <Motion {...props} />
-);
-
-OptionalMotion.propTypes = {
-  reduceMotion: PropTypes.bool,
-};
-
-export default connect(mapStateToProps)(OptionalMotion);

app/soapbox/features/ui/util/optional_motion.tsx

@@ -0,0 +1,16 @@
+import React from 'react';
+import { Motion, MotionProps } from 'react-motion';
+
+import { useSettings } from 'soapbox/hooks';
+
+import ReducedMotion from './reduced_motion';
+
+const OptionalMotion = (props: MotionProps) => {
+  const reduceMotion = useSettings().get('reduceMotion');
+
+  return (
+    reduceMotion ? <ReducedMotion {...props} /> : <Motion {...props} />
+  );
+};
+
+export default OptionalMotion;

app/soapbox/features/ui/util/reduced_motion.js

@@ -1,44 +0,0 @@
-// Like react-motion's Motion, but reduces all animations to cross-fades
-// for the benefit of users with motion sickness.
-import PropTypes from 'prop-types';
-import React from 'react';
-import Motion from 'react-motion/lib/Motion';
-
-const stylesToKeep = ['opacity', 'backgroundOpacity'];
-
-const extractValue = (value) => {
-  // This is either an object with a "val" property or it's a number
-  return (typeof value === 'object' && value && 'val' in value) ? value.val : value;
-};
-
-class ReducedMotion extends React.Component {
-
-  static propTypes = {
-    defaultStyle: PropTypes.object,
-    style: PropTypes.object,
-    children: PropTypes.func,
-  }
-
-  render() {
-
-    const { style, defaultStyle, children } = this.props;
-
-    Object.keys(style).forEach(key => {
-      if (stylesToKeep.includes(key)) {
-        return;
-      }
-      // If it's setting an x or height or scale or some other value, we need
-      // to preserve the end-state value without actually animating it
-      style[key] = defaultStyle[key] = extractValue(style[key]);
-    });
-
-    return (
-      <Motion style={style} defaultStyle={defaultStyle}>
-        {children}
-      </Motion>
-    );
-  }
-
-}
-
-export default ReducedMotion;

app/soapbox/features/ui/util/reduced_motion.tsx

@@ -0,0 +1,31 @@
+// Like react-motion's Motion, but reduces all animations to cross-fades
+// for the benefit of users with motion sickness.
+import React from 'react';
+import { Motion, MotionProps } from 'react-motion';
+
+const stylesToKeep = ['opacity', 'backgroundOpacity'];
+
+const extractValue = (value: any) => {
+  // This is either an object with a "val" property or it's a number
+  return (typeof value === 'object' && value && 'val' in value) ? value.val : value;
+};
+
+const ReducedMotion: React.FC<MotionProps> = ({ style = {}, defaultStyle = {}, children }) => {
+
+  Object.keys(style).forEach(key => {
+    if (stylesToKeep.includes(key)) {
+      return;
+    }
+    // If it's setting an x or height or scale or some other value, we need
+    // to preserve the end-state value without actually animating it
+    style[key] = defaultStyle[key] = extractValue(style[key]);
+  });
+
+  return (
+    <Motion style={style} defaultStyle={defaultStyle}>
+      {children}
+    </Motion>
+  );
+};
+
+export default ReducedMotion;