@oracle/oraclejet 15.1.1 → 15.1.3

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

@@ -437,6 +437,11 @@ class CachedIteratorResultsDataProvider {
         });
     }
     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 @@ class CachedIteratorResultsDataProvider {
     }
     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 @@ class CachedIteratorResultsDataProvider {
         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_esm/ojcomponentcore.js

@@ -6598,7 +6598,8 @@ function _returnTrue() {
 // 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) {
@@ -6617,11 +6618,14 @@ $.cleanData = (function (orig) {
       }
       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_esm/ojcomposite.js

@@ -11,7 +11,7 @@ import { info, warn } from 'ojs/ojlogger';
 import { getDefaultValue } from 'ojs/ojmetadatautils';
 import 'ojs/ojcomposite-knockout';
 import 'ojs/ojcustomelement';
-import { ElementState, CustomElementUtils, ElementUtils, transformPreactValue, JetElementError, CHILD_BINDING_PROVIDER } from 'ojs/ojcustomelement-utils';
+import { LifecycleElementState, CustomElementUtils, ElementUtils, transformPreactValue, JetElementError, CHILD_BINDING_PROVIDER } from 'ojs/ojcustomelement-utils';
 import { getElementDescriptor, getElementRegistration, registerElement, isElementRegistered, isComposite } from 'ojs/ojcustomelement-registry';
 
 const CompositeInternal = {};
@@ -48,7 +48,7 @@ CompositeInternal.getContainingComposite = function (node, stopBelow) {
   return composite;
 };
 
-class CompositeState extends ElementState {
+class CompositeState extends LifecycleElementState {
     getTrackChildrenOption() {
         return 'immediate';
     }
@@ -85,6 +85,9 @@ CompositeElementBridge.DESC_KEY_VIEW_MODEL = 'viewModel';
 /** @ignore */
 CompositeElementBridge.SUBID_MAP = 'data-oj-subid-map';
 
+CompositeElementBridge.DisconnectedState = 0;
+CompositeElementBridge.ConnectedState = 1;
+
 oj.CollectionUtils.copyInto(CompositeElementBridge.proto, {
   beforePropertyChangedEvent: function (element, property, detail) {
     var vmContext = { property: property };
@@ -323,6 +326,11 @@ oj.CollectionUtils.copyInto(CompositeElementBridge.proto, {
     oj.CompositeTemplateRenderer.invokeViewModelMethod(element, this._VIEW_MODEL, 'disconnected', [
       element
     ]);
+    this._verifyConnectDisconnect(element, CompositeElementBridge.DisconnectedState);
+  },
+
+  HandleAttached: function (element) {
+    this._verifyConnectDisconnect(element, CompositeElementBridge.ConnectedState);
   },
 
   HandleReattached: function (element) {
@@ -339,6 +347,7 @@ oj.CollectionUtils.copyInto(CompositeElementBridge.proto, {
         this._VM_CONTEXT
       ]);
     }
+    this._verifyConnectDisconnect(element, CompositeElementBridge.ConnectedState);
   },
 
   InitializeElement: function (element) {
@@ -547,6 +556,34 @@ oj.CollectionUtils.copyInto(CompositeElementBridge.proto, {
     return this._VIEW_MODEL;
   },
 
+  // Called from HandleAttached, HandleReattached, HandleDetached in order
+  // to cleanup a composite on a true disconnect.
+  _verifyConnectDisconnect: function (element, state) {
+    if (this._verifyingState === undefined) {
+      window.queueMicrotask(() => {
+        if (this._verifyingState === state) {
+          if (this._verifyingState === CompositeElementBridge.ConnectedState) {
+            this._verifiedConnect(element);
+          } else {
+            this._verifiedDisconnect(element);
+          }
+          this._verifyingState = undefined;
+        }
+      });
+    }
+    this._verifyingState = state;
+  },
+
+  _verifiedConnect: function (element) {
+    const state = CustomElementUtils.getElementState(element);
+    state.executeLifecycleCallbacks(true);
+  },
+
+  _verifiedDisconnect: function (element) {
+    const state = CustomElementUtils.getElementState(element);
+    state.executeLifecycleCallbacks(false);
+  },
+
   _processCompositeTemplate: function (element) {
     // Skip rendering the composite template since the it is not attached to the DOM.
     // The template will be rendered if and when the component will be reattached.

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

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '15.1.1',
+  version: '15.1.3',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2023-10-24_09-12-11',
+  revision: '2023-12-06_06-28-08',
 
   // 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/ojcustomelement-utils.js

@@ -763,6 +763,34 @@ var ComponentState;
     ComponentState[ComponentState["BindingsDisposed"] = 8] = "BindingsDisposed";
 })(ComponentState || (ComponentState = {}));
 
+class LifecycleElementState extends ElementState {
+    constructor() {
+        super(...arguments);
+        this._connectCallbacks = [];
+        this._disconnectCallbacks = [];
+    }
+    addLifecycleCallbacks(connectFunc, disconnectFunc) {
+        if (connectFunc) {
+            this._connectCallbacks.push(connectFunc);
+        }
+        if (disconnectFunc) {
+            this._disconnectCallbacks.push(disconnectFunc);
+        }
+    }
+    removeLifecycleCallbacks(connectFunc, disconnectFunc) {
+        if (connectFunc) {
+            this._connectCallbacks = this._connectCallbacks.filter((item) => item != connectFunc);
+        }
+        if (disconnectFunc) {
+            this._disconnectCallbacks = this._disconnectCallbacks.filter((item) => item != disconnectFunc);
+        }
+    }
+    executeLifecycleCallbacks(isConnected) {
+        const callbacks = isConnected ? this._connectCallbacks : this._disconnectCallbacks;
+        callbacks.forEach((callback) => callback());
+    }
+}
+
 const NULL_SYMBOL = Symbol('custom element null');
 const EMPTY_STRING_SYMBOL = Symbol('custom element empty string');
 const toSymbolizedValue = (value) => {
@@ -803,4 +831,4 @@ const transformPreactValue = (element, propertyMeta, originalValue) => {
 
 const OJ_BIND_CONVERTED_NODE = Symbol('ojBindConvertedNode');
 
-export { AttributeUtils, CACHED_BINDING_PROVIDER, CHILD_BINDING_PROVIDER, CustomElementUtils, ElementState, ElementUtils, JetElementError, OJ_BIND_CONVERTED_NODE, toSymbolizedValue, transformPreactValue };
+export { AttributeUtils, CACHED_BINDING_PROVIDER, CHILD_BINDING_PROVIDER, CustomElementUtils, ElementState, ElementUtils, JetElementError, LifecycleElementState, OJ_BIND_CONVERTED_NODE, toSymbolizedValue, transformPreactValue };

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

@@ -263,6 +263,9 @@ BaseCustomElementBridge.proto = {
   // eslint-disable-next-line no-unused-vars
   HandleBindingsApplied: function (element, bindingContext) {},
 
+  // eslint-disable-next-line no-unused-vars
+  HandleAttached: function (element) {},
+
   // eslint-disable-next-line no-unused-vars
   HandleDetached: function (element) {},
 

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

@@ -186,6 +186,9 @@ DataCollectionUtils.isElementOrAncestorFocusable = function (element, stopCondit
  */
 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();
@@ -204,6 +207,9 @@ DataCollectionUtils.handleActionableTab = function (event, element) {
  */
 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_esm/ojdatagrid.js

@@ -13900,13 +13900,13 @@ DvtDataGrid.prototype.handleHeaderMouseDown = function (event) {
   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;
     }
   }
@@ -14459,25 +14459,24 @@ DvtDataGrid.prototype.handleDatabodyMouseDown = function (event) {
   // 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);
@@ -14940,11 +14939,10 @@ DvtDataGrid.prototype.handleTouchEnd = function (event) {
       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 &&
@@ -19135,6 +19133,7 @@ DvtDataGrid.prototype._updateActive = function (activeObject, shouldFocus, shoul
  * @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 (
@@ -19143,7 +19142,8 @@ DvtDataGrid.prototype._setActive = function (
   event,
   clearSelection,
   silent,
-  shouldNotScroll
+  shouldNotScroll,
+  shouldNotFocusIn
 ) {
   if (cellInfo != null && !shouldNotScroll) {
     this._scrollToActive(cellInfo);
@@ -19161,6 +19161,12 @@ DvtDataGrid.prototype._setActive = function (
         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) {
+          disableAllFocusableElements(prevActiveElement);
+        }
+
         if (event && event.type === 'mousedown') {
           this.m_trueIndex = null;
         }
@@ -19195,7 +19201,7 @@ DvtDataGrid.prototype._setActive = function (
       }
     } 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)) {
@@ -19332,7 +19338,9 @@ DvtDataGrid.prototype._compareActive = function (active1, active2) {
   } 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 ||
@@ -19962,10 +19970,11 @@ DvtDataGrid.prototype.find = function (elem, key, className) {
 /**
  * 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);
 };
 
 /**
@@ -19983,13 +19992,15 @@ DvtDataGrid.prototype._unhighlightActive = function (classNames) {
  * @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
@@ -19999,7 +20010,9 @@ DvtDataGrid.prototype._highlightActiveObject = function (
     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);
       }
@@ -20992,12 +21005,18 @@ DvtDataGrid.prototype.readCurrentContent = function () {
  * @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;
 };
 
@@ -24684,6 +24703,7 @@ DvtDataGrid.prototype.handleRootFocus = function (event, isPopupFocusin) {
   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();
@@ -24694,6 +24714,7 @@ DvtDataGrid.prototype.handleRootFocus = function (event, isPopupFocusin) {
         this.m_scrollbarFocus &&
         this.m_root.tabIndex === 0)
     ) {
+      this._exitActionableMode();
       this.m_externalFocus = true;
 
       if (this._isCellEditable()) {
@@ -24728,11 +24749,42 @@ DvtDataGrid.prototype.handleRootFocus = function (event, isPopupFocusin) {
       } 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);
+          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);
 };
@@ -24782,6 +24834,7 @@ DvtDataGrid.prototype.handleRootBlur = function (event, isPopupFocusout) {
           if (this._isEditOrEnter() && !this.m_animating) {
             this._leaveEditing(event, active, false, false);
           }
+          this._exitActionableMode();
         }
       }
       this._clearFocusoutBusyState();
@@ -25518,7 +25571,7 @@ DvtDataGrid.prototype.setActionableMode = function (flag) {
  * @returns {boolean} false
  */
 DvtDataGrid.prototype._handleActionable = function (event, element) {
-  this._enterActionableMode(element, event);
+  this._enterActionableMode(element, event, true);
   return false;
 };
 
@@ -25716,7 +25769,7 @@ DvtDataGrid.prototype._handleEdit = function (event, element) {
     });
   } else {
     rerender = false;
-    this._enterActionableMode(element);
+    this._enterActionableMode(element, null, true);
   }
   return rerender;
 };

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

@@ -2901,6 +2901,8 @@ IteratingDataProviderContentHandler.prototype._handleFetchSuccess = function (
     return Promise.resolve(true);
   }
 
+  this.m_lastFetchedData = data;
+
   // remove any existing items with the same key first
   this._removeDuplicateItems(keys);
 
@@ -2948,17 +2950,50 @@ IteratingDataProviderContentHandler.prototype._handleFetchSuccess = function (
     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;
 };
 
 /**
@@ -3410,7 +3445,11 @@ IteratingDataProviderContentHandler.prototype._handleFetchedData = function (
     ).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_esm/ojlistview.js

@@ -1467,7 +1467,7 @@ TreeDataProviderContentHandler.prototype.Collapse = function (item) {
   // template engine should have already been loaded
   var templateEngine = this.getTemplateEngine();
   if (templateEngine) {
-    templateEngine.clean(item.get(0), this.m_widget.GetRootElement());
+    templateEngine.clean(item.get(0), this.m_widget.GetRootElement().get(0));
   }
 
   // remove all children nodes
@@ -1607,7 +1607,7 @@ TreeDataProviderContentHandler.prototype._replaceGroupItem = function (
     if (contentNode) {
       // explicit clean when inline template is used
       if (templateEngine) {
-        templateEngine.clean(groupItem, this.m_widget.GetRootElement());
+        templateEngine.clean(groupItem, this.m_widget.GetRootElement().get(0));
       }
       cellNode.removeChild(contentNode);
 
@@ -1692,7 +1692,7 @@ TreeDataProviderContentHandler.prototype._handleChildRefresh = function (keys) {
         var groupItem = elem.querySelector('.' + groupItemStyleClass);
         if (group != null && groupItem != null) {
           if (templateEngine != null) {
-            templateEngine.clean(group, this.m_widget.GetRootElement());
+            templateEngine.clean(group, this.m_widget.GetRootElement().get(0));
           }
           group.innerHTML = ''; // @HTMLUpdateOK
 
@@ -4128,7 +4128,7 @@ const _ojListView = _ListViewUtils.clazz(
       var elem = document.getElementById(this._createSubId('empty'));
       if (elem) {
         if (this.m_engine) {
-          this.m_engine.clean(elem, this.GetRootElement());
+          this.m_engine.clean(elem, this.GetRootElement().get(0));
         }
         elem.parentNode.removeChild(elem);
       }

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

@@ -1591,7 +1591,6 @@ MessagesViewModel.prototype._refresh = function () {
 
 MessagesViewModel.prototype._surrogateRemoveHandler = function () {
   this._closeOverlay();
-  this._composite.parentElement.removeChild(this._composite);
 };
 
 MessagesViewModel.prototype._createObservables = function () {

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

@@ -865,14 +865,19 @@ ModuleBinding._EMPTY_MODULE = 'oj:blank';
    * @ignore
    */
   function _getKoNodes(container, cacheHolder) {
-    var nodes = [];
-    var firstChild = virtualElements.firstChild(container);
-
-    _koNodesForEach(firstChild, cacheHolder, function (node) {
-      nodes.push(node);
-    });
+    const koNodes = [];
+    const childNodes = 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_esm/ojpopupcore.js

@@ -435,6 +435,10 @@ oj.__registerWidget('oj.ojSurrogate', $.oj.baseComponent, {
   _NotifyDetached: function () {
     this._invokeBeforeDestroy();
     this._super();
+  },
+  // This method is designed to be triggered by jquery cleanData override.
+  $$cleanElement: function () {
+    this._invokeBeforeDestroy();
   }
 });
 
@@ -444,6 +448,9 @@ var ojSurrogateMeta = {
       type: 'function'
     }
   },
+  methods: {
+    $$cleanElement: {}
+  },
   extension: {
     _WIDGET_NAME: 'ojSurrogate'
   }