@oracle/oraclejet 15.1.2 → 15.1.4

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

@@ -13900,40 +13900,27 @@ 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;
     }
   }
 
-  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;
     }
 
@@ -14236,19 +14223,7 @@ DvtDataGrid.prototype.handleCornerClick = function (event) {
  */
 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();
@@ -14459,25 +14434,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 +14914,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 &&
@@ -15203,12 +15176,7 @@ DvtDataGrid.prototype.handleHeaderTouchEnd = function (event) {
       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();
           }
@@ -19135,6 +19103,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 +19112,8 @@ DvtDataGrid.prototype._setActive = function (
   event,
   clearSelection,
   silent,
-  shouldNotScroll
+  shouldNotScroll,
+  shouldNotFocusIn
 ) {
   if (cellInfo != null && !shouldNotScroll) {
     this._scrollToActive(cellInfo);
@@ -19161,6 +19131,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 +19171,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 +19308,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 +19940,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 +19962,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 +19980,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 +20975,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 +24673,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 +24684,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 +24719,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 +24804,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 +25541,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 +25739,7 @@ DvtDataGrid.prototype._handleEdit = function (event, element) {
     });
   } else {
     rerender = false;
-    this._enterActionableMode(element);
+    this._enterActionableMode(element, null, true);
   }
   return rerender;
 };
@@ -33161,6 +33184,20 @@ DvtDataGrid.prototype._doDelayedSort = function () {
   }
 };
 
+/**
+ * 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_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/ojdomscroller.js

@@ -223,9 +223,13 @@ DomScroller.prototype._doFetch = function (scrollTop) {
 
 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_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'
   }