@oracle/oraclejet 15.1.2 → 15.1.4

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

@@ -333,7 +333,7 @@
   visibility: hidden; }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v15.1.2"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v15.1.4"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;
@@ -10249,10 +10249,11 @@ ul[aria-multiselectable=false] .oj-listview-item.oj-selected + .oj-listview-grid
 .oj-listview-item-padding-off .oj-listview-item-element.oj-listview-item-layout {
   padding: 0; }
 
-/* Styling for the items alignment on list header */
+/* Styling for the content on list header */
 .oj-listview-group-item .oj-listview-cell-element {
   display: flex;
-  align-items: center; }
+  align-items: center;
+  flex-grow: 1; }
 
 /* Styling for single line skeleton */
 .oj-listview-skeleton-line-height {

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

@@ -437,6 +437,11 @@ define(['ojs/ojcore-base', 'ojs/ojeventtarget', 'ojs/ojcomponentcore'], function
             });
         }
         fetchFirst(params) {
+            if (params?.signal?.aborted) {
+                const asyncIterable = this.dataProvider.fetchFirst(params);
+                const asyncIterator = asyncIterable[Symbol.asyncIterator]();
+                return new this.CacheAsyncIterable(this, asyncIterator, null, null);
+            }
             if (!CachedIteratorResultsDataProvider._compareCachedFetchParameters(params, this._lastFetchParams)) {
                 this.cache.reset();
                 this._lastFetchParams = CachedIteratorResultsDataProvider._createCachedFetchParams(params);
@@ -475,6 +480,9 @@ define(['ojs/ojcore-base', 'ojs/ojeventtarget', 'ojs/ojcomponentcore'], function
         }
         static _compareCachedFetchParameters(params, cachedParams) {
             params = params || {};
+            if (cachedParams != null && cachedParams.signal?.aborted && !params.signal?.aborted) {
+                return false;
+            }
             return (cachedParams != null &&
                 oj.Object.compareValues(cachedParams.attributes, params.attributes || null) &&
                 oj.Object.compareValues(cachedParams.filterDef, CachedIteratorResultsDataProvider._getFilterDef(params.filterCriterion)) &&
@@ -491,6 +499,7 @@ define(['ojs/ojcore-base', 'ojs/ojeventtarget', 'ojs/ojcomponentcore'], function
             cachedFetchParams.sortCriteria = params.sortCriteria
                 ? JSON.parse(JSON.stringify(params.sortCriteria))
                 : null;
+            cachedFetchParams.signal = params.signal;
             return cachedFetchParams;
         }
         static _getFilterDef(filter) {

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

@@ -6585,7 +6585,8 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
   // override jQuery's cleanData method to bypass cleanup of custom elements and composites
   $.cleanData = (function (orig) {
     return function (elems) {
-      var nonCustomElements = [];
+      const nonCustomElements = [];
+      const customElementsToClean = [];
       for (var i = 0; i < elems.length; i++) {
         var elem = elems[i];
         if (elem == null) {
@@ -6604,11 +6605,14 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
         }
         if (!bSkip) {
           nonCustomElements.push(elem);
+        } else if (elem.$$cleanElement) {
+          customElementsToClean.push(elem);
         }
       }
       if (nonCustomElements.length > 0) {
         orig(nonCustomElements);
       }
+      customElementsToClean.forEach((item) => item.$$cleanElement());
     };
   })($.cleanData);
 

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: '15.1.2',
+    version: '15.1.4',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2023-11-02_05-11-27',
+    revision: '2023-12-21_15-18-51',
 
     // 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

@@ -576,18 +576,24 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
       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();
-      } else if (!this._noHistory) {
-        // Cleanup noHistorySegments after navigating any history-tracking routers
-        noHistorySegments = [];
-      }
-      return p;
-    });
+    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();
+        } else if (!this._noHistory) {
+          // Cleanup noHistorySegments after navigating any history-tracking routers
+          noHistorySegments = [];
+        }
+        return p;
+      })
+      .catch((ex) => {
+        // Clear transitions if transition rejected
+        pendingTransitions = [];
+        throw ex;
+      });
   };
 
   /**
@@ -741,7 +747,7 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
         window.history.pushState(null, 'path', newPath);
       }
       goP = this.sync().catch((ex) => {
-        // Rollback transitions if navigation rejected
+        // Clear transitions if transition rejected
         pendingTransitions = [];
         if (this._noHistory) {
           noHistorySegments = prevNoHistorySegments;

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

@@ -185,6 +185,9 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojdomutils', 'ojs/ojlogger', 'ojs/ojk
    */
   DataCollectionUtils.handleActionableTab = function (event, element) {
     var focusElems = DataCollectionUtils.getFocusableElementsInNode(element);
+    if (focusElems.length === 1) {
+      return true;
+    }
     if (focusElems.length > 0 && event.target === focusElems[focusElems.length - 1]) {
       // recycle to first focusable element in the cell
       focusElems[0].focus();
@@ -203,6 +206,9 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojdomutils', 'ojs/ojlogger', 'ojs/ojk
    */
   DataCollectionUtils.handleActionablePrevTab = function (event, element) {
     var focusElems = DataCollectionUtils.getFocusableElementsInNode(element);
+    if (focusElems.length === 1) {
+      return true;
+    }
     if (focusElems.length > 0 && event.target === focusElems[0]) {
       // recycle to last focusable element in the cell
       focusElems[focusElems.length - 1].focus();

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

@@ -13884,40 +13884,27 @@ var __oj_data_grid_metadata =
     if (header == null) {
       return;
     }
+    this.m_shouldFocus = false;
 
-    this._exitActionableMode();
     var target = /** @type {Element} */ (event.target);
+    const activeElement = this._getActiveElement();
 
     if (this._isEditOrEnter()) {
-      var cell = this._getActiveElement();
-      if (this._leaveEditing(event, cell, false) === false) {
+      if (this._leaveEditing(event, activeElement, false) === false) {
         return;
       }
     }
 
-    if (this._isDisclosureIcon(target)) {
-      this.handleHeaderClickActive(event, null, true);
-      return;
-    }
-
     var selectionMode = this.m_options.getSelectionMode();
     // only perform events on left mouse, (right in rtl culture)
     if (event.button === 0) {
       // if mousedown in an icon it the click event will handle mousedown/up
-      if (
-        (this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortascending')) ||
-          this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdescending'))) &&
-        this._isDOMElementSortable(target)
-      ) {
-        event.preventDefault();
+      if (this._isSortIcon(target) && this._isDOMElementSortable(target)) {
+        this.handleHeaderClickActive(event, null, true);
         this._handleSortIconMouseDown(target);
         return;
-      } else if (
-        this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortIcon')) &&
-        this._isDOMElementSortable(target.lastChild)
-      ) {
-        event.preventDefault();
-        this._handleSortIconMouseDown(target.lastChild);
+      } else if (this._isDisclosureIcon(target)) {
+        this.handleHeaderClickActive(event, null, true);
         return;
       }
 
@@ -14220,19 +14207,7 @@ var __oj_data_grid_metadata =
    */
   DvtDataGrid.prototype.handleHeaderClick = function (event) {
     var target = /** @type {Element} */ (event.target);
-    if (
-      (this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortascending')) ||
-        this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdescending')) ||
-        this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdefault'))) &&
-      this._isDOMElementSortable(target)
-    ) {
-      this._removeTouchSelectionAffordance();
-      this._handleHeaderSort(event);
-      event.preventDefault();
-    } else if (
-      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortIcon')) &&
-      this._isDOMElementSortable(target.lastChild)
-    ) {
+    if (this._isSortIcon(target) && this._isDOMElementSortable(target)) {
       this._removeTouchSelectionAffordance();
       this._handleHeaderSort(event);
       event.preventDefault();
@@ -14443,25 +14418,24 @@ var __oj_data_grid_metadata =
     // removing hidden column indicator in databody after hiding a column
     // on mousedown elsewhere in databody
     this.deleteDatabodyHiddenVisualIndicators();
+
     var target = /** @type {Element} */ (event.target);
     var cell = this.findCell(target);
     if (cell == null) {
       this.m_scrollbarFocus = true;
       return;
     }
+    this.m_shouldFocus = false;
 
+    const activeElement = this._getActiveElement();
     if (this._isEditOrEnter()) {
-      var activeCell = this._getActiveElement();
-      if (cell !== activeCell) {
-        if (this._leaveEditing(event, activeCell, false) === false) {
+      if (cell !== activeElement) {
+        if (this._leaveEditing(event, activeElement, false) === false) {
           return;
         }
       } else {
         return;
       }
-    } else {
-      // reset actionable mode whenever user clicks in the databody
-      this._exitActionableMode();
     }
 
     var ctrlKey = this.m_utils.ctrlEquivalent(event);
@@ -14924,11 +14898,10 @@ var __oj_data_grid_metadata =
         this.handleTouchCancel(event);
         return;
       }
-    } else {
-      // reset actionable mode whenever user clicks in the databody
-      this._exitActionableMode();
     }
 
+    this.m_shouldFocus = false;
+
     if (
       this.m_lastTapTime != null &&
       this.m_startTime - this.m_lastTapTime < 250 &&
@@ -15187,12 +15160,7 @@ var __oj_data_grid_metadata =
         var contextMenu = document.querySelector('#' + rootId + 'contextmenu');
         if (contextMenu && contextMenu.style.display === 'none') {
           // if touch in an icon it the click event will handle mousedown/up
-          if (
-            (this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortascending')) ||
-              this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdescending')) ||
-              this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdefault'))) &&
-            this._isDOMElementSortable(target)
-          ) {
+          if (this._isSortIcon(target) && this._isDOMElementSortable(target)) {
             if (event.cancelable) {
               event.preventDefault();
             }
@@ -19119,6 +19087,7 @@ var __oj_data_grid_metadata =
    * @param {boolean|null=} clearSelection true if we should clear the selection on active change
    * @param {boolean|null=} silent true if we should not fire events
    * @param {boolean|null=} shouldNotScroll true if we should not scroll before setting active (in case it came froma  scroll event, prevent loop)
+   * @param {boolean|null=} shouldNotFocusIn true coming from case where somthing is already focused and would just like to set active
    * @returns {boolean} true if active was changed, false if not
    */
   DvtDataGrid.prototype._setActive = function (
@@ -19127,7 +19096,8 @@ var __oj_data_grid_metadata =
     event,
     clearSelection,
     silent,
-    shouldNotScroll
+    shouldNotScroll,
+    shouldNotFocusIn
   ) {
     if (cellInfo != null && !shouldNotScroll) {
       this._scrollToActive(cellInfo);
@@ -19145,6 +19115,12 @@ var __oj_data_grid_metadata =
           this.m_prevActive = this.m_active;
           this.m_active = active;
 
+          // Disable previous active element's focusable content
+          const prevActiveElement = this._getElementFromActiveObject(this.m_prevActive);
+          if (prevActiveElement) {
+            DataCollectionUtils.disableAllFocusableElements(prevActiveElement);
+          }
+
           if (event && event.type === 'mousedown') {
             this.m_trueIndex = null;
           }
@@ -19179,7 +19155,7 @@ var __oj_data_grid_metadata =
         }
       } else {
         // still wanted to make sure the cell was highlighted even if focus hasn't actually changed
-        this._highlightActive();
+        this._highlightActive(null, shouldNotFocusIn);
       }
     } else if (!this.m_scrollIndexAfterFetch && !this.m_scrollHeaderAfterFetch) {
       if (silent || this._fireBeforeCurrentCellEvent(active, this.m_active, event)) {
@@ -19316,7 +19292,9 @@ var __oj_data_grid_metadata =
     } else if ((active1 == null && active2 != null) || (active1 != null && active2 == null)) {
       return true;
     } else if (active1.type === active2.type) {
-      if (active1.type === 'header') {
+      if (active1.type === 'empty') {
+        return true;
+      } else if (active1.type === 'header') {
         if (
           active1.index !== active2.index ||
           active1.key !== active2.key ||
@@ -19946,10 +19924,11 @@ var __oj_data_grid_metadata =
   /**
    * Highlight the current active element
    * @param {Array=} classNames string of classNames to add to active element
+   * @param {boolean|null=} shouldNotFocusIn true coming from case where somthing is already focused and would just like to set active
    * @private
    */
-  DvtDataGrid.prototype._highlightActive = function (classNames) {
-    this._highlightActiveObject(this.m_active, this.m_prevActive, classNames);
+  DvtDataGrid.prototype._highlightActive = function (classNames, shouldNotFocusIn) {
+    this._highlightActiveObject(this.m_active, this.m_prevActive, classNames, null, shouldNotFocusIn);
   };
 
   /**
@@ -19967,13 +19946,15 @@ var __oj_data_grid_metadata =
    * @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
+   * @param {boolean|null=} shouldNotFocusIn true coming from case where somthing is already focused and would just like to set active
    * @private
    */
   DvtDataGrid.prototype._highlightActiveObject = function (
     activeObject,
     prevActiveObject,
     classNames,
-    shouldNotScroll
+    shouldNotScroll,
+    shouldNotFocusIn
   ) {
     if (classNames == null && this.m_utils.shouldOffsetOutline()) {
       // eslint-disable-next-line no-param-reassign
@@ -19983,7 +19964,9 @@ var __oj_data_grid_metadata =
       var element = this._getElementFromActiveObject(activeObject);
       // possible in the virtual case
       if (element != null) {
-        this.m_focusInHandler(element);
+        if (!shouldNotFocusIn) {
+          this.m_focusInHandler(element);
+        }
         if (classNames != null) {
           this._highlightElement(element, classNames);
         }
@@ -20976,12 +20959,18 @@ var __oj_data_grid_metadata =
    * @param {Element|undefined|null} element to set actionable
    * @returns {boolean} false
    */
-  DvtDataGrid.prototype._enterActionableMode = function (element, event) {
-    // focus on first focusable item in the cell
-    if (this._setFocusToFirstFocusableElement(element, event)) {
-      this.m_focusOutHandler(element);
-      this.setActionableMode(true);
+  DvtDataGrid.prototype._enterActionableMode = function (element, event, shouldApplyFocus) {
+    if (!this.isActionableMode()) {
+      this._enteringActionableMode = true;
+      if (
+        !shouldApplyFocus ||
+        (shouldApplyFocus && this._setFocusToFirstFocusableElement(element, event))
+      ) {
+        this.m_focusOutHandler(element);
+        this.setActionableMode(true);
+      }
     }
+    this._enteringActionableMode = false;
     return false;
   };
 
@@ -24668,6 +24657,7 @@ var __oj_data_grid_metadata =
     this.m_utils.addCSSClassName(this.m_root, this.getMappedStyle('focus'));
     this._clearFocusoutTimeout();
     this._clearFocusoutBusyState();
+    const target = event.target;
     // if nothing is active, and came from the outside of the datagrid, activate first cell
     if (!isPopupFocusin) {
       this._clearOpenPopupListeners();
@@ -24678,6 +24668,7 @@ var __oj_data_grid_metadata =
           this.m_scrollbarFocus &&
           this.m_root.tabIndex === 0)
       ) {
+        this._exitActionableMode();
         this.m_externalFocus = true;
 
         if (this._isCellEditable()) {
@@ -24712,11 +24703,42 @@ var __oj_data_grid_metadata =
         } else if (this.m_active != null) {
           this._highlightActive();
         }
+      } else if (
+        !this.m_utils.containsCSSClassName(target, this.getMappedStyle('cell')) &&
+        !this.m_utils.containsCSSClassName(target, this.getMappedStyle('headercell')) &&
+        !this.m_utils.containsCSSClassName(target, this.getMappedStyle('headerlabel')) &&
+        !this.m_utils.containsCSSClassName(target, this.getMappedStyle('endheadercell')) &&
+        !this.m_utils.containsCSSClassName(target, this.getMappedStyle('noDataContainer')) &&
+        !this._isEditOrEnter()
+      ) {
+        if (!this._enteringActionableMode) {
+          let element = this._getOwnedContentFromTarget(target);
+          if (element) {
+            this.m_shouldFocus = false;
+            const active = this._createActiveObject(element);
+            this._setActive(element, active, event, null, null, null, true);
+            DataCollectionUtils.enableAllFocusableElements(element);
+            this._enterActionableMode(element, null, false);
+          }
+        }
+      } else {
+        this._exitActionableMode();
       }
       this.m_root.tabIndex = -1;
     }
   };
 
+  DvtDataGrid.prototype._getOwnedContentFromTarget = function (target) {
+    let element = this.findCellOrHeader(target);
+    if (element === null) {
+      element = this.findLabel(target);
+    }
+    if (element === null) {
+      element = this.find(target, 'noDataContainer');
+    }
+    return element;
+  };
+
   DvtDataGrid.prototype._handlePopupFocusout = function (event) {
     this.handleRootBlur(event, true);
   };
@@ -24766,6 +24788,7 @@ var __oj_data_grid_metadata =
             if (this._isEditOrEnter() && !this.m_animating) {
               this._leaveEditing(event, active, false, false);
             }
+            this._exitActionableMode();
           }
         }
         this._clearFocusoutBusyState();
@@ -25502,7 +25525,7 @@ var __oj_data_grid_metadata =
    * @returns {boolean} false
    */
   DvtDataGrid.prototype._handleActionable = function (event, element) {
-    this._enterActionableMode(element, event);
+    this._enterActionableMode(element, event, true);
     return false;
   };
 
@@ -25700,7 +25723,7 @@ var __oj_data_grid_metadata =
       });
     } else {
       rerender = false;
-      this._enterActionableMode(element);
+      this._enterActionableMode(element, null, true);
     }
     return rerender;
   };
@@ -33145,6 +33168,20 @@ var __oj_data_grid_metadata =
     }
   };
 
+  /**
+   * boolean if target is sort icon
+   * @param {Element} target the target being tested
+   * @private
+   */
+  DvtDataGrid.prototype._isSortIcon = function (target) {
+    return (
+      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortascending')) ||
+      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdescending')) ||
+      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdefault')) ||
+      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortIcon'))
+    );
+  };
+
   /**
    * fireExpandRequestEvent
    * @param {Event} event - click event on the headers

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

@@ -2899,6 +2899,8 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojdatacoll
       return Promise.resolve(true);
     }
 
+    this.m_lastFetchedData = data;
+
     // remove any existing items with the same key first
     this._removeDuplicateItems(keys);
 
@@ -2946,17 +2948,50 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojdatacoll
       index += 1;
     }
 
+    if (this.m_animateShowContentPromise) {
+      return this.m_animateShowContentPromise.then(() => {
+        if (this.m_widget == null) {
+          this.m_animateShowContentPromise = null;
+          return Promise.resolve(null);
+        }
+
+        const animateShowContentPromise = this.animateShowContent(
+          this.m_root,
+          parent,
+          isInitialFetch
+        );
+        return this._getAnimateShowContentPromise(animateShowContentPromise, doneOrMaxLimitReached);
+      });
+    }
+
     const animateShowContentPromise = this.animateShowContent(this.m_root, parent, isInitialFetch);
-    if (doneOrMaxLimitReached) {
-      animateShowContentPromise.then(() => {
-        if (this.m_root && this.m_widget && this.shouldUseGridRole() && this._isLoadMoreOnScroll()) {
+    this.m_animateShowContentPromise = animateShowContentPromise;
+    return this._getAnimateShowContentPromise(animateShowContentPromise, doneOrMaxLimitReached);
+  };
+
+  /**
+   * @private
+   */
+  IteratingDataProviderContentHandler.prototype._getAnimateShowContentPromise = function (
+    animateShowContentPromise,
+    doneOrMaxLimitReached
+  ) {
+    return animateShowContentPromise
+      .then(() => {
+        if (
+          doneOrMaxLimitReached &&
+          this.m_root &&
+          this.m_widget &&
+          this.shouldUseGridRole() &&
+          this._isLoadMoreOnScroll()
+        ) {
           // update aria rowcount once all data is loaded
           this.m_root.setAttribute('aria-rowcount', this.getItems(this.m_root).length);
         }
+      })
+      .finally(() => {
+        this.m_animateShowContentPromise = null;
       });
-    }
-
-    return animateShowContentPromise;
   };
 
   /**
@@ -3408,7 +3443,11 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojdatacoll
       ).then(
         function (skipPostProcessing) {
           // component could have been destroyed or another refresh already happened
-          if (this.m_widget == null || skipPostProcessing === null) {
+          if (
+            this.m_widget == null ||
+            skipPostProcessing === null ||
+            this.m_lastFetchedData !== data
+          ) {
             if (this.m_widget) {
               // for refresh case, we'll still need to reduce readiness stack, which is usually done in fetchEnd
               this.m_widget.signalTaskEnd();

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

@@ -223,9 +223,13 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojdatacollection-common', 'ojs/ojlogge
 
   DomScroller.prototype._handleExternalScrollerScrollTop = function (scrollTop, scrollerHeight) {
     if (!this._fetchPromise && this._asyncIterator) {
-      var bounds = this._contentElement.getBoundingClientRect();
-      var bottom = bounds.bottom - this._fetchTrigger - bounds.height * this._fetchThreshold;
-      if (bottom <= scrollerHeight) {
+      var contentBounds = this._contentElement.getBoundingClientRect();
+      var scrollerBottom =
+        this._element === document.body || this._element === document.documentElement
+          ? scrollerHeight
+          : this._element.getBoundingClientRect().bottom;
+      var scrollDiff = contentBounds.bottom - scrollerBottom;
+      if (scrollDiff <= this._fetchTrigger + contentBounds.height * this._fetchThreshold) {
         this._doFetch(scrollTop);
       }
     }

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

@@ -1580,7 +1580,6 @@ define(['ojs/ojcore-base', 'jquery', 'knockout', 'ojs/ojanimation', 'ojs/ojconte
 
   MessagesViewModel.prototype._surrogateRemoveHandler = function () {
     this._closeOverlay();
-    this._composite.parentElement.removeChild(this._composite);
   };
 
   MessagesViewModel.prototype._createObservables = function () {

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

@@ -865,14 +865,19 @@ define(['ojs/ojcore-base', 'knockout', 'ojs/ojlogger', 'ojs/ojcontext'], functio
      * @ignore
      */
     function _getKoNodes(container, cacheHolder) {
-      var nodes = [];
-      var firstChild = ko.virtualElements.firstChild(container);
-
-      _koNodesForEach(firstChild, cacheHolder, function (node) {
-        nodes.push(node);
-      });
+      const koNodes = [];
+      const childNodes = ko.virtualElements.childNodes(container);
 
-      return nodes;
+      for (let i = 0; i < childNodes.length; i++) {
+        const node = childNodes[i];
+        if (node !== cacheHolder) {
+          const type = node.nodeType;
+          if (type === 1 || type === 8) {
+            koNodes.push(node);
+          }
+        }
+      }
+      return koNodes;
     }
 
     /**

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

@@ -429,6 +429,10 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcomponentcore', 'ojs/ojlo
     _NotifyDetached: function () {
       this._invokeBeforeDestroy();
       this._super();
+    },
+    // This method is designed to be triggered by jquery cleanData override.
+    $$cleanElement: function () {
+      this._invokeBeforeDestroy();
     }
   });
 
@@ -438,6 +442,9 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcomponentcore', 'ojs/ojlo
         type: 'function'
       }
     },
+    methods: {
+      $$cleanElement: {}
+    },
     extension: {
       _WIDGET_NAME: 'ojSurrogate'
     }