@pushwoosh/dumb-components 1.1.64 → 1.1.65
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Calendar/helpers.d.ts +2 -2
- package/Calendar/helpers.js +10 -2
- package/package.json +1 -1
package/Calendar/helpers.d.ts
CHANGED
|
@@ -19,7 +19,7 @@ export declare const getLastDayOfMonth: (date: DateStruct) => DateStruct;
|
|
|
19
19
|
export declare const getPeriodStart: (date: DateTimeStruct | DateStruct, period: Period) => DateTimeStruct;
|
|
20
20
|
export declare const getPeriodEnd: (date: DateTimeStruct | DateStruct, period: Period) => DateTimeStruct;
|
|
21
21
|
export declare const dateToStruct: (date: Date, tzOffsetMinutes: number) => DateTimeStruct;
|
|
22
|
-
export declare const structToDate: (ds: DateTimeStruct, tzOffsetMinutes: number) => Date;
|
|
22
|
+
export declare const structToDate: (ds: DateTimeStruct | DateStruct, tzOffsetMinutes: number) => Date;
|
|
23
23
|
export declare function getTimezoneOffset(timezoneName: string, at?: Date): number;
|
|
24
24
|
export declare const dateToStructTz: (date: Date, tzName: string) => DateTimeStruct;
|
|
25
|
-
export declare const structToDateTz: (ds: DateTimeStruct, tzName: string) => Date;
|
|
25
|
+
export declare const structToDateTz: (ds: DateTimeStruct | DateStruct, tzName: string) => Date;
|
package/Calendar/helpers.js
CHANGED
|
@@ -128,7 +128,11 @@ export const dateToStruct = (date, tzOffsetMinutes) => {
|
|
|
128
128
|
return utcDateToStruct(localTime);
|
|
129
129
|
};
|
|
130
130
|
export const structToDate = (ds, tzOffsetMinutes) => {
|
|
131
|
-
const
|
|
131
|
+
const hour = ds.hour ?? 0;
|
|
132
|
+
const minute = ds.minute ?? 0;
|
|
133
|
+
const second = ds.second ?? 0;
|
|
134
|
+
const millisecond = ds.millisecond ?? 0;
|
|
135
|
+
const utcTime = Date.UTC(ds.year, ds.month - 1, ds.day, hour, minute, second, millisecond);
|
|
132
136
|
return new Date(utcTime - tzOffsetMinutes * 60_000);
|
|
133
137
|
};
|
|
134
138
|
export function getTimezoneOffset(timezoneName, at = new Date()) {
|
|
@@ -158,7 +162,11 @@ export const dateToStructTz = (date, tzName) => {
|
|
|
158
162
|
return dateToStruct(date, tzOffsetMinutes);
|
|
159
163
|
};
|
|
160
164
|
export const structToDateTz = (ds, tzName) => {
|
|
161
|
-
const
|
|
165
|
+
const hour = ds.hour ?? 0;
|
|
166
|
+
const minute = ds.minute ?? 0;
|
|
167
|
+
const second = ds.second ?? 0;
|
|
168
|
+
const millisecond = ds.millisecond ?? 0;
|
|
169
|
+
const utcTime = Date.UTC(ds.year, ds.month - 1, ds.day, hour, minute, second, millisecond);
|
|
162
170
|
const tentativeDate = new Date(utcTime);
|
|
163
171
|
const tzOffsetMinutes = getTimezoneOffset(tzName, tentativeDate);
|
|
164
172
|
return new Date(utcTime - tzOffsetMinutes * 60_000);
|