Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
88 changes: 88 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
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 recommendedTsRulesConfig = tsEslintPlugin.configs.recommended;
const recommendedTsRulesObject = Array.isArray(recommendedTsRulesConfig)
? recommendedTsRulesConfig.reduce((rules, config) => ({ ...rules, ...(config.rules || {}) }), {})
: recommendedTsRulesConfig?.rules || {};
const recommendedTsRules = new Set(Object.keys(recommendedTsRulesObject));
const noopRule = {
meta: { type: 'problem', docs: {}, schema: [] },
create: () => ({}),
};

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

if (next.plugins?.['@typescript-eslint']) {
next.plugins = { ...next.plugins };
delete next.plugins['@typescript-eslint'];
}

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

return next;
}

export default [
{
ignores: [
'node_modules/',
'coverage/',
'es/',
'lib/',
'dist/',
'docs-dist/',
'.dumi/',
'.doc/',
'.vercel/',
'.eslintrc.js',
'src/index.d.ts',
],
},
{
plugins: {
'@typescript-eslint': {
...tsEslintPlugin,
rules: {
...tsEslintPlugin.rules,
'consistent-type-exports': noopRule,
},
},
},
},
...compat.config(require('./.eslintrc.js')).map(normalizeConfig),
{
rules: {
'@typescript-eslint/no-empty-object-type': 'off',
'@typescript-eslint/no-unsafe-function-type': 'off',
'@typescript-eslint/no-unused-vars': 'off',
},
},
];
11 changes: 11 additions & 0 deletions global.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/// <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 module 'moment/locale/zh-cn';
39 changes: 26 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,34 +118,47 @@
"clsx": "^2.1.1"
},
"devDependencies": {
"@babel/eslint-parser": "^7.29.7",
"@babel/eslint-plugin": "^7.29.7",
"@eslint/eslintrc": "^3.3.5",
"@eslint/js": "^9.39.4",
"@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/dom": "^10.4.1",
"@testing-library/jest-dom": "^6.9.1",
"@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",
"@typescript-eslint/eslint-plugin": "^8.62.1",
"@typescript-eslint/parser": "^8.62.1",
"cross-env": "^10.1.0",
"date-fns": "2.x",
"dayjs": "1.x",
"dumi": "^2.4.35",
"eslint": "^8.57.1",
"father": "^4.6.23",
"dumi": "^2.4.38",
"eslint": "^9.39.4",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-jest": "^29.15.4",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.1.1",
"eslint-plugin-unicorn": "^65.0.1",
"father": "^4.6.24",
"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",
"prettier": "^3.9.4",
"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"
},
"peerDependencies": {
"date-fns": ">= 2.x",
Expand Down
2 changes: 1 addition & 1 deletion src/PickerInput/Selector/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ const Input = React.forwardRef<InputRef, InputProps>((props, ref) => {
};

// ======================== Format ========================
const rafRef = React.useRef<number>();
const rafRef = React.useRef<number | undefined>(undefined);

useLayoutEffect(() => {
if (!focused || !format || mouseDownRef.current) {
Expand Down
6 changes: 3 additions & 3 deletions src/PickerInput/Selector/RangeSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ function RangeSelector<DateType extends object = any>(
}, [id]);

// ========================= Refs =========================
const rootRef = React.useRef<HTMLDivElement>();
const inputStartRef = React.useRef<InputRef>();
const inputEndRef = React.useRef<InputRef>();
const rootRef = React.useRef<HTMLDivElement>(null);
const inputStartRef = React.useRef<InputRef>(null);
const inputEndRef = React.useRef<InputRef>(null);

const getInput = (index: number) => [inputStartRef, inputEndRef][index]?.current;

Expand Down
4 changes: 2 additions & 2 deletions src/PickerInput/Selector/SingleSelector/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ function SingleSelector<DateType extends object = any>(
const { prefixCls, classNames, styles } = React.useContext(PickerContext);

// ========================= Refs =========================
const rootRef = React.useRef<HTMLDivElement>();
const inputRef = React.useRef<InputRef>();
const rootRef = React.useRef<HTMLDivElement>(null);
const inputRef = React.useRef<InputRef>(null);

React.useImperativeHandle(ref, () => ({
nativeElement: rootRef.current,
Expand Down
2 changes: 1 addition & 1 deletion src/PickerInput/hooks/useDelayState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default function useDelayState<T>(
const nextValueRef = React.useRef<T>(value);

// ============================= Update =============================
const rafRef = React.useRef<number>();
const rafRef = React.useRef<number | undefined>(undefined);
const cancelRaf = () => {
raf.cancel(rafRef.current);
};
Expand Down
2 changes: 1 addition & 1 deletion src/PickerInput/hooks/usePickerRef.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type PickerRefType<OptionType> = Omit<PickerRef, 'focus'> & {
};

export default function usePickerRef<OptionType>(ref: React.Ref<PickerRefType<OptionType>>) {
const selectorRef = React.useRef<PickerRefType<OptionType>>();
const selectorRef = React.useRef<PickerRefType<OptionType>>(null);

React.useImperativeHandle(ref, () => ({
nativeElement: selectorRef.current?.nativeElement,
Expand Down
4 changes: 2 additions & 2 deletions src/PickerPanel/TimePanel/TimePanelBody/TimeColumn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import useScrollTo from './useScrollTo';
const SCROLL_DELAY = 300;

export type Unit<ValueType = number | string> = {
label: React.ReactText;
label: string | number;
value: ValueType;
disabled?: boolean;
};
Expand Down Expand Up @@ -41,7 +41,7 @@ export default function TimeColumn<DateType extends object>(props: TimeUnitColum
const ulRef = React.useRef<HTMLUListElement>(null);

// ========================= Scroll =========================
const checkDelayRef = React.useRef<any>();
const checkDelayRef = React.useRef<any>(undefined);

const clearDelayCheck = () => {
clearTimeout(checkDelayRef.current);
Expand Down
2 changes: 1 addition & 1 deletion src/PickerPanel/TimePanel/TimePanelBody/useScrollTo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function useScrollTo(
scrollingRef.current = false;
};

const scrollRafTimesRef = React.useRef<number>();
const scrollRafTimesRef = React.useRef<number | undefined>(undefined);

const startScroll = () => {
const ul = ulRef.current;
Expand Down
2 changes: 1 addition & 1 deletion src/PickerPanel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ function PickerPanel<DateType extends object = any>(
const mergedPrefixCls = contextPrefixCls || prefixCls || 'rc-picker';

// ========================== Refs ==========================
const rootRef = React.useRef<HTMLDivElement>();
const rootRef = React.useRef<HTMLDivElement>(null);

React.useImperativeHandle(ref, () => ({
nativeElement: rootRef.current,
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useTimeInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { findValidateTime } from '../PickerPanel/TimePanel/TimePanelBody/util';
import { leftPad } from '../utils/miscUtil';

export type Unit<ValueType = number | string> = {
label: React.ReactText;
label: string | number;
value: ValueType;
disabled?: boolean;
};
Expand Down
2 changes: 1 addition & 1 deletion tests/__snapshots__/panel.spec.tsx.snap
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing

exports[`Picker.Panel append cell with cellRender in date 1`] = `
<div>
Expand Down
2 changes: 1 addition & 1 deletion tests/__snapshots__/picker.spec.tsx.snap
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing

exports[`Picker.Basic icon 1`] = `
<div
Expand Down
Loading
Loading