@oracle/oraclejet 13.0.14 → 13.0.16

package/dist/css/stable/oj-stable.css

@@ -333,7 +333,7 @@
   visibility: hidden; }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v13.0.14"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v13.0.16"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;

package/dist/js/libs/oj/debug/ojconverter-nativedatetime.js

@@ -875,23 +875,34 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojconfig', 'ojs/ojlocaledata', 'ojs/ojco
             }
             return year;
         }
-        static _arrayIndexOfMonthOrDay(monthsObj, item) {
-            let trimItem = LocalOraI18nUtils.toUpper(item);
-            trimItem = LocalOraI18nUtils.trim(trimItem);
-            trimItem = trimItem.replace(/\.$/, '');
-            const monthsKeys = Object.keys(monthsObj);
-            for (let i = 0; i < monthsKeys.length; i++) {
-                let m = monthsKeys[i];
-                m = LocalOraI18nUtils.toUpper(monthsObj[m]);
-                m = LocalOraI18nUtils.trim(m);
-                m = m.replace(/\.$/, '');
-                if (trimItem == m) {
+        static _arrayIndexOfMonthOrDay(monthsDaysData, userInput, type) {
+            const trimUserInput = NativeParserImpl.toUpperTrimmedNoPeriod(userInput);
+            const keys = Object.keys(monthsDaysData);
+            for (let i = 0; i < keys.length; i++) {
+                const valueFromData = monthsDaysData[keys[i]];
+                const trimValueFromData = NativeParserImpl.toUpperTrimmedNoPeriod(valueFromData);
+                if (trimUserInput === trimValueFromData) {
                     return i;
                 }
+                if (type === 'months') {
+                    const trimUserInputNumber = Number(trimUserInput);
+                    const numberPartFromData = parseInt(trimValueFromData);
+                    if (Number.isInteger(numberPartFromData) && Number.isInteger(trimUserInputNumber)) {
+                        if (numberPartFromData === trimUserInputNumber) {
+                            return i;
+                        }
+                    }
+                }
             }
             return -1;
         }
-        static _getDayIndex(calNode, value, fmt) {
+        static toUpperTrimmedNoPeriod(value) {
+            let trimItem = LocalOraI18nUtils.toUpper(value);
+            trimItem = LocalOraI18nUtils.trim(trimItem);
+            trimItem = trimItem.replace(/\.$/, '');
+            return trimItem;
+        }
+        static _getDayIndex(calNode, value) {
             let ret = 0;
             let days = [];
             const calDaysFmt = calNode.days.format;
@@ -903,7 +914,7 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojconfig', 'ojs/ojlocaledata', 'ojs/ojco
                 calDaysStdAlone.wide
             ];
             for (let m = 0; m < days.length; m++) {
-                ret = this._arrayIndexOfMonthOrDay(days[m], value);
+                ret = this._arrayIndexOfMonthOrDay(days[m], value, 'days');
                 if (ret !== -1) {
                     return ret;
                 }
@@ -921,7 +932,7 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojconfig', 'ojs/ojlocaledata', 'ojs/ojco
                 calMonthsStdAlone.abbreviated
             ];
             for (let m = 0; m < months.length; m++) {
-                ret = this._arrayIndexOfMonthOrDay(months[m], value);
+                ret = this._arrayIndexOfMonthOrDay(months[m], value, 'months');
                 if (ret !== -1) {
                     return ret;
                 }
@@ -1248,7 +1259,7 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojconfig', 'ojs/ojlocaledata', 'ojs/ojco
             let parsedDate = new Date(year, month, day);
             let dName = this._getWeekdayName(value, cal);
             if (dName !== null) {
-                const weekDay = this._getDayIndex(cal, dName, 0);
+                const weekDay = this._getDayIndex(cal, dName);
                 if (parsedDate.getDay() !== weekDay) {
                     this._throwWeekdayMismatch(dName, parsedDate.getDate());
                 }
@@ -1384,7 +1395,7 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojconfig', 'ojs/ojlocaledata', 'ojs/ojco
             this._validateRange(range);
             const parsedDate = new Date(year, month, day);
             if (dName !== null) {
-                const weekDay = this._getDayIndex(cal, dName, 0);
+                const weekDay = this._getDayIndex(cal, dName);
                 if (parsedDate.getDay() !== weekDay) {
                     this._throwWeekdayMismatch(dName, parsedDate.getDate());
                 }
@@ -1456,7 +1467,7 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojconfig', 'ojs/ojlocaledata', 'ojs/ojco
                 index = this._getMonthIndex(calNode, matchGroup, matchIndex);
             }
             else {
-                index = this._getDayIndex(calNode, matchGroup, matchIndex);
+                index = this._getDayIndex(calNode, matchGroup);
             }
             const startName = monthsFormat[mLength][start2];
             const endName = monthsFormat[mLength][end2];

package/dist/js/libs/oj/debug/ojcore-base.js

@@ -37,12 +37,12 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
      * @global
      * @member {string} version JET version numberr
      */
-    version: '13.0.14',
+    version: '13.0.16',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2023-05-08_10-51-29',
+    revision: '2023-08-20_09-04-34',
 
     // This function is only meant to be used outside the library, so quoting the name
     // to avoid renaming is appropriate

package/dist/js/libs/oj/debug/ojdatetimepicker.js

@@ -1389,10 +1389,10 @@ var __oj_input_date_time_metadata =
    * @static
    * @private
    */
-    function _getConverterTimezone(converter) {
+  function _getConverterTimezone(converter) {
     const converterOptions =
       converter && converter.resolvedOptions ? converter.resolvedOptions() : null;
-    return converterOptions && converterOptions.timeZone ? converterOptions.timeZone : null;
+    return converterOptions && converterOptions.timeZone ? converterOptions.timeZone : undefined;
   }
 
   /**
@@ -5990,13 +5990,37 @@ var __oj_input_date_time_metadata =
       }
     },
 
+    // If the inputConverter is not one with isoStrFormat offset, then create a new converter
+    // based on the options of the inputConverter but with isoStrFormat: 'offset'.
     _createOffsetConverter: function (inputConverter) {
       var resolvedOptions = inputConverter.resolvedOptions();
+      const isoStrFormat = resolvedOptions.isoStrFormat;
+      if (isoStrFormat === 'offset') return inputConverter;
       var options = {};
       $.extend(options, resolvedOptions, { isoStrFormat: 'offset' });
       return new ojconverterDatetime.IntlDateTimeConverter(options);
     },
 
+    // Call this function if you need to substitute the day, month, year, time, etc, of the date time iso
+    // string. You cannot substitute in a day or time to a zulu iso string.
+    // If the value is 'zulu', then the converter uses 'offset' isoStrFormat.
+    // Substituting the day into a zulu date might be a different day in the timezone and then the formatted
+    // date will be a different day than what the user selected. (See JET-54551)
+    // So if it is zulu we change it to offset.
+    // This is what a zulu and offset format looks like
+    // zulu: 2013-12-13T04:00:00Z
+    // offset: 2013-12-01T20:00:00-08:00
+    _parseValueToSubstituteDateOrTimePiece: function (converter, dateTimeIso) {
+      let parsedValue;
+      if (dateTimeIso && ojconverterutilsI18n.IntlConverterUtils._getISOStrFormatType(dateTimeIso) === 'zulu') {
+        const offsetConverter = this._createOffsetConverter(converter);
+        parsedValue = offsetConverter.parse(dateTimeIso);
+      } else {
+        parsedValue = converter.parse(dateTimeIso);
+      }
+      return parsedValue;
+    },
+
     /**
      * TODO: Technically i think should be used for the calendar, but later since late in release
      * @ignore
@@ -6139,12 +6163,7 @@ var __oj_input_date_time_metadata =
         // zulu: 2013-12-13T04:00:00Z
         // offset: 2013-12-01T20:00:00-08:00
         const dateIso = this.options.value ? this._getDateIso() : '';
-        if (dateIso && ojconverterutilsI18n.IntlConverterUtils._getISOStrFormatType(dateIso) === 'zulu') {
-          const offsetConverter = this._createOffsetConverter(converter);
-          this._switcherPrevValue = offsetConverter.parse(dateIso);
-        } else {
-          this._switcherPrevValue = converter.parse(dateIso);
-        }
+        this._switcherPrevValue = this._parseValueToSubstituteDateOrTimePiece(converter, dateIso);
       } else {
         this._switcherPrevValue = this._getDateIso();
       }
@@ -10944,17 +10963,6 @@ var __oj_input_date_time_metadata =
    * var node = myInputTime.getNodeBySubId( {'subId': 'oj-timepicker-now'} );
    */
 
-  /**
-   *
-   * @private
-   */
-  var dateSwitcherConverter;
-
-  /**
-   * @private
-   */
-  var timeSwitcherConverter;
-
   var _defaultOptions$2 = ThemeUtils.parseJSONFromFontFamily('oj-inputdatetime-option-defaults') || {};
   var _yearFormat$1 = _defaultOptions$2.converterYear || 'numeric';
   var _sDefaultDateTimeConverter;
@@ -11996,23 +12004,45 @@ var __oj_input_date_time_metadata =
                 ($.ui.keyCode.ENTER === keyCode || $.ui.keyCode.SPACE === keyCode)) ||
               evt.type === 'click'
             ) {
+              // All manipulation (like copying in the time the user selected)
+              // should be done in offset or local, not zulu.
+              // newVal will contain the value, but in offset or local. When it
+              // is run back through the converter in SetValue then it will be converted
+              // back into the isoStrFormat of the component's converter.
               var newVal;
+              // _switcherDateValue is the date and time that is displayed in the picker. This is
+              // a local date time with no offset or zulu. This can be manipulated to merge
+              // in a new day or a new time, no problem.
               if (self._switcherDateValue) {
                 newVal = self._switcherDateValue;
               } else {
-                var formattedValue = self._GetConverter().format(self._getDateIso());
-                newVal = self._GetConverter().parse(formattedValue);
+                // dateIso could be this._switcherDateValue, this.options.value, or this._getDefaultIsoDate();
+                // if local, don't change it
+                const dateIso = self._getDateIso();
+                if (dateIso && ojconverterutilsI18n.IntlConverterUtils._getISOStrFormatType(dateIso) === 'local') {
+                  newVal = dateIso;
+                } else {
+                  const converter = self._GetConverter();
+                  newVal = self._parseValueToSubstituteDateOrTimePiece(converter, dateIso);
+                }
               }
 
+              // If the user changed the time in the datetime picker, we will
+              // have a _switcherTimeValue. We want to copy this time over into the new value.
               if (self._switcherTimeValue) {
                 newVal = ojconverterutilsI18n.IntlConverterUtils._copyTimeOver(
                   self._switcherTimeValue, newVal);
               }
+              // but if we don't have a switcherTimeValue, we want to copy over the switcherPrevValue's
+              // time into the newValue.
               if (self._switcherPrevValue && newVal && !self._switcherTimeValue) {
                 newVal = ojconverterutilsI18n.IntlConverterUtils._copyTimeOver(
                   self._switcherPrevValue, newVal);
               }
 
+              // At this point we have a newVal that is what the user picked. It's in local or offset format
+              // so that the user will see the day and time they picked.
+              // SetValue will parse it to whatever isoStrFormat the converter is in.
               var formatted = self._GetConverter().format(newVal);
               self._SetDisplayValue(formatted);
               self._SetValue(formatted, {});
@@ -12398,36 +12428,43 @@ var __oj_input_date_time_metadata =
     },
 
     /**
+     * In the UI, the switcher text shows the date when the timepicker is up and it shows the time when the
+     * datepicker is up.
      * @ignore
      */
     _updateSwitcherText: function () {
       if (!this._switcherDiv) {
         return;
       }
-      // create a converter to format the picker text
-      if (!dateSwitcherConverter) {
-        dateSwitcherConverter = new ojconverterDatetime.IntlDateTimeConverter({
-          day: '2-digit', month: '2-digit', year: _yearFormat$1
-          });
-      }
       var switcherText = '';
       if (this._isShowingDatePickerSwitcher()) {
+        // create the date switcher converter we use to format the switcher text
+        // copy timezone and isoStrFormat from the component's converter.
+        const componentConverter = this._GetConverter();
+        const timeZone = _getConverterTimezone(componentConverter);
+        const isoStrFormat = componentConverter.resolvedOptions().isoStrFormat;
+        const dateSwitcherConverter = new ojconverterDatetime.IntlDateTimeConverter({
+          day: '2-digit',
+          month: '2-digit',
+          year: _yearFormat$1,
+          timeZone,
+          isoStrFormat
+        });
         try {
           switcherText = dateSwitcherConverter.format(this._switcherDateValue || this._getDateIso());
         } catch (e) {
           switcherText = dateSwitcherConverter.format(this._getDefaultIsoDate());
         }
       } else {
-      // create a converter to format the picker text
-      if (!timeSwitcherConverter) {
-        timeSwitcherConverter = new ojconverterDatetime.IntlDateTimeConverter({
-          hour: '2-digit', minute: '2-digit'
-        });
-      }
         try {
           switcherText = this._getTimePickerConverter().format(
                   this._switcherTimeValue || this._getDateIso());
         } catch (e) {
+          // create a converter to format the picker text
+          const timeSwitcherConverter = new ojconverterDatetime.IntlDateTimeConverter({
+            hour: '2-digit',
+            minute: '2-digit'
+          });
           switcherText = timeSwitcherConverter.format(this._getDefaultIsoDate());
         }
       }
@@ -12520,12 +12557,14 @@ var __oj_input_date_time_metadata =
      */
     timeSelected: function (newValue, event) {
       // TEMP TILL FIXED pass in formatted for _SetValue (should be newValue)
+      const converter = this._GetConverter();
       if (!this._dateTimeSwitcherActive) {
-        var formatted = this._GetConverter().format(newValue);
+        var formatted = converter.format(newValue);
         this._SetDisplayValue(formatted);
         this._SetValue(formatted, event);
       } else {
-        this._switcherTimeValue = newValue;
+        // switcherTimeValue will be in offset or local, but not zulu. It is the time that the user picked.
+        this._switcherTimeValue = this._parseValueToSubstituteDateOrTimePiece(converter, newValue);
       }
     },
 

package/dist/js/libs/oj/debug/ojpopupcore.js

@@ -3573,6 +3573,15 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcomponentcore', 'ojs/ojlo
           // factor in half the width of the popup
           posLeft -= dirFactor * (data.elemWidth / 2);
 
+          // JET-53426: need to check if the popup element fits the screen after centering
+          // otherwise it could cause text reflow and popup resize which might result
+          // in another positioning cycle with a potential endless loop.
+          // If the element does not fit, apply the 'fit' collision to avoid the resize.
+          if (posLeft < withinOffset || posLeft + data.elemWidth > outerWidth - withinOffset) {
+            $.ui.position.fit.left.call(this, position, data);
+            posLeft = position.left;
+          }
+
           // Force the popup start to be within the viewport.
           // This collision rule is only used by input components internally. The notewindow will auto dismiss when
           // what it is aligned to is hidden in a scroll container.

package/dist/js/libs/oj/debug_esm/ojconverter-nativedatetime.js

@@ -881,23 +881,34 @@ class NativeParserImpl {
         }
         return year;
     }
-    static _arrayIndexOfMonthOrDay(monthsObj, item) {
-        let trimItem = LocalOraI18nUtils.toUpper(item);
-        trimItem = LocalOraI18nUtils.trim(trimItem);
-        trimItem = trimItem.replace(/\.$/, '');
-        const monthsKeys = Object.keys(monthsObj);
-        for (let i = 0; i < monthsKeys.length; i++) {
-            let m = monthsKeys[i];
-            m = LocalOraI18nUtils.toUpper(monthsObj[m]);
-            m = LocalOraI18nUtils.trim(m);
-            m = m.replace(/\.$/, '');
-            if (trimItem == m) {
+    static _arrayIndexOfMonthOrDay(monthsDaysData, userInput, type) {
+        const trimUserInput = NativeParserImpl.toUpperTrimmedNoPeriod(userInput);
+        const keys = Object.keys(monthsDaysData);
+        for (let i = 0; i < keys.length; i++) {
+            const valueFromData = monthsDaysData[keys[i]];
+            const trimValueFromData = NativeParserImpl.toUpperTrimmedNoPeriod(valueFromData);
+            if (trimUserInput === trimValueFromData) {
                 return i;
             }
+            if (type === 'months') {
+                const trimUserInputNumber = Number(trimUserInput);
+                const numberPartFromData = parseInt(trimValueFromData);
+                if (Number.isInteger(numberPartFromData) && Number.isInteger(trimUserInputNumber)) {
+                    if (numberPartFromData === trimUserInputNumber) {
+                        return i;
+                    }
+                }
+            }
         }
         return -1;
     }
-    static _getDayIndex(calNode, value, fmt) {
+    static toUpperTrimmedNoPeriod(value) {
+        let trimItem = LocalOraI18nUtils.toUpper(value);
+        trimItem = LocalOraI18nUtils.trim(trimItem);
+        trimItem = trimItem.replace(/\.$/, '');
+        return trimItem;
+    }
+    static _getDayIndex(calNode, value) {
         let ret = 0;
         let days = [];
         const calDaysFmt = calNode.days.format;
@@ -909,7 +920,7 @@ class NativeParserImpl {
             calDaysStdAlone.wide
         ];
         for (let m = 0; m < days.length; m++) {
-            ret = this._arrayIndexOfMonthOrDay(days[m], value);
+            ret = this._arrayIndexOfMonthOrDay(days[m], value, 'days');
             if (ret !== -1) {
                 return ret;
             }
@@ -927,7 +938,7 @@ class NativeParserImpl {
             calMonthsStdAlone.abbreviated
         ];
         for (let m = 0; m < months.length; m++) {
-            ret = this._arrayIndexOfMonthOrDay(months[m], value);
+            ret = this._arrayIndexOfMonthOrDay(months[m], value, 'months');
             if (ret !== -1) {
                 return ret;
             }
@@ -1254,7 +1265,7 @@ class NativeParserImpl {
         let parsedDate = new Date(year, month, day);
         let dName = this._getWeekdayName(value, cal);
         if (dName !== null) {
-            const weekDay = this._getDayIndex(cal, dName, 0);
+            const weekDay = this._getDayIndex(cal, dName);
             if (parsedDate.getDay() !== weekDay) {
                 this._throwWeekdayMismatch(dName, parsedDate.getDate());
             }
@@ -1390,7 +1401,7 @@ class NativeParserImpl {
         this._validateRange(range);
         const parsedDate = new Date(year, month, day);
         if (dName !== null) {
-            const weekDay = this._getDayIndex(cal, dName, 0);
+            const weekDay = this._getDayIndex(cal, dName);
             if (parsedDate.getDay() !== weekDay) {
                 this._throwWeekdayMismatch(dName, parsedDate.getDate());
             }
@@ -1462,7 +1473,7 @@ class NativeParserImpl {
             index = this._getMonthIndex(calNode, matchGroup, matchIndex);
         }
         else {
-            index = this._getDayIndex(calNode, matchGroup, matchIndex);
+            index = this._getDayIndex(calNode, matchGroup);
         }
         const startName = monthsFormat[mLength][start2];
         const endName = monthsFormat[mLength][end2];

package/dist/js/libs/oj/debug_esm/ojcore-base.js

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '13.0.14',
+  version: '13.0.16',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2023-05-08_10-51-29',
+  revision: '2023-08-20_09-04-34',
 
   // This function is only meant to be used outside the library, so quoting the name
   // to avoid renaming is appropriate

package/dist/js/libs/oj/debug_esm/ojdatetimepicker.js

@@ -1404,10 +1404,10 @@ function _getMetaData(dayMetaData, position, params) {
  * @static
  * @private
  */
-  function _getConverterTimezone(converter) {
+function _getConverterTimezone(converter) {
   const converterOptions =
     converter && converter.resolvedOptions ? converter.resolvedOptions() : null;
-  return converterOptions && converterOptions.timeZone ? converterOptions.timeZone : null;
+  return converterOptions && converterOptions.timeZone ? converterOptions.timeZone : undefined;
 }
 
 /**
@@ -6005,13 +6005,37 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
     }
   },
 
+  // If the inputConverter is not one with isoStrFormat offset, then create a new converter
+  // based on the options of the inputConverter but with isoStrFormat: 'offset'.
   _createOffsetConverter: function (inputConverter) {
     var resolvedOptions = inputConverter.resolvedOptions();
+    const isoStrFormat = resolvedOptions.isoStrFormat;
+    if (isoStrFormat === 'offset') return inputConverter;
     var options = {};
     $.extend(options, resolvedOptions, { isoStrFormat: 'offset' });
     return new IntlDateTimeConverter(options);
   },
 
+  // Call this function if you need to substitute the day, month, year, time, etc, of the date time iso
+  // string. You cannot substitute in a day or time to a zulu iso string.
+  // If the value is 'zulu', then the converter uses 'offset' isoStrFormat.
+  // Substituting the day into a zulu date might be a different day in the timezone and then the formatted
+  // date will be a different day than what the user selected. (See JET-54551)
+  // So if it is zulu we change it to offset.
+  // This is what a zulu and offset format looks like
+  // zulu: 2013-12-13T04:00:00Z
+  // offset: 2013-12-01T20:00:00-08:00
+  _parseValueToSubstituteDateOrTimePiece: function (converter, dateTimeIso) {
+    let parsedValue;
+    if (dateTimeIso && IntlConverterUtils._getISOStrFormatType(dateTimeIso) === 'zulu') {
+      const offsetConverter = this._createOffsetConverter(converter);
+      parsedValue = offsetConverter.parse(dateTimeIso);
+    } else {
+      parsedValue = converter.parse(dateTimeIso);
+    }
+    return parsedValue;
+  },
+
   /**
    * TODO: Technically i think should be used for the calendar, but later since late in release
    * @ignore
@@ -6154,12 +6178,7 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
       // zulu: 2013-12-13T04:00:00Z
       // offset: 2013-12-01T20:00:00-08:00
       const dateIso = this.options.value ? this._getDateIso() : '';
-      if (dateIso && IntlConverterUtils._getISOStrFormatType(dateIso) === 'zulu') {
-        const offsetConverter = this._createOffsetConverter(converter);
-        this._switcherPrevValue = offsetConverter.parse(dateIso);
-      } else {
-        this._switcherPrevValue = converter.parse(dateIso);
-      }
+      this._switcherPrevValue = this._parseValueToSubstituteDateOrTimePiece(converter, dateIso);
     } else {
       this._switcherPrevValue = this._getDateIso();
     }
@@ -10959,17 +10978,6 @@ setDefaultOptions(
  * var node = myInputTime.getNodeBySubId( {'subId': 'oj-timepicker-now'} );
  */
 
-/**
- *
- * @private
- */
-var dateSwitcherConverter;
-
-/**
- * @private
- */
-var timeSwitcherConverter;
-
 var _defaultOptions$2 = parseJSONFromFontFamily('oj-inputdatetime-option-defaults') || {};
 var _yearFormat$1 = _defaultOptions$2.converterYear || 'numeric';
 var _sDefaultDateTimeConverter;
@@ -12011,23 +12019,45 @@ oj.__registerWidget('oj.ojInputDateTime', $.oj.ojInputDate, {
               ($.ui.keyCode.ENTER === keyCode || $.ui.keyCode.SPACE === keyCode)) ||
             evt.type === 'click'
           ) {
+            // All manipulation (like copying in the time the user selected)
+            // should be done in offset or local, not zulu.
+            // newVal will contain the value, but in offset or local. When it
+            // is run back through the converter in SetValue then it will be converted
+            // back into the isoStrFormat of the component's converter.
             var newVal;
+            // _switcherDateValue is the date and time that is displayed in the picker. This is
+            // a local date time with no offset or zulu. This can be manipulated to merge
+            // in a new day or a new time, no problem.
             if (self._switcherDateValue) {
               newVal = self._switcherDateValue;
             } else {
-              var formattedValue = self._GetConverter().format(self._getDateIso());
-              newVal = self._GetConverter().parse(formattedValue);
+              // dateIso could be this._switcherDateValue, this.options.value, or this._getDefaultIsoDate();
+              // if local, don't change it
+              const dateIso = self._getDateIso();
+              if (dateIso && IntlConverterUtils._getISOStrFormatType(dateIso) === 'local') {
+                newVal = dateIso;
+              } else {
+                const converter = self._GetConverter();
+                newVal = self._parseValueToSubstituteDateOrTimePiece(converter, dateIso);
+              }
             }
 
+            // If the user changed the time in the datetime picker, we will
+            // have a _switcherTimeValue. We want to copy this time over into the new value.
             if (self._switcherTimeValue) {
               newVal = IntlConverterUtils._copyTimeOver(
                 self._switcherTimeValue, newVal);
             }
+            // but if we don't have a switcherTimeValue, we want to copy over the switcherPrevValue's
+            // time into the newValue.
             if (self._switcherPrevValue && newVal && !self._switcherTimeValue) {
               newVal = IntlConverterUtils._copyTimeOver(
                 self._switcherPrevValue, newVal);
             }
 
+            // At this point we have a newVal that is what the user picked. It's in local or offset format
+            // so that the user will see the day and time they picked.
+            // SetValue will parse it to whatever isoStrFormat the converter is in.
             var formatted = self._GetConverter().format(newVal);
             self._SetDisplayValue(formatted);
             self._SetValue(formatted, {});
@@ -12413,36 +12443,43 @@ oj.__registerWidget('oj.ojInputDateTime', $.oj.ojInputDate, {
   },
 
   /**
+   * In the UI, the switcher text shows the date when the timepicker is up and it shows the time when the
+   * datepicker is up.
    * @ignore
    */
   _updateSwitcherText: function () {
     if (!this._switcherDiv) {
       return;
     }
-    // create a converter to format the picker text
-    if (!dateSwitcherConverter) {
-      dateSwitcherConverter = new IntlDateTimeConverter({
-        day: '2-digit', month: '2-digit', year: _yearFormat$1
-        });
-    }
     var switcherText = '';
     if (this._isShowingDatePickerSwitcher()) {
+      // create the date switcher converter we use to format the switcher text
+      // copy timezone and isoStrFormat from the component's converter.
+      const componentConverter = this._GetConverter();
+      const timeZone = _getConverterTimezone(componentConverter);
+      const isoStrFormat = componentConverter.resolvedOptions().isoStrFormat;
+      const dateSwitcherConverter = new IntlDateTimeConverter({
+        day: '2-digit',
+        month: '2-digit',
+        year: _yearFormat$1,
+        timeZone,
+        isoStrFormat
+      });
       try {
         switcherText = dateSwitcherConverter.format(this._switcherDateValue || this._getDateIso());
       } catch (e) {
         switcherText = dateSwitcherConverter.format(this._getDefaultIsoDate());
       }
     } else {
-    // create a converter to format the picker text
-    if (!timeSwitcherConverter) {
-      timeSwitcherConverter = new IntlDateTimeConverter({
-        hour: '2-digit', minute: '2-digit'
-      });
-    }
       try {
         switcherText = this._getTimePickerConverter().format(
                 this._switcherTimeValue || this._getDateIso());
       } catch (e) {
+        // create a converter to format the picker text
+        const timeSwitcherConverter = new IntlDateTimeConverter({
+          hour: '2-digit',
+          minute: '2-digit'
+        });
         switcherText = timeSwitcherConverter.format(this._getDefaultIsoDate());
       }
     }
@@ -12535,12 +12572,14 @@ oj.__registerWidget('oj.ojInputDateTime', $.oj.ojInputDate, {
    */
   timeSelected: function (newValue, event) {
     // TEMP TILL FIXED pass in formatted for _SetValue (should be newValue)
+    const converter = this._GetConverter();
     if (!this._dateTimeSwitcherActive) {
-      var formatted = this._GetConverter().format(newValue);
+      var formatted = converter.format(newValue);
       this._SetDisplayValue(formatted);
       this._SetValue(formatted, event);
     } else {
-      this._switcherTimeValue = newValue;
+      // switcherTimeValue will be in offset or local, but not zulu. It is the time that the user picked.
+      this._switcherTimeValue = this._parseValueToSubstituteDateOrTimePiece(converter, newValue);
     }
   },
 

package/dist/js/libs/oj/debug_esm/ojpopupcore.js

@@ -3579,6 +3579,15 @@ PositionUtils.calcAvailablePopupSize = function (pos, feedback, withinElem) {
         // factor in half the width of the popup
         posLeft -= dirFactor * (data.elemWidth / 2);
 
+        // JET-53426: need to check if the popup element fits the screen after centering
+        // otherwise it could cause text reflow and popup resize which might result
+        // in another positioning cycle with a potential endless loop.
+        // If the element does not fit, apply the 'fit' collision to avoid the resize.
+        if (posLeft < withinOffset || posLeft + data.elemWidth > outerWidth - withinOffset) {
+          $.ui.position.fit.left.call(this, position, data);
+          posLeft = position.left;
+        }
+
         // Force the popup start to be within the viewport.
         // This collision rule is only used by input components internally. The notewindow will auto dismiss when
         // what it is aligned to is hidden in a scroll container.