Merge branch 'fix/tabs'

mallfoundry · Sep 8, 2021 · 401e87d · 401e87d
2 parents ee4246c + 520a3ee
commit 401e87d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/packages/core/src/tabs/tabs-header.tsx b/packages/core/src/tabs/tabs-header.tsx
@@ -1,5 +1,5 @@
 import { ScrollView, View } from "@tarojs/components"
-import { nextTick, offWindowResize, onWindowResize, useReady } from "@tarojs/taro"
+import { offWindowResize, onWindowResize, useReady } from "@tarojs/taro"
 import classNames from "classnames"
 import * as _ from "lodash"
 import * as React from "react"
@@ -35,9 +35,10 @@ export default function TabsHeader() {
   const [navOffset, setNavOffset] = useState<NavOffset>({})
   const [tabOffsets, setTabOffsets] = useState<TabOffset[]>([])
 
-  const activeIndex = useMemo(() => {
-    return _.find(tabObjects, (tab) => tab.key === activeKey)?.index ?? -1
-  }, [tabObjects, activeKey])
+  const activeIndex = useMemo(
+    () => _.find(tabObjects, (tab) => tab.key === activeKey)?.index ?? -1,
+    [tabObjects, activeKey],
+  )
 
   const activeOffset = useMemo(() => {
     if (_.isEmpty(tabOffsets) || activeIndex === -1) {
@@ -60,14 +61,12 @@ export default function TabsHeader() {
   }, [navOffset, activeOffset])
 
   const resize = useCallback(() => {
-    nextTick(() => {
-      Promise.all([
-        getBoundingClientRect(navRef),
-        getBoundingClientRects(navRef, ` .${prefixClassname("tabs__tab")}`),
-      ]).then(([navRect, tabRects]) => {
-        setNavOffset(navRect)
-        setTabOffsets(tabRects)
-      })
+    Promise.all([
+      getBoundingClientRect(navRef),
+      getBoundingClientRects(navRef, ` .${prefixClassname("tabs__tab")}`),
+    ]).then(([navRect, tabRects]) => {
+      setNavOffset(navRect)
+      setTabOffsets(tabRects)
     })
   }, [])
 

diff --git a/packages/core/src/tabs/tabs.tsx b/packages/core/src/tabs/tabs.tsx
@@ -1,7 +1,7 @@
 import { View } from "@tarojs/components"
 import classNames from "classnames"
 import * as React from "react"
-import { Children, ReactElement, ReactNode, useMemo, useRef } from "react"
+import { Children, isValidElement, ReactElement, ReactNode, useMemo, useRef } from "react"
 import Sticky from "../sticky"
 import { prefixClassname } from "../styles"
 import TabPane from "./tab-pane"
@@ -16,7 +16,7 @@ function useTabObjects(children: ReactNode) {
 
     let index = 0
     Children.forEach(children, (node: ReactNode, i: number) => {
-      if (!React.isValidElement(node)) {
+      if (!isValidElement(node)) {
         return node
       }
       const element = node as ReactElement