@oracle/oraclejet 11.0.8 → 11.0.12

package/dist/css/stable/oj-stable.css

@@ -266,7 +266,7 @@
   visibility: hidden; }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v11.0.8"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v11.0.12"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;

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

@@ -37,12 +37,12 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
      * @global
      * @member {string} version JET version numberr
      */
-    version: '11.0.8',
+    version: '11.0.12',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2021-10-19_14-27-37',
+    revision: '2021-12-07_16-37-01',
 
     // This function is only meant to be used outside the library, so quoting the name
     // to avoid renaming is appropriate

package/dist/js/libs/oj/debug/ojdatacollection-common.js

@@ -16,6 +16,16 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
    */
   const DataCollectionUtils = function () {};
 
+  /**
+   * @private
+   */
+  DataCollectionUtils._ARIA_READONLY = 'aria-readonly';
+
+  /**
+   * @private
+   */
+  DataCollectionUtils._DATA_OJ_ARIA_READONLY_MOD = 'data-oj-ariareadonlymod';
+
   /**
    * @private
    */
@@ -68,7 +78,7 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
       // this will cause problem with TAB/Shift-TAB (recognizing whether to go to next cell or to tab within the current cell
       for (var i = 0; i < nodeCount; i++) {
         var elem = nodes[i];
-        if (!elem.disabled && (skipVisibilityCheck || elem.style.display !== 'none')) {
+        if (!elem.disabled && (skipVisibilityCheck || DataCollectionUtils.checkVisibility(elem))) {
           var tabIndex = parseInt(elem.getAttribute(DataCollectionUtils._TAB_INDEX), 10);
           if (isNaN(tabIndex) || tabIndex >= 0) {
             inputElems.push(elem);
@@ -79,6 +89,27 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
     return inputElems;
   };
 
+  /**
+   * Check if the specified element is visible
+   * @param {Element} element
+   * @private
+   */
+  DataCollectionUtils.checkVisibility = function (element) {
+    return !(element.offsetHeight === 0 || element.offsetWidth === 0);
+  };
+
+  /**
+   * Remove the aria-readonly attribute from the specified element
+   * @param {Element} element
+   * @private
+   */
+  DataCollectionUtils.removeAriaReadonly = function (element) {
+    var ariaReadonly = element.getAttribute(DataCollectionUtils._ARIA_READONLY);
+    // store the aria-readonly value as an attribute
+    element.setAttribute(DataCollectionUtils._DATA_OJ_ARIA_READONLY_MOD, ariaReadonly); // @HTMLUpdateOK
+    element.removeAttribute(DataCollectionUtils._ARIA_READONLY);
+  };
+
   /**
    * Make the specified element unfocusable
    * @param {Element} element
@@ -96,11 +127,12 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
    * @param {Element} element
    * @param {boolean=} skipVisibilityCheck
    * @param {boolean=} excludeActiveElement
+   * @param {boolean=} includeReadonly
    * @return {Element[]} An array of the disabled elements
    * @private
    */
   DataCollectionUtils.disableAllFocusableElements = function (element, skipVisibilityCheck,
-    excludeActiveElement) {
+    excludeActiveElement, includeReadonly) {
     var disabledElems = [];
     // make all focusable elements non-focusable, since we want to manage tab stops
     var focusElems = DataCollectionUtils.getFocusableElementsInNode(element, skipVisibilityCheck);
@@ -109,9 +141,13 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
         DataCollectionUtils.disableElement(focusElems[i]);
         disabledElems.push(focusElems[i]);
       }
+      if (includeReadonly && focusElems[i].hasAttribute(DataCollectionUtils._ARIA_READONLY)) {
+        DataCollectionUtils.removeAriaReadonly(focusElems[i]);
+      }
     }
     return disabledElems;
   };
+
   /**
    * Enable all focusable elements within the specified element that were previously disabled
    * @param {Element} element
@@ -130,6 +166,11 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
       } else {
         focusElems[i].setAttribute(DataCollectionUtils._TAB_INDEX, tabIndex); // @HTMLUpdateOK
       }
+      if (focusElems[i].hasAttribute(DataCollectionUtils._DATA_OJ_ARIA_READONLY_MOD)) {
+        var ariaReadonly = focusElems[i].getAttribute(DataCollectionUtils._DATA_OJ_ARIA_READONLY_MOD);
+        focusElems[i].removeAttribute(DataCollectionUtils._DATA_OJ_ARIA_READONLY_MOD);
+        focusElems[i].setAttribute(DataCollectionUtils._ARIA_READONLY, ariaReadonly); // @HTMLUpdateOK
+      }
     }
     return focusElems;
   };

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

@@ -2898,8 +2898,10 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojconfig',
     busyContext.whenReady().then(function () {
       if (self.m_root != null) {
         var children = self.m_root.children;
-        for (var i = lastItemIndex; i < children.length; i++) {
-          self.m_widget.disableAllTabbableElements(children[i]);
+        for (var i = 0; i < lastItemIndex; i++) {
+          if (children[i]) {
+            self.m_widget.disableAllTabbableElements(children[i]);
+          }
         }
       }
     });

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

@@ -563,6 +563,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget'], function
             cachedData[ListDataProviderView._ITEMS] = [];
             cachedData[ListDataProviderView._DONE] = false;
             cachedData[ListDataProviderView._STARTINDEX] = 0;
+            cachedData[ListDataProviderView._LASTDONEHASDATA] = false;
             const size = params != null ? params[ListDataProviderView._SIZE] : null;
             let sortCriteria = params != null ? params[ListDataProviderView._SORTCRITERIA] : null;
             if (sortCriteria == null) {
@@ -615,9 +616,17 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget'], function
                 const cachedAsyncIterator = this.dataProvider[ListDataProviderView._FETCHFIRST](updatedParams)[Symbol.asyncIterator]();
                 return new this.AsyncIterable(this, new this.AsyncIterator(this, ((cachedData, cachedAsyncIterator) => {
                     return () => {
+                        if (cachedData[ListDataProviderView._LASTDONEHASDATA]) {
+                            cachedData[ListDataProviderView._LASTDONEHASDATA] = false;
+                            return Promise.resolve(new this.AsyncIteratorReturnResult(this, new this.FetchListResult(this, params, [], [])));
+                        }
                         return cachedAsyncIterator.next().then((result) => {
-                            const data = result[ListDataProviderView._VALUE][ListDataProviderView._DATA];
-                            const metadata = result[ListDataProviderView._VALUE][ListDataProviderView._METADATA];
+                            let resultValue = result[ListDataProviderView._VALUE];
+                            if (!resultValue) {
+                                resultValue = { data: [], metadata: [], fetchParameters: null };
+                            }
+                            const data = resultValue[ListDataProviderView._DATA];
+                            const metadata = resultValue[ListDataProviderView._METADATA];
                             const items = data.map((value, index) => {
                                 return new this.Item(this, metadata[index], data[index]);
                             });
@@ -629,7 +638,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget'], function
                             cachedData[ListDataProviderView._DONE] = result[ListDataProviderView._DONE];
                             const size = params != null ? params[ListDataProviderView._SIZE] : null;
                             const offset = params != null ? params[ListDataProviderView._OFFSET] : null;
-                            const resultFetchParams = result[ListDataProviderView._VALUE][ListDataProviderView._FETCHPARAMETERS];
+                            const resultFetchParams = resultValue[ListDataProviderView._FETCHPARAMETERS];
                             const resultSortCriteria = resultFetchParams != null
                                 ? resultFetchParams[ListDataProviderView._SORTCRITERIA]
                                 : null;
@@ -728,7 +737,10 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget'], function
                 const mappedFilterCriterion = this._getMappedFilterCriterion(params[ListDataProviderView._FILTERCRITERION]);
                 this._filterResult(mappedFilterCriterion, cachedItems);
             }
-            if (cachedItems.length < fetchSize && !cachedData[ListDataProviderView._DONE]) {
+            if (params &&
+                params[ListDataProviderView._SIZE] > 0 &&
+                cachedItems.length < fetchSize &&
+                !cachedData[ListDataProviderView._DONE]) {
                 return cachedAsyncIterator.next().then((nextResult) => {
                     const data = nextResult[ListDataProviderView._VALUE][ListDataProviderView._DATA];
                     const metadata = nextResult[ListDataProviderView._VALUE][ListDataProviderView._METADATA];
@@ -742,10 +754,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget'], function
                     const mappedResult = this._getMappedItems(items);
                     this._cacheResult(cachedData, mappedResult);
                     cachedData[ListDataProviderView._DONE] = nextResult[ListDataProviderView._DONE];
-                    if (data.length === 0) {
-                        return this._createResultPromise(params, cachedData, cachedItems);
-                    }
-                    return this._fetchUntilOffset(nextResult[ListDataProviderView._VALUE][ListDataProviderView._FETCHPARAMETERS], offset, data.length, cachedData, cachedAsyncIterator);
+                    return this._fetchUntilOffset(params, offset, data.length, cachedData, cachedAsyncIterator);
                 });
             }
             return this._createResultPromise(params, cachedData, cachedItems);
@@ -759,7 +768,16 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget'], function
             const metadata = cachedItems.map((item) => {
                 return item[ListDataProviderView._METADATA];
             });
-            if (data.length === 0) {
+            let isDone = false;
+            if (cachedData[ListDataProviderView._DONE]) {
+                if (data.length === 0) {
+                    isDone = true;
+                }
+                else {
+                    cachedData[ListDataProviderView._LASTDONEHASDATA] = true;
+                }
+            }
+            if (isDone) {
                 return Promise.resolve(new this.AsyncIteratorReturnResult(this, new this.FetchListResult(this, params, data, metadata)));
             }
             return Promise.resolve(new this.AsyncIteratorYieldResult(this, new this.FetchListResult(this, params, data, metadata)));
@@ -879,6 +897,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget'], function
     ListDataProviderView._FETCHPARAMETERS = 'fetchParameters';
     ListDataProviderView._VALUE = 'value';
     ListDataProviderView._DONE = 'done';
+    ListDataProviderView._LASTDONEHASDATA = 'lastDoneHasData';
     ListDataProviderView._DATAMAPPING = 'dataMapping';
     ListDataProviderView._MAPFIELDS = 'mapFields';
     ListDataProviderView._MAPSORTCRITERIA = 'mapSortCriteria';

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

@@ -4722,10 +4722,17 @@ var __oj_list_view_metadata =
       // first time tab into listview, focus on first item
       if (this.m_active == null) {
         // checks whether there's pending click to active, and the focus target is not inside any item (if it is the focus will shift to that item) or it's a unfocusable item
-        var item = this.FindItem($(event.target));
+        var target = $(event.target);
+        var item = this.FindItem(target);
         if (!this.m_preActive && !this._isFocusBlurTriggeredByDescendent(event) &&
           (item == null || item.length === 0 || this.SkipFocus(item))) {
           this._initFocus(event);
+        } else if (item && item.length > 0 && !this.SkipFocus(item) &&
+          !this._isInputElement(target.get(0)) &&
+          !event.target.classList.contains('oj-component')) {
+          // focus programmatically set on element within item (including JAWS, see JET-46814)
+          // but don't do it if the target is editable/component so that we do not steal focus
+          this.SetCurrentItem(item, event);
         }
       } else {
         // focus could be caused by pending click to active

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

@@ -2716,7 +2716,7 @@ var __oj_table_metadata =
         var rowKey = this._getRowKey(tableBodyRow);
         // disable all focusable content unless this is the current edit row
         if (!(editableRowKey != null && oj.KeyUtils.equals(rowKey, editableRowKey))) {
-          DataCollectionUtils.disableAllFocusableElements(tableBodyRow);
+          DataCollectionUtils.disableAllFocusableElements(tableBodyRow, null, null, true);
         }
       }.bind(this));
       return Promise.resolve(true);
@@ -2733,7 +2733,7 @@ var __oj_table_metadata =
   Table.prototype._finalizeNonBodyRowRendering = function (rowElements) {
     return this._waitForAllElementsToResolve(rowElements).then(function () {
       rowElements.forEach(function (rowElement) {
-        DataCollectionUtils.disableAllFocusableElements(rowElement);
+        DataCollectionUtils.disableAllFocusableElements(rowElement, null, null, true);
       });
       return Promise.resolve(true);
     });
@@ -15798,7 +15798,7 @@ var __oj_table_metadata =
       var resetFocus = $.contains(this._getTable(), document.activeElement);
       // disable all focusable elements
       if (this._tableActionableElement != null) {
-        DataCollectionUtils.disableAllFocusableElements(this._tableActionableBoundaryElement);
+        DataCollectionUtils.disableAllFocusableElements(this._tableActionableBoundaryElement, null, null, true);
       }
       if (resetFocus && !skipFocusReset) {
         this._focusInHandler($(this._tableActionableElement));

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

@@ -3788,6 +3788,9 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
 
           if ((eventType === 'dragEnter' || eventType === 'dragOver') &&
             event.originalEvent.defaultPrevented) {
+            if (eventType === 'dragEnter' && DomUtils.isTouchSupported()) {
+              this.ojTreeViewDragEvent = true;
+            }
             var isRTL = this._GetReadingDirection() === 'rtl';
             // Draw the drop target effect on dragEnter and dragOver
             var dropLineTop = middleY;
@@ -3855,6 +3858,9 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
                 event.target.classList.contains(this.constants.OJ_TREEVIEW_ITEM_CONTENT) &&
                 (event.offsetX >= targetWidth || event.offsetX <= 0)) {
                 this._dropLine.style.display = 'none';
+                if (DomUtils.isTouchSupported()) {
+                  this.ojTreeViewDragEvent = false;
+                }
                 this._removeDropClass(targetItem);
               } else if (event.offsetY >= targetItem.offsetHeight
                 || event.offsetY <= 0) {
@@ -3865,9 +3871,15 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
                   if ((targetItem === lastItem && position === 'after')
                     || (targetItem === firstItem && position === 'before')) {
                     this._dropLine.style.display = 'none';
+                    if (DomUtils.isTouchSupported()) {
+                      this.ojTreeViewDragEvent = false;
+                    }
                   }
                 } else if (treeviewItems.length === 0) {
                   this._dropLine.style.display = 'none';
+                  if (DomUtils.isTouchSupported()) {
+                    this.ojTreeViewDragEvent = false;
+                  }
                 }
               }
               if (position !== 'inside') {

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

@@ -1083,7 +1083,7 @@ define(['exports', 'preact', 'ojs/ojvcomponent', 'ojs/ojcore-base', 'ojs/ojdatac
         _restoreCurrentItem(items) {
             if (this.currentKey != null) {
                 for (const curr of items) {
-                    if (this.contentHandler.getKey(curr) == this.currentKey) {
+                    if (curr.key == this.currentKey) {
                         const elem = curr.element;
                         this._setFocus(elem, false);
                         this.currentItem = elem;
@@ -1091,7 +1091,7 @@ define(['exports', 'preact', 'ojs/ojvcomponent', 'ojs/ojcore-base', 'ojs/ojdatac
                     }
                 }
                 if ((this.currentItem == null || this.currentItem.parentNode == null) && items.length > 0) {
-                    this.currentKey = this.contentHandler.getKey(items[0]);
+                    this.currentKey = items[0].key;
                     const elem = items[0].element;
                     this._setFocus(elem, false);
                     this.currentItem = elem;

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.0.8',
+  version: '11.0.12',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2021-10-19_14-27-37',
+  revision: '2021-12-07_16-37-01',
 
   // 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

@@ -15,6 +15,16 @@ import { getNoJQFocusHandlers as getNoJQFocusHandlers$1, getLogicalParent } from
  */
 const DataCollectionUtils = function () {};
 
+/**
+ * @private
+ */
+DataCollectionUtils._ARIA_READONLY = 'aria-readonly';
+
+/**
+ * @private
+ */
+DataCollectionUtils._DATA_OJ_ARIA_READONLY_MOD = 'data-oj-ariareadonlymod';
+
 /**
  * @private
  */
@@ -67,7 +77,7 @@ DataCollectionUtils.getFocusableElementsInNode = function (node, skipVisibilityC
     // this will cause problem with TAB/Shift-TAB (recognizing whether to go to next cell or to tab within the current cell
     for (var i = 0; i < nodeCount; i++) {
       var elem = nodes[i];
-      if (!elem.disabled && (skipVisibilityCheck || elem.style.display !== 'none')) {
+      if (!elem.disabled && (skipVisibilityCheck || DataCollectionUtils.checkVisibility(elem))) {
         var tabIndex = parseInt(elem.getAttribute(DataCollectionUtils._TAB_INDEX), 10);
         if (isNaN(tabIndex) || tabIndex >= 0) {
           inputElems.push(elem);
@@ -78,6 +88,27 @@ DataCollectionUtils.getFocusableElementsInNode = function (node, skipVisibilityC
   return inputElems;
 };
 
+/**
+ * Check if the specified element is visible
+ * @param {Element} element
+ * @private
+ */
+DataCollectionUtils.checkVisibility = function (element) {
+  return !(element.offsetHeight === 0 || element.offsetWidth === 0);
+};
+
+/**
+ * Remove the aria-readonly attribute from the specified element
+ * @param {Element} element
+ * @private
+ */
+DataCollectionUtils.removeAriaReadonly = function (element) {
+  var ariaReadonly = element.getAttribute(DataCollectionUtils._ARIA_READONLY);
+  // store the aria-readonly value as an attribute
+  element.setAttribute(DataCollectionUtils._DATA_OJ_ARIA_READONLY_MOD, ariaReadonly); // @HTMLUpdateOK
+  element.removeAttribute(DataCollectionUtils._ARIA_READONLY);
+};
+
 /**
  * Make the specified element unfocusable
  * @param {Element} element
@@ -95,11 +126,12 @@ DataCollectionUtils.disableElement = function (element) {
  * @param {Element} element
  * @param {boolean=} skipVisibilityCheck
  * @param {boolean=} excludeActiveElement
+ * @param {boolean=} includeReadonly
  * @return {Element[]} An array of the disabled elements
  * @private
  */
 DataCollectionUtils.disableAllFocusableElements = function (element, skipVisibilityCheck,
-  excludeActiveElement) {
+  excludeActiveElement, includeReadonly) {
   var disabledElems = [];
   // make all focusable elements non-focusable, since we want to manage tab stops
   var focusElems = DataCollectionUtils.getFocusableElementsInNode(element, skipVisibilityCheck);
@@ -108,9 +140,13 @@ DataCollectionUtils.disableAllFocusableElements = function (element, skipVisibil
       DataCollectionUtils.disableElement(focusElems[i]);
       disabledElems.push(focusElems[i]);
     }
+    if (includeReadonly && focusElems[i].hasAttribute(DataCollectionUtils._ARIA_READONLY)) {
+      DataCollectionUtils.removeAriaReadonly(focusElems[i]);
+    }
   }
   return disabledElems;
 };
+
 /**
  * Enable all focusable elements within the specified element that were previously disabled
  * @param {Element} element
@@ -129,6 +165,11 @@ DataCollectionUtils.enableAllFocusableElements = function (element) {
     } else {
       focusElems[i].setAttribute(DataCollectionUtils._TAB_INDEX, tabIndex); // @HTMLUpdateOK
     }
+    if (focusElems[i].hasAttribute(DataCollectionUtils._DATA_OJ_ARIA_READONLY_MOD)) {
+      var ariaReadonly = focusElems[i].getAttribute(DataCollectionUtils._DATA_OJ_ARIA_READONLY_MOD);
+      focusElems[i].removeAttribute(DataCollectionUtils._DATA_OJ_ARIA_READONLY_MOD);
+      focusElems[i].setAttribute(DataCollectionUtils._ARIA_READONLY, ariaReadonly); // @HTMLUpdateOK
+    }
   }
   return focusElems;
 };

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

@@ -2900,8 +2900,10 @@ IteratingDataProviderContentHandler.prototype.disableAllTabbableElements = funct
   busyContext.whenReady().then(function () {
     if (self.m_root != null) {
       var children = self.m_root.children;
-      for (var i = lastItemIndex; i < children.length; i++) {
-        self.m_widget.disableAllTabbableElements(children[i]);
+      for (var i = 0; i < lastItemIndex; i++) {
+        if (children[i]) {
+          self.m_widget.disableAllTabbableElements(children[i]);
+        }
       }
     }
   });

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

@@ -563,6 +563,7 @@ class ListDataProviderView {
         cachedData[ListDataProviderView._ITEMS] = [];
         cachedData[ListDataProviderView._DONE] = false;
         cachedData[ListDataProviderView._STARTINDEX] = 0;
+        cachedData[ListDataProviderView._LASTDONEHASDATA] = false;
         const size = params != null ? params[ListDataProviderView._SIZE] : null;
         let sortCriteria = params != null ? params[ListDataProviderView._SORTCRITERIA] : null;
         if (sortCriteria == null) {
@@ -615,9 +616,17 @@ class ListDataProviderView {
             const cachedAsyncIterator = this.dataProvider[ListDataProviderView._FETCHFIRST](updatedParams)[Symbol.asyncIterator]();
             return new this.AsyncIterable(this, new this.AsyncIterator(this, ((cachedData, cachedAsyncIterator) => {
                 return () => {
+                    if (cachedData[ListDataProviderView._LASTDONEHASDATA]) {
+                        cachedData[ListDataProviderView._LASTDONEHASDATA] = false;
+                        return Promise.resolve(new this.AsyncIteratorReturnResult(this, new this.FetchListResult(this, params, [], [])));
+                    }
                     return cachedAsyncIterator.next().then((result) => {
-                        const data = result[ListDataProviderView._VALUE][ListDataProviderView._DATA];
-                        const metadata = result[ListDataProviderView._VALUE][ListDataProviderView._METADATA];
+                        let resultValue = result[ListDataProviderView._VALUE];
+                        if (!resultValue) {
+                            resultValue = { data: [], metadata: [], fetchParameters: null };
+                        }
+                        const data = resultValue[ListDataProviderView._DATA];
+                        const metadata = resultValue[ListDataProviderView._METADATA];
                         const items = data.map((value, index) => {
                             return new this.Item(this, metadata[index], data[index]);
                         });
@@ -629,7 +638,7 @@ class ListDataProviderView {
                         cachedData[ListDataProviderView._DONE] = result[ListDataProviderView._DONE];
                         const size = params != null ? params[ListDataProviderView._SIZE] : null;
                         const offset = params != null ? params[ListDataProviderView._OFFSET] : null;
-                        const resultFetchParams = result[ListDataProviderView._VALUE][ListDataProviderView._FETCHPARAMETERS];
+                        const resultFetchParams = resultValue[ListDataProviderView._FETCHPARAMETERS];
                         const resultSortCriteria = resultFetchParams != null
                             ? resultFetchParams[ListDataProviderView._SORTCRITERIA]
                             : null;
@@ -728,7 +737,10 @@ class ListDataProviderView {
             const mappedFilterCriterion = this._getMappedFilterCriterion(params[ListDataProviderView._FILTERCRITERION]);
             this._filterResult(mappedFilterCriterion, cachedItems);
         }
-        if (cachedItems.length < fetchSize && !cachedData[ListDataProviderView._DONE]) {
+        if (params &&
+            params[ListDataProviderView._SIZE] > 0 &&
+            cachedItems.length < fetchSize &&
+            !cachedData[ListDataProviderView._DONE]) {
             return cachedAsyncIterator.next().then((nextResult) => {
                 const data = nextResult[ListDataProviderView._VALUE][ListDataProviderView._DATA];
                 const metadata = nextResult[ListDataProviderView._VALUE][ListDataProviderView._METADATA];
@@ -742,10 +754,7 @@ class ListDataProviderView {
                 const mappedResult = this._getMappedItems(items);
                 this._cacheResult(cachedData, mappedResult);
                 cachedData[ListDataProviderView._DONE] = nextResult[ListDataProviderView._DONE];
-                if (data.length === 0) {
-                    return this._createResultPromise(params, cachedData, cachedItems);
-                }
-                return this._fetchUntilOffset(nextResult[ListDataProviderView._VALUE][ListDataProviderView._FETCHPARAMETERS], offset, data.length, cachedData, cachedAsyncIterator);
+                return this._fetchUntilOffset(params, offset, data.length, cachedData, cachedAsyncIterator);
             });
         }
         return this._createResultPromise(params, cachedData, cachedItems);
@@ -759,7 +768,16 @@ class ListDataProviderView {
         const metadata = cachedItems.map((item) => {
             return item[ListDataProviderView._METADATA];
         });
-        if (data.length === 0) {
+        let isDone = false;
+        if (cachedData[ListDataProviderView._DONE]) {
+            if (data.length === 0) {
+                isDone = true;
+            }
+            else {
+                cachedData[ListDataProviderView._LASTDONEHASDATA] = true;
+            }
+        }
+        if (isDone) {
             return Promise.resolve(new this.AsyncIteratorReturnResult(this, new this.FetchListResult(this, params, data, metadata)));
         }
         return Promise.resolve(new this.AsyncIteratorYieldResult(this, new this.FetchListResult(this, params, data, metadata)));
@@ -879,6 +897,7 @@ ListDataProviderView._SIZE = 'size';
 ListDataProviderView._FETCHPARAMETERS = 'fetchParameters';
 ListDataProviderView._VALUE = 'value';
 ListDataProviderView._DONE = 'done';
+ListDataProviderView._LASTDONEHASDATA = 'lastDoneHasData';
 ListDataProviderView._DATAMAPPING = 'dataMapping';
 ListDataProviderView._MAPFIELDS = 'mapFields';
 ListDataProviderView._MAPSORTCRITERIA = 'mapSortCriteria';

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

@@ -4714,10 +4714,17 @@ const _ojListView = _ListViewUtils.clazz(Object, /** @lends oj._ojListView.proto
     // first time tab into listview, focus on first item
     if (this.m_active == null) {
       // checks whether there's pending click to active, and the focus target is not inside any item (if it is the focus will shift to that item) or it's a unfocusable item
-      var item = this.FindItem($(event.target));
+      var target = $(event.target);
+      var item = this.FindItem(target);
       if (!this.m_preActive && !this._isFocusBlurTriggeredByDescendent(event) &&
         (item == null || item.length === 0 || this.SkipFocus(item))) {
         this._initFocus(event);
+      } else if (item && item.length > 0 && !this.SkipFocus(item) &&
+        !this._isInputElement(target.get(0)) &&
+        !event.target.classList.contains('oj-component')) {
+        // focus programmatically set on element within item (including JAWS, see JET-46814)
+        // but don't do it if the target is editable/component so that we do not steal focus
+        this.SetCurrentItem(item, event);
       }
     } else {
       // focus could be caused by pending click to active

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

@@ -2734,7 +2734,7 @@ Table.prototype._finalizeBodyRowRendering = function (rowElements) {
       var rowKey = this._getRowKey(tableBodyRow);
       // disable all focusable content unless this is the current edit row
       if (!(editableRowKey != null && oj.KeyUtils.equals(rowKey, editableRowKey))) {
-        disableAllFocusableElements(tableBodyRow);
+        disableAllFocusableElements(tableBodyRow, null, null, true);
       }
     }.bind(this));
     return Promise.resolve(true);
@@ -2751,7 +2751,7 @@ Table.prototype._finalizeBodyRowRendering = function (rowElements) {
 Table.prototype._finalizeNonBodyRowRendering = function (rowElements) {
   return this._waitForAllElementsToResolve(rowElements).then(function () {
     rowElements.forEach(function (rowElement) {
-      disableAllFocusableElements(rowElement);
+      disableAllFocusableElements(rowElement, null, null, true);
     });
     return Promise.resolve(true);
   });
@@ -15816,7 +15816,7 @@ Table.prototype._setTableActionableMode = function (value, skipFocusReset) {
     var resetFocus = $.contains(this._getTable(), document.activeElement);
     // disable all focusable elements
     if (this._tableActionableElement != null) {
-      disableAllFocusableElements(this._tableActionableBoundaryElement);
+      disableAllFocusableElements(this._tableActionableBoundaryElement, null, null, true);
     }
     if (resetFocus && !skipFocusReset) {
       this._focusInHandler($(this._tableActionableElement));

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

@@ -3779,6 +3779,9 @@ class TreeviewSelectionManager {
 
         if ((eventType === 'dragEnter' || eventType === 'dragOver') &&
           event.originalEvent.defaultPrevented) {
+          if (eventType === 'dragEnter' && isTouchSupported()) {
+            this.ojTreeViewDragEvent = true;
+          }
           var isRTL = this._GetReadingDirection() === 'rtl';
           // Draw the drop target effect on dragEnter and dragOver
           var dropLineTop = middleY;
@@ -3846,6 +3849,9 @@ class TreeviewSelectionManager {
               event.target.classList.contains(this.constants.OJ_TREEVIEW_ITEM_CONTENT) &&
               (event.offsetX >= targetWidth || event.offsetX <= 0)) {
               this._dropLine.style.display = 'none';
+              if (isTouchSupported()) {
+                this.ojTreeViewDragEvent = false;
+              }
               this._removeDropClass(targetItem);
             } else if (event.offsetY >= targetItem.offsetHeight
               || event.offsetY <= 0) {
@@ -3856,9 +3862,15 @@ class TreeviewSelectionManager {
                 if ((targetItem === lastItem && position === 'after')
                   || (targetItem === firstItem && position === 'before')) {
                   this._dropLine.style.display = 'none';
+                  if (isTouchSupported()) {
+                    this.ojTreeViewDragEvent = false;
+                  }
                 }
               } else if (treeviewItems.length === 0) {
                 this._dropLine.style.display = 'none';
+                if (isTouchSupported()) {
+                  this.ojTreeViewDragEvent = false;
+                }
               }
             }
             if (position !== 'inside') {

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

@@ -1089,7 +1089,7 @@ let WaterfallLayout = WaterfallLayout_1 = class WaterfallLayout extends Componen
     _restoreCurrentItem(items) {
         if (this.currentKey != null) {
             for (const curr of items) {
-                if (this.contentHandler.getKey(curr) == this.currentKey) {
+                if (curr.key == this.currentKey) {
                     const elem = curr.element;
                     this._setFocus(elem, false);
                     this.currentItem = elem;
@@ -1097,7 +1097,7 @@ let WaterfallLayout = WaterfallLayout_1 = class WaterfallLayout extends Componen
                 }
             }
             if ((this.currentItem == null || this.currentItem.parentNode == null) && items.length > 0) {
-                this.currentKey = this.contentHandler.getKey(items[0]);
+                this.currentKey = items[0].key;
                 const elem = items[0].element;
                 this._setFocus(elem, false);
                 this.currentItem = elem;

package/dist/js/libs/oj/main-template.js

@@ -15,9 +15,9 @@
   requirejs.config({
     // Path mappings for the logical module names
     paths: {
-      'ojs': 'libs/oj/v11.0.8/min@insertESLevelPath@',
-      'ojL10n': 'libs/oj/v11.0.8/ojL10n',
-      'ojtranslations': 'libs/oj/v11.0.8/resources',
+      'ojs': 'libs/oj/v11.0.12/min@insertESLevelPath@',
+      'ojL10n': 'libs/oj/v11.0.12/ojL10n',
+      'ojtranslations': 'libs/oj/v11.0.12/resources',
       
   'knockout': 'libs/knockout/knockout-3.5.1',
   'knockout-mapping': 'libs/knockout/knockout.mapping-latest',