@oracle/oraclejet 18.0.5 → 18.1.0

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

@@ -2227,8 +2227,8 @@ var __oj_table_metadata =
     // cleanup needed for both, 'destroy()' and 'ReleaseResources()' calls
     this._animateOnFetch = null;
     this._isEditPending = null;
+    this._isApplyingEdit = null;
     this._deferredEditInfo = null;
-    this._focusoutEditKey = null;
     this._skipScrollOnFocus = null;
     this._active = null;
     this._isTableTab = null;
@@ -6527,7 +6527,9 @@ var __oj_table_metadata =
             rowClone,
             Table.CSS_CLASSES._TABLE_DATA_ROW_SELECTOR_CLASS
           )[0];
-          selector.selectedKeys = this.component.options.selected.row;
+          selector.selectedKeys = this.component._getRowKeySetFromSelected(
+            this.component.options.selected
+          );
           selector.rowKey = this.component._getRowKey(row);
         }
 
@@ -10321,6 +10323,14 @@ var __oj_table_metadata =
     if (selectorCol != null) {
       selectorCol.style[Table.CSS_PROP._WIDTH] = '';
     }
+    var gutterStartCol = this._table._getTableGutterStartCol();
+    if (gutterStartCol != null) {
+      gutterStartCol.style[Table.CSS_PROP._WIDTH] = '';
+    }
+    var gutterEndCol = this._table._getTableGutterEndCol();
+    if (gutterEndCol != null) {
+      gutterEndCol.style[Table.CSS_PROP._WIDTH] = '';
+    }
     var colElements = this._table._getTableCols();
     for (var i = 0; i < colElements.length; i++) {
       var tableCol = colElements[i];
@@ -11582,13 +11592,15 @@ var __oj_table_metadata =
     var newColumnWidths = []; // pending widths of all data columns
     this._appliedColumnWidths = []; // pending (and eventually applied) widths of all data columns
 
+    let gutterStartWidth;
+    let gutterEndWidth;
     var totalWidth = this._selectorColWidth != null ? this._selectorColWidth : 0;
     if (this._table._isGutterStartColumnEnabled()) {
-      const gutterStartWidth = this._table._getTableGutterWidth('start');
+      gutterStartWidth = this._table._getTableGutterWidth('start');
       totalWidth += gutterStartWidth;
     }
     if (this._table._isGutterEndColumnEnabled()) {
-      const gutterEndWidth = this._table._getTableGutterWidth('end');
+      gutterEndWidth = this._table._getTableGutterWidth('end');
       totalWidth += gutterEndWidth;
     }
 
@@ -11671,6 +11683,18 @@ var __oj_table_metadata =
         selectorCol.style[Table.CSS_PROP._WIDTH] = this._selectorColWidth + Table.CSS_VAL._PX;
       }
     }
+    if (this._table._isGutterStartColumnEnabled()) {
+      var gutterStartCol = this._table._getTableGutterStartCol();
+      if (gutterStartCol != null) {
+        gutterStartCol.style[Table.CSS_PROP._WIDTH] = gutterStartWidth + Table.CSS_VAL._PX;
+      }
+    }
+    if (this._table._isGutterEndColumnEnabled()) {
+      var gutterEndCol = this._table._getTableGutterEndCol();
+      if (gutterEndCol != null) {
+        gutterEndCol.style[Table.CSS_PROP._WIDTH] = gutterEndWidth + Table.CSS_VAL._PX;
+      }
+    }
     for (i = 0; i < columnsCount; i++) {
       var colWidth = newColumnWidths[i];
       var tableCol = this._table._getTableCol(i);
@@ -11986,13 +12010,15 @@ var __oj_table_metadata =
     var newColumnWidths = []; // pending widths of all data columns
     this._appliedColumnWidths = []; // pending (and eventually applied) widths of all data columns
 
+    let gutterStartWidth;
+    let gutterEndWidth;
     var totalWidth = this._selectorColWidth != null ? this._selectorColWidth : 0;
     if (this._table._isGutterStartColumnEnabled()) {
-      const gutterStartWidth = this._table._getTableGutterWidth('start');
+      gutterStartWidth = this._table._getTableGutterWidth('start');
       totalWidth += gutterStartWidth;
     }
     if (this._table._isGutterEndColumnEnabled()) {
-      const gutterEndWidth = this._table._getTableGutterWidth('end');
+      gutterEndWidth = this._table._getTableGutterWidth('end');
       totalWidth += gutterEndWidth;
     }
 
@@ -12056,6 +12082,18 @@ var __oj_table_metadata =
         selectorCol.style[Table.CSS_PROP._WIDTH] = this._selectorColWidth + Table.CSS_VAL._PX;
       }
     }
+    if (this._table._isGutterStartColumnEnabled()) {
+      var gutterStartCol = this._table._getTableGutterStartCol();
+      if (gutterStartCol != null) {
+        gutterStartCol.style[Table.CSS_PROP._WIDTH] = gutterStartWidth + Table.CSS_VAL._PX;
+      }
+    }
+    if (this._table._isGutterEndColumnEnabled()) {
+      var gutterEndCol = this._table._getTableGutterEndCol();
+      if (gutterEndCol != null) {
+        gutterEndCol.style[Table.CSS_PROP._WIDTH] = gutterEndWidth + Table.CSS_VAL._PX;
+      }
+    }
     for (i = 0; i < columnsCount; i++) {
       var colWidth = newColumnWidths[i];
       var tableCol = this._table._getTableCol(i);
@@ -12793,7 +12831,7 @@ var __oj_table_metadata =
             this._getLayoutManager().notifyTableUpdate(Table._UPDATE._ROWS_REMOVED);
             // reset active row to ensure active row index is not stale after refresh
             this._clearActiveRow(null, true);
-            this._removeRowsAfterLastValidRow(event.detail.disregardAfterKey).then(() => {
+            return this._removeRowsAfterLastValidRow(event.detail.disregardAfterKey).then(() => {
               if (!this._hasMoreToFetch()) {
                 this._registerDomScroller();
               }
@@ -14221,8 +14259,8 @@ var __oj_table_metadata =
 
     var selector = document.createElement('oj-selector');
     selector.id = this._getTableUID() + '_table_selector_' + rowKey;
-    let rowSelected = this.options.selected.row;
-    if (rowSelected.has(rowKey)) {
+    var rowKeySet = this._getRowKeySetFromSelected(this.options.selected);
+    if (rowKeySet.has(rowKey)) {
       selector.selectedKeys = new ojkeyset.KeySetImpl([rowKey]);
     } else {
       selector.selectedKeys = new ojkeyset.KeySetImpl();
@@ -14266,7 +14304,7 @@ var __oj_table_metadata =
 
     if (this._isSelectAllControlVisible()) {
       var selector = document.createElement('oj-selector');
-      selector.selectedKeys = this.options.selected.row;
+      selector.selectedKeys = this._getRowKeySetFromSelected(this.options.selected);
       selector.setAttribute(Table._DATA_OJ_BINDING_PROVIDER, 'none'); // @HTMLUpdateOK
       selector.classList.add(Table.CSS_CLASSES._TABLE_HEADER_SELECTOR_CLASS);
       selector.setAttribute('selection-mode', 'all');
@@ -15430,6 +15468,35 @@ var __oj_table_metadata =
     return null;
   };
 
+  Table.prototype._getTableGutterStartCol = function () {
+    var tableColGroup = this._getTableColGroup();
+    if (
+      tableColGroup != null &&
+      tableColGroup.children != null &&
+      tableColGroup.children.length > 0 &&
+      tableColGroup.children[0].classList.contains(Table.CSS_CLASSES._TABLE_COL_GUTTER_CLASS)
+    ) {
+      return tableColGroup.children[0];
+    }
+    return null;
+  };
+
+  Table.prototype._getTableGutterEndCol = function () {
+    var tableColGroup = this._getTableColGroup();
+    if (tableColGroup != null && tableColGroup.children != null) {
+      var childCount = tableColGroup.children.length;
+      if (
+        childCount > 0 &&
+        tableColGroup.children[childCount - 1].classList.contains(
+          Table.CSS_CLASSES._TABLE_COL_GUTTER_CLASS
+        )
+      ) {
+        return tableColGroup.children[childCount - 1];
+      }
+    }
+    return null;
+  };
+
   /**
    * Return all table column headers
    * @return {Array|null} array of th DOM elements
@@ -17492,7 +17559,6 @@ var __oj_table_metadata =
 
     this._setFocusoutBusyState();
     var isClearEditMode = this._hasEditableRow();
-    this._focusoutEditKey = this._getEditableRowKey();
     var isClearActionableMode = this._isTableActionableMode();
 
     // set timeout to stay in editable/actionable mode if focus comes back into the table
@@ -17518,15 +17584,10 @@ var __oj_table_metadata =
           this._setTableActionableMode(false, true);
         }
         if (isClearEditMode) {
-          if (this._focusoutEditKey != null) {
-            // only clear edit mode if it was enabled prior to the focusout trigger AND the editRow has not changed
-            this._queueTask(() => {
-              return this._setTableEditable(false, false, 0, true, event);
-            });
-          } else {
-            // otherwise ensure focus remains in the Table if it has not yet been regained and an editrow update is pending
-            table.focus();
-          }
+          this._deferredEditInfo = { editRow: { rowKey: null, rowIndex: -1 }, event };
+          this._queueTask(() => {
+            return this._setEditRow();
+          });
         }
         this._clearFocusoutBusyState();
       }.bind(this),
@@ -17722,13 +17783,17 @@ var __oj_table_metadata =
       // ignore key event on the footer or target is editable
       var keyboardCode1 = this._getKeyboardKeys()[0];
 
+      if (this._isPendingEdit()) {
+        event.preventDefault();
+        event.stopPropagation();
+        return;
+      }
       if (
-        this._isPendingEdit() ||
-        (!DataCollectionUtils.isEscapeKeyEvent(keyboardCode1) &&
-          !DataCollectionUtils.isEnterKeyEvent(keyboardCode1) &&
-          !DataCollectionUtils.isF2KeyEvent(keyboardCode1) &&
-          !DataCollectionUtils.isTabKeyEvent(keyboardCode1) &&
-          this._isNodeEditable(event.target))
+        !DataCollectionUtils.isEscapeKeyEvent(keyboardCode1) &&
+        !DataCollectionUtils.isEnterKeyEvent(keyboardCode1) &&
+        !DataCollectionUtils.isF2KeyEvent(keyboardCode1) &&
+        !DataCollectionUtils.isTabKeyEvent(keyboardCode1) &&
+        this._isNodeEditable(event.target)
       ) {
         return;
       }
@@ -18168,10 +18233,10 @@ var __oj_table_metadata =
           const rowIdx = this._getElementRowIdx(event.target);
           if (rowIdx != null) {
             const rowKey = this._getRowKeyForRowIdx(rowIdx);
+            this._deferredEditInfo = { editRow: { rowKey }, columnIdx, isNext: true, event };
             this._queueTask(() => {
               return this._setEditRow();
             });
-            this._deferredEditInfo = { editRow: { rowKey }, columnIdx };
           }
         }
         this._currentPointerTarget = null;
@@ -18559,11 +18624,16 @@ var __oj_table_metadata =
           function (event) {
             return function () {
               var eventTarget = this._getEventTargetElement(event);
-              var columnIdx = this._getElementColumnIdx(eventTarget);
-              this._queueTask(() => {
-                return this._setTableEditable(true, false, columnIdx, true, event);
-              });
-              event.preventDefault();
+              const rowIdx = this._getElementRowIdx(eventTarget);
+              if (rowIdx != null) {
+                const rowKey = this._getRowKeyForRowIdx(rowIdx);
+                var columnIdx = this._getElementColumnIdx(eventTarget);
+                this._deferredEditInfo = { editRow: { rowKey }, columnIdx, isNext: true, event };
+                this._queueTask(() => {
+                  return this._setEditRow();
+                });
+                event.preventDefault();
+              }
             }.bind(this);
           }.bind(this)(evt)
         );
@@ -19444,7 +19514,7 @@ var __oj_table_metadata =
             (value) => {
               if (value === false) {
                 this._resetCurrentRow(existingCurrentRow, existingCurrentRowIdx, event);
-                return Table._CURRENT_ROW_STATUS._IGNORED;
+                return Table._CURRENT_ROW_STATUS._VETOED;
               }
               var existingBodyRow = this._getTableBodyRow(existingCurrentRowIdx);
               if (existingBodyRow != null) {
@@ -19486,32 +19556,10 @@ var __oj_table_metadata =
    */
   Table.prototype._resetCurrentRow = function (existingCurrentRow, existingCurrentRowIdx, event) {
     this._currentRow = existingCurrentRow;
-    var currentFocusElement = document.activeElement;
     var accessibleContext = this._getAccessibleContext();
-    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)
-    );
+    if (existingCurrentRowIdx != null) {
+      this._setActiveRow(existingCurrentRowIdx, event);
+    }
     // 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
@@ -20851,18 +20899,29 @@ var __oj_table_metadata =
         if (this._deferredEditInfo != null) {
           var editRow = this._deferredEditInfo.editRow;
           var columnIdx = this._deferredEditInfo.columnIdx || 0;
+          var isNext = this._deferredEditInfo.isNext;
+          var isCancel = this._deferredEditInfo.isCancel;
+          var event = this._deferredEditInfo.event;
           this._deferredEditInfo = null;
 
           var rowKey = editRow.rowKey;
           var rowIndex = editRow.rowIndex;
-          if (rowKey != null || rowIndex > -1) {
+          if (rowKey != null || (rowIndex != null && rowIndex > -1)) {
+            var localRowIndex = rowIndex;
             // an editable row has to be current also
-            var currentStatus = this._setCurrentRow({ rowKey: rowKey, rowIndex: rowIndex });
+            var currentStatus = this._setCurrentRow({ rowKey: rowKey, rowIndex: rowIndex }, event);
             if (currentStatus instanceof Promise) {
               currentStatus.then(
-                function (value) {
+                (value) => {
                   if (value === Table._CURRENT_ROW_STATUS._UPDATED) {
-                    this._setTableEditable(true, false, columnIdx, true, null).then(
+                    if (rowKey != null) {
+                      localRowIndex = this._getRowIdxForRowKey(rowKey);
+                    }
+                    if (localRowIndex != null) {
+                      this._setActiveRow(localRowIndex, event, true, false, true);
+                      this._scrollRowIntoViewport(localRowIndex, true);
+                    }
+                    this._setTableEditable(true, false, columnIdx, isNext, event).then(
                       () => {
                         this._isEditPending = false;
                         resolve();
@@ -20873,12 +20932,26 @@ var __oj_table_metadata =
                       }
                     );
                   } else if (value === Table._CURRENT_ROW_STATUS._IGNORED) {
-                    this._scrollToRowHelper(editRow, columnIdx, resolve);
+                    this._scrollToRowHelper(editRow, columnIdx, isNext, event, resolve);
+                  } else {
+                    this._isEditPending = false;
+                    resolve();
                   }
-                }.bind(this)
+                },
+                () => {
+                  this._isEditPending = false;
+                  resolve();
+                }
               );
             } else if (currentStatus === Table._CURRENT_ROW_STATUS._UPDATED) {
-              this._setTableEditable(true, false, columnIdx, true, null).then(
+              if (rowKey != null) {
+                localRowIndex = this._getRowIdxForRowKey(rowKey);
+              }
+              if (localRowIndex != null) {
+                this._setActiveRow(localRowIndex, event, true, false, true);
+                this._scrollRowIntoViewport(localRowIndex, true);
+              }
+              this._setTableEditable(true, false, columnIdx, isNext, event).then(
                 () => {
                   this._isEditPending = false;
                   resolve();
@@ -20889,10 +20962,13 @@ var __oj_table_metadata =
                 }
               );
             } else if (currentStatus === Table._CURRENT_ROW_STATUS._IGNORED) {
-              this._scrollToRowHelper(editRow, columnIdx, resolve);
+              this._scrollToRowHelper(editRow, columnIdx, isNext, event, resolve);
+            } else {
+              this._isEditPending = false;
+              resolve();
             }
           } else {
-            this._setTableEditable(false, false, 0, true, null).then(
+            this._setTableEditable(false, isCancel, 0, true, event).then(
               () => {
                 this._isEditPending = false;
                 resolve();
@@ -20912,14 +20988,14 @@ var __oj_table_metadata =
   };
 
   Table.prototype._isPendingEdit = function () {
-    return this._isEditPending || this._deferredEditInfo != null;
+    return this._isEditPending || this._deferredEditInfo != null || this._isApplyingEdit;
   };
 
   /**
    * Helper method to scroll to row and invoke _setEditRow
    * @private
    */
-  Table.prototype._scrollToRowHelper = function (editRow, columnIdx, resolve) {
+  Table.prototype._scrollToRowHelper = function (editRow, columnIdx, isNext, event, resolve) {
     // try to scroll to editRow.rowKey
     const scrollTop = this._scrollTop;
     if (editRow.rowKey != null) {
@@ -20928,7 +21004,7 @@ var __oj_table_metadata =
         validationPromise.then(
           (valid) => {
             if (valid) {
-              this._setupEditRowCallback(editRow, columnIdx, scrollTop);
+              this._setupEditRowCallback(editRow, columnIdx, isNext, scrollTop, event);
               this._syncScrollPosition({ rowKey: editRow.rowKey }, true);
             }
             this._isEditPending = false;
@@ -20945,7 +21021,7 @@ var __oj_table_metadata =
       }
     } else {
       if (!this._syncScrollPosition({ rowIndex: editRow.rowIndex })) {
-        this._setupEditRowCallback(editRow, columnIdx, scrollTop);
+        this._setupEditRowCallback(editRow, columnIdx, isNext, scrollTop, event);
       }
       this._isEditPending = false;
       resolve();
@@ -20955,15 +21031,16 @@ var __oj_table_metadata =
   /**
    * Helper method to setup a scroll callback for honoring an edit row setting.
    */
-  Table.prototype._setupEditRowCallback = function (editRow, columnIdx, scrollTop) {
+  Table.prototype._setupEditRowCallback = function (editRow, columnIdx, isNext, scrollTop, event) {
     // this will be invoked after scroll and fetch is done
     this._editRowCallback = function () {
       // try again after scroll and fetch
-      if (this._scrollTop !== scrollTop && this._deferredEditInfo == null) {
+      var currentScrollTop = this._getLayoutManager().getScroller().scrollTop;
+      if (currentScrollTop !== scrollTop && this._deferredEditInfo == null) {
+        this._deferredEditInfo = { editRow, columnIdx, isNext, event };
         this._queueTask(() => {
           return this._setEditRow();
         });
-        this._deferredEditInfo = { editRow, columnIdx };
       }
     }.bind(this);
   };
@@ -20998,34 +21075,20 @@ var __oj_table_metadata =
    * Set the next or previous row as editable
    * @private
    */
-  Table.prototype._setAdjacentRowEditable = function (columnIdx, origColumnIdx, isNext, event) {
-    var editableRowIdx = this._getEditableRowIdx();
-    return this._setTableEditable(false, false, columnIdx, isNext, event).then(
-      (updateEditable) => {
-        if (updateEditable === false) {
-          return this._handleEditEndRejected(origColumnIdx, editableRowIdx, !isNext);
-        }
-        return this._handleAdjacentEditEndSuccessful(columnIdx, editableRowIdx, isNext, event);
-      },
-      () => {
-        return this._handleEditEndRejected(origColumnIdx, editableRowIdx, !isNext);
-      }
-    );
-  };
-
-  /**
-   * Helper method when attempting to set the adjacent row as editable
-   * @private
-   */
-  Table.prototype._handleAdjacentEditEndSuccessful = function (columnIdx, rowIdx, isNext, event) {
+  Table.prototype._setAdjacentRowEditable = function (focusedRowIdx, columnIdx, isNext, event) {
     var tableBodyRows = this._getTableBodyRows();
-    var newRowIdx = this._findAdjacentEditableRow(rowIdx, tableBodyRows, isNext);
+    var newRowIdx = this._findAdjacentEditableRow(focusedRowIdx, tableBodyRows, isNext);
     if (newRowIdx !== null) {
-      this._setActiveRow(newRowIdx, event, true, false, true);
-      return this._setTableEditable(true, false, columnIdx, isNext, event);
+      var rowKey = this._getRowKeyForRowIdx(newRowIdx);
+      if (rowKey != null) {
+        this._deferredEditInfo = { editRow: { rowKey }, columnIdx, isNext, event };
+      }
+    } else {
+      this._deferredEditInfo = { editRow: { rowKey: null, rowIndex: -1 }, event };
     }
-    this._getTable().focus();
-    return Promise.resolve();
+    this._queueTask(() => {
+      return this._setEditRow();
+    });
   };
 
   /**
@@ -21050,13 +21113,6 @@ var __oj_table_metadata =
     return null;
   };
 
-  /**
-   * @private
-   */
-  Table.prototype._handleEditEndRejected = function (origColumnIdx, rowIdx, isNext) {
-    this._setCellInRowFocus(rowIdx, origColumnIdx, isNext);
-  };
-
   /**
    * Fire editRow property change event
    * @private
@@ -21098,7 +21154,7 @@ var __oj_table_metadata =
         var isLegacyDataSource = this._getData() instanceof oj$1.TableDataSourceAdapter;
         var currentRow = this._getCurrentRow();
         if (currentRow != null) {
-          this._isEditPending = true;
+          this._isApplyingEdit = true;
           const rowElementToBeEdited = this._getRowToBeEdited(currentRow);
           if (
             rowElementToBeEdited &&
@@ -21167,18 +21223,18 @@ var __oj_table_metadata =
                 }
               } else {
                 // No updates so just exit
-                this._isEditPending = false;
+                this._isApplyingEdit = false;
                 resolve();
                 return;
               }
             } catch (err) {
-              this._isEditPending = false;
+              this._isApplyingEdit = false;
               resolve(false);
               return;
             }
             if (!updateEditMode) {
               this._syncActiveElement();
-              this._isEditPending = false;
+              this._isApplyingEdit = false;
               resolve(false);
               return;
             }
@@ -21232,11 +21288,11 @@ var __oj_table_metadata =
                       (updatedItemObj) => {
                         _handleAsyncEdit(updatedItemObj).then(
                           () => {
-                            this._isEditPending = false;
+                            this._isApplyingEdit = false;
                             resolve();
                           },
                           () => {
-                            this._isEditPending = false;
+                            this._isApplyingEdit = false;
                             resolve();
                           }
                         );
@@ -21244,11 +21300,11 @@ var __oj_table_metadata =
                       () => {
                         _handleAsyncEdit().then(
                           () => {
-                            this._isEditPending = false;
+                            this._isApplyingEdit = false;
                             resolve();
                           },
                           () => {
-                            this._isEditPending = false;
+                            this._isApplyingEdit = false;
                             resolve();
                           }
                         );
@@ -21257,11 +21313,11 @@ var __oj_table_metadata =
                   } else {
                     _handleAsyncEdit().then(
                       () => {
-                        this._isEditPending = false;
+                        this._isApplyingEdit = false;
                         resolve();
                       },
                       () => {
-                        this._isEditPending = false;
+                        this._isApplyingEdit = false;
                         resolve();
                       }
                     );
@@ -21273,7 +21329,7 @@ var __oj_table_metadata =
                     this._syncActiveElement();
                   }
                   this._isSkipScrollOnFocus = false;
-                  this._isEditPending = false;
+                  this._isApplyingEdit = false;
                   resolve(false);
                 }
               );
@@ -21287,11 +21343,11 @@ var __oj_table_metadata =
                 (updatedItemObj) => {
                   _handleAsyncEdit(updatedItemObj).then(
                     () => {
-                      this._isEditPending = false;
+                      this._isApplyingEdit = false;
                       resolve();
                     },
                     () => {
-                      this._isEditPending = false;
+                      this._isApplyingEdit = false;
                       resolve();
                     }
                   );
@@ -21299,11 +21355,11 @@ var __oj_table_metadata =
                 () => {
                   _handleAsyncEdit().then(
                     () => {
-                      this._isEditPending = false;
+                      this._isApplyingEdit = false;
                       resolve();
                     },
                     () => {
-                      this._isEditPending = false;
+                      this._isApplyingEdit = false;
                       resolve();
                     }
                   );
@@ -21328,12 +21384,12 @@ var __oj_table_metadata =
                   // set focus on the column in the row
                   this._setCellInRowFocus(editableRowIndex, columnIdx, forwardSearch);
                   this._refreshPrevEditableRow(prevEditableRowKey, null, cancelled).then(() => {
-                    this._isEditPending = false;
+                    this._isApplyingEdit = false;
                     resolve();
                   });
                 },
                 () => {
-                  this._isEditPending = false;
+                  this._isApplyingEdit = false;
                   resolve();
                 }
               );
@@ -21345,11 +21401,11 @@ var __oj_table_metadata =
             this._fireEditRowChangeEvent(newEditRowValue, event);
             this._refreshPrevEditableRow(prevEditableRowKey, null, cancelled).then(
               () => {
-                this._isEditPending = false;
+                this._isApplyingEdit = false;
                 resolve();
               },
               () => {
-                this._isEditPending = false;
+                this._isApplyingEdit = false;
                 resolve();
               }
             );
@@ -21730,21 +21786,15 @@ var __oj_table_metadata =
       var rowElementTabIndex = $(tabbableElementsInRow).index(currentFocusElement);
 
       var maxIndex = Math.max(this._getColumnDefs().length - 1, 0);
-      if (
-        rowElementTabIndex === tabbableElementsInRowCount - 1 &&
-        !event[Table._KEYBOARD_CODES._MODIFIER_SHIFT]
-      ) {
-        this._queueTask(() => {
-          // last tabbable element in row so go to the next row
-          return this._setAdjacentRowEditable(-1, maxIndex, true, event);
-        });
+      var isNext = !event[Table._KEYBOARD_CODES._MODIFIER_SHIFT];
+      if (rowElementTabIndex === tabbableElementsInRowCount - 1 && isNext) {
+        // last tabbable element in row so go to the next row
+        this._setAdjacentRowEditable(focusedRowIdx, -1, isNext, event);
         event.preventDefault();
         event.stopPropagation();
-      } else if (rowElementTabIndex === 0 && event[Table._KEYBOARD_CODES._MODIFIER_SHIFT]) {
-        this._queueTask(() => {
-          // first tabbable element in row and Shift+Tab so go to the previous row
-          return this._setAdjacentRowEditable(maxIndex, 0, false, event);
-        });
+      } else if (rowElementTabIndex === 0 && !isNext) {
+        // first tabbable element in row so go to the previous row
+        this._setAdjacentRowEditable(focusedRowIdx, maxIndex, isNext, event);
         event.preventDefault();
         event.stopPropagation();
       }
@@ -21867,16 +21917,18 @@ var __oj_table_metadata =
       var currentRow = this._getCurrentRow();
       currentRow = currentRow || {};
       var currentRowIdx = currentRow.rowIndex != null ? currentRow.rowIndex : -1;
-      if (currentRowIdx >= 0) {
+      if (currentRowIdx >= 0 && currentRow.rowKey != null) {
         if (this._isTableEditMode()) {
-          this._queueTask(() => {
-            if (!this._hasEditableRow()) {
-              return this._setTableEditable(true, false, -1, true, event);
-            }
+          if (!this._hasEditableRow()) {
+            this._deferredEditInfo = { editRow: { rowKey: currentRow.rowKey }, isNext: true, event };
+            this._queueTask(() => {
+              return this._setEditRow();
+            });
+          } else {
             var columnIdx = this._getElementColumnIdx(event.target);
             var isNext = !event[Table._KEYBOARD_CODES._MODIFIER_SHIFT];
-            return this._setAdjacentRowEditable(columnIdx, columnIdx, isNext, event);
-          });
+            this._setAdjacentRowEditable(currentRowIdx, columnIdx, isNext, event);
+          }
         } else {
           this._fireActionEvent(currentRowIdx, event, false);
           this._setTableActionableMode(true);
@@ -21960,15 +22012,16 @@ var __oj_table_metadata =
   Table.prototype._handleKeydownEsc = function (event) {
     // pressing Esc always returns focus back to the table.
     if (this._hasEditableRow()) {
-      event.preventDefault();
-      event.stopPropagation();
+      this._deferredEditInfo = { editRow: { rowKey: null, rowIndex: -1 }, isCancel: true, event };
       this._queueTask(() => {
-        return this._setTableEditable(false, true, 0, true, event);
+        return this._setEditRow();
       });
-    } else if (this._isTableActionableMode()) {
       event.preventDefault();
       event.stopPropagation();
+    } else if (this._isTableActionableMode()) {
       this._setTableActionableMode(false);
+      event.preventDefault();
+      event.stopPropagation();
     }
     this._getLayoutManager().handleKeyDownEsc();
   };
@@ -22533,28 +22586,26 @@ var __oj_table_metadata =
     addEventDetail
   ) {
     var selected = this.option('selected');
-    var rowKeySet = selected.row;
-    if (rowKeySet) {
-      eventDetail[Table._CONST_KEYS].forEach(function (key) {
-        if (addEventDetail == null || !addEventDetail[Table._CONST_KEYS].has(key)) {
-          // remove rowKey reference from the existing selection state
-          if (!rowKeySet.isAddAll()) {
-            rowKeySet = rowKeySet.delete([key]);
-          } else if (!rowKeySet.has(key)) {
-            rowKeySet = rowKeySet.add([key]);
-          }
-        }
-      });
-      // only update selection if this led to a new selection state
-      if (selected.row !== rowKeySet) {
-        selected = { row: rowKeySet, column: selected.column };
-        // ensure selectionRequired is satisfied
-        if (!this._isSelectionRequiredSatisfied(selected)) {
-          this._selectFirstRowOrColumn();
-        } else {
-          this._setSelected(selected);
+    var rowKeySet = this._getRowKeySetFromSelected(selected);
+    eventDetail[Table._CONST_KEYS].forEach(function (key) {
+      if (addEventDetail == null || !addEventDetail[Table._CONST_KEYS].has(key)) {
+        // remove rowKey reference from the existing selection state
+        if (!rowKeySet.isAddAll()) {
+          rowKeySet = rowKeySet.delete([key]);
+        } else if (!rowKeySet.has(key)) {
+          rowKeySet = rowKeySet.add([key]);
         }
       }
+    });
+    // only update selection if this led to a new selection state
+    if (selected.row !== rowKeySet) {
+      selected = { row: rowKeySet, column: this._getColumnKeySetFromSelected(selected) };
+      // ensure selectionRequired is satisfied
+      if (!this._isSelectionRequiredSatisfied(selected)) {
+        this._selectFirstRowOrColumn();
+      } else {
+        this._setSelected(selected);
+      }
     }
   };
 
@@ -22603,7 +22654,7 @@ var __oj_table_metadata =
    */
   Table.prototype._updateSelectionStylingFromColumnReorder = function () {
     var selected = this.option('selected');
-    var columnKeySet = selected.column;
+    var columnKeySet = this._getColumnKeySetFromSelected(selected);
 
     var headers = this._getTableHeaderColumns();
     headers.forEach(function (header, index) {
@@ -22624,8 +22675,8 @@ var __oj_table_metadata =
     var validateSelectedResult;
     var selection = this.option('selection');
     var selected = this.option('selected');
-    var rowKeySet = selected.row;
-    var columnKeySet = selected.column;
+    var rowKeySet = this._getRowKeySetFromSelected(selected);
+    var columnKeySet = this._getColumnKeySetFromSelected(selected);
     this._validatedSelectedRowKeyData = null;
 
     // generate new selected value from existing selection value if required
@@ -22689,8 +22740,8 @@ var __oj_table_metadata =
       // eslint-disable-next-line no-param-reassign
       selected = this.option('selected');
     }
-    var rowKeySet = selected.row;
-    var columnKeySet = selected.column;
+    var rowKeySet = this._getRowKeySetFromSelected(selected);
+    var columnKeySet = this._getColumnKeySetFromSelected(selected);
     return (
       rowKeySet.isAddAll() ||
       rowKeySet.values().size > 0 ||
@@ -22780,7 +22831,7 @@ var __oj_table_metadata =
    * @private
    */
   Table.prototype._validateSelected = function (selected) {
-    var columnKeySet = selected.column;
+    var columnKeySet = this._getColumnKeySetFromSelected(selected);
     var validatedColumnKeySet = columnKeySet;
     if (!columnKeySet.isAddAll()) {
       var columnKeys = this._getColumnKeys();
@@ -22796,7 +22847,7 @@ var __oj_table_metadata =
       }
     }
 
-    var rowKeySet = selected.row;
+    var rowKeySet = this._getRowKeySetFromSelected(selected);
     var validatedRowKeySet = rowKeySet;
     if (!rowKeySet.isAddAll()) {
       var localRowKeys = this._getLocalRowKeys();
@@ -23140,6 +23191,8 @@ var __oj_table_metadata =
       if (this._selectionSet) {
         // when selection is set, we need to check if selected key sets are equivalent
         if (
+          currentSelected.row == null ||
+          currentSelected.column == null ||
           !DataCollectionUtils.areKeySetsEqual(currentSelected.row, selected.row) ||
           !DataCollectionUtils.areKeySetsEqual(currentSelected.column, selected.column)
         ) {
@@ -23290,12 +23343,14 @@ var __oj_table_metadata =
    * @private
    */
   Table.prototype._getSelectionEquivalent = function (selected) {
-    var selection = this._getRowSelectionFromKeySet(selected.row);
+    var rowKeySet = this._getRowKeySetFromSelected(selected);
+    var selection = this._getRowSelectionFromKeySet(rowKeySet);
     // if there is a row selection, return that selection as it takes precedence over column selection
     if (selection.length > 0 || selection.inverted) {
       return selection;
     }
-    selection = this._getColumnSelectionFromKeySet(selected.column);
+    var columnKeySet = this._getColumnKeySetFromSelected(selected);
+    selection = this._getColumnSelectionFromKeySet(columnKeySet);
     // otherwise, if there is a column selection, return that selection
     if (selection.length > 0 || selection.inverted) {
       return selection;
@@ -23350,8 +23405,8 @@ var __oj_table_metadata =
    * @private
    */
   Table.prototype._applySelected = function (selected) {
-    var rowKeySet = selected.row;
-    var columnKeySet = selected.column;
+    var rowKeySet = this._getRowKeySetFromSelected(selected);
+    var columnKeySet = this._getColumnKeySetFromSelected(selected);
 
     // remove selection state from previously selected rows that are no longer selected
     var prevSelectedRows = this._getSelectedRowIdxs();
@@ -23532,8 +23587,8 @@ var __oj_table_metadata =
   Table.prototype._handleSelectionGesture = function (index, isRow, isMultiSelectGesture) {
     var isSelect;
     var selected = this.option('selected');
-    var rowKeySet = selected.row;
-    var columnKeySet = selected.column;
+    var rowKeySet = this._getRowKeySetFromSelected(selected);
+    var columnKeySet = this._getColumnKeySetFromSelected(selected);
     if (isRow) {
       columnKeySet = columnKeySet.clear();
       const row = this._getTableBodyRow(index);
@@ -23627,8 +23682,8 @@ var __oj_table_metadata =
    */
   Table.prototype._handleSelectAllGesture = function () {
     var selected = this.option('selected');
-    var rowKeySet = selected.row;
-    var columnKeySet = selected.column;
+    var rowKeySet = this._getRowKeySetFromSelected(selected);
+    var columnKeySet = this._getColumnKeySetFromSelected(selected);
     columnKeySet = columnKeySet.clear();
     if (rowKeySet.isAddAll()) {
       rowKeySet = new ojkeyset.KeySetImpl();
@@ -23685,8 +23740,8 @@ var __oj_table_metadata =
    */
   Table.prototype._selectRange = function (firstSelectedIndex, lastSelectedIndex, isRow) {
     var selected = this.option('selected');
-    var rowKeySet = selected.row;
-    var columnKeySet = selected.column;
+    var rowKeySet = this._getRowKeySetFromSelected(selected);
+    var columnKeySet = this._getColumnKeySetFromSelected(selected);
 
     var i;
     if (isRow) {
@@ -23818,10 +23873,11 @@ var __oj_table_metadata =
   Table.prototype._clearSelectedRows = function () {
     this._selectionAnchorIdx = null;
     this._lastSelectedRowIdx = null;
-    var rowKeySet = this.option('selected.row');
+    var selected = this.options.selected;
+    var rowKeySet = this._getRowKeySetFromSelected(selected);
     var newRowKeySet = rowKeySet.clear();
     if (newRowKeySet !== rowKeySet) {
-      var selected = { row: newRowKeySet, column: this.option('selected.column') };
+      selected = { row: newRowKeySet, column: this._getColumnKeySetFromSelected(selected) };
       this._setSelected(selected);
     }
   };
@@ -23849,7 +23905,7 @@ var __oj_table_metadata =
       if (event.detail.value.isAddAll()) {
         this._setSelected({ row: event.detail.value, column: new ojkeyset.KeySetImpl() }, false, true);
       } else {
-        let rowSelectedKeySet = this.option('selected').row;
+        let rowSelectedKeySet = this._getRowKeySetFromSelected(this.options.selected);
         // header selector
         if (event.target.rowKey == null) {
           this._setSelected({ row: new ojkeyset.KeySetImpl(), column: new ojkeyset.KeySetImpl() }, false, true);
@@ -23916,6 +23972,20 @@ var __oj_table_metadata =
     }
   };
 
+  /**
+   * Returns a valid row key set from a 'selected' object
+   */
+  Table.prototype._getRowKeySetFromSelected = function (selected) {
+    return selected.row || new ojkeyset.KeySetImpl();
+  };
+
+  /**
+   * Returns a valid column key set from a 'selected' object
+   */
+  Table.prototype._getColumnKeySetFromSelected = function (selected) {
+    return selected.column || new ojkeyset.KeySetImpl();
+  };
+
   /**
    * @ojcomponent oj.ojTable
    * @augments oj.baseComponent
@@ -26814,15 +26884,11 @@ var __oj_table_metadata =
         this._syncScrollPosition(value);
       });
     } else if (key === 'editRow') {
+      this._deferredEditInfo = { editRow: value, isNext: true };
       this._queueTask(() => {
-        if (value != null && (value.rowKey != null || value.rowIndex > -1)) {
-          // clear the pending focusout editkey value if a row is becoming editable
-          this._focusoutEditKey = null;
-        }
         // setEditRow will update with all props within value
         return this._setEditRow();
       });
-      this._deferredEditInfo = { editRow: value };
     } else if (key === 'scrollPolicyOptions' && flags != null) {
       this._superApply(arguments);
       if (this._isStickyLayoutEnabled()) {