@oracle/oraclejet 11.1.5 → 11.1.6

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

@@ -2550,14 +2550,15 @@ var __oj_table_metadata =
    * Refresh the row at a particular index with the row data
    * @param {number} rowIdx  row index relative to the start of the table
    * @param {Object} row  row and key object
-   * @param {Object} tableBodyRow tr element
-   * @param {Object} docFrag  document fragment
-   * @param {number} docFragStartIdx  document fragment row start index
+   * @param {Object=} tableBodyRow tr element
+   * @param {Object=} docFrag  document fragment
+   * @param {number=} docFragStartIdx  document fragment row start index
+   * @param {boolean=} isRefresh whether this is a specific row refresh
    * @return {Element|null} tableBodyRow  DOM element
    * @private
    */
   Table.prototype._refreshTableBodyRow = function (rowIdx, row, tableBodyRow, docFrag,
-    docFragStartIdx) {
+    docFragStartIdx, isRefresh) {
     var rowRenderer = this._getRowRenderer();
 
     if (isNaN(rowIdx) || rowIdx < 0) {
@@ -2701,11 +2702,8 @@ var __oj_table_metadata =
       }
       this._tableBodyRowDefaultRenderer(rowIdx, row, context);
     }
-    if (this._hasEditableRow() && this._getEditableRowIdx() === rowIdx) {
-      tableBodyRow.classList.add(Table.CSS_CLASSES._TABLE_DATA_ROW_EDIT_CLASS);
-    } else {
-      tableBodyRow.classList.remove(Table.CSS_CLASSES._TABLE_DATA_ROW_EDIT_CLASS);
-    }
+    // immediately apply styling to newly refreshed row when possible
+    this._getLayoutManager().handleRowRefresh(rowIdx, tableBodyRow, isRefresh);
 
     // eslint-disable-next-line no-param-reassign
     tableBodyRow[Table._ROW_ITEM_EXPANDO] = row;
@@ -2814,7 +2812,7 @@ var __oj_table_metadata =
           metadata: rowResults.metadata,
           index: rowIdx,
           key: rowKey
-        });
+        }, null, null, null, true);
 
         // Give the focus back to the table if needed.  currentRow is retained after refresh.
         if (resetFocus) {
@@ -3327,23 +3325,23 @@ var __oj_table_metadata =
    * Returns whether the table refresh is needed based on option change
    * @param {string} key option key
    * @param {Object} value option value
+   * @param {Object} flags object containing additional context (subkey, subproperty, etc...)
    * @return {boolean} true or false
    * @private
    */
-  Table.prototype._isTableRefreshNeeded = function (key, value) {
-    var currentOptions = this._cachedOptions;
+  Table.prototype._isTableRefreshNeeded = function (key, value, flags) {
+    var currentOptions = this.options;
     var refresh;
 
-    if (key === 'contextMenu' &&
-        value === '#' + this._getTableId() + '_contextmenu') {
-      refresh = false;
-    } else if (key === 'columns' && !this._isColumnMetadataUpdated()) {
-      // optimization for columns. Column re-order can change the columns options but we don't need to refresh
-      refresh = false;
-    } else if (key === 'scrollToKey') {
+    if ((key === 'contextMenu' && value === '#' + this._getTableId() + '_contextmenu') ||
+        (key === 'columns' && !this._isColumnMetadataUpdated(value)) ||
+        key === 'scrollToKey' || key === 'scrollPosition' ||
+        key === 'selection' || key === 'selected' || key === 'currentRow' || key === 'editRow' ||
+        (key === 'scrollPolicyOptions' && this._isStickyLayoutEnabled() && flags != null &&
+         (flags.subkey === 'scrollerOffsetTop' || flags.subkey === 'scrollerOffsetBottom' ||
+          flags.subkey === 'scrollerOffsetStart' || flags.subkey === 'scrollerOffsetEnd'))) {
       refresh = false;
-    } else if (key !== 'selection' && key !== 'currentRow' &&
-               !oj.Object.compareValues(value, currentOptions[key])) {
+    } else if (!oj.Object.compareValues(value, currentOptions[key])) {
       if (key === 'verticalGridVisible') {
         this._renderedTableHeaderColumns = false;
       }
@@ -3351,7 +3349,6 @@ var __oj_table_metadata =
     } else {
       refresh = false;
     }
-    this._cachedOptions = $.extend(true, {}, this.options);
 
     return refresh;
   };
@@ -3699,9 +3696,9 @@ var __oj_table_metadata =
    * @return {Array} array of column metadata Objects.
    * @private
    */
-  Table.prototype._getColumnMetadata = function () {
+  Table.prototype._getColumnMetadata = function (columnsOption) {
     // get the columns metadata
-    var columns = this.options.columns;
+    var columns = columnsOption != null ? columnsOption : this.options.columns;
     var columnsDefault = this.options.columnsDefault;
 
     if ((columns.length === 0 ||
@@ -4780,9 +4777,9 @@ var __oj_table_metadata =
    * @return {boolean} true or false
    * @private
    */
-  Table.prototype._isColumnMetadataUpdated = function () {
+  Table.prototype._isColumnMetadataUpdated = function (columnOptions) {
     if (this._columnDefArray != null) {
-      var columnsMetadata = this._getColumnMetadata();
+      var columnsMetadata = this._getColumnMetadata(columnOptions);
       if (this._columnDefArray.length !== columnsMetadata.length) {
         return true;
       }
@@ -6870,6 +6867,18 @@ var __oj_table_metadata =
    */
   TableLayoutManager.prototype.handleFocusout = function () { };
 
+  /**
+   * @private
+   */
+  // eslint-disable-next-line no-unused-vars
+  TableLayoutManager.prototype.handleRowRefresh = function (rowIdx, tableBodyRow, isRefresh) {
+    if (this._table._hasEditableRow() && this._table._getEditableRowIdx() === rowIdx) {
+      tableBodyRow.classList.add(Table.CSS_CLASSES._TABLE_DATA_ROW_EDIT_CLASS);
+    } else {
+      tableBodyRow.classList.remove(Table.CSS_CLASSES._TABLE_DATA_ROW_EDIT_CLASS);
+    }
+  };
+
   /**
    * @private
    */
@@ -8212,7 +8221,6 @@ var __oj_table_metadata =
       this._clearColumnSizingCache();
     } else {
       if (tableUpdates.has(Table._UPDATE._ROWS_ADDED) ||
-          tableUpdates.has(Table._UPDATE._ROW_REFRESH) ||
           tableUpdates.has(Table._UPDATE._DATA_SORT)) {
         this._initializeFrozenColumns();
       }
@@ -8463,7 +8471,7 @@ var __oj_table_metadata =
   /**
    * @private
    */
-  TableStickyLayoutManager.prototype._initializeFrozenColumns = function () {
+  TableStickyLayoutManager.prototype._initializeFrozenColumns = function (tableBodyRow) {
     var i;
     var frozenIndex;
     var frozenStartOffset;
@@ -8481,7 +8489,7 @@ var __oj_table_metadata =
 
     var updateFrozenEdges = false;
     if (this._table._isDefaultSelectorEnabled()) {
-      this._applyFrozenOffset(-1, frozenStartOffset, true);
+      this._applyFrozenOffset(-1, frozenStartOffset, true, tableBodyRow);
       frozenStartOffset += this._selectorColWidth;
       updateFrozenEdges = true;
     }
@@ -8490,7 +8498,7 @@ var __oj_table_metadata =
       updateFrozenEdges = true;
       for (i = 0; i < frozenStartColumns.length; i++) {
         frozenIndex = frozenStartColumns[i];
-        this._applyFrozenOffset(frozenIndex, frozenStartOffset, true);
+        this._applyFrozenOffset(frozenIndex, frozenStartOffset, true, tableBodyRow);
         frozenStartOffset += this._appliedColumnWidths[frozenIndex];
       }
     }
@@ -8500,13 +8508,13 @@ var __oj_table_metadata =
       updateFrozenEdges = true;
       for (i = frozenEndColumns.length - 1; i > -1; i--) {
         frozenIndex = frozenEndColumns[i];
-        this._applyFrozenOffset(frozenIndex, frozenEndOffset, false);
+        this._applyFrozenOffset(frozenIndex, frozenEndOffset, false, tableBodyRow);
         frozenEndOffset += this._appliedColumnWidths[frozenIndex];
       }
     }
 
     if (updateFrozenEdges) {
-      this._updateFrozenEdges(this._scrollLeft, true);
+      this._updateFrozenEdges(this._scrollLeft, true, tableBodyRow);
     }
   };
 
@@ -8541,7 +8549,8 @@ var __oj_table_metadata =
   /**
    * @private
    */
-  TableStickyLayoutManager.prototype._applyFrozenOffset = function (columnIndex, offset, isStart) {
+  TableStickyLayoutManager.prototype._applyFrozenOffset = function (columnIndex, offset, isStart,
+    targetRow) {
     var i;
     var styleProperty;
     var isRTL = (this._table._GetReadingDirection() === 'rtl');
@@ -8552,6 +8561,22 @@ var __oj_table_metadata =
     }
     var styleValue = offset + Table.CSS_VAL._PX;
 
+    // check if only a single row is being refreshed
+    if (targetRow != null) {
+      if (columnIndex === -1) {
+        var targetSelectorCell = this._table._getTableBodySelectorCell(targetRow);
+        if (targetSelectorCell != null) {
+          targetSelectorCell.style[styleProperty] = styleValue;
+        }
+      } else {
+        var targetCell = this._table._getTableBodyCell(null, columnIndex, targetRow);
+        if (targetCell != null) {
+          targetCell.style[styleProperty] = styleValue;
+        }
+      }
+      return;
+    }
+
     var tableBodyRows = this._table._getTableBodyRows();
     if (columnIndex === -1) {
       // update header cell
@@ -8596,7 +8621,7 @@ var __oj_table_metadata =
   /**
    * @private
    */
-  TableStickyLayoutManager.prototype._updateFrozenEdges = function (scrollLeft, isForce) {
+  TableStickyLayoutManager.prototype._updateFrozenEdges = function (scrollLeft, isForce, targetRow) {
     var i;
     var currIndex;
     var startIndex;
@@ -8619,7 +8644,7 @@ var __oj_table_metadata =
         }
       }
     }
-    this._updateFrozenEdge(startIndex, true, isForce);
+    this._updateFrozenEdge(startIndex, true, isForce, targetRow);
 
     // update frozen end edge if present
     var scroller = this.getScroller();
@@ -8642,47 +8667,64 @@ var __oj_table_metadata =
         }
       }
     }
-    this._updateFrozenEdge(endIndex, false, isForce);
+    this._updateFrozenEdge(endIndex, false, isForce, targetRow);
   };
 
   /**
    * @private
    */
-  TableStickyLayoutManager.prototype._updateFrozenEdge = function (columnIndex, isStart, isForce) {
+  TableStickyLayoutManager.prototype._updateFrozenEdge = function (columnIndex, isStart, isForce,
+    targetRow) {
     var appliedEdge = false;
     if (isStart) {
       if (this._frozenStartIndex !== columnIndex) {
         if (this._frozenStartIndex != null) {
-          this._removeFrozenEdge(this._frozenStartIndex);
+          this._removeFrozenEdge(this._frozenStartIndex, targetRow);
         }
         if (columnIndex != null) {
-          this._applyFrozenEdge(columnIndex);
+          this._applyFrozenEdge(columnIndex, targetRow);
           appliedEdge = true;
         }
         this._frozenStartIndex = columnIndex;
       }
     } else if (this._frozenEndIndex !== columnIndex) {
       if (this._frozenEndIndex != null) {
-        this._removeFrozenEdge(this._frozenEndIndex);
+        this._removeFrozenEdge(this._frozenEndIndex, targetRow);
       }
       if (columnIndex != null) {
-        this._applyFrozenEdge(columnIndex);
+        this._applyFrozenEdge(columnIndex, targetRow);
         appliedEdge = true;
       }
       this._frozenEndIndex = columnIndex;
     }
     if (isForce && !appliedEdge) {
-      this._applyFrozenEdge(columnIndex);
+      this._applyFrozenEdge(columnIndex, targetRow);
     }
   };
 
   /**
    * @private
    */
-  TableStickyLayoutManager.prototype._applyFrozenEdge = function (columnIndex) {
+  TableStickyLayoutManager.prototype._applyFrozenEdge = function (columnIndex, targetRow) {
     var i;
     var tableBodyRows = this._table._getTableBodyRows();
 
+    // check if only a single row is being refreshed
+    if (targetRow != null) {
+      if (columnIndex === -1) {
+        var targetSelectorCell = this._table._getTableBodySelectorCell(targetRow);
+        if (targetSelectorCell != null) {
+          targetSelectorCell.classList.add(Table.CSS_CLASSES._TABLE_FROZEN_EDGE);
+        }
+      } else {
+        var targetCell = this._table._getTableBodyCell(null, columnIndex, targetRow);
+        if (targetCell != null) {
+          targetCell.classList.add(Table.CSS_CLASSES._TABLE_FROZEN_EDGE);
+        }
+      }
+      return;
+    }
+
     if (columnIndex === -1) {
       // update header cell
       var headerSelector = this._table._getTableSelectorColumn();
@@ -8726,10 +8768,26 @@ var __oj_table_metadata =
   /**
    * @private
    */
-  TableStickyLayoutManager.prototype._removeFrozenEdge = function (columnIndex) {
+  TableStickyLayoutManager.prototype._removeFrozenEdge = function (columnIndex, targetRow) {
     var i;
     var tableBodyRows = this._table._getTableBodyRows();
 
+    // check if only a single row is being refreshed
+    if (targetRow != null) {
+      if (columnIndex === -1) {
+        var targetSelectorCell = this._table._getTableBodySelectorCell(targetRow);
+        if (targetSelectorCell != null) {
+          targetSelectorCell.classList.remove(Table.CSS_CLASSES._TABLE_FROZEN_EDGE);
+        }
+      } else {
+        var targetCell = this._table._getTableBodyCell(null, columnIndex, targetRow);
+        if (targetCell != null) {
+          targetCell.classList.remove(Table.CSS_CLASSES._TABLE_FROZEN_EDGE);
+        }
+      }
+      return;
+    }
+
     if (columnIndex === -1) {
       // update header cell
       var headerSelector = this._table._getTableSelectorColumn();
@@ -9050,6 +9108,17 @@ var __oj_table_metadata =
     });
   };
 
+  /**
+   * @private
+   */
+  TableStickyLayoutManager.prototype.handleRowRefresh = function (rowIdx, tableBodyRow, isRefresh) {
+    TableStickyLayoutManager.superclass.handleRowRefresh.call(this, rowIdx, tableBodyRow);
+    // apply frozen column states if refreshing a row that was already rendered
+    if (isRefresh) {
+      this._initializeFrozenColumns(tableBodyRow);
+    }
+  };
+
   /**
    * Creates an accessibility-specific child DOM element that contains the
    * current context information for the Table.
@@ -9839,7 +9908,9 @@ var __oj_table_metadata =
    */
   Table.prototype._getRowsFromEventDetailAdd = function (eventDetail) {
     var rowArray = [];
-    var isLoadAll = !this._isLoadMoreOnScroll();
+    var dataprovider = this._getData();
+    var isLoadAll = !this._isLoadMoreOnScroll() ||
+                    DataCollectionUtils.isIterateAfterDoneNotAllowed(dataprovider);
     var initialKeys = this._getLocalRowKeys();
     var initialKeyLength = initialKeys.length;
     // don't add rows if the component is empty and loadMoreOnScroll is set
@@ -9849,7 +9920,6 @@ var __oj_table_metadata =
     }
     var finalRowKeys = DataCollectionUtils.getAddEventKeysResult(initialKeys, eventDetail, isLoadAll);
 
-    var dataprovider = this._getData();
     var eventData = eventDetail[Table._CONST_DATA];
     var eventMetadata = eventDetail[Table._CONST_METADATA];
 
@@ -9985,7 +10055,7 @@ var __oj_table_metadata =
           staleRow[Table._ROW_ITEM_EXPANDO] = rows[i].row;
         }
 
-        var tableBodyRow = this._refreshTableBodyRow(row.rowIdx, row.row);
+        var tableBodyRow = this._refreshTableBodyRow(row.rowIdx, row.row, null, null, null, true);
         if (tableBodyRow) {
           updatedTableBodyRows.push(tableBodyRow);
           rowIdxArray.push(row.rowIdx);
@@ -21001,8 +21071,6 @@ var __oj_table_metadata =
       this._registerTouchEvents();
     }
     this._registerDomEventListeners();
-    // cache the options
-    this._cachedOptions = $.extend(true, {}, this.options);
     this._setEditableRowIdx(null);
 
     DataCollectionUtils.disableDefaultBrowserStyling(this.element[0]);
@@ -21241,11 +21309,48 @@ var __oj_table_metadata =
     this._OpenContextMenu(event, eventType, openOptions);
   };
 
+  /**
+   * Sets multiple options
+   * @param {Object} options the options object
+   * @param {Object} flags additional flags for option
+   * @override
+   * @private
+   */
+  // eslint-disable-next-line no-unused-vars
+  Table.prototype._setOptions = function (options, flags) {
+    var requiresRefresh = false;
+    var requiresDataRefresh = false;
+    var requiresHeaderRefresh = false;
+    var keys = Object.keys(options);
+    for (var i = 0; i < keys.length; i++) {
+      var key = keys[i];
+      var value = options[key];
+      if (this._isTableRefreshNeeded(key, value, flags)) {
+        if (key === 'columns' || (key === 'selectionMode' && value.row !== undefined)) {
+          requiresHeaderRefresh = true;
+        } else if (key === 'data') {
+          requiresDataRefresh = true;
+        }
+        requiresRefresh = true;
+      }
+    }
+    this._superApply(arguments);
+    if (requiresRefresh) {
+      if (requiresHeaderRefresh) {
+        this._clearCachedMetadata();
+        this._refreshTableHeader();
+      } if (requiresDataRefresh) {
+        this._beforeDataRefresh();
+      }
+      this._refresh();
+    }
+  };
+
   /**
    * @override
    * @private
    */
-  Table.prototype._setOption = function (key, value, subKeyValue) {
+  Table.prototype._setOption = function (key, value, flags) {
     if (key === 'selection') {
       this._selectionSet = true;
       // update row index/key values in the 'selection' option
@@ -21272,31 +21377,19 @@ var __oj_table_metadata =
     } else if (key === 'editRow') {
       // setEditRow will update with all props within value
       this._setEditRow(value);
-    } else if (this._isStickyLayoutEnabled() && key === 'scrollPolicyOptions' &&
-               subKeyValue != null && (subKeyValue.subkey === 'scrollerOffsetTop' ||
-               subKeyValue.subkey === 'scrollerOffsetBottom' ||
-               subKeyValue.subkey === 'scrollerOffsetStart' ||
-               subKeyValue.subkey === 'scrollerOffsetEnd')) {
+    } else if (key === 'scrollPolicyOptions' && flags != null) {
       this._superApply(arguments);
-      if (subKeyValue.subkey === 'scrollerOffsetTop' ||
-          subKeyValue.subkey === 'scrollerOffsetBottom') {
-        this._styleTableContainer(this._getTableContainer());
-      } else {
-        this._getLayoutManager()._initializeFrozenColumns();
+      if (this._isStickyLayoutEnabled()) {
+        if (flags.subkey === 'scrollerOffsetTop' ||
+            flags.subkey === 'scrollerOffsetBottom') {
+          this._styleTableContainer(this._getTableContainer());
+        } else if (flags.subkey === 'scrollerOffsetStart' ||
+                   flags.subkey === 'scrollerOffsetEnd') {
+          this._getLayoutManager()._initializeFrozenColumns();
+        }
       }
     } else {
       this._superApply(arguments);
-      var shouldRefresh = this._isTableRefreshNeeded(key, value);
-      if (shouldRefresh) {
-        if (key === 'columns' ||
-          (key === 'selectionMode' && value.row !== undefined)) {
-          this._clearCachedMetadata();
-          this._refreshTableHeader();
-        } else if (key === 'data') {
-          this._beforeDataRefresh();
-        }
-        this._refresh();
-      }
     }
   };
 

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

@@ -1172,11 +1172,7 @@ var __oj_checkboxset_metadata =
         }
 
         // if readonly, set tabindex on the wrapper
-        if (this.options.readOnly) {
-          let domElem = this.element[0];
-          let wrapperDom = domElem.querySelector('.oj-checkboxset-wrapper');
-          wrapperDom.setAttribute('tabindex', this._externalTabIndex);
-        }
+        this._updateReadonlyState();
         this._on(this._events);
         this._setup();
       },
@@ -2057,6 +2053,43 @@ var __oj_checkboxset_metadata =
 
         this.$checkboxes._ojRadioCheckbox('refreshDisabled'); // re-render disabled
       },
+
+      /**
+       * Updates the component's state based on whether or not it is in the readonly
+       * state.
+       * @private
+       * @memberof! oj.ojCheckboxSet
+       */
+       _updateReadonlyState: function () {
+        const wrapperDom = this.element[0].querySelector('.oj-checkboxset-wrapper');
+        if (this.options.readOnly) {
+          wrapperDom.setAttribute('tabindex', this._externalTabIndex);
+          this.element.addClass('oj-read-only');
+
+          // JET-49297 - reassess accessibility implementation of 'readonly' checkboxset
+          // In readonly mode, we will not have any checkbox input in the visible DOM. Thus,
+          // in this state it will just be showing generic text based on the value selected.
+          // So, we need to clean up the role along with the aria-labelledby attributes we added
+          // for that role to make things accessible.
+          this.element.removeAttr('role').removeAttr('aria-labelledby');
+          return;
+        }
+
+        // remove tabindex and role
+        wrapperDom.removeAttribute('tabindex');
+        this.element.removeClass('oj-read-only');
+
+        // JET-49297 - reassess accessibility implementation of 'readonly' checkboxset
+        // add back the role and aria attributes removed before
+        this.element.attr('role', 'group');
+        this._labelledByUpdatedForSet(
+          this.widget()[0].id,
+          null,
+          this.options.labelledBy,
+          this.widget()
+        );
+      },
+
   /**
    * @override
    * @private
@@ -2072,17 +2105,8 @@ var __oj_checkboxset_metadata =
             break;
           case 'readOnly':
             this.options.readOnly = !!value;
-            var wrapperDom = this.element[0].querySelector('.oj-checkboxset-wrapper');
             var val = this.options.value;
-            if (this.options.readOnly) {
-              wrapperDom.setAttribute('tabindex', this._externalTabIndex);
-              this.element.addClass('oj-read-only');
-            } else {
-              // remove tabindex and role
-              wrapperDom.removeAttribute('tabindex');
-              // remove oj-read-only class
-              this.element.removeClass('oj-read-only');
-            }
+            this._updateReadonlyState();
             this._ResetComponentState();
             // when toggle readonly to false, we need to check the initial set values.
             if (val != null) {

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

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '11.1.5',
+  version: '11.1.6',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2022-01-10_12-22-23',
+  revision: '2022-02-28_13-00-53',
 
   // 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

@@ -805,6 +805,19 @@ DataCollectionUtils.isElementInScrollerBounds = function (elem, scroller) {
   return (bounds.top >= top && bounds.bottom <= bottom);
 };
 
+/**
+ * Check for SDP-specific internal flag - not a public API
+ */
+DataCollectionUtils.isIterateAfterDoneNotAllowed = function (dataProvider) {
+  if (dataProvider && dataProvider.getCapability) {
+    var capability = dataProvider.getCapability('fetchFirst');
+    if (capability && capability.iterateAfterDone === 'notAllowed') {
+      return true;
+    }
+  }
+  return false;
+};
+
 /**
  * Whether browser supports requestIdleCallback
  */
@@ -826,6 +839,7 @@ const getAddEventKeysResult = DataCollectionUtils.getAddEventKeysResult;
 const getDefaultScrollBarWidth = DataCollectionUtils.getDefaultScrollBarWidth;
 const getFocusableElementsIncludingDisabled = DataCollectionUtils.getFocusableElementsIncludingDisabled;
 const isElementOrAncestorFocusable = DataCollectionUtils.isElementOrAncestorFocusable;
+const isIterateAfterDoneNotAllowed = DataCollectionUtils.isIterateAfterDoneNotAllowed;
 const getFocusableElementsInNode = DataCollectionUtils.getFocusableElementsInNode;
 const getLogicalChildPopup = DataCollectionUtils.getLogicalChildPopup;
 const getNoJQFocusHandlers = DataCollectionUtils.getNoJQFocusHandlers;
@@ -854,4 +868,4 @@ const calculateOffsetTop = DataCollectionUtils.calculateOffsetTop;
 const isElementInScrollerBounds = DataCollectionUtils.isElementInScrollerBounds;
 const isRequestIdleCallbackSupported = DataCollectionUtils.isRequestIdleCallbackSupported;
 
-export { CHECKVIEWPORT_THRESHOLD, KEYBOARD_KEYS, applyMergedInlineStyles, applyStyleObj, areKeySetsEqual, calculateOffsetTop, containsKey, convertStringToStyleObj, disableAllFocusableElements, disableDefaultBrowserStyling, disableElement, enableAllFocusableElements, getAddEventKeysResult, getDefaultScrollBarWidth, getFocusableElementsInNode, getFocusableElementsIncludingDisabled, getLogicalChildPopup, getNoJQFocusHandlers, handleActionablePrevTab, handleActionableTab, isArrowDownKeyEvent, isArrowLeftKeyEvent, isArrowRightKeyEvent, isArrowUpKeyEvent, isClickthroughDisabled, isElementInScrollerBounds, isElementOrAncestorFocusable, isEndKeyEvent, isEnterKeyEvent, isEscapeKeyEvent, isEventClickthroughDisabled, isF2KeyEvent, isFromDefaultSelector, isHomeKeyEvent, isLetterAKeyEvent, isMobileTouchDevice, isNumberFiveKeyEvent, isRequestIdleCallbackSupported, isSpaceBarKeyEvent, isTabKeyEvent };
+export { CHECKVIEWPORT_THRESHOLD, KEYBOARD_KEYS, applyMergedInlineStyles, applyStyleObj, areKeySetsEqual, calculateOffsetTop, containsKey, convertStringToStyleObj, disableAllFocusableElements, disableDefaultBrowserStyling, disableElement, enableAllFocusableElements, getAddEventKeysResult, getDefaultScrollBarWidth, getFocusableElementsInNode, getFocusableElementsIncludingDisabled, getLogicalChildPopup, getNoJQFocusHandlers, handleActionablePrevTab, handleActionableTab, isArrowDownKeyEvent, isArrowLeftKeyEvent, isArrowRightKeyEvent, isArrowUpKeyEvent, isClickthroughDisabled, isElementInScrollerBounds, isElementOrAncestorFocusable, isEndKeyEvent, isEnterKeyEvent, isEscapeKeyEvent, isEventClickthroughDisabled, isF2KeyEvent, isFromDefaultSelector, isHomeKeyEvent, isIterateAfterDoneNotAllowed, isLetterAKeyEvent, isMobileTouchDevice, isNumberFiveKeyEvent, isRequestIdleCallbackSupported, isSpaceBarKeyEvent, isTabKeyEvent };

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

@@ -11,7 +11,7 @@ import Context from 'ojs/ojcontext';
 import { __getTemplateEngine } from 'ojs/ojconfig';
 import { fadeOut, fadeIn } from 'ojs/ojanimation';
 import { log, error, info } from 'ojs/ojlogger';
-import { isRequestIdleCallbackSupported, calculateOffsetTop, getDefaultScrollBarWidth, isElementInScrollerBounds } from 'ojs/ojdatacollection-common';
+import { isRequestIdleCallbackSupported, calculateOffsetTop, getDefaultScrollBarWidth, isElementInScrollerBounds, isIterateAfterDoneNotAllowed } from 'ojs/ojdatacollection-common';
 import DomScroller from 'ojs/ojdomscroller';
 import KeySet from 'ojs/ojset';
 import KeyMap from 'ojs/ojmap';
@@ -2597,20 +2597,6 @@ IteratingDataProviderContentHandler.prototype.GetReferenceNode = function (paren
   return referenceNode;
 };
 
-/**
- * @private
- */
-IteratingDataProviderContentHandler.prototype._isIterateAfterDoneNotAllowed = function () {
-  var dataProvider = this.getDataProvider();
-  if (dataProvider && dataProvider.getCapability) {
-    var capability = dataProvider.getCapability('fetchFirst');
-    if (capability && capability.iterateAfterDone === 'notAllowed') {
-      return true;
-    }
-  }
-  return false;
-};
-
 /**
  * Gets the maximum index for insert event
  * @private
@@ -2618,7 +2604,8 @@ IteratingDataProviderContentHandler.prototype._isIterateAfterDoneNotAllowed = fu
 IteratingDataProviderContentHandler.prototype._getMaxIndexForInsert = function () {
   var max = Number.MAX_VALUE;
   // temporary solution for SDP
-  if (this._isIterateAfterDoneNotAllowed() && !this.hasMoreToFetch()) {
+  if (isIterateAfterDoneNotAllowed(this.getDataProvider()) &&
+      !this.hasMoreToFetch()) {
     return max;
   }
 
@@ -2666,7 +2653,8 @@ IteratingDataProviderContentHandler.prototype.addItemsForModelInsert =
           index = isBeforeKeys ? index : index + 1;
         } else if (this._isLoadMoreOnScroll()) {
           // if append to the end
-          if (!this._isIterateAfterDoneNotAllowed() || this.hasMoreToFetch()) {
+          if (!isIterateAfterDoneNotAllowed(this.getDataProvider()) ||
+              this.hasMoreToFetch()) {
             index = max;
           }
         }

package/dist/js/libs/oj/debug_esm/ojdvt-toolkit.js

@@ -11233,18 +11233,9 @@ TextUtils.getTextStringWidth = function (context, textString, cssStyle) {
       width = TextUtils._getCanvasTextWidth(context, textString, cssStyle);
     } else {
       // Properties that are supported in <canvas> elements by browser
-      // Chrome supports letterSpacing, wordSpacing, and fontVariantNumeric
-      // Safari supports only supports fontVariantNumeric
+      // Chrome and Safari supports only support fontVariantNumeric
       // Firefox supports none
-      if (Agent.browser === 'chrome') {
-        if (TextUtils._letterSpacing != letterSpacing || (TextUtils._wordSpacing != wordSpacing) || (TextUtils._fontVariantNumeric != fontVariantNumeric)) {
-          TextUtils._clearCanvasContext();
-          TextUtils._setSpacing(wordSpacing, letterSpacing, fontVariantNumeric);
-        }
-        TextUtils._storeCanvasContext();
-        TextUtils._attachCanvas(context);
-        width = TextUtils._getCanvasTextWidth(context, textString, cssStyle);
-      } else if (Agent.browser === 'safari' && isLetterSpacingNormal && isWordSpacingNormal) {
+      if ((Agent.browser === 'safari' || Agent.browser === 'chrome') && isLetterSpacingNormal && isWordSpacingNormal) {
         if (TextUtils._fontVariantNumeric != fontVariantNumeric) {
           TextUtils._clearCanvasContext();
           TextUtils._setSpacing(wordSpacing, letterSpacing, fontVariantNumeric);