test: More test case

Author: zombieJ

examples/panel.tsx

@@ -75,14 +75,23 @@ export default () => {
 
         <div style={{ margin: '0 8px' }}>
           <h3>Time</h3>
-          <PickerPanel<Moment> {...sharedProps} locale={jaJP} mode="time" />
+          <PickerPanel<Moment> {...sharedProps} locale={jaJP} picker="time" />
+        </div>
+        <div style={{ margin: '0 8px' }}>
+          <h3>Uncontrolled</h3>
+          <PickerPanel<Moment>
+            {...sharedProps}
+            locale={jaJP}
+            value={undefined}
+            picker="time"
+          />
         </div>
         <div style={{ margin: '0 8px' }}>
           <h3>Time AM/PM</h3>
           <PickerPanel<Moment>
             {...sharedProps}
             locale={jaJP}
-            mode="time"
+            picker="time"
             showTime={{
               use12Hours: true,
               showSecond: false,

src/PickerPanel.tsx

@@ -178,19 +178,13 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
   // Handle init logic
   const initRef = React.useRef(true);
 
-  // Inner value
-  const [innerValue, setInnerValue] = React.useState(() => {
-    if (value !== undefined) {
-      return value;
-    }
-    if (defaultValue !== undefined) {
-      return defaultValue;
-    }
-    return null;
+  // Value
+  const [mergedValue, setInnerValue] = useMergedState({
+    value,
+    defaultValue,
+    defaultStateValue: null,
   });
 
-  const mergedValue = value !== undefined ? value : innerValue;
-
   // View date control
   const [viewDate, setInnerViewDate] = useMergedState<
     DateType | null,
@@ -429,13 +423,13 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
     rangesNode = getRanges({
       prefixCls,
       needConfirmButton,
-      okDisabled: !value,
+      okDisabled: !mergedValue,
       locale,
       onOk: () => {
-        if (value) {
-          triggerSelect(value, 'submit', true);
+        if (mergedValue) {
+          triggerSelect(mergedValue, 'submit', true);
           if (onOk) {
-            onOk(value);
+            onOk(mergedValue);
           }
         }
       },

tests/panel.spec.tsx

@@ -400,4 +400,19 @@ describe('Picker.Panel', () => {
       });
     });
   });
+
+  it('onOk to trigger', () => {
+    const onOk = jest.fn();
+    const wrapper = mount(<MomentPickerPanel picker="time" onOk={onOk} />);
+    wrapper
+      .find('.rc-picker-time-panel-column')
+      .first()
+      .find('.rc-picker-time-panel-cell')
+      .at(3)
+      .simulate('click');
+
+    expect(onOk).not.toHaveBeenCalled();
+    wrapper.confirmOK();
+    expect(isSame(onOk.mock.calls[0][0], '1990-09-03 03:00:00')).toBeTruthy();
+  });
 });

tests/picker.spec.tsx

@@ -387,15 +387,20 @@ describe('Picker.Basic', () => {
 
         expect(wrapper.find(finalPanel).length).toBeTruthy();
 
-        wrapper.confirmOK();
+        if (showTime) {
+          wrapper.confirmOK();
+        }
         wrapper.closePicker();
         expect(isSame(onChange.mock.calls[0][0], '2019-08-18')).toBeTruthy();
       });
     });
 
     it('time', () => {
       const onChange = jest.fn();
-      const wrapper = mount(<MomentPicker picker="time" onChange={onChange} />);
+      const onOk = jest.fn();
+      const wrapper = mount(
+        <MomentPicker picker="time" onChange={onChange} onOk={onOk} />,
+      );
       wrapper.openPicker();
 
       function selectColumn(colIndex: number, rowIndex: number) {
@@ -411,7 +416,9 @@ describe('Picker.Basic', () => {
       selectColumn(1, 22);
       selectColumn(2, 33);
 
+      expect(onOk).not.toHaveBeenCalled();
       wrapper.confirmOK();
+      expect(onOk).toHaveBeenCalled();
       expect(
         isSame(onChange.mock.calls[0][0], '1990-09-03 13:22:33', 'second'),
       ).toBeTruthy();

tests/setup.js

@@ -24,10 +24,7 @@ Object.assign(Enzyme.ReactWrapper.prototype, {
       .simulate('blur');
   },
   confirmOK() {
-    const okBtn = this.find('.rc-picker-ok > *');
-    if (okBtn.length) {
-      okBtn.simulate('click');
-    }
+    this.find('.rc-picker-ok > *').simulate('click');
   },
   isOpen() {
     const openDiv = this.find('.rc-picker-dropdown').hostNodes();