fix: collapse 异步bug (#130)

* fix: 修复collapse 异步使用bug
AntmJS · Dec 20, 2021 · 31f0bc7 · 31f0bc7
1 parent a4c02fd
commit 31f0bc7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/packages/react-demo/package.json b/packages/react-demo/package.json
@@ -3,7 +3,7 @@
   "version": "1.4.3",
   "private": true,
   "dependencies": {
-    "@antmjs/vantui": "1.4.3",
+    "@antmjs/vantui": "^1.4.3",
     "@babel/core": "7.12.3",
     "@pmmmwh/react-refresh-webpack-plugin": "0.4.3",
     "@svgr/webpack": "5.5.0",

diff --git a/packages/vantui-demo/package.json b/packages/vantui-demo/package.json
@@ -109,7 +109,7 @@
   },
   "dependencies": {
     "@antmjs/mini-fix": "^1.12.0",
-    "@antmjs/vantui": "1.4.3",
+    "@antmjs/vantui": "^1.4.3",
     "@babel/runtime-corejs3": "^7.14.7",
     "@tarojs/components": "3.3.11",
     "@tarojs/react": "3.3.11",

diff --git a/packages/vantui/src/collapse-item/animate.ts b/packages/vantui/src/collapse-item/animate.ts
@@ -82,7 +82,7 @@ export function setContentAnimate(
     .then((rect: any) => {
       return process.env.TARO_ENV === 'h5'
         ? ref.current.clientHeight
-        : rect.height
+        : rect?.height
     })
     .then((height) => {
       useAnimation(expanded, mounted, height, setState)

diff --git a/packages/vantui/src/collapse-item/index.tsx b/packages/vantui/src/collapse-item/index.tsx
@@ -55,14 +55,16 @@ export function CollapseItem(
     }
   })
   useEffect(() => {
-    if (process.env.TARO_ENV === 'h5') {
+    // if (process.env.TARO_ENV === 'h5') {
+    setTimeout(() => {
       setState((state) => {
         return {
           ...state,
           ready: true,
         }
       })
-    }
+    }, 0)
+    // }
   }, [])
 
   const refDom = useRef(null)