Skip to content

Commit 731f693

Browse files
authored
chore: update maintenance dependencies (#335)
* chore: update maintenance dependencies * fix: align TypeScript and ESLint compatibility * chore: use testing-library dom events * test: keep react testing event behavior * chore: address review comments * fix: keep compatible eslint export rule * chore: remove react type compatibility shim * chore: enable strict type checking * docs: use ut install for local setup * chore: restore vercel install command * chore: align maintenance dependencies * chore: fix upgraded test tooling * fix: preserve React peer dependency range * test: update Jest matcher aliases * docs: use npm install in README * chore: remove manual global test declarations * chore: migrate to native eslint flat config * chore: address review comments
1 parent 56a1695 commit 731f693

13 files changed

Lines changed: 201 additions & 93 deletions

File tree

.eslintrc.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ updates:
88
time: '21:00'
99
timezone: Asia/Shanghai
1010
open-pull-requests-limit: 10
11+
groups:
12+
npm-dependencies:
13+
patterns:
14+
- '*'
1115

1216
- package-ecosystem: github-actions
1317
directory: '/'
@@ -17,3 +21,7 @@ updates:
1721
time: '21:00'
1822
timezone: Asia/Shanghai
1923
open-pull-requests-limit: 10
24+
groups:
25+
github-actions:
26+
patterns:
27+
- '*'

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div align="center">
22
<h1>@rc-component/segmented</h1>
3-
<p><sub><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /> Part of the Ant Design ecosystem.</sub></p>
3+
<p><sub><a href="https://ant.design"><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /></a> Part of the Ant Design ecosystem.</sub></p>
44
<p>🧩 React segmented control for switching between compact options.</p>
55

66
<p>

README.zh-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div align="center">
22
<h1>@rc-component/segmented</h1>
3-
<p><sub><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /> Ant Design 生态的一部分。</sub></p>
3+
<p><sub><a href="https://ant.design"><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /></a> Ant Design 生态的一部分。</sub></p>
44
<p>🧩 React 分段控制器组件。</p>
55

66
<p>

docs/demo/refs.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ import React from 'react';
33
import '../../assets/style.less';
44

55
class ClassComponentWithStringRef extends React.Component {
6+
refs!: {
7+
segmentedRef: HTMLDivElement;
8+
};
9+
610
componentDidMount() {
711
// eslint-disable-next-line react/no-string-refs
812
console.log(this.refs.segmentedRef, 'ref');
@@ -29,7 +33,9 @@ class ClassComponent2 extends React.Component {
2933
return (
3034
<Segmented
3135
options={['iOS', 'Android', 'Web']}
32-
ref={(ref) => (this.segmentedRef = ref)}
36+
ref={(ref) => {
37+
this.segmentedRef = ref;
38+
}}
3339
/>
3440
);
3541
}

eslint.config.mjs

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
import js from '@eslint/js';
2+
import { defineConfig } from 'eslint/config';
3+
import { dirname } from 'node:path';
4+
import { fileURLToPath } from 'node:url';
5+
import prettier from 'eslint-config-prettier';
6+
import jest from 'eslint-plugin-jest';
7+
import react from 'eslint-plugin-react';
8+
import reactHooks from 'eslint-plugin-react-hooks';
9+
import globals from 'globals';
10+
import tseslint from 'typescript-eslint';
11+
12+
const tsconfigRootDir = dirname(fileURLToPath(import.meta.url));
13+
14+
export default defineConfig([
15+
{
16+
plugins: {
17+
'@typescript-eslint': tseslint.plugin,
18+
},
19+
},
20+
{
21+
linterOptions: {
22+
reportUnusedDisableDirectives: 'warn',
23+
},
24+
},
25+
{
26+
ignores: [
27+
'node_modules/',
28+
'coverage/',
29+
'es/',
30+
'lib/',
31+
'dist/',
32+
'docs-dist/',
33+
'.docs-dist/',
34+
'.dumi/',
35+
'.doc/',
36+
'.vercel/',
37+
],
38+
},
39+
{
40+
files: ['**/*.{js,jsx,ts,tsx}'],
41+
extends: [
42+
js.configs.recommended,
43+
react.configs.flat.recommended,
44+
react.configs.flat['jsx-runtime'],
45+
prettier,
46+
],
47+
plugins: {
48+
'react-hooks': reactHooks,
49+
},
50+
languageOptions: {
51+
globals: {
52+
...globals.browser,
53+
...globals.node,
54+
},
55+
},
56+
settings: {
57+
react: {
58+
version: 'detect',
59+
},
60+
},
61+
rules: {
62+
'no-async-promise-executor': 'off',
63+
'no-empty-pattern': 'off',
64+
'no-irregular-whitespace': 'off',
65+
'no-prototype-builtins': 'off',
66+
'no-useless-escape': 'off',
67+
'no-extra-boolean-cast': 'off',
68+
'no-undef': 'off',
69+
'no-unused-vars': 'off',
70+
'react/no-find-dom-node': 'off',
71+
'react/display-name': 'off',
72+
'react/no-unknown-property': 'off',
73+
'react/prop-types': 'off',
74+
'react-hooks/exhaustive-deps': 'warn',
75+
'react-hooks/rules-of-hooks': 'error',
76+
},
77+
},
78+
{
79+
files: ['**/*.{ts,tsx}'],
80+
extends: [...tseslint.configs.recommended],
81+
rules: {
82+
'@typescript-eslint/ban-ts-comment': 'off',
83+
'@typescript-eslint/no-empty-object-type': 'off',
84+
'@typescript-eslint/no-explicit-any': 'off',
85+
'@typescript-eslint/no-unsafe-function-type': 'off',
86+
'@typescript-eslint/no-unnecessary-type-constraint': 'off',
87+
'@typescript-eslint/no-unused-vars': 'off',
88+
},
89+
},
90+
{
91+
files: ['src/**/*.{ts,tsx}'],
92+
languageOptions: {
93+
parserOptions: {
94+
projectService: true,
95+
tsconfigRootDir,
96+
},
97+
},
98+
},
99+
{
100+
files: ['tests/**/*.{js,jsx,ts,tsx}', '**/*.{test,spec}.{js,jsx,ts,tsx}'],
101+
extends: [jest.configs['flat/recommended']],
102+
rules: {
103+
'jest/no-disabled-tests': 'off',
104+
'jest/no-done-callback': 'off',
105+
'jest/no-identical-title': 'off',
106+
'jest/expect-expect': 'off',
107+
'jest/no-alias-methods': 'off',
108+
'jest/no-conditional-expect': 'off',
109+
'jest/no-export': 'off',
110+
'jest/no-standalone-expect': 'off',
111+
'jest/valid-expect': 'off',
112+
'jest/valid-title': 'off',
113+
},
114+
},
115+
]);

global.d.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/// <reference types="jest" />
2+
/// <reference types="node" />
3+
/// <reference types="react" />
4+
/// <reference types="react-dom" />
5+
/// <reference types="@testing-library/jest-dom" />
6+
7+
declare module '*.css';
8+
declare module '*.less';
9+
declare module 'jsonp';
10+
11+
declare module 'moment/locale/zh-cn';

package.json

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,38 +47,45 @@
4747
"prepare": "husky"
4848
},
4949
"dependencies": {
50-
"@babel/runtime": "^7.11.1",
50+
"@babel/runtime": "^7.29.7",
5151
"@rc-component/util": "^1.11.1",
5252
"clsx": "^2.1.1",
5353
"@rc-component/motion": "^1.1.4"
5454
},
5555
"devDependencies": {
56+
"@eslint/js": "^9.39.4",
5657
"@rc-component/father-plugin": "^2.2.0",
5758
"@rc-component/np": "^1.0.4",
59+
"@testing-library/dom": "^10.4.1",
5860
"@testing-library/jest-dom": "^6.9.1",
59-
"@testing-library/react": "^15.0.7",
60-
"@testing-library/user-event": "14.5.2",
61-
"@types/jest": "^29.5.14",
61+
"@testing-library/react": "^16.3.2",
62+
"@testing-library/user-event": "^14.6.1",
63+
"@types/jest": "^30.0.0",
6264
"@types/node": "^26.0.1",
63-
"@types/react": "^18.3.31",
64-
"@types/react-dom": "^18.3.7",
65-
"@umijs/fabric": "^4.0.1",
65+
"@types/react": "^19.2.17",
66+
"@types/react-dom": "^19.2.3",
6667
"@umijs/test": "^4.6.68",
6768
"cross-env": "^10.1.0",
68-
"dumi": "^2.4.35",
69-
"eslint": "^8.57.1",
70-
"father": "^4.6.23",
69+
"dumi": "^2.4.38",
70+
"eslint": "^9.39.4",
71+
"eslint-config-prettier": "^10.1.8",
72+
"eslint-plugin-jest": "^29.15.4",
73+
"eslint-plugin-react": "^7.37.5",
74+
"eslint-plugin-react-hooks": "^7.1.1",
75+
"father": "^4.6.24",
7176
"gh-pages": "^6.3.0",
77+
"globals": "^17.7.0",
7278
"husky": "^9.1.7",
73-
"jest": "^29.7.0",
74-
"jest-environment-jsdom": "^29.7.0",
79+
"jest": "^30.4.2",
80+
"jest-environment-jsdom": "^30.4.1",
7581
"less": "^4.6.7",
76-
"prettier": "^3.9.0",
77-
"react": "^18.3.1",
78-
"react-dom": "^18.3.1",
82+
"lint-staged": "^17.0.8",
83+
"prettier": "^3.9.4",
84+
"react": "^19.2.7",
85+
"react-dom": "^19.2.7",
7986
"ts-node": "^10.9.1",
80-
"typescript": "^5.9.3",
81-
"lint-staged": "^16.4.0"
87+
"typescript": "^6.0.3",
88+
"typescript-eslint": "^8.62.1"
8289
},
8390
"peerDependencies": {
8491
"react": ">=16.0.0",

src/MotionThumb.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type ThumbReact = {
1414
} | null;
1515

1616
export interface MotionThumbInterface {
17-
containerRef: React.RefObject<HTMLDivElement>;
17+
containerRef: React.RefObject<HTMLDivElement | null>;
1818
value: SegmentedValue;
1919
getValueIndex: (value: SegmentedValue) => number;
2020
prefixCls: string;

src/index.tsx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@ type ItemRender = (
2626
) => React.ReactNode;
2727

2828
type SegmentedOptions<T = SegmentedRawOption> = (
29-
| T
30-
| SegmentedLabeledOption<T>
29+
T | SegmentedLabeledOption<T>
3130
)[];
3231

33-
export interface SegmentedProps<ValueType = SegmentedValue>
34-
extends Omit<
35-
React.HTMLProps<HTMLDivElement>,
36-
'defaultValue' | 'value' | 'onChange'
37-
> {
32+
export interface SegmentedProps<ValueType = SegmentedValue> extends Omit<
33+
React.HTMLProps<HTMLDivElement>,
34+
'defaultValue' | 'value' | 'onChange'
35+
> {
3836
options: SegmentedOptions<ValueType>;
3937
defaultValue?: ValueType;
4038
value?: ValueType;
@@ -67,13 +65,14 @@ function normalizeOptions(options: SegmentedOptions): SegmentedLabeledOption[] {
6765
const validTitle = getValidTitle(option);
6866
return {
6967
...option,
68+
value: option.value as SegmentedValue,
7069
title: validTitle,
71-
};
70+
} as SegmentedLabeledOption;
7271
}
7372
return {
7473
label: option?.toString(),
7574
title: option?.toString(),
76-
value: option,
75+
value: option as SegmentedValue,
7776
};
7877
});
7978
}

0 commit comments

Comments
 (0)