v4.1.1 #65

iRoachie · Aug 10, 2019 · 72e1bff · 72e1bff
2 parents 7684195 + cfde9eb
commit 72e1bff
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 48 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-material-tabs",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "Material Design implementation of Tabs",
   "keywords": [
     "react",

diff --git a/src/components/MaterialTabs.tsx b/src/components/MaterialTabs.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import {
   Animated,
   ScrollView,
@@ -57,63 +57,76 @@ const MaterialTabs: React.FC<Props> = ({
   const scrollView = React.createRef<ScrollView>();
   const bar = React.createRef<View>();
 
-  useEffect(() => {
-    bar.current &&
-      bar.current.measure((_, b, width) => {
-        getTabWidth(width);
-      });
+  const getTabWidth = useCallback(
+    (width: number) => {
+      if (!scrollable) {
+        setTabWidth(width / items.length);
+      }
 
-    selectTab();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [items, barWidth]);
+      setBarWidth(width);
+    },
+    [items.length, scrollable]
+  );
 
-  const getAnimateValues = () => {
-    const scrollValue = !scrollable ? tabWidth : barWidth * 0.4;
+  useEffect(() => {
+    const getAnimateValues = () => {
+      const scrollValue = !scrollable ? tabWidth : barWidth * 0.4;
 
-    const indicator = I18nManager.isRTL
-      ? -selectedIndex * scrollValue
-      : selectedIndex * scrollValue;
+      const indicator = I18nManager.isRTL
+        ? -selectedIndex * scrollValue
+        : selectedIndex * scrollValue;
+
+      // All props for fixed tabs are the same
+      if (!scrollable) {
+        return {
+          indicatorPosition: indicator,
+          scrollPosition: 0,
+        };
+      }
 
-    // All props for fixed tabs are the same
-    if (!scrollable) {
       return {
         indicatorPosition: indicator,
-        scrollPosition: 0,
+        scrollPosition: I18nManager.isRTL
+          ? scrollValue * 0.25 +
+            scrollValue * (items.length - selectedIndex - 2)
+          : scrollValue * 0.25 + scrollValue * (selectedIndex - 1),
       };
-    }
-
-    return {
-      indicatorPosition: indicator,
-      scrollPosition: I18nManager.isRTL
-        ? scrollValue * 0.25 + scrollValue * (items.length - selectedIndex - 2)
-        : scrollValue * 0.25 + scrollValue * (selectedIndex - 1),
     };
-  };
 
-  const getTabWidth = (width: number) => {
-    if (!scrollable) {
-      setTabWidth(width / items.length);
-    }
-
-    setBarWidth(width);
-  };
-
-  const selectTab = () => {
-    const values = getAnimateValues();
-
-    Animated.spring(indicatorPosition, {
-      toValue: values.indicatorPosition,
-      tension: 300,
-      friction: 20,
-      useNativeDriver: true,
-    }).start();
+    const selectTab = () => {
+      const values = getAnimateValues();
+
+      Animated.spring(indicatorPosition, {
+        toValue: values.indicatorPosition,
+        tension: 300,
+        friction: 20,
+        useNativeDriver: true,
+      }).start();
+
+      if (scrollView.current) {
+        scrollView.current.scrollTo({
+          x: values.scrollPosition,
+        });
+      }
+    };
 
-    if (scrollView.current) {
-      scrollView.current.scrollTo({
-        x: values.scrollPosition,
+    bar.current &&
+      bar.current.measure((_, b, width) => {
+        getTabWidth(width);
       });
-    }
-  };
+
+    selectTab();
+  }, [
+    bar,
+    barWidth,
+    getTabWidth,
+    indicatorPosition,
+    items.length,
+    scrollView,
+    scrollable,
+    selectedIndex,
+    tabWidth,
+  ]);
 
   return (
     items && (