Merge pull request #14 from siriwatknp/develop

fix bug rules-of-hooks
siriwatknp · Jul 17, 2019 · 387474d · 387474d
2 parents a3678f3 + a31396d
commit 387474d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/src/hooks/useAutoCollapse.js b/src/hooks/useAutoCollapse.js
@@ -15,23 +15,24 @@ export default () => {
     autoCollapsedDisabled,
   } = useConfig();
 
-  if (autoCollapsedDisabled) {
-    return null;
-  }
-
   useEffect(() => {
-    if (collapsible && screen) {
-      if (collapsed && screen === collapsedBreakpoint) {
-        setCollapsed(false);
-      }
-      if (
-        !collapsed &&
-        keys.indexOf(screen) < keys.indexOf(collapsedBreakpoint)
-      ) {
-        setCollapsed(true);
+    // skip everything if user disable this feature in config
+    if (!autoCollapsedDisabled) {
+      if (collapsible && screen) {
+        if (collapsed && screen === collapsedBreakpoint) {
+          setCollapsed(false);
+        }
+        if (
+          !collapsed &&
+          keys.indexOf(screen) < keys.indexOf(collapsedBreakpoint)
+        ) {
+          setCollapsed(true);
+        }
       }
     }
   }, [screen]);
-
+  if (autoCollapsedDisabled) {
+    return null;
+  }
   return true;
 };
diff --git a/src/hooks/useHeightAdjustment.js b/src/hooks/useHeightAdjustment.js
@@ -21,16 +21,6 @@ export default (appBarHeight, interval) => {
   const getScreenValue = createGetScreenValue(keys, currentScreen);
   const initialHeight = getScreenValue(appBarHeight, initialAdjustmentHeight);
 
-  if (heightAdjustmentDisabled) return 0; // disabled by user.
-  if (navVariant === 'temporary') return 0;
-  if (!clipped) {
-    // do not run the effect below if behavior is not right.
-    return 0;
-  }
-  if (clipped && someIs(['sticky', 'fixed'], headerPosition)) {
-    return initialHeight;
-  }
-
   const [height, setHeight] = useState(initialHeight);
   const debounced = useRef(() =>
     setTimeout(() => {
@@ -46,5 +36,14 @@ export default (appBarHeight, interval) => {
       window.removeEventListener('scroll', debounced.current);
     };
   }, []);
+  if (heightAdjustmentDisabled) return 0; // disabled by user.
+  if (navVariant === 'temporary') return 0;
+  if (!clipped) {
+    // do not run the effect below if behavior is not right.
+    return 0;
+  }
+  if (clipped && someIs(['sticky', 'fixed'], headerPosition)) {
+    return initialHeight;
+  }
   return height;
 };