@capillarytech/blaze-ui 5.1.19 → 5.1.20

package/CapDatePicker/index.js

@@ -3823,6 +3823,7 @@ exports.isDayjsObject = isDayjsObject;
 exports.isMomentObject = isMomentObject;
 exports.momentToDayjs = momentToDayjs;
 exports.normalizeDateValue = normalizeDateValue;
+exports.toDayjsInTimezone = toDayjsInTimezone;
 var _dayjs = _interopRequireDefault(__webpack_require__(87695));
 var _advancedFormat = _interopRequireDefault(__webpack_require__(96833));
 var _customParseFormat = _interopRequireDefault(__webpack_require__(2825));
@@ -3934,7 +3935,23 @@ if (!tzIsCallable) {
       if (_dayjs.default.isDayjs(date)) {
         return date.tz(tzName);
       }
-      return (0, _dayjs.default)(date).tz(tzName);
+      // For strings/Dates: interpret the date/time values as being IN the target timezone
+      // (matching moment.tz(string, tz) semantics). dayjs(date).tz(tz) is wrong because
+      // dayjs(date) anchors to the system local timezone, so .tz() converts FROM local TO tz.
+      // Instead: parse as UTC to get raw date/time values, compute the target timezone's offset,
+      // then adjust the UTC timestamp so .tz() produces the intended local time.
+      try {
+        // Validate timezone is a real IANA timezone before applying the offset correction
+        Intl.DateTimeFormat(undefined, {
+          timeZone: tzName
+        });
+      } catch (_unused) {
+        // Invalid timezone — fall back to local time
+        return (0, _dayjs.default)(date);
+      }
+      const asUtc = _dayjs.default.utc(date);
+      const tzOffset = asUtc.tz(tzName).utcOffset(); // target tz offset in minutes
+      return _dayjs.default.utc(asUtc.valueOf() - tzOffset * 60000).tz(tzName);
     } catch (error) {
       // If timezone is invalid, log error and fall back to local time
       logDevError("dayjs.tz: Invalid timezone \"" + tzName + "\"", error);
@@ -4160,6 +4177,35 @@ function momentToDayjs(value) {
   return null;
 }
 
+/**
+ * Converts any supported date value (Moment, Day.js, string, Date) to a Day.js object
+ * in the specified timezone. This is the recommended single entry point for timezone-safe
+ * date conversion — it handles moment-to-dayjs conversion and timezone application in one step,
+ * avoiding the double-offset bug in dayjs-timezone-iana-plugin.
+ *
+ * @param value - Moment, Day.js, string, Date, or null/undefined
+ * @param timezone - Target IANA timezone (e.g., 'Asia/Kolkata', 'America/New_York')
+ * @returns Day.js object in the target timezone, or null if invalid
+ *
+ * @example
+ * toDayjsInTimezone(moment.tz('2025-04-21 00:00', 'Asia/Kolkata'), 'Asia/Kolkata');
+ * // Returns dayjs representing 2025-04-21 00:00 IST
+ *
+ * @example
+ * toDayjsInTimezone(moment.tz('2025-04-21 00:00', 'UTC'), 'Asia/Kolkata');
+ * // Returns dayjs representing 2025-04-21 05:30 IST
+ */
+function toDayjsInTimezone(value, timezone) {
+  const dayjsValue = momentToDayjs(value);
+  if (!dayjsValue) return null;
+
+  // Convert via UTC to avoid the double-offset bug in dayjs-timezone-iana-plugin:
+  // calling .tz() on a dayjs that already has a non-zero utcOffset corrupts the value.
+  // Going through .toDate() → dayjs.utc() gives us a clean UTC-mode dayjs that .tz()
+  // correctly converts to the target timezone.
+  return _dayjs.default.utc(dayjsValue.toDate()).tz(timezone);
+}
+
 /**
  * Converts a Day.js object to Moment.js, preserving timezone and locale information.
  *