@capillarytech/blaze-ui 5.1.18 → 5.1.20

package/index.js

@@ -23454,6 +23454,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));
@@ -23565,7 +23566,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);
@@ -23735,7 +23752,10 @@ function momentToDayjs(value) {
         const tz = value.tz();
         if (tz) {
           // Has a named timezone - preserve it
-          dayjsObj = (0, _dayjs.default)(date).tz(tz);
+          // dayjs.utc(date) is required here: dayjs(date) anchors to the system local timezone,
+          // causing .tz() to only re-label without converting hours. dayjs.utc(date) creates a
+          // UTC-mode dayjs, which .tz() correctly converts to the target timezone for display.
+          dayjsObj = _dayjs.default.utc(date).tz(tz);
 
           // WORKAROUND: dayjs-timezone-iana-plugin doesn't persist timezone name in standard way
           // Store it manually in $x for round-trip conversion fidelity
@@ -23788,6 +23808,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.
  *
@@ -27183,6 +27232,14 @@ var _default = exports["default"] = (0, _reactIntl.defineMessages)({
   selectDateTimePlaceHolder: {
     id: scope + ".selectDateTimePlaceHolder",
     defaultMessage: 'Select date | time'
+  },
+  selectLabel: {
+    id: scope + ".selectLabel",
+    defaultMessage: 'Select'
+  },
+  todayLabel: {
+    id: scope + ".todayLabel",
+    defaultMessage: 'Today'
   }
 });
 
@@ -34891,7 +34948,7 @@ var _logDeprecationWarning = _interopRequireDefault(__webpack_require__(19224));
 var _messages = _interopRequireDefault(__webpack_require__(32528));
 var _styles = _interopRequireDefault(__webpack_require__(2580));
 var _jsxRuntime = __webpack_require__(74848);
-const _excluded = ["intl", "className", "value", "onChange", "cellRender", "dateRender", "showTime", "format", "placeholder", "timezone", "disabledTime", "renderExtraFooter", "showToday", "onOk", "onPanelChange", "popupClassName", "dropdownClassName", "popupStyle", "dropdownStyle", "getPopupContainer", "getCalendarContainer", "popupOpen", "open", "onPopupOpenChange", "onOpenChange"];
+const _excluded = ["intl", "className", "value", "defaultValue", "onChange", "cellRender", "dateRender", "showTime", "format", "placeholder", "timezone", "disabledTime", "renderExtraFooter", "showToday", "onOk", "onPanelChange", "popupClassName", "dropdownClassName", "popupStyle", "dropdownStyle", "getPopupContainer", "getCalendarContainer", "popupOpen", "open", "onPopupOpenChange", "onOpenChange"];
 /**
  *
  * CapDateTimePicker
@@ -34910,6 +34967,7 @@ const CapDateTimePicker = _ref => {
       },
       className = '',
       value = null,
+      defaultValue = null,
       onChange = () => {},
       cellRender,
       dateRender,
@@ -34948,16 +35006,14 @@ const CapDateTimePicker = _ref => {
   const skipNextCloseRef = (0, _react.useRef)(false);
 
   // Detect if consumer is using moment
-  const isConsumerUsingMoment = (0, _dayjs.isMomentObject)(value);
+  const isConsumerUsingMoment = (0, _dayjs.isMomentObject)(value) || (0, _dayjs.isMomentObject)(defaultValue);
 
   // Parse date in timezone
   const parseDateTime = dateTime => {
     if (!dateTime) return null;
-
-    // Convert moment to dayjs
-    const dayjsDateTime = (0, _dayjs.momentToDayjs)(dateTime);
-    if (!dayjsDateTime) return null;
-    return dayjsDateTime.clone().tz(timezone);
+    const dayjsDateTimeToTimezone = (0, _dayjs.toDayjsInTimezone)(dateTime, timezone);
+    if (!dayjsDateTimeToTimezone) return null;
+    return dayjsDateTimeToTimezone;
   };
 
   // Today's date in target timezone
@@ -34994,7 +35050,9 @@ const CapDateTimePicker = _ref => {
   const handleOk = date => {
     skipNextCloseRef.current = false;
     setIsPickerOpen(false);
-    onOk == null || onOk(date);
+    const parsedValue = parseDateTime(date);
+    const result = (0, _dayjs.normalizeDateValue)(isConsumerUsingMoment, parsedValue);
+    onOk == null || onOk(result != null ? result : null);
   };
 
   // Get the current value in the correct timezone
@@ -35005,14 +35063,18 @@ const CapDateTimePicker = _ref => {
 
   // Backward compatibility: map deprecated props to new props
   const finalPopupClassName = (0, _classnames.default)(_styles.default[clsPrefix + "__calendar-popup"], popupClassName != null ? popupClassName : dropdownClassName);
-  const finalPopupStyle = popupStyle != null ? popupStyle : dropdownStyle;
+  const labelVars = {
+    '--cap-datetime-select-label': "'" + formatMessage(_messages.default.selectLabel) + "'",
+    '--cap-datetime-today-label': "'" + formatMessage(_messages.default.todayLabel) + "'"
+  };
+  const finalPopupStyle = _extends({}, labelVars, popupStyle != null ? popupStyle : dropdownStyle);
   const finalGetPopupContainer = getPopupContainer != null ? getPopupContainer : getCalendarContainer;
   const finalOpen = (_ref2 = popupOpen != null ? popupOpen : openProp) != null ? _ref2 : isPickerOpen;
 
   // Backward compatibility: map deprecated dateRender to cellRender
   const finalCellRender = cellRender != null ? cellRender : dateRender ? current => dateRender(current, todayDate) : undefined;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antdV.DatePicker, _extends({
-    className: (0, _classnames.default)(_styles.default[clsPrefix], className),
+    className: (0, _classnames.default)(clsPrefix, className),
     showTime: showTimeConfig,
     format: format,
     placeholder: placeholder || formatMessage(_messages.default.selectDateTimePlaceHolder),
@@ -35184,7 +35246,7 @@ var ___CSS_LOADER_API_NO_SOURCEMAP_IMPORT___ = __webpack_require__(31601);
 var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(76314);
 var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(___CSS_LOADER_API_NO_SOURCEMAP_IMPORT___);
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, `.cap-date-time-picker__calendar-icon{color:#091e42}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges{width:100%;display:flex;align-items:center;justify-content:flex-start;gap:1.142rem;padding:.571rem 1.142rem .857rem 1.142rem}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-ok{order:0;margin-inline-start:0}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-ok>button{background:#47af46;border:none;border-radius:.285rem;padding:0 2rem;height:2.285rem;line-height:2.285rem;font-weight:500;color:#fff;box-shadow:none}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-ok>button>span{display:none}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-ok>button::after{content:"Select";font-size:1rem}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-ok>button:disabled{background:#a1d8a0;cursor:not-allowed}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-now{order:1}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-now>a{font-size:0;font-weight:500;color:#2466ea}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-now>a::after{content:"Today";font-size:1rem;vertical-align:sub}`, ""]);
+___CSS_LOADER_EXPORT___.push([module.id, `.cap-date-time-picker__calendar-icon{color:#091e42}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges{width:100%;display:flex;align-items:center;justify-content:flex-start;gap:1.142rem;padding:.571rem 1.142rem .857rem 1.142rem}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-ok{order:0;margin-inline-start:0}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-ok>button{background:#47af46;border:none;border-radius:.285rem;padding:0 2rem;height:2.285rem;line-height:2.285rem;font-weight:500;color:#fff;box-shadow:none}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-ok>button>span{display:none}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-ok>button::after{content:var(--cap-datetime-select-label, "Select");font-size:1rem}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-ok>button:disabled{background:#a1d8a0;cursor:not-allowed}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-now{order:1}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-now>a{font-size:0;font-weight:500;color:#2466ea}.cap-date-time-picker__calendar-popup .ant-picker-footer .ant-picker-ranges .ant-picker-now>a::after{content:var(--cap-datetime-today-label, "Today");font-size:1rem;vertical-align:sub}`, ""]);
 // Exports
 ___CSS_LOADER_EXPORT___.locals = {
 	"cap-date-time-picker__calendar-icon": `cap-date-time-picker__calendar-icon`,