@salesforcedevs/dx-components 1.3.25 → 1.3.26

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.3.25",
+    "version": "1.3.26",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -38,5 +38,5 @@
         "eventsourcemock": "^2.0.0",
         "luxon": "^3.1.0"
     },
-    "gitHead": "47eb24c8ff76bf71e4b8eff4e2f9ced63a4d340f"
+    "gitHead": "31be8a973c75cec3678c6ec7308fb6099b29d055"
 }

package/src/modules/dx/formattedDateTime/formattedDateTime.ts

@@ -1,4 +1,5 @@
 import { LightningElement, api } from "lwc";
+import { convertForDaylightSavings } from "dxUtils/dates";
 import {
     formattedDateDay,
     formattedDateHour,
@@ -11,8 +12,6 @@ import {
     formattedDateYear
 } from "typings/custom";
 
-import { DateTime } from "luxon";
-
 export default class FormattedDateTime extends LightningElement {
     @api weekday: formattedDateWeekday;
     @api year: formattedDateYear;
@@ -29,11 +28,7 @@ export default class FormattedDateTime extends LightningElement {
             return;
         }
 
-        this._unformattedDate = DateTime.fromISO(value)
-            .plus({
-                hour: 1
-            })
-            .toJSDate();
+        this._unformattedDate = convertForDaylightSavings(value).toJSDate();
 
         if (this._unformattedDate.toString() === "Invalid Date") {
             // this is a fix for Safari since it doesn't support date strings with 'yyyy/mm/dd' patterns

package/src/modules/dxUtils/dates/dates.ts

@@ -1,3 +1,5 @@
+import { DateTime } from "luxon";
+
 const MONTHS = {
     January: 0,
     February: 1,
@@ -20,7 +22,6 @@ const MONTHS = {
         "January 2022": [ *array of dates for this month* ],
     }
 */
-
 export function sortSplittedPostsByMonth(postsByMonth: any) {
     const sortedPostsByMonth: { [key: string]: Array<{}> } = {};
 
@@ -58,3 +59,23 @@ export function sortSplittedPostsByMonth(postsByMonth: any) {
 
     return sortedPostsByMonth;
 }
+
+export function convertForDaylightSavings(
+    date: string,
+    zone: string = "local"
+) {
+    if (!hasDST(zone)) {
+        return DateTime.fromISO(date).setZone(zone);
+    }
+
+    return DateTime.fromISO(date).setZone(zone).isInDST
+        ? DateTime.fromISO(date).setZone(zone)
+        : DateTime.fromISO(date).setZone(zone).plus({ hour: 1 });
+}
+
+export function hasDST(zone: string = "local") {
+    return (
+        DateTime.fromISO("2022-01-01").setZone(zone).isInDST !==
+        DateTime.fromISO("2022-06-01").setZone(zone).isInDST
+    );
+}