@oracle/oraclejet 10.0.3 → 10.0.7

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

@@ -63,11 +63,42 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojeventtarget'], function (oj, jquery,
      */
 
     /**
-     * @inheritdoc
+     * Get an AsyncIterable object for iterating the data.
+     * <p>
+     * AsyncIterable contains a Symbol.asyncIterator method that returns an AsyncIterator.
+     * AsyncIterator contains a “next” method for fetching the next block of data.
+     * </p><p>
+     * The "next" method returns a promise that resolves to an object, which contains a "value" property for the data and a "done" property
+     * that is set to true when there is no more data to be fetched.  The "done" property should be set to true only if there is no "value"
+     * in the result.  Note that "done" only reflects whether the iterator is done at the time "next" is called.  Future calls to "next"
+     * may or may not return more rows for a mutable data source.
+     * </p>
+     * <p>
+     * Please see the <a href="DataProvider.html#custom-implementations-section">DataProvider documentation</a> for
+     * more information on custom implementations.
+     * </p>
+     *
+     * @param {FetchListParameters=} params fetch parameters
+     * @return {AsyncIterable.<FetchListResult>} AsyncIterable with {@link FetchListResult}
+     * @see {@link https://github.com/tc39/proposal-async-iteration} for further information on AsyncIterable.
+     * @export
+     * @expose
      * @memberof PagingDataProviderView
      * @instance
      * @method
      * @name fetchFirst
+     * @ojsignature {target: "Type",
+     *               value: "(parameters?: FetchListParameters<D>): AsyncIterable<FetchListResult<K, D>>"}
+     * @ojtsexample <caption>Get an asyncIterator and then fetch first block of data by executing next() on the iterator. Subsequent blocks can be fetched by executing next() again.</caption>
+     * let asyncIterator = dataprovider.fetchFirst(options)[Symbol.asyncIterator]();
+     * let result = await asyncIterator.next();
+     * let value = result.value;
+     * let data = value.data;
+     * let keys = value.metadata.map(function(val) {
+     *   return val.key;
+     * });
+     * // true or false for done
+     * let done = result.done;
      */
 
     /**

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

@@ -5,7 +5,7 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['ojs/ojeditablevalue', 'ojs/ojlistview', 'ojs/ojpopupcore', 'ojs/ojinputtext', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojdomutils', 'ojs/ojlogger', 'ojs/ojconfig', 'ojs/ojfocusutils', 'ojs/ojkeyset', 'ojs/ojhtmlutils', 'ojs/ojcomponentcore', 'ojs/ojthemeutils', 'ojs/ojcachingdataprovider', 'ojs/ojlistdataproviderview', 'ojs/ojtreedataproviderview', 'ojs/ojdataprovider', 'ojs/ojtimerutils', 'ojs/ojcustomelement-utils'], function (ojeditablevalue, ojlistview, ojpopupcore, ojinputtext, oj$1, $, Context, DomUtils, Logger, Config, FocusUtils, ojkeyset, HtmlUtils, Components, ThemeUtils, CachingDataProvider, ListDataProviderView, TreeDataProviderView, ojdataprovider, TimerUtils, ojcustomelementUtils) { 'use strict';
+define(['ojs/ojeditablevalue', 'ojs/ojlistview', 'ojs/ojpopupcore', 'ojs/ojinputtext', 'ojs/ojhighlighttext', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojdomutils', 'ojs/ojlogger', 'ojs/ojconfig', 'ojs/ojfocusutils', 'ojs/ojkeyset', 'ojs/ojcomponentcore', 'ojs/ojthemeutils', 'ojs/ojcachingdataprovider', 'ojs/ojlistdataproviderview', 'ojs/ojtreedataproviderview', 'ojs/ojdataprovider', 'ojs/ojtimerutils', 'ojs/ojcustomelement-utils'], function (ojeditablevalue, ojlistview, ojpopupcore, ojinputtext, ojhighlighttext, oj$1, $, Context, DomUtils, Logger, Config, FocusUtils, ojkeyset, Components, ThemeUtils, CachingDataProvider, ListDataProviderView, TreeDataProviderView, ojdataprovider, TimerUtils, ojcustomelementUtils) { 'use strict';
 
   oj$1 = oj$1 && Object.prototype.hasOwnProperty.call(oj$1, 'default') ? oj$1['default'] : oj$1;
   $ = $ && Object.prototype.hasOwnProperty.call($, 'default') ? $['default'] : $;
@@ -1265,21 +1265,6 @@ var __oj_select_single_metadata =
   //   return wrapper;
   // };
 
-  LovDropdown._highlighter = function (unhighlightedText, searchText) {
-    if (searchText && searchText.length > 0) {
-      // Escape the search text to use it for RegExp
-      // JET-34448 - LOV should escape search text used for highlighting
-      var escSearchText = LovDropdown._escapeRegExp(searchText);
-      return unhighlightedText.replace(new RegExp(escSearchText, 'gi'),
-        '<span class="oj-listbox-highlighter">$&</span>');
-    }
-    return unhighlightedText;
-  };
-
-  LovDropdown._escapeRegExp = function (text) {
-    return text.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&');
-  };
-
   LovDropdown.prototype._defaultItemRenderer = function (listViewItemContext) {
     // TODO: Can/should we expect to write directly to the <li> when using an item template or
     // collection template?
@@ -1298,14 +1283,20 @@ var __oj_select_single_metadata =
     // only highlight matches for leaf nodes when data is hierarchical
     // the leaf property will be absent for flat data
     var isParent = listViewItemContext.leaf === false;
-    var str = isParent ?
-      formatted :
-      LovDropdown._highlighter(formatted, this._collectionContext.searchText);
-    var nodes = HtmlUtils.stringToNodeArray('<span>' + str + '</span>');
-    for (var i = 0; i < nodes.length; i++) {
-      // label.appendChild(nodes[i]);
-      li.appendChild(nodes[i]);
+    // JET-43702 - Special characters in oj-select-single dropdown are not escaped
+    // set text content of node or use oj-highlight-text so that displayed text is correctly escaped
+    var childNode;
+    if (isParent) {
+      // add text content directly
+      childNode = document.createElement('span');
+      $(childNode).text(formatted);
+    } else {
+      // create oj-highlight-text
+      childNode = document.createElement('oj-highlight-text');
+      childNode.setAttribute('text', formatted);
+      childNode.setAttribute('match-text', this._collectionContext.searchText);
     }
+    li.appendChild(childNode);
 
     // li.appendChild(label);
     // return li;

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

@@ -479,7 +479,7 @@ define(['exports', 'ojs/ojvcomponent-element', 'ojs/ojdatacollection-common', 'o
         _renderInitialSkeletons(count, shouldScroll) {
             if (shouldScroll) {
                 const scroller = this._getScroller();
-                if (scroller != null) {
+                if (scroller != null && scroller === this.root) {
                     scroller.scrollTop = 0;
                 }
             }
@@ -747,7 +747,7 @@ define(['exports', 'ojs/ojvcomponent-element', 'ojs/ojdatacollection-common', 'o
         }
         scrollListener() {
             var self = this;
-            if (!this._ticking) {
+            if (this.getData() != null && !this._ticking) {
                 window.requestAnimationFrame(function () {
                     self._updateScrollPosition();
                     self._ticking = false;

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

@@ -2361,8 +2361,6 @@ var __oj_table_metadata =
     if (rows.length === 0 && tableBodyRows.length === 0) {
       this._showNoDataMessage();
     } else {
-      var tableBodyDocFrag;
-
       // for the pre-fetching case, we'll render items during idle cycles
       // don't do it when the scroll is caused by handling scroll position
       if (startIndex > 0 && this._isOverflow() && !this._fetchBySyncScroll) {
@@ -2374,6 +2372,8 @@ var __oj_table_metadata =
             resultObject.isMouseWheel);
         }.bind(this));
       }
+      var layoutManager = this._getLayoutManager();
+      var tableBodyDocFrag = document.createDocumentFragment();
 
       var rowsCount = rows.length;
       if (this._animateOnFetch && this._IsCustomElement()) {
@@ -2382,20 +2382,25 @@ var __oj_table_metadata =
         var rowIdxArray = [];
         for (i = 0; i < rowsCount; i++) {
           rowIdxArray.push(rows[i].rowIdx);
-          addedTableBodyRows.push(this._addSingleTableBodyRow(rows[i].rowIdx, rows[i].row));
+          addedTableBodyRows.push(
+            this._addSingleTableBodyRow(rows[i].rowIdx, rows[i].row,
+                                        tableBodyDocFrag, startIndex));
         }
+        layoutManager.handleAfterRowsProcessed(tableBodyDocFrag);
+        tableBody.appendChild(tableBodyDocFrag); // @HTMLUpdateOK
+        this._clearCachedDomRowData();
         return this._animateVisibleRows(addedTableBodyRows, rowIdxArray, 'add').then(function () {
-          return this._finalizeBodyRowRendering(addedTableBodyRows);
+          return this._afterRowsRendered(tableBody);
         }.bind(this));
       }
       this._animateOnFetch = false;
       if (!keepVisible) {
         tableBody.style[Table.CSS_PROP._VISIBILITY] = Table.CSS_VAL._HIDDEN;
       }
-      tableBodyDocFrag = document.createDocumentFragment();
       for (i = 0; i < rowsCount; i++) {
         this._renderRow(rows[i], tableBodyDocFrag, startIndex);
       }
+      layoutManager.handleAfterRowsProcessed(tableBodyDocFrag);
       tableBody.appendChild(tableBodyDocFrag); // @HTMLUpdateOK
       return this._afterRowsRendered(tableBody);
     }
@@ -5733,6 +5738,13 @@ var __oj_table_metadata =
   oj.Object.createSubclass(TableLayoutManager, oj.Object, 'TableLayoutManager');
 
 
+  /**
+   * @private
+   */
+  TableLayoutManager.prototype.unregisterListeners = function () {
+    this.unregisterScrollListeners();
+  };
+
   /**
    * @private
    */
@@ -5828,17 +5840,11 @@ var __oj_table_metadata =
         // Do not set to maxScrollTop or we will cause another fetch
         newScrollTop -= 1;
       }
-      // set flag so that scroll() will not cause an scrollPosition update
-      this._table._skipScrollUpdate = true;
       this.getScroller().scrollTop = newScrollTop;
-      $(this.getScroller()).scroll();
     }
 
     if (scrollLeft != null) {
-      // set flag so that scroll() will not cause an scrollPosition update
-      this._table._skipScrollUpdate = true;
-      DomUtils.setScrollLeft(this.getScroller(), scrollLeft);
-      $(this.getScroller()).scroll();
+      this._restoreScrollLeft(scrollLeft);
     }
 
     // cache the final dimensions
@@ -5848,6 +5854,7 @@ var __oj_table_metadata =
 
     this._clearTableUpdates();
     this._enableTableVisibility();
+    this.registerScrollListeners();
   };
 
   /**
@@ -5858,12 +5865,96 @@ var __oj_table_metadata =
   /**
    * @private
    */
-  TableLayoutManager.prototype.handleScrollerScrollLeft = function () { };
+  TableLayoutManager.prototype._handleScrollerScrollLeft = function (scrollLeft) {
+    this._table._scrollLeft = scrollLeft;
+  };
 
   /**
+   * Handle scrollTop on scroller
    * @private
    */
-  TableLayoutManager.prototype.registerScrollListeners = function () { };
+  TableLayoutManager.prototype._handleScrollerScrollTop = function (scrollTop) {
+    // if no domScroller is set, make sure scroll pos busy state is cleared here
+    if (!this._table._domScroller) {
+      this._table._clearScrollPosBusyState();
+    }
+    if (scrollTop < 0) {
+      // eslint-disable-next-line no-param-reassign
+      scrollTop = 0;
+    }
+    this._table._scrollTop = scrollTop;
+    // keep track when scrollTop is triggered internally (syncScrollPosition)
+    this._table._scrollY = this._table._skipScrollUpdate ? scrollTop : null;
+
+    // update mobile touch selection affordance if present
+    this._table._moveTableBodyRowTouchSelectionAffordanceTop();
+    this._table._moveTableBodyRowTouchSelectionAffordanceBottom();
+  };
+
+  /**
+   * @private
+   */
+  TableLayoutManager.prototype.registerScrollListeners = function () {
+    var scroller = this.getScroller();
+    if (scroller != null) {
+      // if width or height is defined then we can have scrollbars so register scroll event listeners
+      if (this._scrollEventListener == null) {
+        this._scrollEventListener = (function (event) {
+          var newScrollLeft = this._table._getElementScrollLeft(event.target);
+          var newScrollTop = event.target.scrollTop;
+          if (newScrollLeft === this._table._scrollLeft && newScrollTop === this._table._scrollTop) {
+            // discard bogus scroll event
+            return;
+          }
+
+          this._handleScrollerScrollLeft(newScrollLeft);
+          this._handleScrollerScrollTop(newScrollTop);
+
+          // do not update scrollPosition if we are already adjusting
+          if (this._table._isScrollPositionAdjusted()) {
+            return;
+          }
+
+          if (!this._table._skipScrollUpdate && !this._ticking) {
+            window.requestAnimationFrame(function () {
+              // scrollPosition could have been adjusted or a new value is set while waiting for animation frame
+              if (!this._table._isScrollPositionAdjusted() && !this._table._skipScrollUpdate) {
+                this._table.option('scrollPosition', this._table._getCurrentScrollPosition(), {
+                  _context: {
+                    originalEvent: event,
+                    internalSet: true
+                  }
+                });
+              }
+              this._ticking = false;
+            }.bind(this));
+            this._ticking = true;
+          }
+          this._table._skipScrollUpdate = false;
+        }.bind(this));
+      }
+      // remove the event listener before adding to make sure only one is active at a time
+      scroller.removeEventListener('scroll', this._scrollEventListener);
+      scroller.addEventListener('scroll', this._scrollEventListener, false);
+    }
+  };
+
+  /**
+   * @private
+   */
+  TableLayoutManager.prototype.unregisterScrollListeners = function () {
+    var scroller = this.getScroller();
+    if (scroller != null && this._scrollEventListener != null) {
+      scroller.removeEventListener('scroll', this._scrollEventListener);
+    }
+  };
+
+  /**
+   * @private
+   */
+  TableLayoutManager.prototype._restoreScrollLeft = function (scrollLeft) {
+    DomUtils.setScrollLeft(this.getScroller(), scrollLeft);
+  };
 
   /**
    * @param {Element} cell
@@ -6115,6 +6206,8 @@ var __oj_table_metadata =
    * @private
    */
   TableLayoutManager.prototype._removeTableDimensionsStyling = function () {
+    this.unregisterScrollListeners();
+
     var tableElem = this._table._getTable();
     var tableHeader = this._table._getTableHeader();
     var tableHeaderRow = this._table._getTableHeaderRow();
@@ -6441,7 +6534,8 @@ var __oj_table_metadata =
   /**
    * @private
    */
-  TableLegacyLayoutManager.prototype.handleScrollerScrollLeft = function (scrollLeft) {
+  TableLegacyLayoutManager.prototype._handleScrollerScrollLeft = function (scrollLeft) {
+    TableLegacyLayoutManager.superclass._handleScrollerScrollLeft.call(this, scrollLeft);
     var tableHeaderRow = this._table._getTableHeaderRow();
     if (tableHeaderRow) {
       DomUtils.setScrollLeft(tableHeaderRow.parentNode, scrollLeft);
@@ -6456,12 +6550,30 @@ var __oj_table_metadata =
    * @private
    */
   TableLegacyLayoutManager.prototype.registerScrollListeners = function () {
+    TableLegacyLayoutManager.superclass.registerScrollListeners.call(this);
+
     // although header region does not contain scrollbars, browser may auto-scroll when contents gain focus
     var tableHeaderRow = this._table._getTableHeaderRow();
     if (tableHeaderRow != null) {
       var tableHeader = tableHeaderRow.parentNode;
-      if (this._table._headerScrollEventListener == null) {
-        this._table._headerScrollEventListener = (function (event) {
+      if (this._headerScrollEventListener == null) {
+        this._headerScrollEventListener = (function (event) {
+          var scrollLeft = this._table._getElementScrollLeft(event.target);
+          if (this._table._scrollLeft !== scrollLeft) {
+            this._table._setScrollX(scrollLeft);
+          }
+        }.bind(this));
+      }
+      // remove the event listener before adding to make sure only one is active at a time
+      tableHeader.removeEventListener('scroll', this._headerScrollEventListener);
+      tableHeader.addEventListener('scroll', this._headerScrollEventListener, false);
+    }
+    // although footer region does not contain scrollbars, browser may auto-scroll when contents gain focus
+    var tableFooterRow = this._table._getTableFooterRow();
+    if (tableFooterRow != null) {
+      var tableFooter = tableFooterRow.parentNode;
+      if (this._footerScrollEventListener == null) {
+        this._footerScrollEventListener = (function (event) {
           var scrollLeft = this._table._getElementScrollLeft(event.target);
           if (this._table._scrollLeft !== scrollLeft) {
             this._table._setScrollX(scrollLeft);
@@ -6469,8 +6581,42 @@ var __oj_table_metadata =
         }.bind(this));
       }
       // remove the event listener before adding to make sure only one is active at a time
-      tableHeader.removeEventListener('scroll', this._table._headerScrollEventListener);
-      tableHeader.addEventListener('scroll', this._table._headerScrollEventListener, false);
+      tableFooter.removeEventListener('scroll', this._footerScrollEventListener);
+      tableFooter.addEventListener('scroll', this._footerScrollEventListener, false);
+    }
+  };
+
+  /**
+   * @private
+   */
+  TableLegacyLayoutManager.prototype.unregisterScrollListeners = function () {
+    TableLegacyLayoutManager.superclass.unregisterScrollListeners.call(this);
+
+    var tableHeaderRow = this._table._getTableHeaderRow();
+    if (tableHeaderRow != null && this._headerScrollEventListener != null) {
+      var tableHeader = tableHeaderRow.parentNode;
+      tableHeader.removeEventListener('scroll', this._headerScrollEventListener);
+    }
+
+    var tableFooterRow = this._table._getTableFooterRow();
+    if (tableFooterRow != null && this._footerScrollEventListener != null) {
+      var tableFooter = tableFooterRow.parentNode;
+      tableFooter.removeEventListener('scroll', this._footerScrollEventListener);
+    }
+  };
+
+  /**
+   * @private
+   */
+  TableLegacyLayoutManager.prototype._restoreScrollLeft = function (scrollLeft) {
+    DomUtils.setScrollLeft(this.getScroller(), scrollLeft);
+    var tableHeaderRow = this._table._getTableHeaderRow();
+    if (tableHeaderRow) {
+      DomUtils.setScrollLeft(tableHeaderRow.parentNode, scrollLeft);
+    }
+    var tableFooterRow = this._table._getTableFooterRow();
+    if (tableFooterRow) {
+      DomUtils.setScrollLeft(tableFooterRow.parentNode, scrollLeft);
     }
   };
 
@@ -6519,17 +6665,20 @@ var __oj_table_metadata =
     var columns = this._table._getColumnDefs();
     var columnsCount = columns.length;
 
-    var tableBodyCell;
     if (!this._frozenWidthRows) {
       this._frozenWidthRows = [];
     }
 
     var minWidths = [];
     for (var i = 0; i < columnsCount; i++) {
-      tableBodyCell = this._table._getTableBodyCell(0, i, null);
-      var minWidth = parseFloat(tableBodyCell.style[Table.CSS_PROP._MIN_WIDTH]);
-      if (!isNaN(minWidth)) {
-        minWidths.push(minWidth);
+      var tableBodyCell = this._table._getTableBodyCell(0, i, null);
+      if (tableBodyCell != null) {
+        var minWidth = parseFloat(tableBodyCell.style[Table.CSS_PROP._MIN_WIDTH]);
+        if (!isNaN(minWidth)) {
+          minWidths.push(minWidth);
+        } else {
+          minWidths.push(null);
+        }
       } else {
         minWidths.push(null);
       }
@@ -8007,7 +8156,8 @@ var __oj_table_metadata =
           }
           return undefined;
         }
-        this._getLayoutManager().notifyTableUpdate(Table._UPDATE._ROWS_ADDED);
+        var layoutManager = this._getLayoutManager();
+        layoutManager.notifyTableUpdate(Table._UPDATE._ROWS_ADDED);
 
         // see if we should batch add
         // only batch if we are adding a block of contiguous rows
@@ -8016,6 +8166,9 @@ var __oj_table_metadata =
         var rowIdxArray = [];
         var i;
         var rowsCount;
+        var tableBodyDocFrag;
+        var tableBodyRowBefore;
+        var tableBody = this._getTableBody();
 
         if (rows.length > 1) {
           rowsCount = rows.length;
@@ -8030,8 +8183,7 @@ var __oj_table_metadata =
           }
 
           if (isContiguous) {
-            var tableBody = this._getTableBody();
-            var tableBodyDocFrag = document.createDocumentFragment();
+            tableBodyDocFrag = document.createDocumentFragment();
             rowsCount = rows.length;
             for (i = 0; i < rowsCount; i++) {
               addedTableBodyRows.push(this._addSingleTableBodyRow(rows[i].rowIdx,
@@ -8039,18 +8191,13 @@ var __oj_table_metadata =
                                                                   tableBodyDocFrag,
                                                                   rows[0].rowIdx));
             }
-            if (rows[0].rowIdx === 0) {
-              tableBody.insertBefore(tableBodyDocFrag, tableBody.firstChild); // @HTMLUpdateOK
+            layoutManager.handleAfterRowsProcessed(tableBodyDocFrag);
+            tableBodyRowBefore = this._getTableBodyRow(rows[0].rowIdx);
+            if (tableBodyRowBefore != null) {
+              tableBody.insertBefore(tableBodyDocFrag, tableBodyRowBefore);// @HTMLUpdateOK
             } else {
-              var tableBodyRowBefore = this._getTableBodyRow(rows[0].rowIdx);
-              if (tableBodyRowBefore != null) {
-                tableBody.insertBefore(tableBodyDocFrag, tableBodyRowBefore);// @HTMLUpdateOK
-              } else {
-                tableBody.appendChild(tableBodyDocFrag, null);// @HTMLUpdateOK
-              }
+              tableBody.appendChild(tableBodyDocFrag, null);// @HTMLUpdateOK
             }
-            this._clearCachedDomRowData();
-            ojcomponentcore.subtreeAttached(tableBody);
             batchAdd = true;
           }
         }
@@ -8058,7 +8205,17 @@ var __oj_table_metadata =
         if (!batchAdd) {
           rowsCount = rows.length;
           for (i = 0; i < rowsCount; i++) {
-            addedTableBodyRows.push(this._addSingleTableBodyRow(rows[i].rowIdx, rows[i].row));
+            var rowIndex = rows[i].rowIdx;
+            tableBodyDocFrag = document.createDocumentFragment();
+            addedTableBodyRows.push(this._addSingleTableBodyRow(rowIndex, rows[i].row,
+                                                                tableBodyDocFrag, rowIndex));
+            layoutManager.handleAfterRowsProcessed(tableBodyDocFrag);
+            tableBodyRowBefore = this._getTableBodyRow(rowIndex);
+            if (tableBodyRowBefore != null) {
+              tableBody.insertBefore(tableBodyDocFrag, tableBodyRowBefore);// @HTMLUpdateOK
+            } else {
+              tableBody.appendChild(tableBodyDocFrag, null);// @HTMLUpdateOK
+            }
           }
         }
         this._clearCachedDomRowData();
@@ -8071,10 +8228,10 @@ var __oj_table_metadata =
         }
         if (this._IsCustomElement()) {
           return this._animateVisibleRows(addedTableBodyRows, rowIdxArray, 'add').then(function () {
-            return this._finalizeBodyRowRendering(addedTableBodyRows);
+            return this._afterRowsRendered(tableBody);
           }.bind(this));
         }
-        return this._finalizeBodyRowRendering(addedTableBodyRows);
+        return this._afterRowsRendered(tableBody);
       }.bind(this));
     }
   };
@@ -9483,9 +9640,6 @@ var __oj_table_metadata =
    */
   Table.prototype._getTableBodyCell = function (rowIdx, columnIdx, tableBodyRow) {
     var tableBodyCells = this._getTableBodyCells(rowIdx, tableBodyRow);
-    if (!tableBodyCells) {
-      return null;
-    }
 
     if (tableBodyCells.length > columnIdx) {
       return tableBodyCells[columnIdx];
@@ -9503,9 +9657,6 @@ var __oj_table_metadata =
    */
   Table.prototype._getTableBodyLogicalCells = function (rowIdx, tableBodyRow) {
     var tableBodyCells = this._getTableBodyCells(rowIdx, tableBodyRow);
-    if (!tableBodyCells) {
-      return null;
-    }
 
     return this._getColspanLogicalElements(tableBodyCells);
   };
@@ -9521,20 +9672,11 @@ var __oj_table_metadata =
     if (!tableBodyRow) {
       // eslint-disable-next-line no-param-reassign
       tableBodyRow = this._getTableBodyRow(rowIdx);
+      if (!tableBodyRow) {
+        return [];
+      }
     }
-
-    if (!tableBodyRow) {
-      return null;
-    }
-
-    var tableBodyCellElements = this._getTableElementsByClassName(tableBodyRow,
-      Table.CSS_CLASSES._TABLE_DATA_CELL_CLASS);
-
-    if (tableBodyCellElements.length > 0) {
-      return tableBodyCellElements;
-    }
-
-    return null;
+    return this._getTableElementsByClassName(tableBodyRow, Table.CSS_CLASSES._TABLE_DATA_CELL_CLASS);
   };
 
   /**
@@ -12898,9 +13040,6 @@ var __oj_table_metadata =
       return;
     }
     var tableBodyCells = this._getTableBodyCells(rowIdx);
-    if (!tableBodyCells) {
-      return;
-    }
 
     var tableBodyCellsCount = tableBodyCells.length;
     for (var i = 0; i < tableBodyCellsCount; i++) {
@@ -13198,9 +13337,10 @@ var __oj_table_metadata =
    */
   Table.prototype._updateRowStateCellsClass = function (rowIdx, state) {
     var tableBodyCells = this._getTableBodyCells(rowIdx);
-    if (!tableBodyCells) {
+    if (tableBodyCells.length === 0) {
       return;
     }
+
     if (this._isDefaultSelectorEnabled()) {
       var tableBodyRow = this._getTableBodyRow(rowIdx);
       var selectorCell = this._getTableBodySelectorCell(tableBodyRow);
@@ -13905,86 +14045,12 @@ var __oj_table_metadata =
     return result;
   };
 
-  /**
-   * Handle scrollLeft on scroller
-   * @private
-   */
-  Table.prototype._handleScrollerScrollLeft = function (scrollLeft) {
-    this._scrollLeft = scrollLeft;
-    this._getLayoutManager().handleScrollerScrollLeft(scrollLeft);
-  };
-
-  /**
-   * Handle scrollTop on scroller
-   * @private
-   */
-  Table.prototype._handleScrollerScrollTop = function (scrollTop) {
-    // if no domScroller is set, make sure scroll pos busy state is cleared here
-    if (!this._domScroller) {
-      this._clearScrollPosBusyState();
-    }
-    if (scrollTop < 0) {
-      // eslint-disable-next-line no-param-reassign
-      scrollTop = 0;
-    }
-    this._scrollTop = scrollTop;
-    // keep track when scrollTop is triggered internally (syncScrollPosition)
-    this._scrollY = this._skipScrollUpdate ? scrollTop : null;
-
-    // update mobile touch selection affordance if present
-    this._moveTableBodyRowTouchSelectionAffordanceTop();
-    this._moveTableBodyRowTouchSelectionAffordanceBottom();
-  };
-
   /**
    * Register event listeners which need to be registered directly on the DOM element.
    * @private
    */
   Table.prototype._registerDomEventListeners = function () {
-    var layoutManager = this._getLayoutManager();
-    var scroller = layoutManager.getScroller();
-    if (scroller != null) {
-      // if width or height is defined then we can have scrollbars so register scroll event listeners
-      if (this._scrollEventListener == null) {
-        this._scrollEventListener = (function (event) {
-          var newScrollLeft = this._getElementScrollLeft(event.target);
-          var newScrollTop = event.target.scrollTop;
-          if (newScrollLeft === this._scrollLeft && newScrollTop === this._scrollTop) {
-            // discard bogus scroll event
-            return;
-          }
-
-          this._handleScrollerScrollLeft(newScrollLeft);
-          this._handleScrollerScrollTop(newScrollTop);
-
-          // do not update scrollPosition if we are already adjusting
-          if (this._isScrollPositionAdjusted()) {
-            return;
-          }
-
-          if (!this._skipScrollUpdate && !this._ticking) {
-            window.requestAnimationFrame(function () {
-              // scrollPosition could have been adjusted or a new value is set while waiting for animation frame
-              if (!this._isScrollPositionAdjusted() && !this._skipScrollUpdate) {
-                this.option('scrollPosition', this._getCurrentScrollPosition(), {
-                  _context: {
-                    originalEvent: event,
-                    internalSet: true
-                  }
-                });
-              }
-              this._ticking = false;
-            }.bind(this));
-            this._ticking = true;
-          }
-          this._skipScrollUpdate = false;
-        }.bind(this));
-      }
-      // remove the event listener before adding to make sure only one is active at a time
-      scroller.removeEventListener('scroll', this._scrollEventListener);
-      scroller.addEventListener('scroll', this._scrollEventListener, false);
-    }
-    layoutManager.registerScrollListeners();
+    this._getLayoutManager().registerScrollListeners();
   };
 
   /**
@@ -17094,7 +17160,7 @@ var __oj_table_metadata =
    * @private
    */
   TableFixedLayoutManager.prototype._removeTableDimensionsStyling = function () {
-    // no-op for fixed layout
+    this.unregisterScrollListeners();
   };
 
   /**
@@ -20401,6 +20467,9 @@ var __oj_table_metadata =
    * @private
    */
   Table.prototype._clearLayoutManager = function () {
+    if (this._layoutManager != null) {
+      this._layoutManager.unregisterListeners();
+    }
     this._layoutManager = null;
   };