Skip to content
Merged
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
7 changes: 6 additions & 1 deletion src/PickerPanel/TimePanel/TimePanelBody/TimeColumn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ export interface TimeUnitColumnProps {
changeOnScroll?: boolean;
}

// Not use JSON.stringify to avoid dead loop
function flattenUnits(units: Unit<string | number>[]) {
return units.map(({ value, label, disabled }) => [value, label, disabled].join(',')).join(';');
}

export default function TimeColumn<DateType extends object>(props: TimeUnitColumnProps) {
const { units, value, optionalValue, type, onChange, onHover, onDblClick, changeOnScroll } =
props;
Expand Down Expand Up @@ -54,7 +59,7 @@ export default function TimeColumn<DateType extends object>(props: TimeUnitColum
stopScroll();
clearDelayCheck();
};
}, [value, optionalValue, units.join(',')]);
}, [value, optionalValue, flattenUnits(units)]);

// ========================= Change =========================
// Scroll event if sync onScroll
Expand Down
39 changes: 23 additions & 16 deletions tests/picker.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1082,21 +1082,25 @@ describe('Picker.Basic', () => {
});

it('not repeat scroll if disabledTime return same value', () => {
const getDisabledTimeFn = () => () => ({
disabledHours: () => [10],
disabledMinutes: () => [10],
disabledSeconds: () => [10],
});
const getDisabledTimeFn =
(num = 10) =>
() => ({
disabledHours: () => [num],
disabledMinutes: () => [num],
disabledSeconds: () => [num],
});

const { rerender } = render(
const renderDemo = (disabledTime: any) => (
<DayPicker
picker="time"
defaultValue={getDay('2020-07-22 09:03:28')}
open
disabledTime={getDisabledTimeFn()}
/>,
disabledTime={disabledTime}
/>
);

const { rerender } = render(renderDemo(getDisabledTimeFn()));

act(() => {
jest.advanceTimersByTime(1000);
jest.clearAllTimers();
Expand All @@ -1105,20 +1109,23 @@ describe('Picker.Basic', () => {

// New disabledTime
triggered = false;
rerender(
<DayPicker
picker="time"
defaultValue={getDay('2020-07-22 09:03:28')}
open
disabledTime={getDisabledTimeFn()}
/>,
);
renderDemo(getDisabledTimeFn());

act(() => {
jest.advanceTimersByTime(1000);
jest.clearAllTimers();
});
expect(triggered).toBeFalsy();

// New disabledTime but different disabled value
triggered = false;
rerender(renderDemo(getDisabledTimeFn(11)));

act(() => {
jest.advanceTimersByTime(1000);
jest.clearAllTimers();
});
expect(triggered).toBeTruthy();
});
});

Expand Down
Loading