Skip to content

Commit e8096c0

Browse files
aojunhao123zombieJ
andauthored
chore: migrate to @rc-component and update dependencies (#1126)
* chore: migrate to @rc-component and update dependencies * refactor: replace popupTransitionName with popupMotion * chore: fix version --------- Co-authored-by: 二货机器人 <[email protected]>
1 parent 14824f5 commit e8096c0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+83
-86
lines changed

docs/examples/auto-adjust-dropdown.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
class Test extends React.Component {

docs/examples/auto-tokenization.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import Select from 'rc-select';
2+
import Select from '@rc-component/select';
33
import '../../assets/index.less';
44

55
const Demo: React.FC = () => (

docs/examples/combobox.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
class Combobox extends React.Component {

docs/examples/controlled.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
interface ControlledState {

docs/examples/custom-icon.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable no-console, max-classes-per-file */
2-
import Select, { Option } from 'rc-select';
2+
import Select, { Option } from '@rc-component/select';
33
import React from 'react';
44
import '../../assets/index.less';
55

docs/examples/custom-label.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable no-console */
2-
import Select, { Option } from 'rc-select';
2+
import Select, { Option } from '@rc-component/select';
33
import React from 'react';
44
import '../../assets/index.less';
55

docs/examples/custom-selector.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select from 'rc-select';
3+
import Select from '@rc-component/select';
44
import '../../assets/index.less';
55

66
export default () => {

docs/examples/custom-tags.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55
import type { CustomTagProps } from '@/BaseSelect';
66

docs/examples/dropdownRender.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
const children = [];

docs/examples/email.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
class Test extends React.Component {

docs/examples/filterSort.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import Select from 'rc-select';
2+
import Select from '@rc-component/select';
33
import '../../assets/index.less';
44

55
const incidencesStateResource = [

docs/examples/focus.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useLayoutEffect, useRef, useState } from 'react';
2-
import type { BaseSelectRef } from 'rc-select';
3-
import Select, { Option } from 'rc-select';
2+
import type { BaseSelectRef } from '@rc-component/select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
const MySelect = () => {

docs/examples/force-suggest.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
import { fetch } from './common/tbFetchSuggest';

docs/examples/getPopupContainer.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'rc-dialog/assets/index.css';
22
import '../../assets/index.less';
33

44
import Dialog from 'rc-dialog';
5-
import Select, { type SelectProps } from 'rc-select';
5+
import Select, { type SelectProps } from '@rc-component/select';
66
import React from 'react';
77

88
const MySelect = (props: Partial<SelectProps>) => (

docs/examples/loading.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
class Test extends React.Component {

docs/examples/mul-suggest.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
import { fetch } from './common/tbFetchSuggest';

docs/examples/mul-tag-suggest.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
import { fetch } from './common/tbFetchSuggest';

docs/examples/multiple-readonly.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
const children: React.ReactNode[] = [];

docs/examples/multiple-with-maxCount.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select from 'rc-select';
3+
import Select from '@rc-component/select';
44
import '../../assets/index.less';
55

66
const Test: React.FC = () => {

docs/examples/multiple.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
const children: React.ReactNode[] = [];

docs/examples/optgroup.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select from 'rc-select';
3+
import Select from '@rc-component/select';
44
import '../../assets/index.less';
55

66
function onChange(value, option) {

docs/examples/option-render.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable no-console */
2-
import Select from 'rc-select';
2+
import Select from '@rc-component/select';
33
import '../../assets/index.less';
44

55
export default () => {

docs/examples/optionFilterProp.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import Select, { Option } from 'rc-select';
2+
import Select, { Option } from '@rc-component/select';
33
import '../../assets/index.less';
44

55
const Test = () => {

docs/examples/optionLabelProp.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import Select from 'rc-select';
2+
import Select from '@rc-component/select';
33
import '../../assets/index.less';
44

55
const data: { value: number; label: string; displayLabel: string }[] = [];

docs/examples/scroll-loading.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Select from 'rc-select';
1+
import Select from '@rc-component/select';
22
import React from 'react';
33
import '../../assets/index.less';
44

docs/examples/single-animation.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
function onChange(value) {

docs/examples/single.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55
import './single.less';
66

docs/examples/singleFieldNames.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select from 'rc-select';
3+
import Select from '@rc-component/select';
44
import '../../assets/index.less';
55
import './single.less';
66

docs/examples/suggest.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable no-console */
2-
import Select, { Option } from 'rc-select';
2+
import Select, { Option } from '@rc-component/select';
33
import React from 'react';
44
import '../../assets/index.less';
55

docs/examples/tags.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
const children = [];

docs/examples/update-option.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
import React from 'react';
3-
import Select, { Option } from 'rc-select';
3+
import Select, { Option } from '@rc-component/select';
44
import '../../assets/index.less';
55

66
function handleChange(value) {

package.json

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "rc-select",
3-
"version": "14.16.4",
2+
"name": "@rc-component/select",
3+
"version": "1.0.0",
44
"description": "React Select",
55
"engines": {
66
"node": ">=8.x"
@@ -34,7 +34,7 @@
3434
"build": "dumi build",
3535
"prepare": "husky && dumi setup",
3636
"compile": "father build && lessc assets/index.less assets/index.css",
37-
"prepublishOnly": "npm run compile && np --yolo --no-publish",
37+
"prepublishOnly": "npm run compile && rc-np",
3838
"prettier": "prettier --write --ignore-unknown .",
3939
"lint": "eslint src/ docs/ tests/ --ext .tsx,.ts,.jsx,.js",
4040
"test": "rc-test",
@@ -49,21 +49,21 @@
4949
"react-dom": "*"
5050
},
5151
"dependencies": {
52-
"@babel/runtime": "^7.10.1",
53-
"@rc-component/trigger": "^2.1.1",
52+
"@rc-component/trigger": "^3.0.0",
53+
"@rc-component/motion": "^1.1.4",
54+
"@rc-component/util": "^1.2.1",
5455
"classnames": "2.x",
55-
"rc-motion": "^2.0.1",
5656
"rc-overflow": "^1.4.0",
57-
"rc-util": "^5.16.1",
5857
"rc-virtual-list": "^3.5.2"
5958
},
6059
"devDependencies": {
61-
"@rc-component/father-plugin": "^1.0.2",
60+
"@rc-component/father-plugin": "^2.0.2",
61+
"@rc-component/np": "^1.0.0",
6262
"@testing-library/jest-dom": "^6.4.5",
6363
"@testing-library/react": "^15.0.6",
6464
"@types/jest": "^29.5.12",
65-
"@types/react": "^18.2.45",
66-
"@types/react-dom": "^19.0.1",
65+
"@types/react": "^18.3.0",
66+
"@types/react-dom": "^18.3.0",
6767
"babel-jest": "^29.6.1",
6868
"cross-env": "^7.0.0",
6969
"dumi": "^2.2.13",
@@ -75,7 +75,6 @@
7575
"jsonp": "^0.2.1",
7676
"less": "^4.2.0",
7777
"lint-staged": "^15.2.9",
78-
"np": "^10.0.7",
7978
"prettier": "^3.1.1",
8079
"querystring": "^0.2.1",
8180
"rc-dialog": "^9.0.0",

src/BaseSelect/index.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { AlignType, BuildInPlacements } from '@rc-component/trigger/lib/interface';
22
import classNames from 'classnames';
3-
import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
4-
import useMergedState from 'rc-util/lib/hooks/useMergedState';
5-
import isMobile from 'rc-util/lib/isMobile';
6-
import { useComposeRef } from 'rc-util/lib/ref';
3+
import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
4+
import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
5+
import isMobile from '@rc-component/util/lib/isMobile';
6+
import { useComposeRef } from '@rc-component/util/lib/ref';
77
import type { ScrollConfig, ScrollTo } from 'rc-virtual-list/lib/List';
88
import * as React from 'react';
99
import { useAllowClear } from '../hooks/useAllowClear';

src/OptionList.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import classNames from 'classnames';
2-
import KeyCode from 'rc-util/lib/KeyCode';
3-
import useMemo from 'rc-util/lib/hooks/useMemo';
4-
import omit from 'rc-util/lib/omit';
5-
import pickAttrs from 'rc-util/lib/pickAttrs';
2+
import KeyCode from '@rc-component/util/lib/KeyCode';
3+
import useMemo from '@rc-component/util/lib/hooks/useMemo';
4+
import omit from '@rc-component/util/lib/omit';
5+
import pickAttrs from '@rc-component/util/lib/pickAttrs';
66
import type { ListRef } from 'rc-virtual-list';
77
import List from 'rc-virtual-list';
88
import type { ScrollConfig } from 'rc-virtual-list/lib/List';

src/Select.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
* - `combobox` mode not support `optionLabelProp`
3030
*/
3131

32-
import useMergedState from 'rc-util/lib/hooks/useMergedState';
33-
import warning from 'rc-util/lib/warning';
32+
import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
33+
import warning from '@rc-component/util/lib/warning';
3434
import * as React from 'react';
3535
import type {
3636
BaseSelectProps,

src/SelectTrigger.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ const SelectTrigger: React.ForwardRefRenderFunction<RefTriggerProps, SelectTrigg
163163
popupPlacement={placement || (direction === 'rtl' ? 'bottomRight' : 'bottomLeft')}
164164
builtinPlacements={mergedBuiltinPlacements}
165165
prefixCls={popupPrefixCls}
166-
popupTransitionName={mergedTransitionName}
166+
popupMotion={{ motionName: mergedTransitionName }}
167167
popup={<div onMouseEnter={onPopupMouseEnter}>{popupNode}</div>}
168168
ref={triggerPopupRef}
169169
stretch={stretch}

src/Selector/Input.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import classNames from 'classnames';
3-
import { composeRef } from 'rc-util/lib/ref';
4-
import { warning } from 'rc-util/lib/warning';
3+
import { composeRef } from '@rc-component/util/lib/ref';
4+
import { warning } from '@rc-component/util/lib/warning';
55

66
type InputRef = HTMLInputElement | HTMLTextAreaElement;
77

src/Selector/MultipleSelector.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import { useState } from 'react';
33
import classNames from 'classnames';
4-
import pickAttrs from 'rc-util/lib/pickAttrs';
4+
import pickAttrs from '@rc-component/util/lib/pickAttrs';
55
import Overflow from 'rc-overflow';
66
import TransBtn from '../TransBtn';
77
import type { InnerSelectorProps } from '.';

src/Selector/SingleSelector.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import pickAttrs from 'rc-util/lib/pickAttrs';
2+
import pickAttrs from '@rc-component/util/lib/pickAttrs';
33
import Input from './Input';
44
import type { InnerSelectorProps } from '.';
55
import { getTitle } from '../utils/commonUtil';

src/Selector/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* - https://www.w3.org/TR/wai-aria-practices/examples/combobox/aria1.1pattern/listbox-combo.html
99
*/
1010

11-
import KeyCode from 'rc-util/lib/KeyCode';
11+
import KeyCode from '@rc-component/util/lib/KeyCode';
1212
import type { ScrollTo } from 'rc-virtual-list/lib/List';
1313
import * as React from 'react';
1414
import { useRef } from 'react';

src/hooks/useId.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import canUseDom from 'rc-util/lib/Dom/canUseDom';
2+
import canUseDom from '@rc-component/util/lib/Dom/canUseDom';
33

44
let uuid = 0;
55

src/utils/keyUtil.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import KeyCode from 'rc-util/lib/KeyCode';
1+
import KeyCode from '@rc-component/util/lib/KeyCode';
22

33
/** keyCode Judgment function */
44
export function isValidateOpenKey(currentKeyCode: number): boolean {

0 commit comments

Comments
 (0)