chore: bump @rc-component deps (#571)

* chore: bump deps

* test: fix test logic

* test: fix deps

* chore: use npm test

* chore: rm now

Author: zombieJ

.github/workflows/main.yml

@@ -2,5 +2,5 @@ name: ✅ test
 on: [push, pull_request]
 jobs:
   test:
-    uses: react-component/rc-test/.github/workflows/test.yml@main
+    uses: react-component/rc-test/.github/workflows/test-npm.yml@main
     secrets: inherit

README.md

@@ -54,7 +54,7 @@ $ npm install rc-cascader --save
 
 ```js
 import React from 'react';
-import Cascader from 'rc-cascader';
+import Cascader from '@rc-component/cascader';
 
 const options = [{
   'label': '福建',
@@ -169,7 +169,7 @@ React.render(
       <td>visibility of popup overlay</td>
     </tr>
     <tr>
-      <td>onDropdownVisibleChange</td>
+      <td>onPopupVisibleChange</td>
       <td>Function(visible)</td>
       <td></td>
       <td>callback when popup overlay's visibility changed</td>
@@ -187,7 +187,7 @@ React.render(
       <td>prefix className of popup overlay</td>
     </tr>
     <tr>
-      <td>dropdownClassName</td>
+      <td>popupClassName</td>
       <td>String</td>
       <td></td>
       <td>additional className of popup overlay</td>

assets/select.less

@@ -1,3 +1,3 @@
-@import '~rc-select/assets/index';
+@import '~@rc-component/select/assets/index';
 
 @select-prefix: ~'rc-cascader';

examples/dropdown-render.tsx

@@ -70,7 +70,7 @@ const Demo = () => {
     <Cascader
       options={addressOptions}
       onChange={onChange}
-      dropdownRender={menus => (
+      popupRender={menus => (
         <div>
           {menus}
           <hr />

now.json

@@ -1,6 +1,6 @@
 {
-  "name": "rc-cascader",
-  "version": "3.33.0",
+  "name": "@rc-component/cascader",
+  "version": "1.0.0",
   "description": "cascade select ui component for react",
   "keywords": [
     "react",
@@ -36,21 +36,21 @@
     "deploy": "UMI_ENV=gh npm run build && gh-pages -d dist",
     "lint": "eslint src/ examples/ --ext .tsx,.ts,.jsx,.jsx",
     "now-build": "npm run build",
-    "prepublishOnly": "npm run compile && np --no-cleanup --yolo --no-publish",
+    "prepublishOnly": "npm run compile && rc-np",
     "lint:tsc": "tsc -p tsconfig.json --noEmit",
     "start": "dumi dev",
     "test": "rc-test"
   },
   "dependencies": {
-    "@babel/runtime": "^7.25.7",
+    "@rc-component/select": "~1.0.0",
+    "@rc-component/util": "^1.2.1",
     "classnames": "^2.3.1",
-    "rc-select": "~14.16.2",
-    "rc-tree": "~5.13.0",
-    "rc-util": "^5.43.0"
+    "rc-tree": "~5.13.1"
   },
   "devDependencies": {
-    "@rc-component/father-plugin": "^1.0.0",
-    "@rc-component/trigger": "^1.5.0",
+    "@rc-component/father-plugin": "^2.0.2",
+    "@rc-component/np": "^1.0.3",
+    "@rc-component/trigger": "^3.0.0",
     "@testing-library/react": "^12.1.5",
     "@types/classnames": "^2.2.6",
     "@types/enzyme": "^3.1.15",
@@ -61,6 +61,7 @@
     "@umijs/fabric": "^4.0.0",
     "array-tree-filter": "^3.0.2",
     "cheerio": "1.0.0-rc.12",
+    "core-js": "^3.40.0",
     "cross-env": "^7.0.0",
     "dumi": "^2.1.10",
     "enzyme": "^3.3.0",
@@ -73,10 +74,9 @@
     "gh-pages": "^6.1.1",
     "glob": "^7.1.6",
     "less": "^4.2.0",
-    "np": "^10.0.2",
     "prettier": "^3.1.0",
     "rc-field-form": "^1.44.0",
-    "rc-test": "^7.0.14",
+    "rc-test": "^7.1.2",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
     "typescript": "^5.3.2"

package.json

@@ -1,10 +1,10 @@
 import type { BuildInPlacements } from '@rc-component/trigger/lib/interface';
-import type { BaseSelectProps, BaseSelectPropsWithoutPrivate, BaseSelectRef } from 'rc-select';
-import { BaseSelect } from 'rc-select';
-import type { DisplayValueType, Placement } from 'rc-select/lib/BaseSelect';
-import useId from 'rc-select/lib/hooks/useId';
-import useEvent from 'rc-util/lib/hooks/useEvent';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import type { BaseSelectProps, BaseSelectPropsWithoutPrivate, BaseSelectRef } from '@rc-component/select';
+import { BaseSelect } from '@rc-component/select';
+import type { DisplayValueType, Placement } from '@rc-component/select/lib/BaseSelect';
+import useId from '@rc-component/select/lib/hooks/useId';
+import useEvent from '@rc-component/util/lib/hooks/useEvent';
+import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
 import * as React from 'react';
 import CascaderContext from './context';
 import useDisplayValues from './hooks/useDisplayValues';
@@ -102,19 +102,15 @@ interface BaseCascaderProps<
   /** @deprecated Use `open` instead */
   popupVisible?: boolean;
 
-  /** @deprecated Use `dropdownClassName` instead */
   popupClassName?: string;
-  dropdownClassName?: string;
   dropdownMenuColumnStyle?: React.CSSProperties;
 
   /** @deprecated Use `placement` instead */
   popupPlacement?: Placement;
   placement?: Placement;
   builtinPlacements?: BuildInPlacements;
 
-  /** @deprecated Use `onDropdownVisibleChange` instead */
   onPopupVisibleChange?: (open: boolean) => void;
-  onDropdownVisibleChange?: (open: boolean) => void;
 
   // Icon
   expandIcon?: React.ReactNode;
@@ -213,14 +209,12 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
     open,
 
     popupClassName,
-    dropdownClassName,
     dropdownMenuColumnStyle,
-    dropdownStyle: customDropdownStyle,
+    popupStyle: customPopupStyle,
 
     popupPlacement,
     placement,
 
-    onDropdownVisibleChange,
     onPopupVisibleChange,
 
     // Icon
@@ -229,7 +223,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
 
     // Children
     children,
-    dropdownMatchSelectWidth = false,
+    popupMatchSelectWidth = false,
     showCheckedStrategy = SHOW_PARENT,
     optionRender,
     ...restProps
@@ -374,12 +368,10 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
   // ============================ Open ============================
   const mergedOpen = open !== undefined ? open : popupVisible;
 
-  const mergedDropdownClassName = dropdownClassName || popupClassName;
 
   const mergedPlacement = placement || popupPlacement;
 
-  const onInternalDropdownVisibleChange = (nextVisible: boolean) => {
-    onDropdownVisibleChange?.(nextVisible);
+  const onInternalPopupVisibleChange = (nextVisible: boolean) => {
     onPopupVisibleChange?.(nextVisible);
   };
 
@@ -432,7 +424,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
   // ==============================================================
   const emptyOptions = !(mergedSearchValue ? searchOptions : mergedOptions).length;
 
-  const dropdownStyle: React.CSSProperties =
+  const popupStyle: React.CSSProperties =
     // Search to match width
     (mergedSearchValue && searchConfig.matchInputWidth) ||
     // Empty keep the width
@@ -451,10 +443,10 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
         id={mergedId}
         prefixCls={prefixCls}
         autoClearSearchValue={autoClearSearchValue}
-        dropdownMatchSelectWidth={dropdownMatchSelectWidth}
-        dropdownStyle={{
-          ...dropdownStyle,
-          ...customDropdownStyle,
+        popupMatchSelectWidth={popupMatchSelectWidth}
+        popupStyle={{
+          ...popupStyle,
+          ...customPopupStyle,
         }}
         // Value
         displayValues={displayValues}
@@ -469,9 +461,9 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
         emptyOptions={emptyOptions}
         // Open
         open={mergedOpen}
-        dropdownClassName={mergedDropdownClassName}
+        popupClassName={popupClassName}
         placement={mergedPlacement}
-        onDropdownVisibleChange={onInternalDropdownVisibleChange}
+        onPopupVisibleChange={onInternalPopupVisibleChange}
         // Children
         getRawInputElement={() => children as React.ReactElement}
       />

src/Cascader.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable default-case */
 import classNames from 'classnames';
-import type { useBaseProps } from 'rc-select';
-import type { RefOptionListProps } from 'rc-select/lib/OptionList';
+import type { useBaseProps } from '@rc-component/select';
+import type { RefOptionListProps } from '@rc-component/select/lib/OptionList';
 import * as React from 'react';
 import type { DefaultOptionType, SingleValueType } from '../Cascader';
 import CascaderContext from '../context';

src/OptionList/List.tsx

@@ -1,5 +1,5 @@
-import { useBaseProps } from 'rc-select';
-import type { RefOptionListProps } from 'rc-select/lib/OptionList';
+import { useBaseProps } from '@rc-component/select';
+import type { RefOptionListProps } from '@rc-component/select/lib/OptionList';
 import * as React from 'react';
 import RawOptionList from './List';
 

src/OptionList/index.tsx

@@ -1,5 +1,5 @@
-import type { RefOptionListProps } from 'rc-select/lib/OptionList';
-import KeyCode from 'rc-util/lib/KeyCode';
+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, SingleValueType } from '../Cascader';
 import { SEARCH_MARK } from '../hooks/useSearchOptions';

src/OptionList/useKeyboard.ts

@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { useEvent, useMergedState } from 'rc-util';
+import { useEvent, useMergedState } from '@rc-component/util';
 import * as React from 'react';
 import type {
   CascaderProps,

src/Panel.tsx

@@ -1,4 +1,4 @@
-import warning from 'rc-util/lib/warning';
+import warning from '@rc-component/util/lib/warning';
 import * as React from 'react';
 import type { CascaderProps, ShowSearchType } from '../Cascader';
 

src/hooks/useSearchConfig.ts

@@ -1,18 +1,10 @@
-import warning from 'rc-util/lib/warning';
+import warning from '@rc-component/util/lib/warning';
 import type { DefaultOptionType, FieldNames, InternalCascaderProps } from '../Cascader';
 
 function warningProps(props: InternalCascaderProps) {
-  const { onPopupVisibleChange, popupVisible, popupClassName, popupPlacement } = props;
+  const { popupVisible, popupPlacement } = props;
 
-  warning(
-    !onPopupVisibleChange,
-    '`onPopupVisibleChange` is deprecated. Please use `onDropdownVisibleChange` instead.',
-  );
   warning(popupVisible === undefined, '`popupVisible` is deprecated. Please use `open` instead.');
-  warning(
-    popupClassName === undefined,
-    '`popupClassName` is deprecated. Please use `dropdownClassName` instead.',
-  );
   warning(
     popupPlacement === undefined,
     '`popupPlacement` is deprecated. Please use `placement` instead.',

src/utils/warningPropsUtil.ts

@@ -1,5 +1,5 @@
-import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
-import { resetWarned } from 'rc-util/lib/warning';
+import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { resetWarned } from '@rc-component/util/lib/warning';
 import React, { useEffect, useState } from 'react';
 import type { CascaderRef, BaseOptionType, CascaderProps } from '../src';
 import Cascader from '../src';
@@ -527,15 +527,9 @@ describe('Cascader.Basic', () => {
       />,
     );
 
-    expect(errorSpy).toHaveBeenCalledWith(
-      'Warning: `onPopupVisibleChange` is deprecated. Please use `onDropdownVisibleChange` instead.',
-    );
     expect(errorSpy).toHaveBeenCalledWith(
       'Warning: `popupVisible` is deprecated. Please use `open` instead.',
     );
-    expect(errorSpy).toHaveBeenCalledWith(
-      'Warning: `popupClassName` is deprecated. Please use `dropdownClassName` instead.',
-    );
     expect(errorSpy).toHaveBeenCalledWith(
       'Warning: `popupPlacement` is deprecated. Please use `placement` instead.',
     );
@@ -623,7 +617,7 @@ describe('Cascader.Basic', () => {
       <Cascader
         options={addressOptions}
         popupVisible
-        dropdownRender={menus => (
+        popupRender={menus => (
           <div className="custom-dropdown">
             {menus}
             <hr />
@@ -1108,7 +1102,7 @@ describe('Cascader.Basic', () => {
   });
 
   it('support custom cascader', () => {
-    const wrapper = mount(<Cascader dropdownStyle={{ zIndex: 999 }} open />);
+    const wrapper = mount(<Cascader popupStyle={{ zIndex: 999 }} open />);
     expect(wrapper.find('.rc-cascader-dropdown').props().style?.zIndex).toBe(999);
   });
 

tests/index.spec.tsx

@@ -1,5 +1,5 @@
 import { mount } from 'enzyme';
-import KeyCode from 'rc-util/lib/KeyCode';
+import KeyCode from '@rc-component/util/lib/KeyCode';
 import type { CascaderProps } from '../src';
 import Cascader from '../src';
 import { addressOptions } from './demoOptions';

tests/keyboard.spec.tsx

@@ -1,6 +1,6 @@
 import { fireEvent, render } from '@testing-library/react';
-import KeyCode from 'rc-util/lib/KeyCode';
-import { resetWarned } from 'rc-util/lib/warning';
+import KeyCode from '@rc-component/util/lib/KeyCode';
+import { resetWarned } from '@rc-component/util/lib/warning';
 import React from 'react';
 import Cascader from '../src';
 import { optionsForActiveMenuItems } from './demoOptions';