Skip to content
Open
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/picker</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 date, time, range, and panel picker primitives with pluggable date-library generate configs.</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/picker</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
32 changes: 18 additions & 14 deletions docs/examples/cellRender.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ function formatDate(date: Moment | null) {
return date ? date.format('YYYY-MM-DD HH:mm:ss') : 'null';
}

function getOriginNode(node: React.ReactElement) {
return node as React.ReactElement<any>;
}

export default () => {
const [value, setValue] = React.useState<Moment | null>(defaultValue);
const [rangeValue, setRangeValue] = React.useState<[Moment | null, Moment | null] | null>([
Expand Down Expand Up @@ -69,9 +73,9 @@ export default () => {
locale={zhCN}
cellRender={(current: Moment, info) =>
React.cloneElement(
info.originNode,
getOriginNode(info.originNode),
{
...info.originNode.props,
...getOriginNode(info.originNode).props,
},
<div style={{ background: 'orange' }}>{current.get('date')}</div>,
)
Expand All @@ -82,9 +86,9 @@ export default () => {
locale={zhCN}
cellRender={(current: Moment, info) =>
React.cloneElement(
info.originNode,
getOriginNode(info.originNode),
{
className: `${info.originNode.props.className} testWrapper`,
className: `${getOriginNode(info.originNode).props.className} testWrapper`,
},
<div style={{ background: 'orange' }}>{current.get('date')}</div>,
)
Expand All @@ -96,9 +100,9 @@ export default () => {
picker="week"
cellRender={(current: Moment, info) =>
React.cloneElement(
info.originNode,
getOriginNode(info.originNode),
{
...info.originNode.props,
...getOriginNode(info.originNode).props,
},
<div style={{ background: 'orange' }}>{current.get('week')}</div>,
)
Expand All @@ -110,9 +114,9 @@ export default () => {
picker="year"
cellRender={(current: Moment, info) =>
React.cloneElement(
info.originNode,
getOriginNode(info.originNode),
{
...info.originNode.props,
...getOriginNode(info.originNode).props,
},
<div style={{ background: 'orange' }}>{current.get('year')}</div>,
)
Expand All @@ -124,9 +128,9 @@ export default () => {
picker="month"
cellRender={(current: Moment, info) =>
React.cloneElement(
info.originNode,
getOriginNode(info.originNode),
{
...info.originNode.props,
...getOriginNode(info.originNode).props,
},
<div style={{ background: 'orange' }}>{current.get('month') + 1}</div>,
)
Expand All @@ -138,9 +142,9 @@ export default () => {
picker="quarter"
cellRender={(current: Moment, info) =>
React.cloneElement(
info.originNode,
getOriginNode(info.originNode),
{
...info.originNode.props,
...getOriginNode(info.originNode).props,
},
<div style={{ background: 'orange' }}>Q{current.get('quarter')}</div>,
)
Expand All @@ -152,9 +156,9 @@ export default () => {
picker="time"
cellRender={(current: number | string, info) =>
React.cloneElement(
info.originNode,
getOriginNode(info.originNode),
{
...info.originNode.props,
...getOriginNode(info.originNode).props,
},
<div style={{ background: 'orange' }}>{current}</div>,
)
Expand Down
79 changes: 79 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
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 || {}));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

In @typescript-eslint/eslint-plugin v8 (and ESLint flat config), configs.recommended can be an array of config objects rather than a single object. If it is an array, tsEslintPlugin.configs.recommended.rules will be undefined, resulting in an empty recommendedTsRules set and silently disabling all recommended TypeScript linting rules. We should handle both array and object structures to ensure rules are correctly extracted.

const recommendedRulesObj = Array.isArray(tsEslintPlugin.configs.recommended) ? tsEslintPlugin.configs.recommended.reduce((acc, config) => ({ ...acc, ...config.rules }), {}) : tsEslintPlugin.configs.recommended?.rules || {};
const recommendedTsRules = new Set(Object.keys(recommendedRulesObj));

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',
},
},
];
58 changes: 58 additions & 0 deletions global.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/// <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;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Declaring testing globals (describe, it, test, expect, etc.) as any disables type safety and autocompletion in test files. Since @types/jest is installed as a devDependency, these globals should be typed properly (either automatically via tsconfig.json types or by importing them/referencing the correct types) rather than using any.


declare module 'moment/locale/zh-cn';
32 changes: 22 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,32 +120,44 @@
"devDependencies": {
"@rc-component/father-plugin": "^2.2.0",
"@rc-component/np": "^1.0.4",
"@testing-library/react": "^15.0.7",
"@types/jest": "^29.5.14",
"@types/luxon": "^3.2.0",
"@testing-library/react": "^16.3.2",
"@types/jest": "^30.0.0",
"@types/luxon": "^3.7.2",
"@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",
"cross-env": "^10.1.0",
"date-fns": "2.x",
"dayjs": "1.x",
"dumi": "^2.4.35",
"eslint": "^8.57.1",
"eslint": "^9.39.4",
"father": "^4.6.23",
"gh-pages": "^6.3.0",
"glob": "^13.0.6",
"husky": "^9.1.7",
"less": "^4.6.7",
"lint-staged": "^16.4.0",
"lint-staged": "^17.0.8",
"luxon": "3.x",
"mockdate": "^3.0.2",
"moment": "^2.24.0",
"moment-timezone": "^0.5.45",
"prettier": "^3.9.0",
"rc-test": "^7.1.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.9.3"
"react": "^19.2.7",
"react-dom": "^19.2.7",
"typescript": "^6.0.3",
"@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",
"@testing-library/jest-dom": "^6.9.1",
"eslint-plugin-jest": "^29.15.3",
"eslint-plugin-unicorn": "^65.0.1"
},
"peerDependencies": {
"date-fns": ">= 2.x",
Expand Down
16 changes: 16 additions & 0 deletions react-compat.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
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;
}
6 changes: 3 additions & 3 deletions tests/panel.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -593,10 +593,10 @@ describe('Picker.Panel', () => {
picker={picker as any}
cellRender={(current, info) =>
React.cloneElement(
info.originNode,
info.originNode as React.ReactElement<any>,
{
...info.originNode.props,
className: `${info.originNode.props.className} customInner`,
...(info.originNode as React.ReactElement<any>).props,
className: `${(info.originNode as React.ReactElement<any>).props.className} customInner`,
},
<div className="customWrapper">{getCurText(picker, current)}</div>,
)
Comment thread
afc163 marked this conversation as resolved.
Outdated
Expand Down
11 changes: 10 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,18 @@
"@@/*": [".dumi/tmp/*"],
"@rc-component/picker": ["src/index.tsx"]
},
"ignoreDeprecations": "5.0"
"ignoreDeprecations": "6.0",
"noImplicitAny": false,
"strictNullChecks": false,
"strictPropertyInitialization": false,
"strictFunctionTypes": false,
"strict": false,
"noImplicitThis": false,
"strictBindCallApply": false

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Disabling strict type-checking flags (such as strict, strictNullChecks, noImplicitAny, etc.) significantly reduces type safety and can easily introduce runtime errors (e.g., Cannot read properties of undefined). It is highly recommended to keep strict mode enabled, especially for a widely used library like @rc-component/picker, to ensure code quality and robustness.

},
"include": [
"react-compat.d.ts",
"global.d.ts",
".dumirc.ts",
".fatherrc.ts",
"src/**/*.ts",
Expand Down
Loading