@pushwoosh/dumb-components 1.1.52 → 1.1.54

package/Calendar/CalendarDropdown/CalendarDropdown.js

@@ -1,4 +1,4 @@
-import React, { useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { Color } from '@pushwoosh/kit-constants';
 import { Horizontal, useClickAway, Vertical } from '@pushwoosh/kit-helpers';
@@ -21,8 +21,14 @@ export const CalendarDropdown = props => {
   const [isShaking, setIsShaking] = useState(false);
   const [popoverPosition, setPopoverPosition] = useState(null);
   const [value, setValue] = useState(props.value ?? (isRangePicker ? [] : undefined));
-  const initialTimezone = 'timezone' in calendarProps ? calendarProps.timezone : 'UTC';
+  const initialTimezone = calendarProps.timezone || 'UTC';
   const [timezone, setTimezone] = useState(initialTimezone);
+  useEffect(() => {
+    setValue(props.value ?? (isRangePicker ? [] : undefined));
+  }, [props.value, isRangePicker]);
+  useEffect(() => {
+    setTimezone(calendarProps.timezone || 'UTC');
+  }, [calendarProps.timezone]);
   const closePopover = () => {
     setPopoverPosition(null);
     setValue(props.value ?? (isRangePicker ? [] : undefined));
@@ -44,7 +50,7 @@ export const CalendarDropdown = props => {
     (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, val);
   };
   const presets = 'presets' in props ? props.presets : undefined;
-  const noValue = isRangePicker ? (value === null || value === void 0 ? void 0 : value.length) === 0 : !value;
+  const noValue = isRangePicker ? ((value === null || value === void 0 ? void 0 : value.length) ?? 0) === 0 : !value;
   let buttonText;
   if (noValue) {
     buttonText = isRangePicker ? 'Select period' : 'Select date';

package/Calendar/helpers.js

@@ -124,8 +124,7 @@ export const getPeriodEnd = (date, period) => {
   return utcDateToStruct(dateObj);
 };
 export const dateToStruct = (date, tzOffsetMinutes) => {
-  const utcTime = date.getTime() + date.getTimezoneOffset() * 60_000;
-  const localTime = new Date(utcTime + tzOffsetMinutes * 60_000);
+  const localTime = new Date(date.getTime() + tzOffsetMinutes * 60_000);
   return utcDateToStruct(localTime);
 };
 export const structToDate = (ds, tzOffsetMinutes) => {
@@ -159,7 +158,8 @@ export const dateToStructTz = (date, tzName) => {
   return dateToStruct(date, tzOffsetMinutes);
 };
 export const structToDateTz = (ds, tzName) => {
-  const tentativeDate = new Date(Date.UTC(ds.year, ds.month - 1, ds.day, ds.hour, ds.minute, ds.second, ds.millisecond));
+  const utcTime = Date.UTC(ds.year, ds.month - 1, ds.day, ds.hour, ds.minute, ds.second, ds.millisecond);
+  const tentativeDate = new Date(utcTime);
   const tzOffsetMinutes = getTimezoneOffset(tzName, tentativeDate);
-  return structToDate(ds, tzOffsetMinutes);
+  return new Date(utcTime - tzOffsetMinutes * 60_000);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushwoosh/dumb-components",
-  "version": "1.1.52",
+  "version": "1.1.54",
   "description": "React components to build Pushwoosh products",
   "main": "index.js",
   "module": "index.js",