Fix disabled (#160)

* fix: disabledMin & disabledSec with 12hour

* test: Add test case

Author: zombieJ

src/panels/TimePanel/TimeBody.tsx

@@ -78,7 +78,8 @@ function TimeBody<DateType>(props: TimeBodyProps<DateType>) {
   const columnPrefixCls = `${prefixCls}-time-panel`;
 
   let isPM: boolean | undefined;
-  let hour = value ? generateConfig.getHour(value) : -1;
+  const originHour = value ? generateConfig.getHour(value) : -1;
+  let hour = originHour;
   const minute = value ? generateConfig.getMinute(value) : -1;
   const second = value ? generateConfig.getSecond(value) : -1;
 
@@ -147,28 +148,25 @@ function TimeBody<DateType>(props: TimeBodyProps<DateType>) {
       });
   }, [use12Hours, memorizedRawHours]);
 
-  const minutes = generateUnits(0, 59, minuteStep, disabledMinutes && disabledMinutes(hour));
+  const minutes = generateUnits(0, 59, minuteStep, disabledMinutes && disabledMinutes(originHour));
 
   const seconds = generateUnits(
     0,
     59,
     secondStep,
-    disabledSeconds && disabledSeconds(hour, minute),
+    disabledSeconds && disabledSeconds(originHour, minute),
   );
 
   // ====================== Operations ======================
   operationRef.current = {
     onUpDown: diff => {
       const column = columns[activeColumnIndex];
       if (column) {
-        const valueIndex = column.units.findIndex(
-          unit => unit.value === column.value,
-        );
+        const valueIndex = column.units.findIndex(unit => unit.value === column.value);
 
         const unitLen = column.units.length;
         for (let i = 1; i < unitLen; i += 1) {
-          const nextUnit =
-            column.units[(valueIndex + diff * i + unitLen) % unitLen];
+          const nextUnit = column.units[(valueIndex + diff * i + unitLen) % unitLen];
 
           if (nextUnit.disabled !== true) {
             column.onSelect(nextUnit.value);
@@ -210,26 +208,14 @@ function TimeBody<DateType>(props: TimeBodyProps<DateType>) {
   });
 
   // Minute
-  addColumnNode(
-    showMinute,
-    <TimeUnitColumn key="minute" />,
-    minute,
-    minutes,
-    num => {
-      onSelect(setTime(isPM, hour, num, second), 'mouse');
-    },
-  );
+  addColumnNode(showMinute, <TimeUnitColumn key="minute" />, minute, minutes, num => {
+    onSelect(setTime(isPM, hour, num, second), 'mouse');
+  });
 
   // Second
-  addColumnNode(
-    showSecond,
-    <TimeUnitColumn key="second" />,
-    second,
-    seconds,
-    num => {
-      onSelect(setTime(isPM, hour, minute, num), 'mouse');
-    },
-  );
+  addColumnNode(showSecond, <TimeUnitColumn key="second" />, second, seconds, num => {
+    onSelect(setTime(isPM, hour, minute, num), 'mouse');
+  });
 
   // 12 Hours
   let PMIndex = -1;
@@ -250,9 +236,7 @@ function TimeBody<DateType>(props: TimeBodyProps<DateType>) {
     },
   );
 
-  return (
-    <div className={contentPrefixCls}>{columns.map(({ node }) => node)}</div>
-  );
+  return <div className={contentPrefixCls}>{columns.map(({ node }) => node)}</div>;
 }
 
 export default TimeBody;

tests/__snapshots__/panel.spec.tsx.snap

@@ -614,7 +614,7 @@ exports[`Picker.Panel should render correctly in rtl 1`] = `
 </div>
 `;
 
-exports[`Picker.Panel time disabled columns 1`] = `
+exports[`Picker.Panel time disabled columns basic 1`] = `
 <div
   class="rc-picker-panel"
   tabindex="0"

tests/panel.spec.tsx

@@ -421,17 +421,37 @@ describe('Picker.Panel', () => {
     });
   });
 
-  it('time disabled columns', () => {
-    const wrapper = mount(
-      <MomentPickerPanel
-        mode="time"
-        disabledHours={() => [0, 1, 2, 3, 4, 5, 6, 7]}
-        disabledMinutes={() => [2, 4, 6, 8, 10]}
-        disabledSeconds={() => [10, 20, 30, 40, 50]}
-      />,
-    );
+  describe('time disabled columns', () => {
+    it('basic', () => {
+      const wrapper = mount(
+        <MomentPickerPanel
+          mode="time"
+          disabledHours={() => [0, 1, 2, 3, 4, 5, 6, 7]}
+          disabledMinutes={() => [2, 4, 6, 8, 10]}
+          disabledSeconds={() => [10, 20, 30, 40, 50]}
+        />,
+      );
 
-    expect(wrapper.render()).toMatchSnapshot();
+      expect(wrapper.render()).toMatchSnapshot();
+    });
+
+    it('use12Hour', () => {
+      const disabledMinutes = jest.fn(() => []);
+      const disabledSeconds = jest.fn(() => []);
+
+      mount(
+        <MomentPickerPanel
+          mode="time"
+          use12Hours
+          value={getMoment('2000-01-01 13:07:04')}
+          disabledMinutes={disabledMinutes}
+          disabledSeconds={disabledSeconds}
+        />,
+      );
+
+      expect(disabledMinutes).toHaveBeenCalledWith(13);
+      expect(disabledSeconds).toHaveBeenCalledWith(13, 7);
+    });
   });
 
   it('warning with invalidate value', () => {