@oracle/oraclejet 14.1.1 → 14.1.3

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

@@ -2863,13 +2863,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]);
     }
@@ -2901,6 +2899,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 = [];
@@ -3059,27 +3058,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);
-              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
+            var node = nodes[i];
+            if (node.tagName === 'TR') {
+              tableBodyRow.parentNode.replaceChild(node, tableBodyRow);
               // eslint-disable-next-line no-param-reassign
-              tableBodyRow = $(docFrag).children()[rowIdx - docFragStartIdx];
+              tableBodyRow = node;
+              break;
             } else {
-              // eslint-disable-next-line no-param-reassign
-              tableBodyRow = docFrag.children[rowIdx - docFragStartIdx];
+              tableBodyRow.appendChild(node); // @HTMLUpdateOK
             }
           }
           this._hasRowTemplate = true;
@@ -3173,11 +3159,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) {
@@ -3219,11 +3204,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()) {
@@ -3237,24 +3218,16 @@ 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];
-          }
+
           // make sure to honor any reordered columns when re-rendering the add row content from a row template
           if (this._columnsDestMap != null) {
             var renderedCells = this._getPlaceHolderRowCells(placeHolderRow);
@@ -3565,76 +3538,82 @@ var __oj_table_metadata =
   /**
    * @private
    */
-  Table.prototype._insertSkeletonRow = function (rowIdx) {
+  Table.prototype._insertSkeletonRow = function (rowElem, rowIdx) {
     if (this._isSkeletonSupport()) {
       var pendingRow;
-      var tableBodyRows = this._getTableBodyRows();
-      if (rowIdx === -1 && this._isAddNewRowEnabled()) {
+      if (rowElem != null) {
+        pendingRow = rowElem;
+      } else if (rowIdx === -1) {
         pendingRow = this._getPlaceHolderRow();
-      } else if (tableBodyRows != null && tableBodyRows.length > 0) {
-        pendingRow = this._getTableBodyRow(rowIdx);
       } else {
-        return;
-      }
-      // add temporary table row for load more on scroll skeleton behavior
-      var existingCells = pendingRow.children;
-      for (var i = 0; i < existingCells.length; i++) {
-        existingCells[i].classList.add(Table.CSS_CLASSES._TABLE_HIDDEN_CELL_CLASS);
-      }
-      var skeletonCell = this._createTableBodyCell();
-      var columnsCount = this._getColumnDefs().length;
-      if (this._isGutterStartColumnEnabled()) {
-        columnsCount += 1;
-      }
-      if (this._isGutterEndColumnEnabled()) {
-        columnsCount += 1;
-      }
-      skeletonCell.colSpan = this._isDefaultSelectorEnabled() ? columnsCount + 1 : columnsCount;
-      skeletonCell.classList.add(Table.CSS_CLASSES._TABLE_SKELETON_CELL_CLASS);
-      if (rowIdx === -1) {
-        skeletonCell.style[Table.CSS_PROP._TOP] = existingCells[0].style.top;
+        pendingRow = this._getTableBodyRow(rowIdx);
       }
-      var skeletonRow = this._createSkeletonRow();
-      skeletonCell.appendChild(skeletonRow); // @HTMLUpdateOK
-      pendingRow.insertBefore(skeletonCell, pendingRow.firstChild); // @HTMLUpdateOK
+      if (pendingRow != null) {
+        // add temporary table row for load more on scroll skeleton behavior
+        var existingCells = pendingRow.children;
+        for (var i = 0; i < existingCells.length; i++) {
+          existingCells[i].classList.add(Table.CSS_CLASSES._TABLE_HIDDEN_CELL_CLASS);
+        }
+        var skeletonCell = this._createTableBodyCell();
+        var columnsCount = this._getColumnDefs().length;
+        if (this._isGutterStartColumnEnabled()) {
+          columnsCount += 1;
+        }
+        if (this._isGutterEndColumnEnabled()) {
+          columnsCount += 1;
+        }
+        skeletonCell.colSpan = this._isDefaultSelectorEnabled() ? columnsCount + 1 : columnsCount;
+        skeletonCell.classList.add(Table.CSS_CLASSES._TABLE_SKELETON_CELL_CLASS);
+        if (rowIdx === -1) {
+          skeletonCell.style[Table.CSS_PROP._TOP] = existingCells[0].style.top;
+        }
+        var skeletonRow = this._createSkeletonRow();
+        skeletonCell.appendChild(skeletonRow); // @HTMLUpdateOK
+        pendingRow.insertBefore(skeletonCell, pendingRow.firstChild); // @HTMLUpdateOK
 
-      this._skeletonHWMSFadeInEndListener = function () {
-        skeletonRow.classList.remove(Table.CSS_CLASSES._ANIMATION_SKELETON_FADE_IN_CLASS);
-        var skeletons = skeletonRow.querySelectorAll('.oj-table-skeleton');
-        skeletons.forEach(function (row) {
-          row.classList.add('oj-animation-skeleton');
-        });
-        skeletonRow.removeEventListener('animationend', this._skeletonHWMSFadeInEndListener);
-      }.bind(this);
-      skeletonRow.addEventListener('animationend', this._skeletonHWMSFadeInEndListener);
-      skeletonRow.classList.add(Table.CSS_CLASSES._ANIMATION_SKELETON_FADE_IN_CLASS);
+        this._skeletonHWMSFadeInEndListener = function () {
+          skeletonRow.classList.remove(Table.CSS_CLASSES._ANIMATION_SKELETON_FADE_IN_CLASS);
+          var skeletons = skeletonRow.querySelectorAll('.oj-table-skeleton');
+          skeletons.forEach(function (row) {
+            row.classList.add('oj-animation-skeleton');
+          });
+          skeletonRow.removeEventListener('animationend', this._skeletonHWMSFadeInEndListener);
+        }.bind(this);
+        skeletonRow.addEventListener('animationend', this._skeletonHWMSFadeInEndListener);
+        skeletonRow.classList.add(Table.CSS_CLASSES._ANIMATION_SKELETON_FADE_IN_CLASS);
+      }
     }
   };
 
   /**
    * @private
    */
-  Table.prototype._removeSkeletonRow = function (rowIdx) {
+  Table.prototype._removeSkeletonRow = function (rowElem, rowIdx) {
     if (this._isSkeletonSupport()) {
       var pendingRow;
-      var tableBodyRows = this._getTableBodyRows();
-      if (rowIdx === -1 && this._isAddNewRowEnabled()) {
+      if (rowElem != null) {
+        pendingRow = rowElem;
+      } else if (rowIdx === -1) {
         pendingRow = this._getPlaceHolderRow();
-      } else if (tableBodyRows != null && tableBodyRows.length > 0) {
-        pendingRow = this._getTableBodyRow(rowIdx);
       } else {
-        return;
+        pendingRow = this._getTableBodyRow(rowIdx);
       }
-      // remove temporary table row for pending skeleton behavior
-      var skeletonCell = pendingRow.children[0];
-      var skeletonRow = skeletonCell.children[0];
-      skeletonRow.classList.remove(Table.CSS_CLASSES._ANIMATION_SKELETON_FADE_IN_CLASS);
-      skeletonRow.removeEventListener('animationend', this._skeletonHWMSFadeInEndListener);
-      pendingRow.removeChild(skeletonCell);
-
-      var existingCells = pendingRow.children;
-      for (var i = 0; i < existingCells.length; i++) {
-        existingCells[i].classList.remove(Table.CSS_CLASSES._TABLE_HIDDEN_CELL_CLASS);
+      if (pendingRow != null) {
+        // remove temporary table row for pending skeleton behavior
+        var skeletonCell = pendingRow.children[0];
+        if (skeletonCell != null &&
+            skeletonCell.classList.contains(Table.CSS_CLASSES._TABLE_SKELETON_CELL_CLASS)) {
+          var skeletonRow = skeletonCell.children[0];
+          if (skeletonRow != null) {
+            skeletonRow.classList.remove(Table.CSS_CLASSES._ANIMATION_SKELETON_FADE_IN_CLASS);
+            skeletonRow.removeEventListener('animationend', this._skeletonHWMSFadeInEndListener);
+          }
+          pendingRow.removeChild(skeletonCell);
+        }
+        var existingCells = pendingRow.children;
+        for (var i = 0; i < existingCells.length; i++) {
+          existingCells[i].classList.remove(Table.CSS_CLASSES._TABLE_HIDDEN_CELL_CLASS);
+        }
       }
     }
   };
@@ -19660,27 +19639,30 @@ var __oj_table_metadata =
         }
         if (editAcceptPromiseArray.length !== 0) {
           this._isEditPending = true;
-          this._insertSkeletonRow(rowIdx);
+          this._insertSkeletonRow(tableBodyRow);
           this._getTable().focus();
           this._queueTask(
             function () {
               return Promise.all(editAcceptPromiseArray).then(
                 function () {
-                  this._removeSkeletonRow(rowIdx);
-                  // update editRow option
-                  if (newEditRowValue) {
-                    this._fireEditRowChangeEvent(newEditRowValue, event);
+                  this._removeSkeletonRow(tableBodyRow);
+                  // recalculate the row index as it could have changed due to other tasks
+                  var editableRowIndex = this._getRowIdxForRowKey(rowKey);
+                  if (editable && rowIdx !== editableRowIndex) {
+                    newEditRowValue.rowIndex = editableRowIndex;
                   }
+                  // update editRow option
+                  this._fireEditRowChangeEvent(newEditRowValue, event);
 
                   if (editable) {
                     // set the editable row index
-                    this._setEditableRowIdx(rowIdx);
+                    this._setEditableRowIdx(editableRowIndex);
                     this._getTable().setAttribute(Table.DOM_ATTR._ARIA_LABELLEDBY, ''); // @HTMLUpdateOK
                     this._accStatus.setAttribute(Table.DOM_ATTR._ARIA_LABELLEDBY, ''); // @HTMLUpdateOK
                     // re-render the newly editable row
-                    return this._refreshRow(rowIdx, true, false, !isLegacyDataSource).then(
+                    return this._refreshRow(editableRowIndex, true, false, !isLegacyDataSource).then(
                       function () {
-                        this._setCellInRowFocus(rowIdx, columnIdx, forwardSearch);
+                        this._setCellInRowFocus(editableRowIndex, columnIdx, forwardSearch);
                         // clear out the old editable row
                         // make sure the row still exists before we refresh it
                         var prevEditableRowIdx = this._getRowIdxForRowKey(prevEditableRowKey);
@@ -19718,7 +19700,7 @@ var __oj_table_metadata =
                   return Promise.resolve();
                 }.bind(this),
                 function () {
-                  this._removeSkeletonRow(rowIdx);
+                  this._removeSkeletonRow(tableBodyRow);
                   if (editable && prevEditableRowKey == null) {
                     this._syncActiveElement();
                   }
@@ -19731,9 +19713,7 @@ var __oj_table_metadata =
           return Promise.all(editAcceptPromiseArray);
         }
         // update editRow option
-        if (newEditRowValue) {
-          this._fireEditRowChangeEvent(newEditRowValue, event);
-        }
+        this._fireEditRowChangeEvent(newEditRowValue, event);
 
         if (editable) {
           // set the editable row index
@@ -19743,10 +19723,12 @@ var __oj_table_metadata =
           // re-render the newly editable row
           this._queueTask(
             function () {
-              return this._refreshRow(rowIdx, true, false, !isLegacyDataSource).then(
+              // recalculate the row index as it could have changed due to other tasks
+              var editableRowIndex = this._getRowIdxForRowKey(rowKey);
+              return this._refreshRow(editableRowIndex, true, false, !isLegacyDataSource).then(
                 function () {
                   // set focus on the column in the row
-                  this._setCellInRowFocus(rowIdx, columnIdx, forwardSearch);
+                  this._setCellInRowFocus(editableRowIndex, columnIdx, forwardSearch);
                 }.bind(this)
               );
             }.bind(this)
@@ -19794,13 +19776,13 @@ var __oj_table_metadata =
     }
     this._setTableActionableMode(false);
     if (addRowAcceptPromiseArray.length !== 0) {
-      this._insertSkeletonRow(-1);
+      this._insertSkeletonRow(null, -1);
       this._getTable().focus();
       this._queueTask(
         function () {
           return Promise.all(addRowAcceptPromiseArray).then(
             function () {
-              this._removeSkeletonRow(-1);
+              this._removeSkeletonRow(null, -1);
               this._isAddRowRendered = false;
               return this._refreshAddNewRowPlaceholder().then(
                 function () {
@@ -19812,7 +19794,7 @@ var __oj_table_metadata =
               );
             }.bind(this),
             function () {
-              this._removeSkeletonRow(-1);
+              this._removeSkeletonRow(null, -1);
               this._setActiveAddRow();
               this._setTableActionableMode(true);
             }.bind(this)

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.1.1',
+  version: '14.1.3',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2023-05-09_11-24-23',
+  revision: '2023-06-09_02-47-50',
 
   // 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

@@ -12652,6 +12652,7 @@ DvtDataGrid.prototype.handleHeaderMouseDown = function (event) {
   }
 
   if (this._isDisclosureIcon(target)) {
+    this.handleHeaderClickActive(event, null, true);
     return;
   }
 
@@ -17295,7 +17296,7 @@ DvtDataGrid.prototype._setActive = function (
           this._clearSelection(event);
         }
         this._unhighlightActiveObject(this.m_prevActive);
-        this._highlightActiveObject(this.m_active, this.m_prevActive);
+        this._highlightActiveObject(this.m_active, this.m_prevActive, null, shouldNotScroll);
         this._manageMoveCursor();
         if (this._isGridEditable()) {
           if (active.type === 'cell') {
@@ -17310,7 +17311,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();
@@ -17675,14 +17677,14 @@ DvtDataGrid.prototype.handleDatabodyClickActive = function (event) {
  * Handles click to select a header
  * @param {Event} event
  */
-DvtDataGrid.prototype.handleHeaderClickActive = function (event, activeOnly) {
+DvtDataGrid.prototype.handleHeaderClickActive = function (event, activeOnly, shouldNotScroll) {
   var target = /** @type {Element} */ (event.target);
   var header = this.findHeader(target);
   if (header != null) {
     if (!activeOnly) {
       this._clearSelection(event);
     }
-    this._setActive(header, this._createActiveObject(header), event);
+    this._setActive(header, this._createActiveObject(header), event, null, null, shouldNotScroll);
   }
 };
 
@@ -18077,12 +18079,14 @@ DvtDataGrid.prototype._unhighlightActive = function (classNames) {
  * @param {Object} activeObject active to unhighlight
  * @param {Object} prevActiveObject last active to base aria properties on
  * @param {Array=} classNames string of classNames to add to active element
+ * @param {boolean|null=} shouldNotScroll boolean if element should be scrolled into view
  * @private
  */
 DvtDataGrid.prototype._highlightActiveObject = function (
   activeObject,
   prevActiveObject,
-  classNames
+  classNames,
+  shouldNotScroll
 ) {
   if (classNames == null && this.m_utils.shouldOffsetOutline()) {
     // eslint-disable-next-line no-param-reassign
@@ -18104,7 +18108,7 @@ DvtDataGrid.prototype._highlightActiveObject = function (
           'Edit'
         );
       }
-      this._setAriaProperties(activeObject, prevActiveObject, element);
+      this._setAriaProperties(activeObject, prevActiveObject, element, shouldNotScroll);
     }
   }
 };
@@ -18211,9 +18215,15 @@ DvtDataGrid.prototype._unhighlightElementsByClassName = function (elements, clas
  * @param {Object} activeObject active to unhighlight
  * @param {Object} prevActiveObject last active to base aria properties on
  * @param {Element} element the element to reset all wai-aria properties
+ * @param {boolean|null=} shouldNotScroll boolean if element should be scrolled into view
  * @private
  */
-DvtDataGrid.prototype._setAriaProperties = function (activeObject, prevActiveObject, element) {
+DvtDataGrid.prototype._setAriaProperties = function (
+  activeObject,
+  prevActiveObject,
+  element,
+  shouldNotScroll
+) {
   var label = this.getLabelledBy(activeObject, prevActiveObject, element);
   this._updateActiveContext(activeObject, prevActiveObject);
 
@@ -18231,7 +18241,7 @@ DvtDataGrid.prototype._setAriaProperties = function (activeObject, prevActiveObj
     (this.m_cellToFocus == null || this.m_cellToFocus !== element) &&
     this.m_shouldFocus !== false
   ) {
-    element.focus();
+    element.focus({ preventScroll: shouldNotScroll });
   }
   this.m_shouldFocus = null;
 };

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);
     }
   },