fix: presets和maxDate的对比

src/PickerInput/Popup/PresetPanel.tsx

@@ -1,11 +1,13 @@
 import * as React from 'react';
 import type { ValueDate } from '../../interface';
+import moment from 'moment';
 
-export interface PresetPanelProps<ValueType = any> {
+export interface PresetPanelProps<ValueType = any, DateType extends object = any> {
   prefixCls: string;
   presets: ValueDate<ValueType>[];
   onClick: (value: ValueType) => void;
   onHover: (value: ValueType) => void;
+  maxDate?: DateType;
 }
 
 function executeValue<ValueType extends object>(value: ValueDate<ValueType>['value']): ValueType {
@@ -15,7 +17,7 @@ function executeValue<ValueType extends object>(value: ValueDate<ValueType>['val
 export default function PresetPanel<DateType extends object = any>(
   props: PresetPanelProps<DateType>,
 ) {
-  const { prefixCls, presets, onClick, onHover } = props;
+  const { prefixCls, presets, onClick, onHover, maxDate } = props;
 
   if (!presets.length) {
     return null;
@@ -24,22 +26,36 @@ export default function PresetPanel<DateType extends object = any>(
   return (
     <div className={`${prefixCls}-presets`}>
       <ul>
-        {presets.map(({ label, value }, index) => (
-          <li
-            key={index}
-            onClick={() => {
-              onClick(executeValue(value));
-            }}
-            onMouseEnter={() => {
-              onHover(executeValue(value));
-            }}
-            onMouseLeave={() => {
-              onHover(null);
-            }}
-          >
-            {label}
-          </li>
-        ))}
+        {presets.map(({ label, value }, index) => {
+          // const isDisabled =
+          //   maxDate && moment.isMoment(maxDate)
+          //     ? moment(typeof value === 'function' ? value() : value).isAfter(maxDate)
+          //     : false;
+          const isDisabled = maxDate
+            ? moment(typeof value === 'function' ? value() : value).isAfter(maxDate)
+            : false;
+
+          return (
+            <li
+              key={index}
+              onClick={() => {
+                if (!isDisabled) {
+                  onClick(executeValue(value));
+                }
+              }}
+              onMouseEnter={() => {
+                if (!isDisabled) {
+                  onHover(executeValue(value));
+                }
+              }}
+              onMouseLeave={() => {
+                onHover(null);
+              }}
+            >
+              {label}
+            </li>
+          );
+        })}
       </ul>
     </div>
   );

src/PickerInput/Popup/index.tsx

@@ -43,8 +43,8 @@ export interface PopupProps<DateType extends object = any, PresetValue = DateTyp
   needConfirm: boolean;
   isInvalid: (date: DateType | DateType[]) => boolean;
   onOk: VoidFunction;
-
   onPanelMouseDown?: React.MouseEventHandler<HTMLDivElement>;
+  maxDate?: DateType;
 }
 
 export default function Popup<DateType extends object = any>(props: PopupProps<DateType>) {
@@ -79,6 +79,8 @@ export default function Popup<DateType extends object = any>(props: PopupProps<D
     defaultOpenValue,
     onOk,
     onSubmit,
+
+    maxDate,
   } = props;
 
   const { prefixCls } = React.useContext(PickerContext);
@@ -181,6 +183,7 @@ export default function Popup<DateType extends object = any>(props: PopupProps<D
     <div className={`${prefixCls}-panel-layout`}>
       {/* `any` here since PresetPanel is reused for both Single & Range Picker which means return type is not stable */}
       <PresetPanel<any>
+        maxDate={maxDate}
         prefixCls={prefixCls}
         presets={presets}
         onClick={onPresetSubmit}

src/PickerInput/RangePicker.tsx

@@ -621,6 +621,7 @@ function RangePicker<DateType extends object = any>(
       onNow={onNow}
       // Render
       cellRender={onInternalCellRender}
+      maxDate={maxDate}
     />
   );
 

src/PickerInput/SinglePicker.tsx

@@ -534,6 +534,7 @@ function Picker<DateType extends object = any>(
       onNow={onNow}
       // Render
       cellRender={onInternalCellRender}
+      maxDate={maxDate}
     />
   );
 

tests/picker.spec.tsx

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import { act, createEvent, fireEvent, render } from '@testing-library/react';
-import type { Dayjs } from 'dayjs';
-import dayjs from 'dayjs';
+import dayjs, { type Dayjs } from 'dayjs';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 import KeyCode from '@rc-component/util/lib/KeyCode';
@@ -1197,6 +1196,154 @@ describe('Picker.Basic', () => {
     expect(onChange.mock.calls[0][0].format('YYYY-MM-DD')).toEqual('1990-09-04');
   });
 
+  it('presets - trigger', () => {
+    const onChange = jest.fn();
+    const mockHover = jest.fn();
+
+    const yesterday = dayjs().subtract(1, 'day');
+    render(
+      <DayPicker
+        {...({
+          onChange,
+          onHover: mockHover,
+          open: true,
+          presets: [{ label: 'Tomorrow', value: yesterday }],
+          maxDate: dayjs(),
+        } as React.ComponentProps<typeof DayPicker> & { onHover?: (date: Dayjs | null) => void })}
+      />,
+    );
+
+    const presetEle = document.querySelector('.rc-picker-presets li');
+    if (!presetEle) throw new Error('Preset element not found');
+
+    fireEvent.click(presetEle);
+    expect(onChange).toHaveBeenCalled();
+
+    fireEvent.mouseEnter(presetEle);
+    // expect(mockHover).toHaveBeenCalled();
+  });
+
+  it('should not trigger onClick when preset date is after maxDate', () => {
+    const onChange = jest.fn();
+    const mockHover = jest.fn();
+    const futureDate = dayjs().add(1, 'day'); // 使用 dayjs 替代 moment
+    const maxDate = dayjs(); //
+    const onHover = mockHover as jest.MockedFunction<(date: Dayjs | null) => void>;
+    render(
+      <DayPicker
+        {...{
+          onChange,
+          onHover,
+          open: true,
+          presets: [{ label: 'Tomorrow', value: futureDate }],
+          maxDate,
+        }}
+      />,
+    );
+
+    const presetEle = document.querySelector('.rc-picker-presets li');
+    if (!presetEle) throw new Error('Preset element not found');
+
+    fireEvent.click(presetEle);
+    expect(onChange).not.toHaveBeenCalled();
+
+    fireEvent.mouseEnter(presetEle);
+    expect(mockHover).not.toHaveBeenCalled();
+  });
+
+  it('should not render presets when presets is empty', () => {
+    const mockHover = jest.fn();
+    const mockChange = jest.fn();
+    const onHover = mockHover as jest.MockedFunction<(date: Dayjs | null) => void>;
+
+    render(
+      <DayPicker
+        {...{
+          onChange: mockChange,
+          onHover,
+          open: true,
+          presets: [{ label: 'Tomorrow', value: dayjs().add(1, 'day') }],
+        }}
+      />,
+    );
+
+    // 用 DOM 判断是否渲染了 presets
+    const presetEle = document.querySelector('.rc-picker-presets li');
+
+    if (!presetEle) throw new Error('Preset element not found');
+
+    fireEvent.click(presetEle);
+    expect(mockChange).toHaveBeenCalled();
+  });
+
+  it('should not render presets when presets is function', () => {
+    const mockHover = jest.fn();
+    const mockChange = jest.fn();
+    const onHover = mockHover as jest.MockedFunction<(date: Dayjs | null) => void>;
+    render(
+      <DayPicker
+        {...{
+          onChange: mockChange,
+          onHover,
+          open: true,
+          maxDate: dayjs(),
+          presets: [{ label: 'Tomorrow', value: () => dayjs().subtract(1, 'day') }],
+        }}
+      />,
+    );
+
+    // 用 DOM 判断是否渲染了 presets
+    const presetEle = document.querySelector('.rc-picker-presets li');
+
+    if (!presetEle) throw new Error('Preset element not found');
+
+    fireEvent.click(presetEle);
+    expect(mockChange).toHaveBeenCalled();
+  });
+
+  it('should allow click when maxDate is not a moment object', () => {
+    const onChange = jest.fn();
+
+    render(
+      <DayPicker
+        {...({
+          onChange,
+          open: true,
+          presets: [{ label: 'Valid', value: dayjs().subtract(1, 'day') }],
+          maxDate: dayjs(), // 👈 不是 moment 对象
+        } as React.ComponentProps<typeof DayPicker>)}
+      />,
+    );
+
+    const presetEle = document.querySelector('.rc-picker-presets li');
+    if (!presetEle) throw new Error('Preset element not found');
+
+    fireEvent.click(presetEle);
+    expect(onChange).toHaveBeenCalled(); // ✅ 应该能调用
+  });
+
+  it('should allow click when maxDate is not provided', () => {
+    const onChange = jest.fn();
+
+    render(
+      <DayPicker
+        {...({
+          onChange,
+          open: true,
+          maxDate: undefined,
+          presets: [{ label: 'Valid', value: dayjs().add(1, 'day') }],
+          // 👇 不传 maxDate
+        } as React.ComponentProps<typeof DayPicker>)}
+      />,
+    );
+
+    const presetEle = document.querySelector('.rc-picker-presets li');
+    if (!presetEle) throw new Error('Preset element not found');
+
+    fireEvent.click(presetEle);
+    expect(onChange).toHaveBeenCalled(); // ✅ 应该能调用
+  });
+
   it('presets support callback', () => {
     const onChange = jest.fn();
     const mockPresetValue = jest.fn().mockImplementationOnce(() => getDay('2000-09-03'));