fix: optimize null check logic

react-component · Dec 23, 2024 · b23bfc2 · b23bfc2
1 parent faa432b
commit b23bfc2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 30 deletions.
diff --git a/src/OptionList.tsx b/src/OptionList.tsx
@@ -9,10 +9,9 @@ import useMemo from 'rc-util/lib/hooks/useMemo';
 import * as React from 'react';
 import LegacyContext from './LegacyContext';
 import TreeSelectContext from './TreeSelectContext';
-import type { DataNode, FieldNames, Key, SafeKey } from './interface';
+import type { DataNode, Key, SafeKey } from './interface';
 import { getAllKeys, isCheckDisabled } from './utils/valueUtil';
 import { useEvent } from 'rc-util';
-import { formatStrategyValues } from './utils/strategyUtil';
 
 const HIDDEN_STYLE = {
   width: 0,

diff --git a/src/TreeSelect.tsx b/src/TreeSelect.tsx
@@ -629,7 +629,7 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
       treeExpandAction,
       treeTitleRender,
       onPopupScroll,
-      leftMaxCount: maxCount ? maxCount - cachedDisplayValues.length : null,
+      leftMaxCount: maxCount === undefined ? null : maxCount - cachedDisplayValues.length,
       leafCountOnly:
         mergedShowCheckedStrategy === 'SHOW_CHILD' && !treeCheckStrictly && !!treeCheckable,
       valueEntities,

diff --git a/tests/Select.maxCount.spec.tsx b/tests/Select.maxCount.spec.tsx
@@ -271,33 +271,6 @@ describe('TreeSelect.maxCount with different strategies', () => {
     fireEvent.click(childCheckboxes[2]);
     expect(handleChange).toHaveBeenCalledTimes(2);
   });
-
-  it('should respect maxCount with SHOW_ALL strategy', () => {
-    const handleChange = jest.fn();
-    const { container } = render(
-      <TreeSelect
-        treeData={treeData}
-        treeCheckable
-        treeDefaultExpandAll
-        multiple
-        maxCount={2}
-        showCheckedStrategy={TreeSelect.SHOW_ALL}
-        onChange={handleChange}
-        open
-      />,
-    );
-
-    // Select parent node - should not work as it would show both parent and children
-    const parentCheckbox = within(container).getByText('parent');
-    fireEvent.click(parentCheckbox);
-    expect(handleChange).not.toHaveBeenCalled();
-
-    // Select individual children
-    const childCheckboxes = within(container).getAllByText(/child/);
-    fireEvent.click(childCheckboxes[0]);
-    fireEvent.click(childCheckboxes[1]);
-    expect(handleChange).toHaveBeenCalledTimes(2);
-  });
 });
 
 describe('TreeSelect.maxCount with treeCheckStrictly', () => {