From 934abc266f7a13404afab2af91b36e611195a8ff Mon Sep 17 00:00:00 2001
From: WmW <48251883+nullptr-z@users.noreply.github.com>
Date: Wed, 2 Mar 2022 14:46:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(Tree):=20=E4=BF=AE=E5=A4=8D=20autoExpandPar?=
 =?UTF-8?q?ent=20=E4=B8=BA=20true=20=E6=97=B6=20openKeys=20=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98=20#582=20(#588)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/react-tree/src/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/react-tree/src/index.tsx b/packages/react-tree/src/index.tsx
index 684bcac73c..45e375b5ea 100644
--- a/packages/react-tree/src/index.tsx
+++ b/packages/react-tree/src/index.tsx
@@ -144,18 +144,18 @@ export default function Tree(props: TreeProps) {
   const [curSelectedKeys, setCurSelectedKeys] = useState(selectedKeys);
 
   useEffect(() => {
-    setCurSelectedKeys(props.selectedKeys!);
+    setCurSelectedKeys(props.selectedKeys || []);
   }, [JSON.stringify(props.selectedKeys)]);
 
   // useEffect(() => setCurOpenKeys(openKeys), [openKeys]);
   // useEffect(() => setCurSelectedKeys(selectedKeys), [selectedKeys]);
 
   useEffect(() => {
-    let arrOpenKeys: TreeData['key'][] = [];
+    let arrOpenKeys: TreeData['key'][] = curOpenKeys;
     if (defaultExpandAll) {
       arrOpenKeys = getChildKeys(data);
     } else if (autoExpandParent) {
-      arrOpenKeys = getChildKeys(data, undefined, 1);
+      arrOpenKeys.push(...getChildKeys(data, undefined, 1));
     }
     setCurOpenKeys(arrOpenKeys);
   }, []);