@oracle/oraclejet 16.0.1 → 16.0.3

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

@@ -335,7 +335,7 @@
   visibility: hidden; }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v16.0.1"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v16.0.3"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;
@@ -16402,11 +16402,11 @@ oj-message-banner:not(.oj-complete) {
 .oj-messagebanner-item {
   background-color: var(--oj-private-message-banner-background-color);
   border-bottom-width: 1px;
-  border-bottom-style: 'solid';
+  border-bottom-style: solid;
   border-bottom-color: var(--oj-core-divider-color); }
 
 .oj-messagebanner-item:focus-visible {
-  outline-style: 'dotted';
+  outline-style: dotted;
   outline-width: 1px;
   outline-color: var(--oj-core-focus-border-color);
   outline-offset: 1px; }
@@ -16416,10 +16416,10 @@ oj-message-banner:not(.oj-complete) {
   border-radius: var(--oj-core-border-radius-lg); }
 
 .oj-messagebanner-content {
-  align-items: 'center';
-  box-sizing: 'border-box';
-  display: 'flex';
-  flex-wrap: 'wrap';
+  align-items: center;
+  box-sizing: border-box;
+  display: flex;
+  flex-wrap: wrap;
   padding-top: var(--oj-core-spacing-4x);
   padding-bottom: var(--oj-core-spacing-4x);
   padding-inline-start: var(--oj-core-gutter-start, var(--oj-core-spacing-4x));
@@ -16432,20 +16432,20 @@ oj-message-banner:not(.oj-complete) {
   color: var(--oj-private-message-banner-start-icon-color);
   font-size: var(--oj-private-message-banner-start-icon-size);
   height: var(--oj-private-message-banner-summary-line-height);
-  align-self: 'flex-start';
-  display: 'flex';
+  align-self: flex-start;
+  display: flex;
   margin-inline-end: var(--oj-core-spacing-2x); }
 
 .oj-messagebanner-start-icon {
   height: calc(var(--oj-private-message-banner-summary-text-size) * var(--oj-private-message-banner-summary-line-height));
-  display: 'flex';
-  align-items: 'center'; }
+  display: flex;
+  align-items: center; }
 
 .oj-messagebanner-header {
-  box-sizing: 'border-box';
-  display: 'flex';
-  flex-wrap: 'wrap';
-  flex-direction: 'row';
+  box-sizing: border-box;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
   line-height: var(--oj-private-message-banner-summary-line-height); }
 
 @media screen and (max-width: 599.9px) {
@@ -16454,7 +16454,7 @@ oj-message-banner:not(.oj-complete) {
 
 .oj-messagebanner-summary {
   flex: 1;
-  overflow-wrap: 'anywhere';
+  overflow-wrap: anywhere;
   font-size: var(--oj-private-message-banner-summary-text-size);
   font-weight: var(--oj-private-message-banner-summary-text-weight);
   color: var(--oj-private-message-banner-summary-text-color); }
@@ -16465,13 +16465,13 @@ oj-message-banner:not(.oj-complete) {
   color: var(--oj-core-text-color-secondary); }
 
 .oj-messagebanner-detail {
-  overflow-wrap: 'anywhere';
+  overflow-wrap: anywhere;
   font-size: var(--oj-typography-body-sm-font-size);
   color: var(--oj-core-text-color-primary); }
 
 .oj-messagebanner-close-button {
-  align-self: 'flex-start';
-  display: 'flex';
+  align-self: flex-start;
+  display: flex;
   margin-inline-start: var(--oj-core-spacing-1x);
   margin-inline-end: calc(-1 * var(--oj-core-spacing-2x));
   margin-top: calc(-1 * var(--oj-core-spacing-2x));

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

@@ -707,8 +707,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                     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) {
@@ -765,16 +764,11 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                             }
                             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) {
@@ -985,7 +979,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                         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)) {
@@ -1148,9 +1142,13 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                 }
                 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;
                             }
@@ -1158,11 +1156,10 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                     }
                     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;
@@ -1217,14 +1214,13 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                     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;
@@ -1666,6 +1662,47 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
     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 };
+    };
     ojeventtarget.EventTargetMixin.applyMixin(BufferingDataProvider);
     oj._registerLegacyNamespaceProp('BufferingDataProvider', BufferingDataProvider);
 

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: '16.0.1',
+    version: '16.0.3',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2024-03-20_19-05-18',
+    revision: '2024-04-19_19-36-49',
 
     // 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/ojcorerouter.js

@@ -5,7 +5,7 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (ojobservable, UrlPathAdapter, Logger) { 'use strict';
+define(['ojs/ojlogger', 'ojs/ojobservable', 'ojs/ojurlpathadapter'], function (Logger, ojobservable, UrlPathAdapter) { 'use strict';
 
   UrlPathAdapter = UrlPathAdapter && Object.prototype.hasOwnProperty.call(UrlPathAdapter, 'default') ? UrlPathAdapter['default'] : UrlPathAdapter;
 
@@ -79,9 +79,6 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
   // similar to how history-tracking routers use URL segments
   let noHistorySegments = [];
 
-  // Pending transitions array to hold extra transitions passed to go()
-  let pendingTransitions = [];
-
   /**
    * Test if two routes are equivalent. Routes are equivalent if they have the
    * same paths and parameter values.
@@ -564,36 +561,16 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
    * @ojsignature {target: "Type", value: "Promise<CoreRouter.CoreRouterState<D, P>>", for: "returns"}
    */
   CoreRouter.prototype.sync = function () {
-    let route;
-    if (pendingTransitions.length) {
-      // Use the pending transition as the new state to sync
-      const transition = pendingTransitions.shift();
-      const newRoutes = this._getParentRoutes().concat(this._getPendingState(transition));
-      const newPath = urlAdapter.getUrlForRoutes(newRoutes);
-      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) => {
-        // Synchronize the next child router
-        var p = state;
-        var childRouter = this.childRouter;
-        if (childRouter) {
-          p = childRouter.sync();
-        }
-        return p;
-      })
-      .catch((ex) => {
-        // Clear transitions if transition rejected
-        pendingTransitions = [];
-        throw ex;
-      });
+    return this._execute(this._getRouteSegment() || { path: '', params: {} }).then((state) => {
+      // Synchronize the next child router
+      var p = state;
+      var childRouter = this.childRouter;
+      if (childRouter) {
+        p = childRouter.sync();
+      }
+      return p;
+    });
   };
 
   /**
@@ -726,9 +703,6 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
       const path = transitions.map((t) => t.path).join('/');
       Logger.info(`Navigating router(${this._name}) to ${path}`);
 
-      // Use first transition and store remaining for next child router to read
-      const first = transitions[0];
-
       // Get the current routes for all active routers, and compare that to the
       // new routes for this transition.
       const currentPath = urlAdapter.getUrlForRoutes(getActiveRoutes());
@@ -743,15 +717,18 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
         // 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 newRoutes = this._getParentRoutes().concat(
+          // only first transition is for this router
+          this._getPendingState(transitions[0]),
+          // remaining are for child routers
+          transitions.slice(1)
+        );
         const newPath = urlAdapter.getUrlForRoutes(newRoutes);
         if (currentPath !== newPath) {
           window.history.pushState(null, 'path', newPath);
         }
       }
       goP = this.sync().catch((ex) => {
-        // Clear transitions if transition rejected
-        pendingTransitions = [];
         if (this._noHistory) {
           noHistorySegments = prevNoHistorySegments;
         } else {
@@ -759,7 +736,6 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
         }
         throw ex;
       });
-      pendingTransitions = transitions.slice(1);
     }
     return goP;
   };
@@ -847,10 +823,7 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
    */
   CoreRouter.prototype._setupNavigationListener = function () {
     if (this === rootRouter) {
-      this._popstateHandler = () => {
-        pendingTransitions = [];
-        this.sync();
-      };
+      this._popstateHandler = () => this.sync();
       window.addEventListener('popstate', this._popstateHandler, false);
     }
   };
@@ -875,12 +848,10 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
    * configured states. This CoreRouterState object will similar to the matched configured
    * state, except will have its own path and params values.
    * @param {CoreRouter.Route} transition The transition for the CoreRouterState
-   * @param {boolean} createEmpty Create an empty state object for the transition,
-   * even if a matching route doesn't exist.
    * @return {CoreRouter.RouterState} The CoreRouterState associated for the transition
    * @private
    */
-  CoreRouter.prototype._getPendingState = function (transition, createEmpty) {
+  CoreRouter.prototype._getPendingState = function (transition) {
     var pending;
     var path = transition.path;
     var params = transition.params || {};
@@ -899,13 +870,6 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
         _match: match._match
       };
       Object.freeze(pending);
-    } else if (createEmpty) {
-      pending = {
-        path,
-        params: {},
-        detail: {},
-        pathParams: []
-      };
     }
     return pending;
   };
@@ -1029,6 +993,13 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
    * @export
    */
   CoreRouter.prototype.destroy = function () {
+    if (this.childRouter) {
+      this.childRouter.destroy();
+    }
+
+    this.beforeStateChange.observers.forEach((subscription) => subscription());
+    this.currentState.observers.forEach((subscription) => subscription());
+
     if (this === rootRouter) {
       window.removeEventListener('popstate', this._popstateHandler, false);
       rootRouter = null;

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

@@ -4518,10 +4518,9 @@ var __oj_data_grid_metadata =
       ' ' +
       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();
@@ -8855,32 +8854,28 @@ var __oj_data_grid_metadata =
    * @param {Object|string} templateContext templateContext is template is used
    * @private
    */
-  DvtDataGrid.prototype._renderContent = function (
-    renderer,
-    context,
-    cell,
-    data,
-    templateContext,
-    headerContentDiv
-  ) {
+  DvtDataGrid.prototype._renderContent = function (renderer, context, cell, data, templateContext) {
+    let shouldAppendContentElement = false;
+    let headerContentDiv = context.contentElement;
     if (renderer != null && typeof renderer === 'function') {
       const returnObj = renderer.call(this, context);
       let element = cell;
       let content = returnObj;
       // if insertContent is provided then returned string or HTMLElement should be wrapped in div.
-      if (returnObj && (returnObj.insert != null || returnObj.insertContent != null)) {
-        if (returnObj.insert == null) {
+      if (returnObj?.insert != null) {
+        content = returnObj.insert;
+      } else if (headerContentDiv != null) {
+        if (returnObj?.insertContent != null) {
           element = headerContentDiv;
           content = returnObj.insertContent;
-        } else {
-          content = returnObj.insert;
+          shouldAppendContentElement = true;
+        } else if (headerContentDiv.hasChildNodes()) {
+          shouldAppendContentElement = true;
+        }
+
+        if (shouldAppendContentElement) {
+          cell.appendChild(headerContentDiv); // @HTMLUpdateOK
         }
-      }
-      if (
-        (context.axis === 'row' || context.axis === 'column') &&
-        (context.contentElement.hasChildNodes() || returnObj?.insertContent != null)
-      ) {
-        cell.appendChild(context.contentElement); // @HTMLUpdateOK
       }
       DataCollectionUtils.applyRendererContent(
         element,
@@ -8891,20 +8886,18 @@ var __oj_data_grid_metadata =
       this._removeFocusFromChildElements(context, cell);
     } else if (renderer != null && typeof renderer === 'object' && this.m_engine) {
       var nodes = this.m_engine.execute(this.m_root, renderer, templateContext, null);
+      shouldAppendContentElement =
+        renderer.slot === 'columnHeaderContentTemplate' ||
+        renderer.slot === 'rowHeaderContentTemplate';
+
       for (var i = 0; i < nodes.length; i++) {
-        if (
-          renderer.slot === 'columnHeaderContentTemplate' ||
-          renderer.slot === 'rowHeaderContentTemplate'
-        ) {
+        if (shouldAppendContentElement) {
           headerContentDiv.appendChild(nodes[i]); // @HTMLUpdateOK
         } else {
           cell.appendChild(nodes[i]); // @HTMLUpdateOK
         }
       }
-      if (
-        renderer.slot === 'columnHeaderContentTemplate' ||
-        renderer.slot === 'rowHeaderContentTemplate'
-      ) {
+      if (shouldAppendContentElement) {
         cell.appendChild(headerContentDiv); // @HTMLUpdateOK
       }
       this._removeFocusFromChildElements(context, cell);
@@ -8921,7 +8914,7 @@ var __oj_data_grid_metadata =
         // eslint-disable-next-line no-param-reassign
         data = '';
       }
-      if (headerContentDiv && (context.axis === 'row' || context.axis === 'column')) {
+      if (headerContentDiv) {
         headerContentDiv.appendChild(document.createTextNode(data.toString())); // @HTMLUpdateOK
         cell.appendChild(headerContentDiv); // @HTMLUpdateOK
       } else {
@@ -9214,13 +9207,16 @@ var __oj_data_grid_metadata =
       // create the header element and append the content to it
       header = document.createElement('div');
 
-      const headerContentDiv = document.createElement('div');
-      headerContentDiv.classList.add(this.getMappedStyle('headerCellContent'));
+      let headerContentDiv;
+      if (axis === 'row' || axis === 'column') {
+        headerContentDiv = document.createElement('div');
+        headerContentDiv.classList.add(this.getMappedStyle('headerCellContent'));
+      }
 
       // build headerContext to pass to renderer
       headerContext = this.createHeaderContext(
         axis,
-        index,
+        isAppend || insert ? index : index - headerExtent + 1,
         headerData,
         headerMetadata,
         header,
@@ -9392,8 +9388,7 @@ var __oj_data_grid_metadata =
         headerContext,
         header,
         headerData,
-        this.buildHeaderTemplateContext(headerContext, headerMetadata),
-        headerContentDiv
+        this.buildHeaderTemplateContext(headerContext, headerMetadata)
       );
 
       // set alignment before inline stlye to ensure inline styles win
@@ -34715,9 +34710,14 @@ var __oj_data_grid_metadata =
 
   // Load translation bundles to handle asynchronous loading for oj-c components.
   // JET-63142 -> JET-64242
+  let translationBundlePromise;
   async function getPreactTranslationPromise() {
+    if (translationBundlePromise) {
+      return translationBundlePromise;
+    }
     const { default: loader } = await new Promise(function (resolve, reject) { require(['@oracle/oraclejet-preact/translationBundle'], function (m) { resolve(_interopNamespace(m)); }, reject) });
-    return ojtranslationbundleutils.getTranslationBundlePromiseFromLoader(loader);
+    translationBundlePromise = ojtranslationbundleutils.getTranslationBundlePromiseFromLoader(loader);
+    return translationBundlePromise;
   }
 
   // import { ImmutableSet } from 'ojs/ojkeyset';
@@ -43056,7 +43056,7 @@ var __oj_data_grid_metadata =
       let adjustedRowIndex = rowIndex === -1 ? 0 : rowIndex;
       let dir = this.getResources().isRTLMode() ? 'right' : 'left';
 
-      let header = this._getHeaderByIndex(adjustedRowIndex, axis, this.m_rowHeaderLevelCount);
+      let header = this._getHeaderByIndex(adjustedRowIndex, axis, this.m_rowHeaderLevelCount - 1);
       let isHeaderWithinSelection = this._isHeaderWithinSelection(header, axis);
       if (rowIndex !== undefined && this.m_dragIndex !== rowIndex) {
         if (this.m_utils.containsCSSClassName(header, this.getMappedStyle('disabledElement'))) {
@@ -43400,7 +43400,11 @@ var __oj_data_grid_metadata =
         let axis = 'column';
         let adjustedColIndex = colIndex === -1 ? 0 : colIndex;
         let dir = this.getResources().isRTLMode() ? 'right' : 'left';
-        let header = this._getHeaderByIndex(adjustedColIndex, axis, this.m_columnHeaderLevelCount);
+        let header = this._getHeaderByIndex(
+          adjustedColIndex,
+          axis,
+          this.m_columnHeaderLevelCount - 1
+        );
         if (this.m_utils.containsCSSClassName(header, this.getMappedStyle('disabledElement'))) {
           this._removeDropTargetLine(axis);
           this._removeDropTargetClass();
@@ -47904,7 +47908,7 @@ var __oj_data_grid_metadata =
       // scroll to left of data region or currently rendered skeletons
       row = rowStart;
       top = rowStartPixel;
-      rowCount = Math.max(this.getFetchCount('row', row), this.m_endRow - row);
+      rowCount = Math.max(skeletonRowEnd, this.m_endRow, 0) - Math.min(skeletonRowStart, row) + 1;
       column = Math.min(skeletonColStart - columnCount, columnStart);
       left = Math.min(
         skeletonColStartPixel,
@@ -47929,7 +47933,7 @@ var __oj_data_grid_metadata =
       } else {
         row = rowStart;
         top = rowStartPixel;
-        rowCount = Math.max(this.getFetchCount('row', row), this.m_endRow - row);
+        rowCount = Math.max(skeletonRowEnd, this.m_endRow, 0) - Math.min(skeletonRowStart, row) + 1;
         column = Math.max(skeletonColEnd + 1, columnStart);
         left = Math.max(skeletonColEndPixel, columnStartPixel);
         columnCount = this.getFetchCount('column', column);
@@ -47939,7 +47943,8 @@ var __oj_data_grid_metadata =
       // scroll above the data region or currently rendered skeletons
       column = columnStart;
       left = columnStartPixel;
-      columnCount = Math.max(this.getFetchCount('column', column), this.m_endCol - column);
+      columnCount =
+        Math.max(skeletonColEnd, this.m_endCol, 0) - Math.min(skeletonColStart, column) + 1;
       row = Math.min(skeletonRowStart - rowCount, rowStart);
       top = Math.min(skeletonRowStartPixel, rowStartPixel + rowCount * this.getDefaultRowHeight());
       rowAppend = false;
@@ -47961,7 +47966,8 @@ var __oj_data_grid_metadata =
       } else {
         column = columnStart;
         left = columnStartPixel;
-        columnCount = Math.max(this.getFetchCount('column', column), this.m_endCol - column);
+        columnCount =
+          Math.max(skeletonColEnd, this.m_endCol, 0) - Math.min(skeletonColStart, column) + 1;
         row = Math.max(skeletonRowEnd + 1, rowStart);
         top = Math.max(skeletonRowEndPixel, rowStartPixel);
         rowCount = this.getFetchCount('row', row);

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

@@ -4410,13 +4410,9 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcomponentcore', 'ojs/ojlo
       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;
       }
   }