fix(datepicker): issue #2369; review fix and fixed test;