Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ updates:
time: '21:00'
timezone: Asia/Shanghai
open-pull-requests-limit: 10
groups:
npm-dependencies:
patterns:
- '*'

- package-ecosystem: github-actions
directory: '/'
Expand All @@ -17,3 +21,7 @@ updates:
time: '21:00'
timezone: Asia/Shanghai
open-pull-requests-limit: 10
groups:
github-actions:
patterns:
- '*'
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="center">
<h1>@rc-component/segmented</h1>
<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>
<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>
<p>🧩 React segmented control for switching between compact options.</p>

<p>
Expand Down
2 changes: 1 addition & 1 deletion README.zh-CN.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="center">
<h1>@rc-component/segmented</h1>
<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>
<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>
<p>🧩 React 分段控制器组件。</p>

<p>
Expand Down
8 changes: 7 additions & 1 deletion docs/demo/refs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import React from 'react';
import '../../assets/style.less';

class ClassComponentWithStringRef extends React.Component {
refs: {
segmentedRef: HTMLDivElement;
};

componentDidMount() {
// eslint-disable-next-line react/no-string-refs
console.log(this.refs.segmentedRef, 'ref');
Expand All @@ -29,7 +33,9 @@ class ClassComponent2 extends React.Component {
return (
<Segmented
options={['iOS', 'Android', 'Web']}
ref={(ref) => (this.segmentedRef = ref)}
ref={(ref) => {
this.segmentedRef = ref;
}}
/>
);
}
Expand Down
84 changes: 84 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
import { FlatCompat } from '@eslint/eslintrc';
import js from '@eslint/js';
import tsEslintPlugin from '@typescript-eslint/eslint-plugin';
import { createRequire } from 'node:module';
import path from 'node:path';
import { fileURLToPath } from 'node:url';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const require = createRequire(import.meta.url);

const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

const recommendedTsRules = new Set(
Object.keys(tsEslintPlugin.configs.recommended.rules || {}),
);
Comment thread
afc163 marked this conversation as resolved.
Outdated
const noopRule = {
meta: { type: 'problem', docs: {}, schema: [] },
create: () => ({}),
};

function normalizeConfig(config) {
const next = { ...config };

if (next.plugins?.['@typescript-eslint']) {
next.plugins = {
...next.plugins,
'@typescript-eslint': {
...next.plugins['@typescript-eslint'],
rules: {
...next.plugins['@typescript-eslint'].rules,
'ban-types': noopRule,
},
},
};
}

if (next.rules) {
next.rules = Object.fromEntries(
Object.entries(next.rules).filter(([ruleName]) => {
if (!ruleName.startsWith('@typescript-eslint/')) {
return true;
}
return (
recommendedTsRules.has(ruleName) ||
ruleName === '@typescript-eslint/ban-types'
);
}),
);
}

return next;
}

export default [
{
ignores: [
'node_modules/',
'coverage/',
'es/',
'lib/',
'dist/',
'docs-dist/',
'.dumi/',
'.doc/',
'.vercel/',
'.eslintrc.js',
'src/index.d.ts',
],
},
...compat.config(require('./.eslintrc.js')).map(normalizeConfig),
{
rules: {
'@typescript-eslint/ban-types': 'off',
'@typescript-eslint/no-empty-object-type': 'off',
'@typescript-eslint/no-unsafe-function-type': 'off',
'@typescript-eslint/no-unused-vars': 'off',
},
},
];
67 changes: 67 additions & 0 deletions global.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/// <reference types="jest" />
/// <reference types="node" />
/// <reference types="react" />
/// <reference types="react-dom" />
/// <reference types="@testing-library/jest-dom" />

declare module '*.css';
declare module '*.less';
declare module 'jsonp';

declare namespace JSX {
type Element = React.JSX.Element;
interface ElementClass extends React.JSX.ElementClass {}
interface ElementAttributesProperty
extends React.JSX.ElementAttributesProperty {}
interface ElementChildrenAttribute
extends React.JSX.ElementChildrenAttribute {}
type LibraryManagedAttributes<C, P> = React.JSX.LibraryManagedAttributes<
C,
P
>;
interface IntrinsicAttributes extends React.JSX.IntrinsicAttributes {}
interface IntrinsicClassAttributes<T> extends React.JSX
.IntrinsicClassAttributes<T> {}
interface IntrinsicElements extends React.JSX.IntrinsicElements {}
}

declare namespace jest {
interface Matchers<R> {
lastCalledWith(...expected: unknown[]): R;
nthCalledWith(nthCall: number, ...expected: unknown[]): R;
toBeCalled(): R;
toBeCalledTimes(expected: number): R;
toBeCalledWith(...expected: unknown[]): R;
}
}

declare const vi: {
fn: <T extends (...args: any[]) => any = (...args: any[]) => any>(
implementation?: T,
) => jest.MockedFunction<T>;
mock: (
moduleName: string,
factory?: (importOriginal: <T>() => Promise<T>) => unknown,
) => void;
spyOn: typeof jest.spyOn;
useFakeTimers: () => void;
useRealTimers: () => void;
advanceTimersByTime: (msToRun: number) => void;
clearAllTimers: () => void;
runAllTimers: () => void;
importActual: <T>(moduleName: string) => Promise<T>;
clearAllMocks: () => void;
resetAllMocks: () => void;
restoreAllMocks: () => void;
};

declare const describe: any;
declare const it: any;
declare const test: any;
declare const beforeEach: any;
declare const afterEach: any;
declare const beforeAll: any;
declare const afterAll: any;
declare const expect: any;
Comment thread
afc163 marked this conversation as resolved.
Outdated

declare module 'moment/locale/zh-cn';
31 changes: 21 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,29 +56,40 @@
"@rc-component/father-plugin": "^2.2.0",
"@rc-component/np": "^1.0.4",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^15.0.7",
"@testing-library/user-event": "14.5.2",
"@types/jest": "^29.5.14",
"@testing-library/react": "^16.3.2",
"@testing-library/user-event": "^14.6.1",
"@types/jest": "^30.0.0",
"@types/node": "^26.0.1",
"@types/react": "^18.3.31",
"@types/react-dom": "^18.3.7",
"@types/react": "^19.2.17",
"@types/react-dom": "^19.2.3",
"@umijs/fabric": "^4.0.1",
"@umijs/test": "^4.6.68",
"cross-env": "^10.1.0",
"dumi": "^2.4.35",
"eslint": "^8.57.1",
"eslint": "^9.39.4",
"father": "^4.6.23",
"gh-pages": "^6.3.0",
"husky": "^9.1.7",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"less": "^4.6.7",
"prettier": "^3.9.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.2.7",
"react-dom": "^19.2.7",
"ts-node": "^10.9.1",
"typescript": "^5.9.3",
"lint-staged": "^16.4.0"
"typescript": "^6.0.3",
"lint-staged": "^17.0.8",
"@eslint/eslintrc": "^3.3.5",
"@eslint/js": "^9.39.4",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.1.1",
"eslint-config-prettier": "^10.1.8",
"@babel/eslint-parser": "^7.29.7",
"@babel/eslint-plugin": "^7.29.7",
"@typescript-eslint/eslint-plugin": "^8.62.0",
"@typescript-eslint/parser": "^8.62.0",
"eslint-plugin-jest": "^29.15.3",
"eslint-plugin-unicorn": "^65.0.1"
},
"peerDependencies": {
"react": ">=16.0.0",
Expand Down
21 changes: 21 additions & 0 deletions react-compat.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import * as React from 'react';

declare module 'react' {
type ReactText = string | number;
function useRef<T = undefined>(): React.MutableRefObject<T | undefined>;
function isValidElement<P = any>(
object: {} | null | undefined,
): object is React.ReactElement<P>;
function cloneElement<P = any>(
element: React.ReactElement<P>,
props?: (Partial<P> & React.Attributes) | null,
...children: React.ReactNode[]
): React.ReactElement<P>;
}
Comment thread
afc163 marked this conversation as resolved.
Outdated

declare module 'react-dom' {
function hydrate(
element: React.ReactNode,
container: Element | DocumentFragment,
): void;
}
17 changes: 8 additions & 9 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,13 @@ type ItemRender = (
) => React.ReactNode;

type SegmentedOptions<T = SegmentedRawOption> = (
| T
| SegmentedLabeledOption<T>
T | SegmentedLabeledOption<T>
)[];

export interface SegmentedProps<ValueType = SegmentedValue>
extends Omit<
React.HTMLProps<HTMLDivElement>,
'defaultValue' | 'value' | 'onChange'
> {
export interface SegmentedProps<ValueType = SegmentedValue> extends Omit<
React.HTMLProps<HTMLDivElement>,
'defaultValue' | 'value' | 'onChange'
> {
options: SegmentedOptions<ValueType>;
defaultValue?: ValueType;
value?: ValueType;
Expand Down Expand Up @@ -67,13 +65,14 @@ function normalizeOptions(options: SegmentedOptions): SegmentedLabeledOption[] {
const validTitle = getValidTitle(option);
return {
...option,
value: option.value as SegmentedValue,
title: validTitle,
};
} as SegmentedLabeledOption;
}
return {
label: option?.toString(),
title: option?.toString(),
value: option,
value: option as SegmentedValue,
};
});
}
Expand Down
52 changes: 18 additions & 34 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,54 +4,38 @@
"module": "ESNext",
"moduleResolution": "node",
"baseUrl": "./",
"lib": [
"dom",
"es2017"
],
"lib": ["dom", "es2017"],
"jsx": "react",
"strict": true,
"strict": false,
"esModuleInterop": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"skipLibCheck": true,
"declaration": true,
"types": [
"jest",
"node",
"@testing-library/jest-dom"
],
"paths": {
"@/*": [
"src/*"
],
"@@/*": [
".dumi/tmp/*"
],
"@rc-component/segmented": [
"src/index.tsx"
],
"@rc-component/segmented/es": [
"src"
],
"@rc-component/segmented/es/*": [
"src/*"
],
"@rc-component/segmented/assets/*": [
"assets/*"
]
"@/*": ["src/*"],
"@@/*": [".dumi/tmp/*"],
"@rc-component/segmented": ["src/index.tsx"],
"@rc-component/segmented/es": ["src"],
"@rc-component/segmented/es/*": ["src/*"],
"@rc-component/segmented/assets/*": ["assets/*"]
},
"ignoreDeprecations": "5.0"
"ignoreDeprecations": "6.0",
"noImplicitAny": false,
"strictNullChecks": false,
"strictPropertyInitialization": false,
"strictFunctionTypes": false,
"noImplicitThis": false,
"strictBindCallApply": false
Comment thread
afc163 marked this conversation as resolved.
Outdated
},
"include": [
"react-compat.d.ts",
"global.d.ts",
".fatherrc.ts",
".dumirc.ts",
"src",
"tests",
"docs/demo"
],
"exclude": [
"docs-dist",
"lib",
"es"
]
"exclude": ["docs-dist", "lib", "es"]
}
Loading