@oracle/oraclejet 16.0.0 → 16.0.2

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

@@ -709,8 +709,7 @@ class BufferingDataProvider {
                 this._baseIterator = _baseIterator;
                 this._params = _params;
                 this.firstBaseKey = null;
-                this.mergedAddKeySet = new Set();
-                this.unFetchedAddItemSet = new Set();
+                this.mergedAddKeySet = new MutableKeySet();
                 this.mergedItemArray = [];
                 this.nextOffset = 0;
                 if (this._params == null) {
@@ -767,16 +766,11 @@ class BufferingDataProvider {
                         }
                         const newDataArray = [];
                         const newMetaArray = [];
-                        this.unFetchedAddItemSet.forEach((item) => {
-                            newDataArray.push(item.data);
-                            newMetaArray.push(item.metadata);
-                        });
-                        this.unFetchedAddItemSet.clear();
                         let idx;
                         for (idx = this.nextOffset; idx < this.mergedItemArray.length; idx++) {
-                            ++this.nextOffset;
                             const item = this.mergedItemArray[idx];
                             if (!this._parent._isItemRemoved(item.metadata.key)) {
+                                this.nextOffset = idx + 1;
                                 newDataArray.push(item.data);
                                 newMetaArray.push(item.metadata);
                                 if (params.size && newDataArray.length === params.size) {
@@ -987,7 +981,7 @@ class BufferingDataProvider {
                     else {
                         sortCriteria = params.sortCriteria;
                     }
-                    this._mergeEdits(baseItemArray, newItemArray, params.filterCriterion, sortCriteria, new Set(), baseResults.done);
+                    this._mergeEdits(baseItemArray, newItemArray, params.filterCriterion, sortCriteria, new MutableKeySet(), baseResults.done);
                     let actualReturnSize = newItemArray.length;
                     for (const newItem of newItemArray) {
                         if (this._isItemRemoved(newItem.metadata.key)) {
@@ -1150,9 +1144,13 @@ class BufferingDataProvider {
             }
             else {
                 addBeforeKey = this.lastIterator.firstBaseKey;
+                let shouldIncrementNextOffset = this.lastIterator.nextOffset !== 0;
                 if (this.editBuffer.isUpdateTransformed(item.metadata.key)) {
                     for (let i = 0; i < this.lastIterator.mergedItemArray.length; i++) {
-                        if (this.lastIterator.mergedItemArray[i].metadata.key === item.metadata.key) {
+                        if (oj.KeyUtils.equals(this.lastIterator.mergedItemArray[i].metadata.key, item.metadata.key)) {
+                            if (shouldIncrementNextOffset) {
+                                shouldIncrementNextOffset = this.lastIterator.nextOffset <= i;
+                            }
                             this.lastIterator.mergedItemArray.splice(i, 1);
                             break;
                         }
@@ -1160,11 +1158,10 @@ class BufferingDataProvider {
                 }
                 this.lastIterator.mergedItemArray.splice(0, 0, item);
                 this.lastIterator.mergedAddKeySet.add(item.metadata.key);
-                if (addBeforeKey === null) {
-                    this.lastIterator.unFetchedAddItemSet.add(item);
-                }
                 this.lastIterator.firstBaseKey = item.metadata.key;
-                this.lastIterator.nextOffset++;
+                if (shouldIncrementNextOffset) {
+                    this.lastIterator.nextOffset++;
+                }
             }
         }
         return addBeforeKey;
@@ -1219,14 +1216,13 @@ class BufferingDataProvider {
                 if (fromBaseDP || mergedAddKeySet.has(key)) {
                     mergedItemArray.splice(keyIdx, 1);
                     mergedAddKeySet.delete(key);
-                    if (keyIdx < this.lastIterator.nextOffset) {
-                        --this.lastIterator.nextOffset;
-                    }
                 }
-                else {
-                    if (keyIdx === this.lastIterator.nextOffset - 1) {
-                        --this.lastIterator.nextOffset;
+                for (let i = this.lastIterator.nextOffset - 1; i >= 0; i--) {
+                    let itemKey = mergedItemArray[i]?.metadata.key;
+                    if (itemKey != null && !this._isItemRemoved(itemKey)) {
+                        break;
                     }
+                    this.lastIterator.nextOffset = i;
                 }
                 if (oj.KeyUtils.equals(this.lastIterator.firstBaseKey, key)) {
                     this.lastIterator.firstBaseKey = null;
@@ -1668,6 +1664,47 @@ class BufferingDataProvider {
 BufferingDataProvider._REFRESH = 'refresh';
 BufferingDataProvider._MUTATE = 'mutate';
 BufferingDataProvider._ADDEVENTLISTENER = 'addEventListener';
+class MutableKeySet {
+    constructor() {
+        this.set = new Set();
+    }
+    has(key) {
+        return _has(this.set, key);
+    }
+    add(key) {
+        if (!_has(this.set, key)) {
+            this.set.add(key);
+        }
+    }
+    delete(key) {
+        const ret = _find(this.set, key);
+        if (ret.value) {
+            this.set.delete(ret.key);
+        }
+    }
+}
+const _has = (keys, keyToFind) => {
+    return _find(keys, keyToFind).value;
+};
+const _find = (keys, keyToFind) => {
+    if (keys.size === 0) {
+        return { value: false };
+    }
+    if (typeof keyToFind === 'string' ||
+        typeof keyToFind === 'number' ||
+        typeof keyToFind === 'boolean') {
+        return { value: keys.has(keyToFind), key: keyToFind };
+    }
+    const iterator = keys[Symbol.iterator]();
+    let key = iterator.next();
+    while (!key.done) {
+        if (oj.KeyUtils.equals(key.value, keyToFind)) {
+            return { value: true, key: key.value };
+        }
+        key = iterator.next();
+    }
+    return { value: false };
+};
 EventTargetMixin.applyMixin(BufferingDataProvider);
 oj._registerLegacyNamespaceProp('BufferingDataProvider', BufferingDataProvider);
 

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

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '16.0.0',
+  version: '16.0.2',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2024-02-10_08-15-32',
+  revision: '2024-04-10_09-01-56',
 
   // 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/ojcorerouter.js

@@ -570,11 +570,14 @@ CoreRouter.prototype.sync = function () {
     const transition = pendingTransitions.shift();
     const newRoutes = this._getParentRoutes().concat(this._getPendingState(transition));
     const newPath = urlAdapter.getUrlForRoutes(newRoutes);
-    window.history.replaceState(null, 'path', newPath);
+    if (!this._noHistory) {
+      window.history.replaceState(null, 'path', newPath);
+    }
     route = transition;
   } else {
     route = this._getRouteSegment();
   }
+
   // Transition to the new route, or a default one if no current one exists
   return this._execute(route || { path: '', params: {} })
     .then((state) => {
@@ -583,9 +586,6 @@ CoreRouter.prototype.sync = function () {
       var childRouter = this.childRouter;
       if (childRouter) {
         p = childRouter.sync();
-      } else if (!this._noHistory) {
-        // Cleanup noHistorySegments after navigating any history-tracking routers
-        noHistorySegments = [];
       }
       return p;
     })
@@ -732,10 +732,6 @@ CoreRouter.prototype.go = function (...transitions) {
     // Get the current routes for all active routers, and compare that to the
     // new routes for this transition.
     const currentPath = urlAdapter.getUrlForRoutes(getActiveRoutes());
-    // Insert the new transitions after the current router's route offset
-    const newRoutes = this._getParentRoutes().concat(this._getPendingState(first, true));
-    const newPath = urlAdapter.getUrlForRoutes(newRoutes);
-
     const prevNoHistorySegments = noHistorySegments;
     if (this._noHistory) {
       info(`Navigating non-history tracking router(${this._name}) to ${path}`);
@@ -743,8 +739,15 @@ CoreRouter.prototype.go = function (...transitions) {
       // to store their transitions. Replace the segments after our index with
       // the new transitions
       noHistorySegments = noHistorySegments.slice(0, this._noHistoryOffset).concat(transitions);
-    } else if (currentPath !== newPath) {
-      window.history.pushState(null, 'path', newPath);
+    } else {
+      // Cleanup noHistorySegments when navigating any history-tracking routers
+      noHistorySegments = [];
+      // Insert the new transitions after the current router's route offset
+      const newRoutes = this._getParentRoutes().concat(this._getPendingState(first, true));
+      const newPath = urlAdapter.getUrlForRoutes(newRoutes);
+      if (currentPath !== newPath) {
+        window.history.pushState(null, 'path', newPath);
+      }
     }
     goP = this.sync().catch((ex) => {
       // Clear transitions if transition rejected
@@ -809,7 +812,7 @@ CoreRouter.prototype._prepublish = function (state) {
     if (activeSync !== this._activeSync) {
       // If this isn't the latest sync, then reject the Promise because another
       // sync() is already underway
-      return Promise.reject();
+      return Promise.reject('sync overridden');
     }
     return s;
   });

package/dist/js/libs/oj/debug_esm/ojdatacollection-common.js

@@ -914,7 +914,10 @@ DataCollectionUtils.isRequestIdleCallbackSupported = function () {
  * @private
  */
 DataCollectionUtils.isFetchAborted = function (fetchResult) {
-  var signal = fetchResult.value.fetchParameters.signal;
+  if (fetchResult?.value == null) {
+    return false;
+  }
+  var signal = fetchResult.value.fetchParameters?.signal;
   if (signal == null) {
     warn(
       'Signal is missing from fetch parameters, which is set by collection component and should be present'

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

@@ -4516,10 +4516,9 @@ DvtDataGrid.prototype.setDefaultDimensions = function () {
     ' ' +
     resources.getMappedStyle('headercell');
   this.m_root.appendChild(div); // @HTMLUpdateOK
-  // Not using offsetWidth/Height due to
-  var rect = div.getBoundingClientRect();
-  this.m_defaultColumnWidth = Math.round(rect.width);
-  this.m_defaultRowHeight = Math.round(rect.height);
+  // can use offset due to fixes in chrome partial pixel rounding fixes
+  this.m_defaultColumnWidth = div.offsetWidth;
+  this.m_defaultRowHeight = div.offsetHeight;
 
   // minimize reflows
   this.getViewportWidth();
@@ -5846,8 +5845,8 @@ DvtDataGrid.prototype.resizeGrid = function () {
   this.setElementWidth(colEndHeader, columnHeaderWidth);
 
   [rowHeaderWidth, colHeaderHeight] = this._setFrozenContainerDimension(
-    availableWidth,
-    availableHeight,
+    databodyWidth,
+    databodyHeight,
     rowHeaderWidth,
     rowEndHeaderWidth,
     colHeaderHeight,
@@ -6060,7 +6059,10 @@ DvtDataGrid.prototype._adjustHeaderBorders = function () {
         this.m_utils.removeCSSClassName(this.m_bottomCorner, style);
       }
     }
-    tags = this.m_rowEndHeader.firstChild.childNodes;
+    tags = Array.from(this.m_rowEndHeader.firstChild.childNodes);
+    if (this.m_rowEndHeaderFrozen?.firstChild?.childNodes?.length) {
+      tags.push(...this.m_rowEndHeaderFrozen.firstChild.childNodes);
+    }
     for (i = 0; i < tags.length; i++) {
       if (bw) {
         this.m_utils.addCSSClassName(tags[i], style);
@@ -6127,7 +6129,10 @@ DvtDataGrid.prototype._adjustHeaderBorders = function () {
         this.m_utils.removeCSSClassName(this.m_bottomCorner, style);
       }
     }
-    tags = this.m_colEndHeader.firstChild.childNodes;
+    tags = Array.from(this.m_colEndHeader.firstChild.childNodes);
+    if (this.m_colEndHeaderFrozen?.firstChild?.childNodes?.length) {
+      tags.push(...this.m_colEndHeaderFrozen.firstChild.childNodes);
+    }
     const groupingContainerStyle = this.getMappedStyle('groupingcontainer');
     // Identify if the endHeader is a groupingcontainer and apply style to the first child.
     for (i = 0; i < tags.length; i++) {
@@ -17129,8 +17134,8 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
   // are available and insert is done at the end of the frozen section.
   if (this._hasFrozenColumns() || this._hasFrozenRows()) {
     if (
-      (axis === 'column' && offset <= this.m_frozenColIndex + 1) ||
-      (axis === 'row' && offset <= this.m_frozenRowIndex + 1)
+      (axis === 'column' && this._hasFrozenColumns() && offset <= this.m_frozenColIndex + 1) ||
+      (axis === 'row' && this._hasFrozenRows() && offset <= this.m_frozenRowIndex + 1)
     ) {
       frozenDimensions = new Array(count).fill(totalDimension / count);
     } else {
@@ -18206,11 +18211,14 @@ DvtDataGrid.prototype._splitRange = function (cellSet, rowStart, rowEnd, colStar
   let frozenColExists = this.m_frozenColIndex !== null && this.m_frozenColIndex !== -1;
   let frozenRowExists = this.m_frozenRowIndex !== null && this.m_frozenRowIndex !== -1;
 
+  // * If no frozen section, mutate the rest of the databody
+  // * If either of them exists, then check if the row/col End exceeds the frozen region and mutate the rest of the databody
+  // * ensure check for frozenAxisExists as 1 > null alone shall pass
   if (
     (!frozenColExists && !frozenRowExists) ||
     ((frozenColExists || frozenRowExists) &&
-      rowEnd > this.m_frozenRowIndex &&
-      colEnd > this.m_frozenColIndex)
+      (!frozenRowExists || rowEnd > this.m_frozenRowIndex) &&
+      (!frozenColExists || colEnd > this.m_frozenColIndex))
   ) {
     this._fetchAndMutateCellsByRange(cellSet, this.m_databody, rowStart, rowEnd, colStart, colEnd);
   }
@@ -18436,6 +18444,14 @@ DvtDataGrid.prototype._handleDeleteRangeEvent = function (eventDetail) {
         if (endHeaders.length) {
           this._removeAndModifyHeaders(endHeaders, dimension, dimensionToRetrieve, dirToSet, index);
         }
+        if (
+          (axis === 'column' && this._hasFrozenColumns() && index <= this.m_frozenColIndex) ||
+          (axis === 'row' && this._hasFrozenRows() && index <= this.m_frozenRowIndex)
+        ) {
+          frozenSectionDimension += dimension;
+        } else {
+          databodyDimension += dimension;
+        }
       }
       if (
         (axis === 'column' && this._hasFrozenColumns() && index <= this.m_frozenColIndex) ||
@@ -18446,14 +18462,6 @@ DvtDataGrid.prototype._handleDeleteRangeEvent = function (eventDetail) {
         insideDeletedDimension += dimension;
         dimensions.unshift(dimension);
       }
-      if (
-        (axis === 'column' && this._hasFrozenColumns() && index <= this.m_frozenColIndex) ||
-        (axis === 'row' && this._hasFrozenRows() && index <= this.m_frozenRowIndex)
-      ) {
-        frozenSectionDimension += dimension;
-      } else {
-        databodyDimension += dimension;
-      }
     } else if (flag === DvtDataGrid.AFTER && this.m_options.getScrollPolicy() === 'scroll') {
       // only concerned with after rows if virtual scroll
       databodyDimension += dimension;
@@ -18591,6 +18599,9 @@ DvtDataGrid.prototype._handleDeleteRangeEvent = function (eventDetail) {
     }
     var databodyContentHeight = this.getElementHeight(databodyContent) - databodyDimension;
     this.setElementHeight(databodyContent, databodyContentHeight);
+    if (this.m_databodyFrozenCol) {
+      this.setElementHeight(this.m_databodyFrozenCol, databodyContentHeight);
+    }
     if (this.m_databodyFrozenRow) {
       var frozenDatabodyContentHeight =
         this.getElementHeight(this.m_databodyFrozenRow) - frozenSectionDimension;
@@ -18627,6 +18638,9 @@ DvtDataGrid.prototype._handleDeleteRangeEvent = function (eventDetail) {
     }
     var databodyContentWidth = this.getElementWidth(databodyContent) - databodyDimension;
     this.setElementWidth(databodyContent, databodyContentWidth);
+    if (this.m_databodyFrozenRow) {
+      this.setElementWidth(this.m_databodyFrozenRow, databodyContentWidth);
+    }
     if (this.m_databodyFrozenCol) {
       var frozenDatabodyContentWidth =
         this.getElementWidth(this.m_databodyFrozenCol) - frozenSectionDimension;
@@ -19176,31 +19190,21 @@ DvtDataGrid.prototype._findHeaderByKey = function (key, root, className) {
   if (root == null) {
     return null;
   }
+  var sections = [];
+  var headers = [];
+  sections.push(root);
 
-  var headers;
-
-  // identify region based on the frozen indexes.
-  if (
-    this._hasFrozenRows() &&
-    parseInt(key, 10) <= this.m_frozenRowIndex &&
-    (root === this.m_rowHeader || root === this.m_rowEndHeader)
-  ) {
-    // eslint-disable-next-line no-param-reassign
-    root = root === this.m_rowHeader ? this.m_rowHeaderFrozen : this.m_rowEndHeaderFrozen;
+  if (this._hasFrozenRows() && (root === this.m_rowHeader || root === this.m_rowEndHeader)) {
+    let section = root === this.m_rowHeader ? this.m_rowHeaderFrozen : this.m_rowEndHeaderFrozen;
+    sections.push(section);
   }
-  if (
-    this._hasFrozenColumns() &&
-    parseInt(key, 10) <= this.m_frozenColIndex &&
-    (root === this.m_colHeader || root === this.m_colEndHeader)
-  ) {
-    // eslint-disable-next-line no-param-reassign
-    root = root === this.m_colHeader ? this.m_colHeaderFrozen : this.m_colEndHeaderFrozen;
+  if (this._hasFrozenColumns() && (root === this.m_colHeader || root === this.m_colEndHeader)) {
+    let section = root === this.m_colHeader ? this.m_colHeaderFrozen : this.m_colEndHeaderFrozen;
+    sections.push(section);
   }
-  // getElementsByClassName support is IE9 and up
-  if (root.getElementsByClassName) {
-    headers = root.getElementsByClassName(className);
-  } else {
-    headers = root.childNodes;
+
+  for (let i = 0; i < sections.length; i++) {
+    headers.push(...sections[i].getElementsByClassName(className));
   }
   for (var i = 0; i < headers.length; i++) {
     var header = headers[i];
@@ -27108,6 +27112,13 @@ DvtDataGrid.prototype._fireCellResizeEvent = function (
     if ((resizeHeaderMode === 'column' || resizeHeaderMode === 'columnEnd') && !isHeaderLabel) {
       // index based
       dimension = 'columnWidth';
+      details.ui.size = this.getElementWidth(
+        this._getHeaderByIndex(
+          resizingElementIndex + context.extent - 1,
+          'column',
+          this.m_columnHeaderLevelCount - 1
+        )
+      );
     } else if (isHeaderLabel) {
       let isRowEndHeaderLabel = this.m_utils.containsCSSClassName(
         this.m_resizingElement,
@@ -27115,10 +27126,9 @@ DvtDataGrid.prototype._fireCellResizeEvent = function (
       );
       dimension = isRowEndHeaderLabel ? 'rowEndHeaderWidth' : 'rowHeaderWidth';
       details.ui.levels = [
-        resizeHeaderMode.includes('row')
-          ? context.level + context.depth - 1
-          : this.m_rowHeaderLevelCount - 1
+        resizeHeaderMode.includes('row') ? context.level : this.m_rowHeaderLevelCount - 1
       ];
+      details.ui.size = newWidth;
     } else {
       let isRowEndHeader = this.m_utils.containsCSSClassName(
         this.m_resizingElement,
@@ -27126,13 +27136,22 @@ DvtDataGrid.prototype._fireCellResizeEvent = function (
       );
       dimension = isRowEndHeader ? 'rowEndHeaderWidth' : 'rowHeaderWidth';
       details.ui.levels = [context.level + context.depth - 1];
+      details.ui.size = isRowEndHeader
+        ? this.m_rowEndHeaderLevelWidths[context.level + context.depth - 1]
+        : this.m_rowHeaderLevelWidths[context.level + context.depth - 1];
     }
-    details.ui.size = newWidth;
     details.ui.dimension = dimension;
   } else if (newHeight !== oldHeight) {
     if ((resizeHeaderMode === 'row' || resizeHeaderMode === 'rowEnd') && !isHeaderLabel) {
       // index based
       dimension = 'rowHeight';
+      details.ui.size = this.getElementHeight(
+        this._getHeaderByIndex(
+          resizingElementIndex + context.extent - 1,
+          'row',
+          this.m_rowHeaderLevelCount - 1
+        )
+      );
     } else if (isHeaderLabel) {
       let isColumnEndHeaderLabel = this.m_utils.containsCSSClassName(
         this.m_resizingElement,
@@ -27140,10 +27159,9 @@ DvtDataGrid.prototype._fireCellResizeEvent = function (
       );
       dimension = isColumnEndHeaderLabel ? 'columnEndHeaderHeight' : 'columnHeaderHeight';
       details.ui.levels = [
-        resizeHeaderMode.includes('column')
-          ? context.level + context.depth - 1
-          : this.m_columnHeaderLevelCount - 1
+        resizeHeaderMode.includes('column') ? context.level : this.m_columnHeaderLevelCount - 1
       ];
+      details.ui.size = newHeight;
     } else {
       let isColumnEndHeader = this.m_utils.containsCSSClassName(
         this.m_resizingElement,
@@ -27151,8 +27169,10 @@ DvtDataGrid.prototype._fireCellResizeEvent = function (
       );
       dimension = isColumnEndHeader ? 'columnEndHeaderHeight' : 'columnHeaderHeight';
       details.ui.levels = [context.level + context.depth - 1];
+      details.ui.size = isColumnEndHeader
+        ? this.m_columnEndHeaderLevelHeights[context.level + context.depth - 1]
+        : this.m_columnHeaderLevelHeights[context.level + context.depth - 1];
     }
-    details.ui.size = newHeight;
     details.ui.dimension = dimension;
   } else {
     return;
@@ -27416,7 +27436,7 @@ DvtDataGrid.prototype.manageHeaderCursor = function (event, isLabel) {
       if ((!end && bottomEdgeCheck) || (end && topEdgeCheck)) {
         this.m_resizingElement = elem;
         return 'row-resize';
-      } else if ((!end && topEdgeCheck) || (end && bottomEdgeCheck)) {
+      } else if (((!end && topEdgeCheck) || (end && bottomEdgeCheck)) && level !== 0) {
         // can we resize the height of the parent header
         this.m_resizingElement = parent;
         this.m_resizingElementSibling = elem;
@@ -27448,8 +27468,9 @@ DvtDataGrid.prototype.manageHeaderCursor = function (event, isLabel) {
         this.m_resizingElement = elem;
         return 'col-resize';
       } else if (
-        (!end && (rtl ? rightEdgeCheck : leftEdgeCheck)) ||
-        (end && (rtl ? leftEdgeCheck : rightEdgeCheck))
+        ((!end && (rtl ? rightEdgeCheck : leftEdgeCheck)) ||
+          (end && (rtl ? leftEdgeCheck : rightEdgeCheck))) &&
+        level !== 0
       ) {
         this.m_resizingElement = parent;
         this.m_resizingElementSibling = elem;
@@ -28483,8 +28504,8 @@ DvtDataGrid.prototype.manageResizeScrollbars = function () {
   this.setElementWidth(colEndHeader, columnHeaderWidth);
 
   [rowHeaderWidth, colHeaderHeight] = this._setFrozenContainerDimension(
-    availableWidth,
-    availableHeight,
+    databodyWidth,
+    databodyHeight,
     rowHeaderWidth,
     rowEndHeaderWidth,
     colHeaderHeight,
@@ -28829,33 +28850,23 @@ DvtDataGrid.prototype._shiftFrozenCellsAlongAxis = function (
 
     if (!(tempArray[i] && tempArray[i][startAxisChange]) && shiftOnly !== true) {
       this.setElementDir(cell, this.getElementDir(cell, dimension) + dimensionDelta, dimension);
-      if (axis === 'row') {
-        this._updateTempArray(
-          tempArray,
-          true,
-          i,
-          startAxisChange,
-          cellContext.extents.column,
-          axisExtent - extentWithinCellToIgnore
-        );
-      } else {
-        if (forHideShow) {
-          if (this.isHidden(axis, startAxisChange)) {
-            cell.style.display = 'none';
-          } else {
-            cell.style.display = '';
-          }
+      if (forHideShow) {
+        if (this.isHidden(axis, startAxisChange)) {
+          cell.style.display = 'none';
+        } else {
+          cell.style.display = '';
         }
-
-        this._updateTempArray(
-          tempArray,
-          true,
-          i,
-          startAxisChange,
-          cellContext.extents.row,
-          axisExtent - extentWithinCellToIgnore
-        );
       }
+
+      const otherAxis = axis === 'row' ? 'column' : 'row';
+      this._updateTempArray(
+        tempArray,
+        true,
+        i,
+        startAxisChange,
+        cellContext.extents[otherAxis],
+        axisExtent - extentWithinCellToIgnore
+      );
     }
     let axisStartValue = startAxisChange;
     if (shiftOnly !== true) {
@@ -45004,8 +45015,10 @@ DvtDataGrid.prototype._buildFrozenHeaders = function (axis, startResults, endRes
     endHeaderFetchCount: 0
   };
 
+  // null check and -1 check to fully ensure frozenSection doesn't exist.
   if (
     this.m_options._getFreezeIndex(axis) === null ||
+    this.m_options._getFreezeIndex(axis) === -1 ||
     !this._isFreezeFeasible(axis, startResults, endResults, start, 0)
   ) {
     returnObj = {
@@ -50146,7 +50159,7 @@ DvtDataGrid.prototype.shiftAxisForHidability = function (index, hide, axis) {
         undefined,
         true
       );
-      if (this.m_databodyFrozenRow) {
+      if (this.m_databodyFrozenRow || this.m_databodyFrozenCol) {
         this._shiftFrozenCellsAlongAxis(axis, dimensionChange, axisIndex, false, true);
       }
       // eslint-disable-next-line no-unused-expressions
@@ -50154,8 +50167,8 @@ DvtDataGrid.prototype.shiftAxisForHidability = function (index, hide, axis) {
         ? (this.m_endColPixel += dimensionChange)
         : (this.m_endRowPixel += dimensionChange);
     } else if (
-      (axis === 'column' && this.m_databodyFrozenRow) ||
-      (axis === 'row' && this.m_databodyFrozenCol)
+      (axis === 'column' && this.m_databodyFrozenCol) ||
+      (axis === 'row' && this.m_databodyFrozenRow)
     ) {
       corner = true;
       this._shiftCellsAlongAxis(

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

@@ -89,6 +89,7 @@ let DrawerPopup = DrawerPopup_1 = class DrawerPopup extends Component {
             const $drawerElement = $(this.rootRef.current);
             const status = ZOrderUtils.getStatus($drawerElement);
             if (status === ZOrderUtils.STATUS.OPEN) {
+                $drawerElement.detach();
                 const psOptions = {};
                 psOptions[PopupService.OPTION.POPUP] = $drawerElement;
                 this.ignoreUpdate = true;

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

@@ -2961,6 +2961,14 @@ oj.__registerWidget(
  * @ojoracleicon 'oj-ux-ico-text-input-password'
  * @ojuxspecs ['input-password']
  *
+ * @ojdeprecated [
+ *   {
+ *     "type": "maintenance",
+ *     "since": "16.0.0",
+ *     "value": ["oj-c-input-password"]
+ *   }
+ * ]
+ *
  * @classdesc
  * <h3 id="inputPasswordOverview-section">
  *   JET InputPassword Component
@@ -3629,6 +3637,14 @@ oj.__registerWidget('oj.ojInputPassword', $.oj.inputBase, {
  * @ojoracleicon 'oj-ux-ico-text-input'
  * @ojuxspecs ['input-text']
  *
+ * @ojdeprecated [
+ *   {
+ *     "type": "maintenance",
+ *     "since": "16.0.0",
+ *     "value": ["oj-c-input-text"]
+ *   }
+ * ]
+ *
  * @classdesc
  * <h3 id="inputTextOverview-section">
  *   JET InputText Component
@@ -4641,6 +4657,14 @@ oj.__registerWidget('oj.ojInputText', $.oj.inputBase, {
  * @ojoracleicon 'oj-ux-ico-text-input-area'
  * @ojuxspecs ['input-text']
  *
+ * @ojdeprecated [
+ *   {
+ *     "type": "maintenance",
+ *     "since": "16.0.0",
+ *     "value": ["oj-c-text-area"]
+ *   }
+ * ]
+ *
  * @classdesc
  * <h3 id="textAreaOverview-section">
  *   JET TextArea Component

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

@@ -4416,13 +4416,9 @@ class VLayerUtils {
     static findOpenVPopups() {
         const rootLayerHost = document.getElementById(NEW_DEFAULT_LAYER_ID);
         const topLayerHost = document.getElementById(NEW_DEFAULT_TOP_LAYER_ID);
-        const result = [];
-        if (rootLayerHost) {
-            result.concat([].slice.call(rootLayerHost.children));
-        }
-        if (topLayerHost) {
-            result.concat([].slice.call(topLayerHost.children));
-        }
+        const resRoot = rootLayerHost ? [].slice.call(rootLayerHost.children) : [];
+        const resTop = topLayerHost ? [].slice.call(topLayerHost.children) : [];
+        const result = resRoot.concat(resTop);
         return result;
     }
 }