@oracle/oraclejet 14.0.11 → 14.0.12

package/dist/icu-l10n/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "strict": true
+  },
+  "include": [ "**/*.ts" ]
+}

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

@@ -943,23 +943,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;
@@ -971,7 +982,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;
                 }
@@ -989,7 +1000,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;
                 }
@@ -1316,7 +1327,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());
                 }
@@ -1452,7 +1463,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());
                 }
@@ -1524,7 +1535,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: '14.0.11',
+    version: '14.0.12',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2023-05-19_09-44-29',
+    revision: '2023-06-12_07-51-30',
 
     // 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/ojdatagrid.js

@@ -17283,7 +17283,8 @@ var __oj_data_grid_metadata =
             this.m_options.isFloodFillEnabled() &&
             this._isSelectionEnabled() &&
             !this.m_discontiguousSelection &&
-            this.m_active.type === 'cell'
+            this.m_active.type === 'cell' &&
+            event
           ) {
             this._addFloodfillAffordance(event);
             this._moveFloodFillAffordance();

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

@@ -6278,6 +6278,26 @@ var __oj_input_date_time_metadata =
       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
@@ -6425,12 +6445,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();
       }
@@ -10348,6 +10363,7 @@ var __oj_input_date_time_metadata =
           var isoValue = newValue;
           // check if time is an isostring and if it is not an isostring then parse it.
           try {
+            // This function will throw an error if it is not an isostring.
             converterUtils._dateTime(newValue, {
               month: date.getMonth(),
               date: date.getDate(),
@@ -12349,21 +12365,38 @@ 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();
+                const dateIso = self._getDateIso();
+                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, {});
@@ -12888,12 +12921,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/ojnavigationlist.js

@@ -7228,13 +7228,6 @@ var __oj_tab_bar_metadata =
     // Slider items don't have Aria-selected tag, overrding selction for slider navlist
 
     var itemSelectionMarkerAttr = 'aria-selected';
-    var prevAnchorTag;
-    var anchor = this.m_widget.getFocusItem($(item))[0];
-    var collapseClass = this.m_widget.getCollapseIconStyleClass();
-    prevAnchorTag = anchor.previousElementSibling;
-    if (prevAnchorTag && prevAnchorTag.classList.contains(collapseClass)) {
-      return false;
-    }
     return (
       this.m_widget.getFocusItem($(item))[0].getAttribute('role') === 'menuitem' &&
       !this.m_widget.getFocusItem($(item))[0].hasAttribute(itemSelectionMarkerAttr)

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

@@ -3715,6 +3715,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/ojtable.js

@@ -2843,13 +2843,11 @@ var __oj_table_metadata =
     }
     this._clearCachedDomRowData();
     this._hideNoDataMessage();
-    const tableBodyDocFrag = document.createDocumentFragment();
 
-    this._refreshAddNewRowPlaceholder(tableBodyDocFrag, true);
+    this._refreshAddNewRowPlaceholder(true);
 
     // if no new rows, and no existing rows, show no data message
     if (rows.length === 0 && this._getTableBodyRows().length === 0) {
-      this._appendElementToTableBody(tableBodyDocFrag, tableBody);
       this._showNoDataMessage();
       return this._finalizeNonBodyRowRendering([tableBody]);
     }
@@ -2881,6 +2879,7 @@ var __oj_table_metadata =
     var layoutManager = this._getLayoutManager();
 
     var rowsCount = rows.length;
+    const tableBodyDocFrag = document.createDocumentFragment();
     if (this._animateOnFetch && this._IsCustomElement()) {
       this._animateOnFetch = false;
       var addedTableBodyRows = [];
@@ -3039,27 +3038,14 @@ var __oj_table_metadata =
             tableBody
           );
           for (let i = 0; i < nodes.length; i++) {
-            if (nodes[i].tagName === 'TR') {
-              tableBodyRow.parentNode.replaceChild(nodes[i], tableBodyRow);
+            var node = nodes[i];
+            if (node.tagName === 'TR') {
+              tableBodyRow.parentNode.replaceChild(node, tableBodyRow);
+              // eslint-disable-next-line no-param-reassign
+              tableBodyRow = node;
               break;
             } else {
-              tableBodyRow.appendChild(nodes[i]); // @HTMLUpdateOK
-            }
-          }
-          if (docFrag == null) {
-            // eslint-disable-next-line no-param-reassign
-            tableBodyRow = this._getRawTableBodyRow(rowIdx);
-          } else {
-            // eslint-disable-next-line no-param-reassign
-            docFragStartIdx = docFragStartIdx == null ? 0 : docFragStartIdx;
-            if (!docFrag.children) {
-              // use jquery children() because documentFragments do not have
-              // good browser support for .children
-              // eslint-disable-next-line no-param-reassign
-              tableBodyRow = $(docFrag).children()[rowIdx - docFragStartIdx];
-            } else {
-              // eslint-disable-next-line no-param-reassign
-              tableBodyRow = docFrag.children[rowIdx - docFragStartIdx];
+              tableBodyRow.appendChild(node); // @HTMLUpdateOK
             }
           }
           this._hasRowTemplate = true;
@@ -3153,11 +3139,10 @@ var __oj_table_metadata =
 
   /**
    * Refresh the add row placeholder if it exists
-   * @param {Object} docFrag  document fragment
    * @param {boolean=} skipTopUpdate whether to skip applying 'top' values to the row cells
    * @private
    */
-  Table.prototype._refreshAddNewRowPlaceholder = function (docFrag, skipTopUpdate) {
+  Table.prototype._refreshAddNewRowPlaceholder = function (skipTopUpdate) {
     let placeHolderRow = this._getPlaceHolderRow();
     if (!this._isAddNewRowEnabled()) {
       if (placeHolderRow != null) {
@@ -3199,11 +3184,7 @@ var __oj_table_metadata =
         if (placeHolderRow == null) {
           placeHolderRow = this._createTableBodyRow();
         }
-        if (docFrag != null) {
-          docFrag.appendChild(placeHolderRow);
-        } else {
-          tableBody.insertBefore(placeHolderRow, tableBody.firstChild);
-        }
+        tableBody.insertBefore(placeHolderRow, tableBody.firstChild);
 
         var addRowCell;
         if (addRowTemplate != null && this._isDefaultAddRowTemplateSlotValid()) {
@@ -3217,24 +3198,15 @@ var __oj_table_metadata =
             tableBody
           );
           for (let i = 0; i < nodes.length; i++) {
-            if (nodes[i].tagName === 'TR') {
-              placeHolderRow.parentNode.replaceChild(nodes[i], placeHolderRow);
+            var node = nodes[i];
+            if (node.tagName === 'TR') {
+              placeHolderRow.parentNode.replaceChild(node, placeHolderRow);
+              placeHolderRow = node;
               break;
             } else {
-              placeHolderRow.appendChild(nodes[i]); // @HTMLUpdateOK
+              placeHolderRow.appendChild(node); // @HTMLUpdateOK
             }
           }
-          if (docFrag == null) {
-            placeHolderRow = this._getRawTableBodyRow(-1);
-          } else if (!docFrag.children) {
-            // use jquery children() because documentFragments do not have
-            // good browser support for .children
-            // eslint-disable-next-line no-param-reassign
-            placeHolderRow = $(docFrag).children()[0];
-          } else {
-            // eslint-disable-next-line no-param-reassign
-            placeHolderRow = docFrag.children[0];
-          }
         } else if (addRowCellTemplate !== null && this._isDefaultAddRowCellTemplateSlotValid()) {
           var columns = this._getColumnDefs();
           var columnsCount = columns.length;

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

@@ -948,23 +948,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;
@@ -976,7 +987,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;
             }
@@ -994,7 +1005,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;
             }
@@ -1321,7 +1332,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());
             }
@@ -1457,7 +1468,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());
             }
@@ -1529,7 +1540,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: '14.0.11',
+  version: '14.0.12',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2023-05-19_09-44-29',
+  revision: '2023-06-12_07-51-30',
 
   // 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/ojdatagrid.js

@@ -17299,7 +17299,8 @@ DvtDataGrid.prototype._setActive = function (
           this.m_options.isFloodFillEnabled() &&
           this._isSelectionEnabled() &&
           !this.m_discontiguousSelection &&
-          this.m_active.type === 'cell'
+          this.m_active.type === 'cell' &&
+          event
         ) {
           this._addFloodfillAffordance(event);
           this._moveFloodFillAffordance();

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

@@ -6293,6 +6293,26 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
     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
@@ -6440,12 +6460,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();
     }
@@ -10363,6 +10378,7 @@ oj.__registerWidget('oj.ojInputTime', $.oj.inputBase, {
         var isoValue = newValue;
         // check if time is an isostring and if it is not an isostring then parse it.
         try {
+          // This function will throw an error if it is not an isostring.
           converterUtils._dateTime(newValue, {
             month: date.getMonth(),
             date: date.getDate(),
@@ -12364,21 +12380,38 @@ 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();
+              const dateIso = self._getDateIso();
+              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, {});
@@ -12903,12 +12936,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/ojnavigationlist.js

@@ -7234,13 +7234,6 @@ SlidingNavListHandler.prototype.IsSelectable = function (item) {
   // Slider items don't have Aria-selected tag, overrding selction for slider navlist
 
   var itemSelectionMarkerAttr = 'aria-selected';
-  var prevAnchorTag;
-  var anchor = this.m_widget.getFocusItem($(item))[0];
-  var collapseClass = this.m_widget.getCollapseIconStyleClass();
-  prevAnchorTag = anchor.previousElementSibling;
-  if (prevAnchorTag && prevAnchorTag.classList.contains(collapseClass)) {
-    return false;
-  }
   return (
     this.m_widget.getFocusItem($(item))[0].getAttribute('role') === 'menuitem' &&
     !this.m_widget.getFocusItem($(item))[0].hasAttribute(itemSelectionMarkerAttr)

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

@@ -3721,6 +3721,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.