chore: add warning

Author: zombieJ

src/OptionList.tsx

@@ -49,7 +49,8 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
     treeTitleRender,
     onPopupScroll,
     leftMaxCount,
-    showCheckedStrategy,
+    leafCountOnly,
+    valueEntities,
   } = React.useContext(TreeSelectContext);
 
   const {
@@ -180,12 +181,16 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
       return false;
     }
 
-    console.log('--->', node);
+    // console.log('--->', node);
 
     if (leftMaxCount === null) {
       return false;
     }
 
+    if (!leafCountOnly && leftMaxCount <= 0) {
+      return true;
+    }
+
     // const cacheKey = `${nodeValue}-${checkedKeys.join(',')}-${maxCount}`;
 
     // // check cache

src/TreeSelect.tsx

@@ -226,6 +226,7 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
   const mergedTreeData = useTreeData(treeData, children, treeDataSimpleMode);
 
   const { keyEntities, valueEntities } = useDataEntities(mergedTreeData, mergedFieldNames);
+  console.log('-->', valueEntities);
 
   /** Get `missingRawValues` which not exist in the tree yet */
   const splitRawValues = React.useCallback(
@@ -630,7 +631,9 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
       treeTitleRender,
       onPopupScroll,
       leftMaxCount: maxCount ? maxCount - cachedDisplayValues.length : null,
-      showCheckedStrategy: mergedShowCheckedStrategy,
+      leafCountOnly:
+        mergedShowCheckedStrategy === 'SHOW_CHILD' && !treeCheckStrictly && !!treeCheckable,
+      valueEntities,
     };
   }, [
     virtual,
@@ -647,6 +650,9 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
     maxCount,
     cachedDisplayValues.length,
     mergedShowCheckedStrategy,
+    treeCheckStrictly,
+    treeCheckable,
+    valueEntities,
   ]);
 
   // ======================= Legacy Context =======================

src/TreeSelectContext.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import type { ExpandAction } from 'rc-tree/lib/Tree';
 import type { DataNode, FieldNames, Key } from './interface';
-import type { CheckedStrategy } from './utils/strategyUtil';
+import type useDataEntities from './hooks/useDataEntities';
 
 export interface TreeSelectContextProps {
   virtual?: boolean;
@@ -15,8 +15,12 @@ export interface TreeSelectContextProps {
   treeExpandAction?: ExpandAction;
   treeTitleRender?: (node: any) => React.ReactNode;
   onPopupScroll?: React.UIEventHandler<HTMLDivElement>;
-  leftMaxCount?: number | null;
-  showCheckedStrategy?: CheckedStrategy;
+
+  // For `maxCount` usage
+  leftMaxCount: number | null;
+  /** When `true`, only take leaf node as count, or take all as count with `maxCount` limitation */
+  leafCountOnly: boolean;
+  valueEntities: ReturnType<typeof useDataEntities>['valueEntities'];
 }
 
 const TreeSelectContext = React.createContext<TreeSelectContextProps>(null as any);

src/utils/warningPropsUtil.ts

@@ -10,6 +10,8 @@ function warningProps(props: TreeSelectProps & { searchPlaceholder?: string }) {
     labelInValue,
     value,
     multiple,
+    showCheckedStrategy,
+    maxCount,
   } = props;
 
   warning(!searchPlaceholder, '`searchPlaceholder` has been removed.');
@@ -20,7 +22,7 @@ function warningProps(props: TreeSelectProps & { searchPlaceholder?: string }) {
 
   if (labelInValue || treeCheckStrictly) {
     warning(
-      toArray(value).every((val) => val && typeof val === 'object' && 'value' in val),
+      toArray(value).every(val => val && typeof val === 'object' && 'value' in val),
       'Invalid prop `value` supplied to `TreeSelect`. You should use { label: string, value: string | number } or [{ label: string, value: string | number }] instead.',
     );
   }
@@ -33,6 +35,13 @@ function warningProps(props: TreeSelectProps & { searchPlaceholder?: string }) {
   } else {
     warning(!Array.isArray(value), '`value` should not be array when `TreeSelect` is single mode.');
   }
+
+  if (maxCount && (showCheckedStrategy === 'SHOW_ALL' || showCheckedStrategy === 'SHOW_PARENT')) {
+    warning(
+      false,
+      '`maxCount` not work with `showCheckedStrategy=SHOW_ALL` or `showCheckedStrategy=SHOW_PARENT`.',
+    );
+  }
 }
 
 export default warningProps;