@oracle/oraclejet 11.1.2 → 11.1.3

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.1.2"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v11.1.3"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;
@@ -12712,6 +12712,117 @@ html[dir="rtl"] .oj-timepicker-ok-button {
 .oj-text-field-label-inside .oj-inputdatetime-input-trigger {
   min-height: var(--oj-text-field-inside-edge-height); }
 
+:root {
+  --oj-drawer-overlay-bg-color: var(--oj-core-bg-color-content); }
+
+:root {
+  --oj-drawer-reflow-bg-color: var(--oj-core-bg-color-content);
+  --oj-drawer-reflow-divider-color: rgb(var(--oj-palette-neutral-rgb-40));
+  --oj-drawer-overlay-bg-color: var(--oj-core-bg-color-content); }
+
+oj-drawer-layout:not(.oj-complete) {
+  visibility: hidden; }
+
+oj-drawer-layout {
+  display: flex; }
+
+.oj-drawer-layout-main-content {
+  flex-grow: 1;
+  overflow-y: auto; }
+
+.oj-drawer-reflow {
+  flex: 0 0 auto;
+  background: var(--oj-drawer-overlay-bg-color); }
+
+html:not([dir="rtl"]) .oj-drawer-reflow.oj-drawer-start.oj-drawer-opened {
+  border-right: 1px solid var(--oj-drawer-reflow-divider-color); }
+
+html[dir="rtl"] .oj-drawer-reflow.oj-drawer-start.oj-drawer-opened {
+  border-left: 1px solid var(--oj-drawer-reflow-divider-color); }
+
+html:not([dir="rtl"]) .oj-drawer-reflow.oj-drawer-end.oj-drawer-opened {
+  border-left: 1px solid var(--oj-drawer-reflow-divider-color); }
+
+html[dir="rtl"] .oj-drawer-reflow.oj-drawer-end.oj-drawer-opened {
+  border-right: 1px solid var(--oj-drawer-reflow-divider-color); }
+
+.oj-drawer-reflow,
+.oj-drawer-overlay {
+  overflow-y: auto; }
+
+.oj-drawer-layout-surrogate {
+  position: relative;
+  z-index: var(--oj-core-z-index-popup); }
+
+.oj-drawer-layout-surrogate .oj-drawer-overlay {
+  position: absolute;
+  background: var(--oj-drawer-overlay-bg-color);
+  min-width: 320px;
+  max-width: 90%; }
+
+.oj-drawer-overlay.oj-drawer-full-overlay {
+  width: 100%;
+  max-width: 100%; }
+
+html:not([dir="rtl"]) .oj-drawer-overlay.oj-drawer-start.oj-drawer-opened {
+  box-shadow: 8px 0 15px rgba(var(--oj-core-box-shadow-rgb), 0.05); }
+
+html[dir="rtl"] .oj-drawer-overlay.oj-drawer-start.oj-drawer-opened {
+  box-shadow: -8px 0 15px rgba(var(--oj-core-box-shadow-rgb), 0.05); }
+
+html:not([dir="rtl"]) .oj-drawer-overlay.oj-drawer-end.oj-drawer-opened {
+  box-shadow: -8px 0 15px rgba(var(--oj-core-box-shadow-rgb), 0.05); }
+
+html[dir="rtl"] .oj-drawer-overlay.oj-drawer-end.oj-drawer-opened {
+  box-shadow: 8px 0 15px rgba(var(--oj-core-box-shadow-rgb), 0.05); }
+
+oj-drawer-popup {
+  display: none; }
+
+.oj-drawer-popup-surrogate:not(.oj-component-overlay) {
+  position: relative; }
+
+.oj-drawer-popup-surrogate {
+  z-index: var(--oj-core-z-index-popup); }
+
+.oj-drawer-popup-surrogate.oj-drawer-modal {
+  z-index: var(--oj-core-z-index-dialog); }
+
+.oj-drawer-popup-surrogate.oj-drawer-modal.oj-focus-within {
+  z-index: calc(var(--oj-core-z-index-dialog) + 1); }
+
+.oj-drawer-popup-surrogate oj-drawer-popup {
+  position: absolute;
+  background: var(--oj-drawer-overlay-bg-color);
+  overflow-y: auto; }
+
+.oj-drawer-popup-surrogate .oj-drawer-start,
+.oj-drawer-popup-surrogate .oj-drawer-end {
+  height: 100vh;
+  max-height: 100vh;
+  max-width: 90vh;
+  min-width: 320px; }
+
+.oj-drawer-popup-surrogate .oj-drawer-bottom {
+  width: 100vw;
+  max-width: 100vw;
+  max-height: 90vh; }
+
+html:not([dir="rtl"]) .oj-drawer-popup-surrogate .oj-drawer-start {
+  box-shadow: 0.3rem 0 1.5rem rgba(var(--oj-core-box-shadow-rgb), 0.05); }
+
+html[dir="rtl"] .oj-drawer-popup-surrogate .oj-drawer-start {
+  box-shadow: -0.3rem 0 1.5rem rgba(var(--oj-core-box-shadow-rgb), 0.05); }
+
+html:not([dir="rtl"]) .oj-drawer-popup-surrogate .oj-drawer-end {
+  box-shadow: -0.3rem 0 1.5rem rgba(var(--oj-core-box-shadow-rgb), 0.05); }
+
+html[dir="rtl"] .oj-drawer-popup-surrogate .oj-drawer-end {
+  box-shadow: 0.3rem 0 1.5rem rgba(var(--oj-core-box-shadow-rgb), 0.05); }
+
+.oj-drawer-popup-surrogate .oj-drawer-bottom {
+  box-shadow: 0 -0.3rem 0.3rem 0 rgba(var(--oj-core-box-shadow-rgb), 0.05); }
+
 :root {
   --oj-diagram-node-border-color-hover:              rgb(var(--oj-palette-neutral-rgb-120));
   --oj-diagram-link-color:                           rgb(var(--oj-palette-neutral-rgb-120));

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

@@ -149,26 +149,27 @@ define(['ojs/ojcore-base', 'ojs/ojeventtarget', 'ojs/ojcomponentcore'], function
         constructor(dataProvider) {
             this.dataProvider = dataProvider;
             this.CacheAsyncIterable = class {
-                constructor(_parent, dataProviderAsyncIterator, cache) {
+                constructor(_parent, dataProviderAsyncIterator, params, cache) {
                     this._parent = _parent;
                     this.dataProviderAsyncIterator = dataProviderAsyncIterator;
+                    this.params = params;
                     this.cache = cache;
                     this[Symbol.asyncIterator] = () => {
-                        return new this._parent.CacheAsyncIterator(this._parent, this.dataProviderAsyncIterator, this.cache);
+                        return new this._parent.CacheAsyncIterator(this._parent, this.dataProviderAsyncIterator, this.params, this.cache);
                     };
                 }
             };
             this.CacheAsyncIterator = class {
-                constructor(_parent, asyncIterator, cache) {
+                constructor(_parent, asyncIterator, params, cache) {
                     this._parent = _parent;
                     this.asyncIterator = asyncIterator;
+                    this.params = params;
                     this.cache = cache;
                     this._cachedOffset = 0;
-                    this._iteratedOffset = 0;
                 }
                 ['next']() {
-                    const params = this._parent._lastFetchParams;
-                    const size = params.size ? params.size : -1;
+                    const params = this.params;
+                    const size = (params === null || params === void 0 ? void 0 : params.size) ? params.size : -1;
                     let result;
                     if (size === -1) {
                         if (this.cache.isDone()) {
@@ -188,11 +189,11 @@ define(['ojs/ojcore-base', 'ojs/ojeventtarget', 'ojs/ojcomponentcore'], function
                         }
                         else if (this._cachedOffset > 0) {
                             return new Promise((resolve, reject) => {
-                                if (this._iteratedOffset < this._cachedOffset) {
+                                if (this._parent._getSharedIteratorState().fetchOffset < this._cachedOffset) {
                                     const fetchUntilOffset = () => {
-                                        return this.asyncIterator.next().then((result) => {
-                                            this._iteratedOffset = this._iteratedOffset + result.value.data.length;
-                                            if (this._iteratedOffset >= this._cachedOffset || result.done) {
+                                        return this._checkCachedParamsAndIterate(params, size).then((result) => {
+                                            if (this._parent._getSharedIteratorState().fetchOffset >= this._cachedOffset ||
+                                                result.done) {
                                                 resolve();
                                             }
                                             else {
@@ -206,10 +207,8 @@ define(['ojs/ojcore-base', 'ojs/ojeventtarget', 'ojs/ojcomponentcore'], function
                                     resolve();
                                 }
                             }).then(() => {
-                                return this.asyncIterator.next().then((result) => {
-                                    this._iteratedOffset = this._iteratedOffset + result.value.data.length;
-                                    this._cachedOffset = this._iteratedOffset;
-                                    this.cache.addListResult(result);
+                                return this._checkCachedParamsAndIterate(params, size).then((result) => {
+                                    this._cachedOffset = this._parent._getSharedIteratorState().fetchOffset;
                                     if (result.done) {
                                         return new this._parent.CacheAsyncIteratorReturnResult(result.value);
                                     }
@@ -220,15 +219,8 @@ define(['ojs/ojcore-base', 'ojs/ojeventtarget', 'ojs/ojcomponentcore'], function
                             });
                         }
                     }
-                    return this.asyncIterator.next().then((result) => {
-                        this._iteratedOffset = this._iteratedOffset + result.value.data.length;
-                        this._cachedOffset = this._iteratedOffset;
-                        this.cache.addListResult(result);
-                        if (size === -1 && !this.cache.isDone()) {
-                            this.asyncIterator.next().then((result) => {
-                                this.cache.addListResult(result);
-                            });
-                        }
+                    return this._checkCachedParamsAndIterate(params, size).then((result) => {
+                        this._cachedOffset = this._parent._getSharedIteratorState().fetchOffset;
                         if (result.done) {
                             return new this._parent.CacheAsyncIteratorReturnResult(result.value);
                         }
@@ -237,6 +229,38 @@ define(['ojs/ojcore-base', 'ojs/ojeventtarget', 'ojs/ojcomponentcore'], function
                         }
                     });
                 }
+                _checkCachedParamsAndIterate(params, size) {
+                    let asyncIteratorFetchPromise;
+                    let firstIteratorCachedFetchParams = this._parent._getSharedIteratorState().cachedFetchParams;
+                    let firstIteratorCachedFetchOffset = this._parent._getSharedIteratorState().fetchOffset;
+                    let firstIteratorCachedFetchPromise = this._parent._getSharedIteratorState().fetchPromise;
+                    if (firstIteratorCachedFetchPromise &&
+                        this._cachedOffset === firstIteratorCachedFetchOffset &&
+                        CachedIteratorResultsDataProvider._compareCachedFetchParameters(params, firstIteratorCachedFetchParams)) {
+                        asyncIteratorFetchPromise = firstIteratorCachedFetchPromise;
+                    }
+                    else {
+                        this._parent._getSharedIteratorState().cachedFetchParams = CachedIteratorResultsDataProvider._createCachedFetchParams(params);
+                        this._parent._getSharedIteratorState().fetchPromise = this.asyncIterator
+                            .next()
+                            .then((result) => {
+                            this._parent._getSharedIteratorState().fetchOffset =
+                                this._parent._getSharedIteratorState().fetchOffset + result.value.data.length;
+                            this._parent._getSharedIteratorState().fetchPromise = null;
+                            this.cache.addListResult(result);
+                            if ((size === -1 && !this.cache.isDone()) ||
+                                (size > 0 && !this.cache.isDone() && result.value.data.length < size)) {
+                                return this.asyncIterator.next().then((finalResult) => {
+                                    this.cache.addListResult(finalResult);
+                                    return result;
+                                });
+                            }
+                            return result;
+                        });
+                        asyncIteratorFetchPromise = this._parent._getSharedIteratorState().fetchPromise;
+                    }
+                    return asyncIteratorFetchPromise;
+                }
             };
             this.CacheAsyncIteratorYieldResult = class {
                 constructor(value) {
@@ -270,6 +294,7 @@ define(['ojs/ojcore-base', 'ojs/ojeventtarget', 'ojs/ojcomponentcore'], function
             });
             dataProvider.addEventListener(CachedIteratorResultsDataProvider._REFRESH, (event) => {
                 this.cache.reset();
+                this._lastFetchParams = null;
                 this.dispatchEvent(event);
             });
         }
@@ -327,8 +352,14 @@ define(['ojs/ojcore-base', 'ojs/ojeventtarget', 'ojs/ojcomponentcore'], function
         }
         fetchByOffset(params) {
             const size = params.size ? params.size : CachedIteratorResultsDataProvider._DEFAULT_SIZE;
-            if (this._compareLastFetchParameters(params) && params.offset + size <= this.cache.getSize()) {
-                const updatedParams = JSON.parse(JSON.stringify(params));
+            if (CachedIteratorResultsDataProvider._compareCachedFetchParameters(params, this._lastFetchParams) &&
+                params.offset + size <= this.cache.getSize()) {
+                const updatedParams = JSON.parse(JSON.stringify(params, (key, value) => {
+                    if (key.startsWith('_')) {
+                        return undefined;
+                    }
+                    return value;
+                }));
                 updatedParams.size = size;
                 const results = this.cache.getDataByOffset(updatedParams);
                 if (results) {
@@ -338,12 +369,19 @@ define(['ojs/ojcore-base', 'ojs/ojeventtarget', 'ojs/ojcomponentcore'], function
             return this.dataProvider.fetchByOffset(params);
         }
         fetchFirst(params) {
-            if (!this._compareLastFetchParameters(params)) {
+            if (!CachedIteratorResultsDataProvider._compareCachedFetchParameters(params, this._lastFetchParams)) {
                 this.cache.reset();
+                this._lastFetchParams = CachedIteratorResultsDataProvider._createCachedFetchParams(params);
+                const asyncIterable = this.dataProvider.fetchFirst(params);
+                const asyncIterator = asyncIterable[Symbol.asyncIterator]();
+                this._firstIteratorState = {
+                    cachedFetchParams: this._lastFetchParams,
+                    fetchOffset: 0,
+                    fetchPromise: null,
+                    asyncIterator: asyncIterator
+                };
             }
-            this._storeLastFetchParams(params);
-            const asyncIterable = this.dataProvider.fetchFirst(params);
-            return new this.CacheAsyncIterable(this, asyncIterable[Symbol.asyncIterator](), this.cache);
+            return new this.CacheAsyncIterable(this, this._getSharedIteratorState().asyncIterator, params, this.cache);
         }
         getCapability(capabilityName) {
             const capability = this.dataProvider.getCapability(capabilityName);
@@ -364,26 +402,30 @@ define(['ojs/ojcore-base', 'ojs/ojeventtarget', 'ojs/ojcomponentcore'], function
             }
             return this.dataProvider.isEmpty();
         }
-        _compareLastFetchParameters(params) {
+        _getSharedIteratorState() {
+            return this._firstIteratorState;
+        }
+        static _compareCachedFetchParameters(params, cachedParams) {
             params = params || {};
-            return (this._lastFetchParams != null &&
-                oj.Object.compareValues(this._lastFetchParams.attributes, params.attributes || null) &&
-                oj.Object.compareValues(this._lastFetchParams.filterDef, this._getFilterDef(params.filterCriterion)) &&
-                oj.Object.compareValues(this._lastFetchParams.sortCriteria, params.sortCriteria || null));
+            return (cachedParams != null &&
+                oj.Object.compareValues(cachedParams.attributes, params.attributes || null) &&
+                oj.Object.compareValues(cachedParams.filterDef, CachedIteratorResultsDataProvider._getFilterDef(params.filterCriterion)) &&
+                oj.Object.compareValues(cachedParams.sortCriteria, params.sortCriteria || null));
         }
-        _storeLastFetchParams(params) {
+        static _createCachedFetchParams(params) {
             params = params || {};
-            this._lastFetchParams = {};
-            this._lastFetchParams.size = params.size;
-            this._lastFetchParams.attributes = params.attributes
+            const cachedFetchParams = {};
+            cachedFetchParams.size = params.size;
+            cachedFetchParams.attributes = params.attributes
                 ? JSON.parse(JSON.stringify(params.attributes))
                 : null;
-            this._lastFetchParams.filterDef = this._getFilterDef(params.filterCriterion);
-            this._lastFetchParams.sortCriteria = params.sortCriteria
+            cachedFetchParams.filterDef = CachedIteratorResultsDataProvider._getFilterDef(params.filterCriterion);
+            cachedFetchParams.sortCriteria = params.sortCriteria
                 ? JSON.parse(JSON.stringify(params.sortCriteria))
                 : null;
+            return cachedFetchParams;
         }
-        _getFilterDef(filter) {
+        static _getFilterDef(filter) {
             if (!filter) {
                 return null;
             }

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.1.2',
+    version: '11.1.3',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2021-11-09_08-29-59',
+    revision: '2021-12-10_13-31-55',
 
     // 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
    */
@@ -88,6 +98,18 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
     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
@@ -105,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);
@@ -118,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
@@ -139,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;
   };
@@ -774,6 +806,14 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
     return (bounds.top >= top && bounds.bottom <= bottom);
   };
 
+  /**
+   * Whether browser supports requestIdleCallback
+   */
+  DataCollectionUtils.isRequestIdleCallbackSupported = function () {
+    return window.requestIdleCallback != null && window.cancelIdleCallback != null &&
+      window.IdleDeadline != null;
+  };
+
   const applyMergedInlineStyles = DataCollectionUtils.applyMergedInlineStyles;
   const applyStyleObj = DataCollectionUtils.applyStyleObj;
   const areKeySetsEqual = DataCollectionUtils.areKeySetsEqual;
@@ -813,6 +853,7 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
   const CHECKVIEWPORT_THRESHOLD = DataCollectionUtils.CHECKVIEWPORT_THRESHOLD;
   const calculateOffsetTop = DataCollectionUtils.calculateOffsetTop;
   const isElementInScrollerBounds = DataCollectionUtils.isElementInScrollerBounds;
+  const isRequestIdleCallbackSupported = DataCollectionUtils.isRequestIdleCallbackSupported;
 
   exports.CHECKVIEWPORT_THRESHOLD = CHECKVIEWPORT_THRESHOLD;
   exports.KEYBOARD_KEYS = KEYBOARD_KEYS;
@@ -851,6 +892,7 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
   exports.isLetterAKeyEvent = isLetterAKeyEvent;
   exports.isMobileTouchDevice = isMobileTouchDevice;
   exports.isNumberFiveKeyEvent = isNumberFiveKeyEvent;
+  exports.isRequestIdleCallbackSupported = isRequestIdleCallbackSupported;
   exports.isSpaceBarKeyEvent = isSpaceBarKeyEvent;
   exports.isTabKeyEvent = isTabKeyEvent;
 

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

@@ -1385,7 +1385,7 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojconfig',
    */
   IteratingDataProviderContentHandler.prototype._cancelIdleCallback = function () {
     if (this.m_idleCallback != null) {
-      if (!window.requestIdleCallback || !window.cancelIdleCallback) {
+      if (!DataCollectionUtils.isRequestIdleCallbackSupported()) {
         window.cancelAnimationFrame(this.m_idleCallback);
       } else {
         window.cancelIdleCallback(this.m_idleCallback);
@@ -2237,7 +2237,7 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojconfig',
       }
 
       // IE/legacy Edge/Safari do not support requestIdleCallback, use requestAnimationFrame as fall back
-      if (!window.requestIdleCallback || !window.cancelIdleCallback) {
+      if (!DataCollectionUtils.isRequestIdleCallbackSupported()) {
         this.m_idleCallback = window.requestAnimationFrame(function () {
           var fragment = document.createDocumentFragment();
           var oneData = data.shift();

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

@@ -252,6 +252,7 @@ define(['exports', 'ojs/ojvcomponent', 'preact', 'jquery', 'ojs/ojanimation', 'o
                 PSOptions[PSoption.POPUP] = $drawerElement;
                 PSOptions[PSoption.LAUNCHER] = $(document.activeElement);
                 PSOptions[PSoption.LAYER_SELECTORS] = ojdrawerutils.DrawerConstants.DrawerLayoutStyleSurrogate;
+                PSOptions[PSoption.LAYER_LEVEL] = PopupService.LAYER_LEVEL.TOP_LEVEL;
                 PSOptions[PSoption.POSITION] = this.getDrawerPosition(edge);
                 const PSEvent = PopupService.EVENT;
                 PSOptions[PSoption.EVENTS] = {

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

@@ -119,6 +119,7 @@ define(['exports', 'ojs/ojvcomponent', 'preact', 'jquery', 'ojs/ojanimation', 'o
             PSOptions[PSoption.LAUNCHER] = $(document.activeElement);
             PSOptions[PSoption.MODALITY] = this.props.modality;
             PSOptions[PSoption.LAYER_SELECTORS] = this.getDrawerSurrogateLayerSelectors();
+            PSOptions[PSoption.LAYER_LEVEL] = PopupService.LAYER_LEVEL.TOP_LEVEL;
             PSOptions[PSoption.POSITION] = this.getDrawerPosition(edge);
             const PSEvent = PopupService.EVENT;
             PSOptions[PSoption.EVENTS] = {
@@ -138,12 +139,6 @@ define(['exports', 'ojs/ojvcomponent', 'preact', 'jquery', 'ojs/ojanimation', 'o
         beforeOpenHandler(edge, PSOptions) {
             const $drawerElement = PSOptions[PopupService.OPTION.POPUP];
             const position = PSOptions[PopupService.OPTION.POSITION];
-            if ([ojdrawerutils.DrawerConstants.stringStart, ojdrawerutils.DrawerConstants.stringEnd].indexOf(edge) > -1) {
-                this.rootRef.current.style.height = `${window.innerHeight}px`;
-            }
-            if (ojdrawerutils.DrawerConstants.stringBottom === edge) {
-                this.rootRef.current.style.width = `${document.documentElement.clientWidth}px`;
-            }
             $drawerElement.show();
             $drawerElement.position(position);
             return AnimationUtils.slideIn(this.rootRef.current, ojdrawerutils.DrawerUtils.getAnimationOptions(ojdrawerutils.DrawerConstants.stringOpen, edge));

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

@@ -3064,6 +3064,8 @@ var __oj_list_view_metadata =
       if (this._isTouchSupport() && this.m_dndContext != null) {
         container.append(this._buildAccInstructionText()); // @HTMLUpdateOK
       }
+
+      this._buildFocusCaptureDiv(container[0]);
     },
 
     /**
@@ -3118,6 +3120,23 @@ var __oj_list_view_metadata =
       return root;
     },
 
+    /**
+     * Build a non-keyboard accessible div used to capture manual focus from JAWS.
+     * @private
+     */
+    _buildFocusCaptureDiv: function (container) {
+      if (!DataCollectionUtils.isMobileTouchDevice()) {
+        var elem = document.createElement('div');
+        elem.setAttribute('tabindex', '-1');
+        elem.classList.add('oj-helper-hidden-accessible');
+        elem.innerHTML = '&nbsp'; // @HTMLUpdateOK
+        container.insertBefore(elem, this.element[0]); // @HTMLUpdateOK
+        elem.addEventListener('focus', () => {
+          this.element[0].focus();
+        });
+      }
+    },
+
     /**
      * Sets the accessible text info
      * @param {string} text the text to set on accessible info div
@@ -4723,17 +4742,10 @@ 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 target = $(event.target);
-        var item = this.FindItem(target);
+        var item = this.FindItem($(event.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.IsElementEditableOrClickable(target) &&
-          !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/clickable/component so that we do not steal focus
-          this.SetCurrentItem(item, event);
         }
       } else {
         // focus could be caused by pending click to active