@oracle/oraclejet 11.1.2 → 11.1.3

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

@@ -2728,7 +2728,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);
@@ -2745,7 +2745,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);
     });
@@ -3958,7 +3958,7 @@ var __oj_table_metadata =
    */
   Table.prototype._clearIdleCallback = function () {
     if (this._idleCallback != null) {
-      if (!window.requestIdleCallback || !window.cancelIdleCallback) {
+      if (!DataCollectionUtils.isRequestIdleCallbackSupported()) {
         window.cancelAnimationFrame(this._idleCallback);
       } else {
         window.cancelIdleCallback(this._idleCallback);
@@ -3975,7 +3975,7 @@ var __oj_table_metadata =
    */
   Table.prototype._requestIdleCallback = function (isMouseWheel, callback) {
     // IE/legacy Edge/Safari do not support requestIdleCallback, use requestAnimationFrame as fall back
-    if (!window.requestIdleCallback || !window.cancelIdleCallback) {
+    if (!DataCollectionUtils.isRequestIdleCallbackSupported()) {
       this._idleCallback = window.requestAnimationFrame(function () {
         callback();
       });
@@ -16092,7 +16092,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_esm/ojcachediteratorresultsdataprovider.js

@@ -149,26 +149,27 @@ class CachedIteratorResultsDataProvider {
     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 @@ class CachedIteratorResultsDataProvider {
                     }
                     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 @@ class CachedIteratorResultsDataProvider {
                                 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 @@ class CachedIteratorResultsDataProvider {
                         });
                     }
                 }
-                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 @@ class CachedIteratorResultsDataProvider {
                     }
                 });
             }
+            _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 @@ class CachedIteratorResultsDataProvider {
         });
         dataProvider.addEventListener(CachedIteratorResultsDataProvider._REFRESH, (event) => {
             this.cache.reset();
+            this._lastFetchParams = null;
             this.dispatchEvent(event);
         });
     }
@@ -327,8 +352,14 @@ class CachedIteratorResultsDataProvider {
     }
     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 @@ class CachedIteratorResultsDataProvider {
         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 @@ class CachedIteratorResultsDataProvider {
         }
         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_esm/ojcore-base.js

@@ -37,12 +37,12 @@ const oj = {
    * @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_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
  */
@@ -87,6 +97,18 @@ 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
@@ -104,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);
@@ -117,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
@@ -138,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;
 };
@@ -773,6 +805,14 @@ DataCollectionUtils.isElementInScrollerBounds = function (elem, scroller) {
   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;
@@ -812,5 +852,6 @@ const KEYBOARD_KEYS = DataCollectionUtils.KEYBOARD_KEYS;
 const CHECKVIEWPORT_THRESHOLD = DataCollectionUtils.CHECKVIEWPORT_THRESHOLD;
 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, 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, 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 { calculateOffsetTop, getDefaultScrollBarWidth, isElementInScrollerBounds } from 'ojs/ojdatacollection-common';
+import { isRequestIdleCallbackSupported, calculateOffsetTop, getDefaultScrollBarWidth, isElementInScrollerBounds } from 'ojs/ojdatacollection-common';
 import DomScroller from 'ojs/ojdomscroller';
 import KeySet from 'ojs/ojset';
 import KeyMap from 'ojs/ojmap';
@@ -1387,7 +1387,7 @@ IteratingDataProviderContentHandler.prototype.Destroy = function (completelyDest
  */
 IteratingDataProviderContentHandler.prototype._cancelIdleCallback = function () {
   if (this.m_idleCallback != null) {
-    if (!window.requestIdleCallback || !window.cancelIdleCallback) {
+    if (!isRequestIdleCallbackSupported()) {
       window.cancelAnimationFrame(this.m_idleCallback);
     } else {
       window.cancelIdleCallback(this.m_idleCallback);
@@ -2239,7 +2239,7 @@ IteratingDataProviderContentHandler.prototype._renderItemsWhenIdle =
     }
 
     // IE/legacy Edge/Safari do not support requestIdleCallback, use requestAnimationFrame as fall back
-    if (!window.requestIdleCallback || !window.cancelIdleCallback) {
+    if (!isRequestIdleCallbackSupported()) {
       this.m_idleCallback = window.requestAnimationFrame(function () {
         var fragment = document.createDocumentFragment();
         var oneData = data.shift();

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

@@ -256,6 +256,7 @@ let DrawerLayout = DrawerLayout_1 = class DrawerLayout extends Component {
             PSOptions[PSoption.POPUP] = $drawerElement;
             PSOptions[PSoption.LAUNCHER] = $(document.activeElement);
             PSOptions[PSoption.LAYER_SELECTORS] = 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_esm/ojdrawerpopup.js

@@ -123,6 +123,7 @@ let DrawerPopup = DrawerPopup_1 = class DrawerPopup extends Component {
         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] = {
@@ -142,12 +143,6 @@ let DrawerPopup = DrawerPopup_1 = class DrawerPopup extends Component {
     beforeOpenHandler(edge, PSOptions) {
         const $drawerElement = PSOptions[PopupService.OPTION.POPUP];
         const position = PSOptions[PopupService.OPTION.POSITION];
-        if ([DrawerConstants.stringStart, DrawerConstants.stringEnd].indexOf(edge) > -1) {
-            this.rootRef.current.style.height = `${window.innerHeight}px`;
-        }
-        if (DrawerConstants.stringBottom === edge) {
-            this.rootRef.current.style.width = `${document.documentElement.clientWidth}px`;
-        }
         $drawerElement.show();
         $drawerElement.position(position);
         return slideIn(this.rootRef.current, DrawerUtils.getAnimationOptions(DrawerConstants.stringOpen, edge));

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

@@ -13,7 +13,7 @@ import Context from 'ojs/ojcontext';
 import { __getTemplateEngine } from 'ojs/ojconfig';
 import { getCachedCSSVarValues } from 'ojs/ojthemeutils';
 import { __GetWidgetConstructor, setDefaultOptions, createDynamicPropertyGetter } from 'ojs/ojcomponentcore';
-import { enableAllFocusableElements, isElementInScrollerBounds, disableAllFocusableElements, getLogicalChildPopup, isElementOrAncestorFocusable, isEventClickthroughDisabled, handleActionablePrevTab, handleActionableTab, getFocusableElementsInNode, disableDefaultBrowserStyling } from 'ojs/ojdatacollection-common';
+import { enableAllFocusableElements, isMobileTouchDevice, isElementInScrollerBounds, disableAllFocusableElements, getLogicalChildPopup, isElementOrAncestorFocusable, isEventClickthroughDisabled, handleActionablePrevTab, handleActionableTab, getFocusableElementsInNode, disableDefaultBrowserStyling } from 'ojs/ojdatacollection-common';
 import { fadeIn, startAnimation } from 'ojs/ojanimation';
 import { info, error, warn } from 'ojs/ojlogger';
 import { KeySet, KeySetImpl, KeySetUtils } from 'ojs/ojkeyset';
@@ -3056,6 +3056,8 @@ const _ojListView = _ListViewUtils.clazz(Object, /** @lends oj._ojListView.proto
     if (this._isTouchSupport() && this.m_dndContext != null) {
       container.append(this._buildAccInstructionText()); // @HTMLUpdateOK
     }
+
+    this._buildFocusCaptureDiv(container[0]);
   },
 
   /**
@@ -3110,6 +3112,23 @@ const _ojListView = _ListViewUtils.clazz(Object, /** @lends oj._ojListView.proto
     return root;
   },
 
+  /**
+   * Build a non-keyboard accessible div used to capture manual focus from JAWS.
+   * @private
+   */
+  _buildFocusCaptureDiv: function (container) {
+    if (!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
@@ -4715,17 +4734,10 @@ 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 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