chore: bump upstream version

examples/rc-form.tsx

@@ -1,5 +1,5 @@
 import arrayTreeFilter from 'array-tree-filter';
-import Form, { Field } from 'rc-field-form';
+import Form, { Field } from '@rc-component/form';
 import '../assets/index.less';
 import type { CascaderProps } from '../src';
 import Cascader from '../src';

package.json

@@ -43,13 +43,14 @@
     "test": "rc-test"
   },
   "dependencies": {
-    "@rc-component/select": "~1.2.0",
-    "@rc-component/tree": "~1.0.0",
-    "@rc-component/util": "^1.3.0",
+    "@rc-component/select": "~1.3.0",
+    "@rc-component/tree": "~1.1.0",
+    "@rc-component/util": "^1.4.0",
     "clsx": "^2.1.1"
   },
   "devDependencies": {
     "@rc-component/father-plugin": "^2.0.2",
+    "@rc-component/form": "^1.4.0",
     "@rc-component/np": "^1.0.3",
     "@rc-component/trigger": "^3.0.0",
     "@testing-library/react": "^12.1.5",
@@ -76,14 +77,13 @@
     "glob": "^7.1.6",
     "less": "^4.2.0",
     "prettier": "^3.1.0",
-    "rc-field-form": "^1.44.0",
     "rc-test": "^7.1.2",
-    "react": "^16.0.0",
-    "react-dom": "^16.0.0",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "typescript": "^5.3.2"
   },
   "peerDependencies": {
-    "react": ">=16.9.0",
-    "react-dom": ">=16.9.0"
+    "react": ">=18.0.0",
+    "react-dom": ">=18.0.0"
   }
 }

src/OptionList/useKeyboard.ts

@@ -1,7 +1,12 @@
 import type { RefOptionListProps } from '@rc-component/select/lib/OptionList';
 import KeyCode from '@rc-component/util/lib/KeyCode';
 import * as React from 'react';
-import type { DefaultOptionType, InternalFieldNames, LegacyKey, SingleValueType } from '../Cascader';
+import type {
+  DefaultOptionType,
+  InternalFieldNames,
+  LegacyKey,
+  SingleValueType,
+} from '../Cascader';
 import { SEARCH_MARK } from '../hooks/useSearchOptions';
 import { getFullPathKeys, toPathKey } from '../utils/commonUtil';
 

tests/__snapshots__/search.spec.tsx.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Cascader.Search should correct render Cascader with same field name of label and value 1`] = `
-[
+<div>
   <div
     class="rc-cascader rc-cascader-single rc-cascader-open rc-cascader-show-search"
   >
@@ -26,7 +26,7 @@ exports[`Cascader.Search should correct render Cascader with same field name of
         value="z"
       />
     </div>
-  </div>,
+  </div>
   <div
     class="rc-cascader-dropdown rc-cascader-dropdown-placement-bottomLeft"
     style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
@@ -68,6 +68,6 @@ exports[`Cascader.Search should correct render Cascader with same field name of
         </ul>
       </div>
     </div>
-  </div>,
-]
+  </div>
+</div>
 `;

tests/checkable.spec.tsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import Cascader from '../src';
 import { addressOptions } from './demoOptions';
-import { mount } from './enzyme';
+import { clickOption, selectOption } from './util';
 
 describe('Cascader.Checkable', () => {
   const options = [
@@ -34,15 +34,16 @@
 
   it('customize', () => {
     const onChange = jest.fn();
-    const wrapper = mount(<Cascader options={options} onChange={onChange} open checkable />);
+    const { container } = render(<Cascader options={options} onChange={onChange} open checkable />);
 
-    expect(wrapper.exists('.rc-cascader-checkbox')).toBeTruthy();
-    expect(wrapper.exists('.rc-cascader-checkbox-checked')).toBeFalsy();
-    expect(wrapper.exists('.rc-cascader-checkbox-indeterminate')).toBeFalsy();
+    expect(container.querySelector('.rc-cascader-checkbox')).toBeTruthy();
+    expect(container.querySelector('.rc-cascader-checkbox-checked')).toBeFalsy();
+    expect(container.querySelector('.rc-cascader-checkbox-indeterminate')).toBeFalsy();
 
     // Check light
-    wrapper.find('.rc-cascader-checkbox').first().simulate('click');
-    expect(wrapper.exists('.rc-cascader-checkbox-checked')).toBeTruthy();
+    const checkboxes = container.querySelectorAll('.rc-cascader-checkbox');
+    fireEvent.click(checkboxes[0]);
+    expect(container.querySelector('.rc-cascader-checkbox-checked')).toBeTruthy();
     expect(onChange).toHaveBeenCalledWith(
       [['light']],
       [[expect.objectContaining({ value: 'light' })]],
@@ -51,13 +52,17 @@
     onChange.mockReset();
 
     // Open bamboo > little
-    wrapper.clickOption(0, 1);
-    wrapper.clickOption(1, 0);
+    clickOption(container, 0, 1); // Click bamboo
+    clickOption(container, 1, 0); // Click little
 
-    // Check cards
-    wrapper.clickOption(2, 1);
-    expect(wrapper.find('.rc-cascader-checkbox-indeterminate')).toHaveLength(2);
-    expect(wrapper.exists('.rc-cascader-checkbox-indeterminate')).toBeTruthy();
+    // Check cards (index 1 in third menu)
+    clickOption(container, 2, 1); // Click cards
+
+    const indeterminateCheckboxes = container.querySelectorAll(
+      '.rc-cascader-checkbox-indeterminate',
+    );
+    expect(indeterminateCheckboxes).toHaveLength(2);
+    expect(container.querySelector('.rc-cascader-checkbox-indeterminate')).toBeTruthy();
     expect(onChange).toHaveBeenCalledWith(
       [
         // Light
@@ -77,10 +82,15 @@
       ],
     );
 
-    // Check fish
-    wrapper.clickOption(2, 0);
-    expect(wrapper.find('.rc-cascader-checkbox-indeterminate')).toHaveLength(0);
-    expect(wrapper.find('.rc-cascader-checkbox-checked')).toHaveLength(5);
+    // Check fish (index 0 in third menu)
+    clickOption(container, 2, 0); // Click fish
+
+    const finalIndeterminateCheckboxes = container.querySelectorAll(
+      '.rc-cascader-checkbox-indeterminate',
+    );
+    expect(finalIndeterminateCheckboxes).toHaveLength(0);
+    const checkedCheckboxes = container.querySelectorAll('.rc-cascader-checkbox-checked');
+    expect(checkedCheckboxes).toHaveLength(5);
     expect(onChange).toHaveBeenCalledWith(
       [
         // Light
@@ -98,22 +108,23 @@
   });
   it('click checkbox invoke one onChange', () => {
     const onChange = jest.fn();
-    const wrapper = mount(<Cascader options={options} onChange={onChange} open checkable />);
+    const { container } = render(<Cascader options={options} onChange={onChange} open checkable />);
 
-    expect(wrapper.exists('.rc-cascader-checkbox')).toBeTruthy();
-    expect(wrapper.exists('.rc-cascader-checkbox-checked')).toBeFalsy();
-    expect(wrapper.exists('.rc-cascader-checkbox-indeterminate')).toBeFalsy();
+    expect(container.querySelector('.rc-cascader-checkbox')).toBeTruthy();
+    expect(container.querySelector('.rc-cascader-checkbox-checked')).toBeFalsy();
+    expect(container.querySelector('.rc-cascader-checkbox-indeterminate')).toBeFalsy();
 
     // Check checkbox
-    wrapper.find('.rc-cascader-checkbox').first().simulate('click');
-    expect(wrapper.exists('.rc-cascader-checkbox-checked')).toBeTruthy();
+    const checkboxes = container.querySelectorAll('.rc-cascader-checkbox');
+    fireEvent.click(checkboxes[0]);
+    expect(container.querySelector('.rc-cascader-checkbox-checked')).toBeTruthy();
     expect(onChange).toHaveBeenCalledTimes(1);
   });
 
   it('merge checked options', () => {
     const onChange = jest.fn();
 
-    const wrapper = mount(
+    const { container } = render(
       <Cascader
         checkable
         open
@@ -138,48 +149,51 @@
     );
 
     // Open parent
-    wrapper.find('.rc-cascader-menu-item-content').first().simulate('click');
+    clickOption(container, 0, 0);
 
     // Check child1
-    wrapper.find('span.rc-cascader-checkbox').at(1).simulate('click');
+    const checkboxes = container.querySelectorAll('span.rc-cascader-checkbox');
+    fireEvent.click(checkboxes[1]);
     expect(onChange).toHaveBeenCalledWith([['parent', 'child1']], expect.anything());
 
     // Check child2
     onChange.mockReset();
-    wrapper.find('span.rc-cascader-checkbox').at(2).simulate('click');
+    fireEvent.click(checkboxes[2]);
     expect(onChange).toHaveBeenCalledWith([['parent']], expect.anything());
 
     // Uncheck child1
     onChange.mockReset();
-    wrapper.find('span.rc-cascader-checkbox').at(1).simulate('click');
+    fireEvent.click(checkboxes[1]);
     expect(onChange).toHaveBeenCalledWith([['parent', 'child2']], expect.anything());
   });
 
   // https://github.com/ant-design/ant-design/issues/33302
   it('should not display checkbox when children is empty', () => {
-    const wrapper = mount(
+    const { container } = render(
       <Cascader checkable options={[]}>
         <input readOnly />
       </Cascader>,
     );
-    wrapper.find('input').simulate('click');
-    const menus = wrapper.find('.rc-cascader-menu');
-    expect(menus.find('.rc-cascader-checkbox').length).toBe(0);
+    const input = container.querySelector('input');
+    fireEvent.click(input!);
+    const checkboxes = container.querySelectorAll('.rc-cascader-checkbox');
+    expect(checkboxes.length).toBe(0);
   });
 
   it('should work with custom checkable', () => {
-    const wrapper = mount(
+    const { container } = render(
       <Cascader
         checkable={<span className="my-custom-checkbox">0</span>}
         open
         options={addressOptions}
       />,
     );
-    expect(wrapper.find('.my-custom-checkbox')).toHaveLength(3);
+    const customCheckboxes = container.querySelectorAll('.my-custom-checkbox');
+    expect(customCheckboxes).toHaveLength(3);
   });
 
   it('should be correct expression with disableCheckbox', () => {
-    const wrapper = mount(
+    const { container } = render(
       <Cascader
         checkable={true}
         open
@@ -206,22 +220,30 @@
     );
 
     // disabled className
-    wrapper.find('.rc-cascader-menu-item').simulate('click');
-    expect(wrapper.find('.rc-cascader-menu-item')).toHaveLength(4);
-    expect(wrapper.find('.rc-cascader-checkbox-disabled')).toHaveLength(1);
+    const menuItems = container.querySelectorAll('.rc-cascader-menu-item');
+    fireEvent.click(menuItems[0]);
+
+    // After clicking, we should have the parent item and its children
+    const updatedMenuItems = container.querySelectorAll('.rc-cascader-menu-item');
+    expect(updatedMenuItems).toHaveLength(4);
+    const disabledCheckboxes = container.querySelectorAll('.rc-cascader-checkbox-disabled');
+    expect(disabledCheckboxes).toHaveLength(1);
 
     // click disableCkeckbox
-    wrapper.find('.rc-cascader-menu-item').at(1).simulate('click');
-    expect(wrapper.find('.rc-cascader-checkbox-checked')).toHaveLength(0);
+    fireEvent.click(updatedMenuItems[1]);
+    const checkedCheckboxes = container.querySelectorAll('.rc-cascader-checkbox-checked');
+    expect(checkedCheckboxes).toHaveLength(0);
 
     // click disableMenuItem
-    wrapper.find('.rc-cascader-checkbox-disabled').simulate('click');
-    expect(wrapper.find('.rc-cascader-checkbox-checked')).toHaveLength(0);
+    fireEvent.click(disabledCheckboxes[0]);
+    expect(checkedCheckboxes).toHaveLength(0);
 
     // Check all children except disableCheckbox When the parent checkbox is checked
-    expect(wrapper.find('.rc-cascader-checkbox')).toHaveLength(4);
-    wrapper.find('.rc-cascader-checkbox').first().simulate('click');
-    expect(wrapper.find('.rc-cascader-checkbox-checked')).toHaveLength(3);
+    const allCheckboxes = container.querySelectorAll('.rc-cascader-checkbox');
+    expect(allCheckboxes).toHaveLength(4);
+    fireEvent.click(allCheckboxes[0]);
+    const finalCheckedCheckboxes = container.querySelectorAll('.rc-cascader-checkbox-checked');
+    expect(finalCheckedCheckboxes).toHaveLength(3);
   });
 
   it('should not merge disabled options', () => {