refactor: reuse formatStrategyValues

react-component · Nov 21, 2024 · a5625a1 · a5625a1
1 parent ff9f216
commit a5625a1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/src/OptionList.tsx b/src/OptionList.tsx
@@ -151,7 +151,7 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
 
   React.useEffect(() => {
     if (searchValue) {
-      setSearchExpandedKeys(getAllKeys(treeData, fieldNames));
+      setSearchExpandedKeys(getAllKeys(memoTreeData, fieldNames));
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchValue]);

diff --git a/src/TreeSelect.tsx b/src/TreeSelect.tsx
@@ -415,15 +415,15 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
       extra: { triggerValue?: SafeKey; selected?: boolean },
       source: SelectSource,
     ) => {
+      const formattedKeyList = formatStrategyValues(
+        newRawValues,
+        mergedShowCheckedStrategy,
+        keyEntities,
+        mergedFieldNames,
+      );
+
       // if multiple and maxCount is set, check if exceed maxCount
       if (mergedMultiple && maxCount !== undefined) {
-        const formattedKeyList = formatStrategyValues(
-          newRawValues,
-          mergedShowCheckedStrategy,
-          keyEntities,
-          mergedFieldNames,
-        );
-
         if (formattedKeyList.length > maxCount) {
           return;
         }
@@ -441,12 +441,6 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
       if (onChange) {
         let eventValues: SafeKey[] = newRawValues;
         if (treeConduction) {
-          const formattedKeyList = formatStrategyValues(
-            newRawValues,
-            mergedShowCheckedStrategy,
-            keyEntities,
-            mergedFieldNames,
-          );
           eventValues = formattedKeyList.map(key => {
             const entity = valueEntities.get(key);
             return entity ? entity.node[mergedFieldNames.value] : key;