chore: handle git conflicts manually

Author: aojunhao123

src/OptionList.tsx

@@ -158,10 +158,6 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
 
   // >>> Disabled Strategy
   const disabledStrategy = (node: DataNode) => {
-    // if (node.disabled) {
-    //   return true;
-    // }
-
     if (isOverMaxCount) {
       const selectedValues = displayValues?.map(v => v.value) || [];
       if (!selectedValues.includes(node[fieldNames.value])) {
@@ -309,13 +305,15 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
     onKeyUp: () => {},
   }));
 
-  const loadDataFun = useMemo(
-    () => (searchValue ? null : (loadData as any)),
+  const hasLoadDataFn = useMemo(
+    () => (searchValue ? false : true),
     [searchValue, treeExpandedKeys || expandedKeys],
     ([preSearchValue], [nextSearchValue, nextExcludeSearchExpandedKeys]) =>
       preSearchValue !== nextSearchValue && !!(nextSearchValue || nextExcludeSearchExpandedKeys),
   );
 
+  const syncLoadData = hasLoadDataFn ? loadData : null;
+
   const onActiveChange = (key: Key) => {
     if (!isOverMaxCount) {
       setActiveKey(key);
@@ -364,7 +362,7 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
         showIcon={showTreeIcon}
         switcherIcon={switcherIcon}
         showLine={treeLine}
-        loadData={loadDataFun}
+        loadData={syncLoadData}
         motion={treeMotion}
         activeKey={activeKey}
         // We handle keys by out instead tree self

tests/Select.loadData.spec.tsx

@@ -0,0 +1,46 @@
+/* eslint-disable no-undef, react/no-multi-comp, no-console */
+import React from 'react';
+import { render, fireEvent, act } from '@testing-library/react';
+
+import TreeSelect from '../src';
+
+describe('TreeSelect.loadData', () => {
+  it('keep sync', async () => {
+    const Demo = () => {
+      const [treeData, setTreeData] = React.useState([
+        {
+          title: '0',
+          value: 0,
+          isLeaf: false,
+        },
+      ]);
+
+      const loadData = async () => {
+        const nextId = treeData.length;
+
+        setTreeData([
+          ...treeData,
+          {
+            title: `${nextId}`,
+            value: nextId,
+            isLeaf: false,
+          },
+        ]);
+      };
+
+      return <TreeSelect open treeData={treeData} loadData={loadData} />;
+    };
+
+    render(<Demo />);
+
+    for (let i = 0; i < 5; i += 1) {
+      fireEvent.click(document.querySelector('.rc-tree-select-tree-switcher_close'));
+      await act(async () => {
+        await Promise.resolve();
+      });
+      expect(
+        document.querySelectorAll('.rc-tree-select-tree-list .rc-tree-select-tree-treenode'),
+      ).toHaveLength(2 + i);
+    }
+  });
+});