chore: sync with rainbow

rainbow-me · Mar 12, 2021 · 4eb0d28 · 4eb0d28
1 parent 52c8b2f
commit 4eb0d28
Show file tree

Hide file tree

Showing 7 changed files with 205 additions and 192 deletions.
diff --git a/src/charts/linear/ChartDot.js b/src/charts/linear/ChartDot.js
@@ -1,23 +1,10 @@
 import React, { useContext } from 'react';
-// eslint-disable-next-line import/no-unresolved
-import Animated, { useAnimatedStyle } from 'react-native-reanimated';
+import Animated from 'react-native-reanimated';
 import ChartContext from '../../helpers/ChartContext';
 import withReanimatedFallback from '../../helpers/withReanimatedFallback';
 
 function ChartDot({ style, size = 10, ...props }) {
-  const { dotScale, positionX, positionY } = useContext(ChartContext);
-  const dotStyle = useAnimatedStyle(
-    () => ({
-      opacity: dotScale.value,
-      transform: [
-        { translateX: positionX.value },
-        { translateY: positionY.value + 10 }, // TODO temporary fix for clipped chart
-        { scale: dotScale.value },
-      ],
-    }),
-    undefined,
-    'dotStyle'
-  );
+  const { dotStyle } = useContext(ChartContext);
 
   return (
     <Animated.View

diff --git a/src/charts/linear/ChartLabels.js b/src/charts/linear/ChartLabels.js
@@ -3,7 +3,6 @@ import { TextInput } from 'react-native';
 import Animated, {
   useAnimatedStyle,
   useDerivedValue,
-  // eslint-disable-next-line import/no-unresolved
 } from 'react-native-reanimated';
 import ChartContext from '../../helpers/ChartContext';
 
@@ -12,22 +11,14 @@ const AnimatedTextInput = Animated.createAnimatedComponent(TextInput);
 function ChartLabelFactory(style) {
   return function ChartLabel({ format, ...props }) {
     const { [style]: val = 0 } = useContext(ChartContext);
-    const formattedValue = useDerivedValue(
-      () => {
-        return format ? format(val.value) : val.value;
-      },
-      undefined,
-      style + 'formattedValue'
-    );
-    const textProps = useAnimatedStyle(
-      () => {
-        return {
-          text: formattedValue.value,
-        };
-      },
-      undefined,
-      style + 'textProps'
-    );
+    const formattedValue = useDerivedValue(() => {
+      return format ? format(val.value) : val.value;
+    }, []);
+    const textProps = useAnimatedStyle(() => {
+      return {
+        text: formattedValue.value,
+      };
+    }, []);
     return (
       <AnimatedTextInput
         {...props}