Merge pull request #123 from canpolatoral/master

datepicker timezone problem bugfix.
canpolatoral · May 8, 2019 · 28885b0 · 28885b0
2 parents 7a8565d + 6eb7a6e
commit 28885b0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 28 deletions.
diff --git a/packages/components/src/DateTimePicker/DateTimePicker.js b/packages/components/src/DateTimePicker/DateTimePicker.js
@@ -11,9 +11,6 @@ import {
   getDatePickerStyle,
   getDefaultDate,
   getDateToString,
-  clearTime,
-  // clearTimeZone,
-  clearJustTimeZone,
   checkDateForBusiness,
 } from './dateUtils';
 
@@ -252,8 +249,6 @@ class DateTimePicker extends ComponentBase {
     } else {
       handleDate = new Date();
       handleDate.setDate(handleDate.getDate() - 1);
-      handleDate = clearTime(handleDate);
-      handleDate = clearJustTimeZone(handleDate);
       handleDate = this.dateUpdate(handleDate, handleDate, -1);
       this.dateOnChange(e, handleDate, true);
     }
@@ -270,8 +265,6 @@ class DateTimePicker extends ComponentBase {
     } else {
       handleDate = new Date();
       handleDate.setDate(handleDate.getDate() + 1);
-      handleDate = clearTime(handleDate);
-      handleDate = clearJustTimeZone(handleDate);
       handleDate = this.dateUpdate(handleDate, handleDate, 1);
       this.dateOnChange(e, handleDate, true);
     }
@@ -290,13 +283,9 @@ class DateTimePicker extends ComponentBase {
 
   getValue() {
     if (this.state.value) {
-      // TODO: timezone farkı kaldırılması gerekiyor.
-      // return  new Date((this.state.value).getTime());
       const formats = getFormatDecomposition(this.props.format);
       const returnDate = this.state.value;
-      // sadece tarih gösterilecek ise saat bilgileri temizleniyor.
       if (formats.timeFormat === undefined) {
-        clearTime(returnDate);
         return returnDate;
       }
       return returnDate;

diff --git a/packages/components/src/DateTimePicker/dateUtils.js b/packages/components/src/DateTimePicker/dateUtils.js
@@ -666,8 +666,7 @@ export function getDefaultDate(props) {
 export function getDateToString(propDate, defaultDate) {
   let returnDate = defaultDate;
   if (isString(propDate)) {
-    let clearedDate = clearTimeZone(propDate);
-    returnDate = clearedDate;
+    returnDate = new Date(propDate);
     if (isNaN(returnDate)) {
       returnDate = defaultDate;
     }
@@ -679,21 +678,6 @@ export function getDateToString(propDate, defaultDate) {
   }
   return returnDate;
 }
-export function clearTime(returnDate) {
-  returnDate.setHours(0);
-  returnDate.setMinutes(0);
-  returnDate.setSeconds(0);
-
-  return returnDate;
-}
-export function clearTimeZone(returnDate) {
-  if (isString(returnDate))
-    returnDate = new Date(returnDate);
-  return new Date((returnDate).getTime() + ((returnDate).getTimezoneOffset() * 60000));
-}
-export function clearJustTimeZone(returnDate) {
-  return new Date(returnDate.getTime());
-}
 export function getDayList(calendarInfo, selectedDate, dayType, betweenDayCount) {
   // let monthFirstDate = cloneDate(getFirstDayOfMonth(selectedDate));
   const specialDayStringArray = [];

diff --git a/packages/utils/src/Localization/index.js b/packages/utils/src/Localization/index.js
@@ -6,6 +6,12 @@ import phoneFormatter from 'phone-formatter';
 import 'numeral/locales';
 import { Language } from './language';
 
+/* eslint-disable */
+Date.prototype.toJSON = function() { 
+  return Moment(this).format(); 
+};
+/* eslint-enable  */
+
 export class Localization {
   static language = 'en';
 
@@ -111,6 +117,7 @@ export class Localization {
   }
 
   static getDateTimeFormat(format) {
+    // eslint-disable-next-line no-underscore-dangle
     return moment.localeData()._longDateFormat[format];
   }
 
@@ -127,10 +134,12 @@ export class Localization {
   }
 
   static getFloatValue(value) {
+    // eslint-disable-next-line no-underscore-dangle
     return numeral(value)._value;
   }
 
   static getIntegerValue(value) {
+    // eslint-disable-next-line no-underscore-dangle
     return parseInt(numeral(value)._value, 10);
   }