@oracle/oraclejet 15.0.7 → 15.0.9

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.0.7"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v15.0.9"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;

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/ojcore-base.js

@@ -37,12 +37,12 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
      * @global
      * @member {string} version JET version numberr
      */
-    version: '15.0.7',
+    version: '15.0.9',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2023-10-22_10-09-43',
+    revision: '2023-11-28_03-39-39',
 
     // 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/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

@@ -13644,13 +13644,13 @@ 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;
       }
     }
@@ -14205,19 +14205,17 @@ var __oj_data_grid_metadata =
       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);
@@ -14680,11 +14678,9 @@ 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 &&
@@ -18859,6 +18855,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 (
@@ -18867,7 +18864,8 @@ var __oj_data_grid_metadata =
     event,
     clearSelection,
     silent,
-    shouldNotScroll
+    shouldNotScroll,
+    shouldNotFocusIn
   ) {
     if (cellInfo != null && !shouldNotScroll) {
       this._scrollToActive(cellInfo);
@@ -18885,6 +18883,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;
           }
@@ -18918,7 +18922,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)) {
@@ -19055,7 +19059,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 ||
@@ -19676,10 +19682,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);
   };
 
   /**
@@ -19697,13 +19704,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
@@ -19713,7 +19722,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);
         }
@@ -20704,12 +20715,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;
   };
 
@@ -24219,6 +24236,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();
@@ -24229,6 +24247,7 @@ var __oj_data_grid_metadata =
           this.m_scrollbarFocus &&
           this.m_root.tabIndex === 0)
       ) {
+        this._exitActionableMode();
         this.m_externalFocus = true;
 
         if (this._isCellEditable()) {
@@ -24261,11 +24280,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);
   };
@@ -24315,6 +24365,7 @@ var __oj_data_grid_metadata =
             if (this._isEditOrEnter() && !this.m_animating) {
               this._leaveEditing(event, active, false, false);
             }
+            this._exitActionableMode();
           }
         }
         this._clearFocusoutBusyState();
@@ -25051,7 +25102,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;
   };
 
@@ -25249,7 +25300,7 @@ var __oj_data_grid_metadata =
       });
     } else {
       rerender = false;
-      this._enterActionableMode(element);
+      this._enterActionableMode(element, null, true);
     }
     return rerender;
   };

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,7 +2948,39 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojdatacoll
       index += 1;
     }
 
-    return this.animateShowContent(this.m_root, parent, isInitialFetch);
+    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);
+      });
+    }
+
+    const animateShowContentPromise = this.animateShowContent(this.m_root, parent, isInitialFetch);
+    this.m_animateShowContentPromise = animateShowContentPromise;
+    return this._getAnimateShowContentPromise(animateShowContentPromise);
+  };
+
+  /**
+   * Note this method basically just returns a finally version of the Promise passed in
+   * This is just to not deviate from the code in 15.1.x and 16.x code base where the fix
+   * is coming from (backport).
+   * @private
+   */
+  IteratingDataProviderContentHandler.prototype._getAnimateShowContentPromise = function (
+    animateShowContentPromise
+  ) {
+    return animateShowContentPromise.finally(() => {
+      this.m_animateShowContentPromise = null;
+    });
   };
 
   /**
@@ -3398,7 +3432,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/ojlistview.js

@@ -1474,7 +1474,7 @@ var __oj_list_view_metadata =
     // 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
@@ -1614,7 +1614,7 @@ var __oj_list_view_metadata =
       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);
 
@@ -1699,7 +1699,7 @@ var __oj_list_view_metadata =
           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
 
@@ -4135,7 +4135,7 @@ var __oj_list_view_metadata =
         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/ojtable.js

@@ -2624,7 +2624,7 @@ var __oj_table_metadata =
         var column = columns[i];
         var headerRenderer = this._getColumnRenderer(i, 'header');
         if (headerRenderer) {
-          headerColumn = this._createTableHeaderColumn(i, true);
+          headerColumn = this._createTableHeaderColumn(i);
           // if headerRenderer is defined then call that
           var headerContext = this._getRendererContextObject(headerColumn, {});
           // Copy additional properties to top-level context to work with custom element
@@ -2646,7 +2646,12 @@ var __oj_table_metadata =
               self._columnHeaderDefaultRenderer(this, delegateRenderer);
             };
           }
-          if (!DataCollectionUtils.applyRendererContent(headerColumn, headerRenderer(context))) {
+          var rendererContent = headerRenderer(context);
+          if (rendererContent != null) {
+            // if the renderer returned a value then we clear the default content
+            $(headerColumn).empty();
+          }
+          if (!DataCollectionUtils.applyRendererContent(headerColumn, rendererContent)) {
             // if the renderer didn't append content then the existing
             // headerColumn was manipulated. So get it and set the required
             // attributes just in case it was replaced or the attributes

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/ojcore-base.js

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '15.0.7',
+  version: '15.0.9',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2023-10-22_10-09-43',
+  revision: '2023-11-28_03-39-39',
 
   // 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/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();