From b72a9eb02ea9dc81e7929f1fab4f3ac309f16b9b Mon Sep 17 00:00:00 2001
From: fusagiko / takayamaki <24884114+takayamaki@users.noreply.github.com>
Date: Mon, 17 Apr 2023 20:25:15 +0900
Subject: [PATCH] Rewrite AnimatedNumber component with React hooks (#24559)
---
.../mastodon/components/animated_number.jsx | 76 -------------------
.../mastodon/components/animated_number.tsx | 58 ++++++++++++++
2 files changed, 58 insertions(+), 76 deletions(-)
delete mode 100644 app/javascript/mastodon/components/animated_number.jsx
create mode 100644 app/javascript/mastodon/components/animated_number.tsx
diff --git a/app/javascript/mastodon/components/animated_number.jsx b/app/javascript/mastodon/components/animated_number.jsx
deleted file mode 100644
index ce688f04f2..0000000000
--- a/app/javascript/mastodon/components/animated_number.jsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import ShortNumber from 'mastodon/components/short_number';
-import TransitionMotion from 'react-motion/lib/TransitionMotion';
-import spring from 'react-motion/lib/spring';
-import { reduceMotion } from 'mastodon/initial_state';
-
-const obfuscatedCount = count => {
- if (count < 0) {
- return 0;
- } else if (count <= 1) {
- return count;
- } else {
- return '1+';
- }
-};
-
-export default class AnimatedNumber extends React.PureComponent {
-
- static propTypes = {
- value: PropTypes.number.isRequired,
- obfuscate: PropTypes.bool,
- };
-
- state = {
- direction: 1,
- };
-
- componentWillReceiveProps (nextProps) {
- if (nextProps.value > this.props.value) {
- this.setState({ direction: 1 });
- } else if (nextProps.value < this.props.value) {
- this.setState({ direction: -1 });
- }
- }
-
- willEnter = () => {
- const { direction } = this.state;
-
- return { y: -1 * direction };
- };
-
- willLeave = () => {
- const { direction } = this.state;
-
- return { y: spring(1 * direction, { damping: 35, stiffness: 400 }) };
- };
-
- render () {
- const { value, obfuscate } = this.props;
- const { direction } = this.state;
-
- if (reduceMotion) {
- return obfuscate ? obfuscatedCount(value) : ;
- }
-
- const styles = [{
- key: `${value}`,
- data: value,
- style: { y: spring(0, { damping: 35, stiffness: 400 }) },
- }];
-
- return (
-
- {items => (
-
- {items.map(({ key, data, style }) => (
- 0 ? 'absolute' : 'static', transform: `translateY(${style.y * 100}%)` }}>{obfuscate ? obfuscatedCount(data) : }
- ))}
-
- )}
-
- );
- }
-
-}
diff --git a/app/javascript/mastodon/components/animated_number.tsx b/app/javascript/mastodon/components/animated_number.tsx
new file mode 100644
index 0000000000..1673ff41bb
--- /dev/null
+++ b/app/javascript/mastodon/components/animated_number.tsx
@@ -0,0 +1,58 @@
+import React, { useCallback, useState } from 'react';
+import ShortNumber from './short_number';
+import { TransitionMotion, spring } from 'react-motion';
+import { reduceMotion } from '../initial_state';
+
+const obfuscatedCount = (count: number) => {
+ if (count < 0) {
+ return 0;
+ } else if (count <= 1) {
+ return count;
+ } else {
+ return '1+';
+ }
+};
+
+type Props = {
+ value: number;
+ obfuscate?: boolean;
+}
+export const AnimatedNumber: React.FC = ({
+ value,
+ obfuscate,
+})=> {
+ const [previousValue, setPreviousValue] = useState(value);
+ const [direction, setDirection] = useState<1|-1>(1);
+
+ if (previousValue !== value) {
+ setPreviousValue(value);
+ setDirection(value > previousValue ? 1 : -1);
+ }
+
+ const willEnter = useCallback(() => ({ y: -1 * direction }), [direction]);
+ const willLeave = useCallback(() => ({ y: spring(1 * direction, { damping: 35, stiffness: 400 }) }), [direction]);
+
+ if (reduceMotion) {
+ return obfuscate ? <>{obfuscatedCount(value)}> : ;
+ }
+
+ const styles = [{
+ key: `${value}`,
+ data: value,
+ style: { y: spring(0, { damping: 35, stiffness: 400 }) },
+ }];
+
+ return (
+
+ {items => (
+
+ {items.map(({ key, data, style }) => (
+ 0 ? 'absolute' : 'static', transform: `translateY(${style.y * 100}%)` }}>{obfuscate ? obfuscatedCount(data) : }
+ ))}
+
+ )}
+
+ );
+};
+
+export default AnimatedNumber;