@oracle/oraclejet 14.1.10 → 14.1.12

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

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: '14.1.10',
+    version: '14.1.12',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2023-10-20_05-03-09',
+    revision: '2023-12-07_10-48-17',
 
     // 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

@@ -144,6 +144,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();
@@ -162,6 +165,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

@@ -12625,12 +12625,17 @@ var __oj_data_grid_metadata =
   DvtDataGrid.prototype.handleHeaderMouseDown = function (event) {
     var processed;
 
-    this._exitActionableMode();
+    const header = this.findHeader(event.target);
+    if (header == null) {
+      return;
+    }
+    this.m_shouldFocus = false;
+
     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;
       }
     }
@@ -12681,7 +12686,6 @@ var __oj_data_grid_metadata =
         processed = true;
       }
 
-      let header = this.findHeader(event.target);
       let axis = this.getHeaderCellAxis(header);
 
       if (this.m_utils.containsCSSClassName(header, this.getMappedStyle('draggableItem'))) {
@@ -12707,7 +12711,6 @@ var __oj_data_grid_metadata =
         this.m_externalFocus = true;
       }
 
-      var header = this.findHeader(target);
       var cellContext = header[this.getResources().getMappedAttribute('context')];
 
       // if click or right click we want to adjust the selction
@@ -13185,18 +13188,17 @@ var __oj_data_grid_metadata =
       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);
@@ -13648,11 +13650,8 @@ 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 &&
@@ -17246,6 +17245,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 (
@@ -17254,7 +17254,8 @@ var __oj_data_grid_metadata =
     event,
     clearSelection,
     silent,
-    shouldNotScroll
+    shouldNotScroll,
+    shouldNotFocusIn
   ) {
     if (cellInfo != null && !shouldNotScroll) {
       this._scrollToActive(cellInfo);
@@ -17272,6 +17273,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;
           }
@@ -17305,7 +17312,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)) {
@@ -17442,7 +17449,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 ||
@@ -18043,10 +18052,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);
   };
 
   /**
@@ -18064,13 +18074,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
@@ -18080,7 +18092,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);
         }
@@ -19086,12 +19100,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;
   };
 
@@ -22593,6 +22613,7 @@ var __oj_data_grid_metadata =
     this._clearFocusoutTimeout();
     this._clearFocusoutBusyState();
     // if nothing is active, and came from the outside of the datagrid, activate first cell
+    const target = event.target;
     if (!isPopupFocusin) {
       this._clearOpenPopupListeners();
       if (
@@ -22602,6 +22623,7 @@ var __oj_data_grid_metadata =
           this.m_scrollbarFocus &&
           this.m_root.tabIndex === 0)
       ) {
+        this._exitActionableMode();
         this.m_externalFocus = true;
 
         if (this._isCellEditable()) {
@@ -22634,11 +22656,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);
   };
@@ -22688,6 +22741,7 @@ var __oj_data_grid_metadata =
             if (this._isEditOrEnter() && !this.m_animating) {
               this._leaveEditing(event, active, false, false);
             }
+            this._exitActionableMode();
           }
         }
         this._clearFocusoutBusyState();
@@ -23392,10 +23446,9 @@ 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;
   };
-
   /**
    * Exit actionable mode on the active cell if in actionable mode
    * @param {Event} event the event exiting actionable mode
@@ -23590,7 +23643,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/ojtable.js

@@ -18081,49 +18081,55 @@ var __oj_table_metadata =
         existingCurrentRow == null ||
         (existingCurrentRow.rowKey == null && existingCurrentRow.rowIndex == null);
       if (!isExistingCurrentRowClear) {
-        var existingCurrentRowIndex = existingCurrentRow.rowIndex;
-        var existingCurrentRowKey = this._getRowKeyForDataSourceRowIndex(existingCurrentRowIndex);
+        var existingCurrentRowKey = existingCurrentRow.rowKey;
         var existingCurrentRowIdx = this._getRowIdxForRowKey(existingCurrentRowKey);
 
-        var updateEditable = this._setTableEditable(false, false, 0, true, event);
-        if (updateEditable === false) {
-          this._currentRow = existingCurrentRow;
-          var currentFocusElement = document.activeElement;
-          var columnIdx = this._getElementColumnIdx(currentFocusElement);
-          this._queueTask(
-            function () {
-              var focusRowIdx = existingCurrentRowIdx;
-              var focusColumnIdx = columnIdx;
-              if (focusRowIdx != null && focusColumnIdx != null) {
-                // prettier-ignore
-                setTimeout( // @HTMLUpdateOK
-                  function () {
-                    this._setCellFocus(focusRowIdx, focusColumnIdx);
-                  }.bind(this),
-                  0
-                );
-              } else if (focusRowIdx != null) {
-                // prettier-ignore
-                setTimeout( // @HTMLUpdateOK
-                  function () {
-                    this._setActiveRow(focusRowIdx, event);
-                  }.bind(this),
-                  0
-                );
+        // end editing if the currently editable rowKey doesn't match the new current rowKey
+        if (
+          this._hasEditableRow() &&
+          (updatedCurrentRow == null ||
+            !oj.KeyUtils.equals(existingCurrentRowKey, updatedCurrentRow.rowKey))
+        ) {
+          var updateEditable = this._setTableEditable(false, false, 0, true, event);
+          if (updateEditable === false) {
+            this._currentRow = existingCurrentRow;
+            var currentFocusElement = document.activeElement;
+            var columnIdx = this._getElementColumnIdx(currentFocusElement);
+            this._queueTask(
+              function () {
+                var focusRowIdx = existingCurrentRowIdx;
+                var focusColumnIdx = columnIdx;
+                if (focusRowIdx != null && focusColumnIdx != null) {
+                  // prettier-ignore
+                  setTimeout( // @HTMLUpdateOK
+                    function () {
+                      this._setCellFocus(focusRowIdx, focusColumnIdx);
+                    }.bind(this),
+                    0
+                  );
+                } else if (focusRowIdx != null) {
+                  // prettier-ignore
+                  setTimeout( // @HTMLUpdateOK
+                    function () {
+                      this._setActiveRow(focusRowIdx, event);
+                    }.bind(this),
+                    0
+                  );
+                }
+              }.bind(this)
+            );
+            // restore previous accessible row context if current row is not changing
+            this._setAccessibleContext(accessibleContext);
+            // do not update the currentRow to the new value if updateEditable returned false
+            this.option('currentRow', this._currentRow, {
+              _context: {
+                writeback: true,
+                originalEvent: event,
+                internalSet: true
               }
-            }.bind(this)
-          );
-          // restore previous accessible row context if current row is not changing
-          this._setAccessibleContext(accessibleContext);
-          // do not update the currentRow to the new value if updateEditable returned false
-          this.option('currentRow', this._currentRow, {
-            _context: {
-              writeback: true,
-              originalEvent: event,
-              internalSet: true
-            }
-          });
-          return Table._CURRENT_ROW_STATUS._IGNORED;
+            });
+            return Table._CURRENT_ROW_STATUS._IGNORED;
+          }
         }
 
         var existingBodyRow = this._getTableBodyRow(existingCurrentRowIdx);

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

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '14.1.10',
+  version: '14.1.12',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2023-10-20_05-03-09',
+  revision: '2023-12-07_10-48-17',
 
   // 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

@@ -145,6 +145,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();
@@ -163,6 +166,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();