disabled today select time (react-component#640)

Co-authored-by: veveue <[email protected]>
narrowizard · Mar 13, 2020 · 3365215 · 3365215
1 parent f68ef71
commit 3365215
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/examples/antd-calendar.js b/examples/antd-calendar.js
@@ -297,6 +297,22 @@ export default () => (
           renderFooter={mode => <span>{mode} extra footer</span>}
         />
       </div>
+      <div style={{ margin: 10 }}>
+        <p>disabled today select time</p>
+        <Calendar
+          showWeekNumber={false}
+          locale={cn ? zhCN : enUS}
+          defaultValue={now}
+          showToday
+          format={getFormat(true)}
+          showOk={false}
+          timePicker={timePickerElement}
+          onChange={onStandaloneChange}
+          disabledDate={current => current && current <= moment()}
+          onSelect={onStandaloneSelect}
+          renderFooter={mode => <span>{mode} extra footer</span>}
+        />
+      </div>
       <div style={{ float: 'left', width: 300 }}>
         <Demo defaultValue={now} />
       </div>

diff --git a/src/Calendar.tsx b/src/Calendar.tsx
@@ -490,6 +490,7 @@ class Calendar extends React.Component<CalendarProps, CalendarState> {
             showDateInput={props.showDateInput}
             timePicker={timePicker}
             selectedValue={selectedValue}
+            timePickerDisabled={!selectedValue}
             value={value}
             disabledDate={disabledDate}
             okDisabled={

diff --git a/tests/Calendar.spec.jsx b/tests/Calendar.spec.jsx
@@ -111,7 +111,9 @@ describe('Calendar', () => {
     });
     it('timePicker date have no changes when hover', () => {
       const timePicker = <TimePickerPanel defaultValue={moment('00:00:00', 'HH:mm:ss')} />;
-      const wrapper = mount(<Calendar timePicker={timePicker} />);
+      const wrapper = mount(
+        <Calendar defaultSelectedValue={moment('01:01:01', 'HH:mm:ss')} timePicker={timePicker} />,
+      );
       wrapper.find('.rc-calendar-time-picker-btn').simulate('click');
       const dateBtns = wrapper.find('.rc-calendar-my-select a');
       const btnClassName = 'rc-calendar-time-status';
@@ -165,8 +167,6 @@ describe('Calendar', () => {
       }
       const wrapper = mount(<ControlledCalendar />);
 
-      wrapper.find('.rc-calendar-time-picker-btn').simulate('click');
-      expect(wrapper.find('.rc-calendar-time-picker').length).toBe(1);
       wrapper.find('.rc-calendar-time-picker-btn').simulate('click');
       expect(wrapper.find('.rc-calendar-time-picker').length).toBe(0);