From 6d833c75c51fbf1c845dea329a538b2d53fe5972 Mon Sep 17 00:00:00 2001
From: goodmice <av.sirotkin@autodrilling.ru>
Date: Mon, 18 Apr 2022 10:51:50 +0500
Subject: [PATCH] =?UTF-8?q?*=20=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B2=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=81=D0=BE=D0=BB=D1=8C=20=D1=81=D0=BA=D1=80?=
 =?UTF-8?q?=D1=8B=D1=82=20=D0=B2=20TimezoneSelect=20*=20=D0=94=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20falsy=20=D0=B7=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B2=20DatePickerWrapper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/Columns/timezone.tsx  | 13 +++++--------
 src/components/Table/DatePickerWrapper.tsx |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/Table/Columns/timezone.tsx b/src/components/Table/Columns/timezone.tsx
index affae17..79025b7 100755
--- a/src/components/Table/Columns/timezone.tsx
+++ b/src/components/Table/Columns/timezone.tsx
@@ -37,14 +37,11 @@ export const TimezoneSelect = memo<TimezoneSelectProps>(({ onChange, value, defa
     useEffect(() => setDefaultTimezone(defaultValue ? findTimezoneId(defaultValue) : null), [defaultValue])
     useEffect(() => setId(value ? findTimezoneId(value) : null), [value])
 
-    const onValueChanged = useCallback((id: TimezoneId | null) => {
-        console.log(id)
-        onChange?.({
-            timezoneId: id,
-            hours: id ? rawTimezones[id] : 0,
-            isOverride: false,
-        })
-    }, [onChange])
+    const onValueChanged = useCallback((id: TimezoneId | null) => onChange?.({
+        timezoneId: id,
+        hours: id ? rawTimezones[id] : 0,
+        isOverride: false,
+    }), [onChange])
 
     return (<Select {...other} onChange={onValueChanged} value={id} defaultValue={defaultTimezone} />)
 })
diff --git a/src/components/Table/DatePickerWrapper.tsx b/src/components/Table/DatePickerWrapper.tsx
index a453fbc..9fa14d1 100755
--- a/src/components/Table/DatePickerWrapper.tsx
+++ b/src/components/Table/DatePickerWrapper.tsx
@@ -18,7 +18,7 @@ export const DatePickerWrapper = memo<DatePickerWrapperProps>(({ value, onChange
     format={defaultFormat}
     defaultValue={moment()}
     onChange={(date) => onChange?.(date)}
-    value={isUTC ? moment.utc(value).local() : moment(value)}
+    value={value && (isUTC ? moment.utc(value).local() : moment(value))}
     {...other}
   />
 ))