@oracle/oraclejet 10.1.1 → 10.1.6

package/dist/css/redwood/oj-redwood-novars.css

@@ -6,7 +6,7 @@
   visibility: hidden; }
 
 .oj-theme-json {
-  font-family: '{"name":"redwood","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v10.1.1"}' !important; }
+  font-family: '{"name":"redwood","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v10.1.6"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;
@@ -20866,7 +20866,6 @@ oj-tree-view {
   -webkit-user-select: none;
       -ms-user-select: none;
           user-select: none;
-  min-width: -webkit-fit-content;
   min-width: fit-content;
   min-width: -moz-fit-content; }
 

package/dist/css/redwood/oj-redwood.css

@@ -370,7 +370,7 @@
   visibility: hidden; }
 
 .oj-theme-json {
-  font-family: '{"name":"redwood","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v10.1.1"}' !important; }
+  font-family: '{"name":"redwood","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v10.1.6"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;
@@ -23525,7 +23525,6 @@ oj-tree-view {
   -webkit-user-select: none;
       -ms-user-select: none;
           user-select: none;
-  min-width: -webkit-fit-content;
   min-width: fit-content;
   min-width: -moz-fit-content; }
 

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

@@ -143,7 +143,7 @@ define(['require', 'exports', 'ojs/ojcore-base', 'ojL10n!ojtranslations/nls/ojtr
         var localeBundle = prefix + locale + '/localeElements';
         const localePromise = new Promise(function (resolve, reject) { require([localeBundle], function (m) { resolve(_interopNamespace(m)); }, reject) }).then(localeElements => {
           if (localeElements) {
-            oj.LocaleData.__updateBundle(localeElements);
+            oj.LocaleData.__updateBundle(Object.assign({}, localeElements.default));
           }
         });
         promises.push(localePromise);
@@ -151,7 +151,7 @@ define(['require', 'exports', 'ojs/ojcore-base', 'ojL10n!ojtranslations/nls/ojtr
           var tzBundlesPromises = oj.TimezoneData.__getBundleNames()
             .map(bundleName => new Promise(function (resolve, reject) { require([`${prefix}${locale}${bundleName}`], function (m) { resolve(_interopNamespace(m)); }, reject) }));
           promises.push(Promise.all(tzBundlesPromises).then((timezoneBundles) => {
-            oj.TimezoneData.__mergeIntoLocaleElements(timezoneBundles);
+            timezoneBundles.forEach(oj.TimezoneData.__mergeIntoLocaleElements);
           }));
         }
       }

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

@@ -1256,7 +1256,9 @@ define(['ojs/ojcore-base', 'ojs/ojlogger'], function (oj, Logger) { 'use strict'
       if (surrogate) { return surrogate.parentElement; }
     }
 
-    return element.parentElement;
+    // _ojReportBusy expando will be set by the TemplateEngine if busy states need to bubble
+    // up to an alternate parent
+    return element._ojReportBusy || element.parentElement;
   };
 
   return Context;

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

@@ -128,11 +128,11 @@ var __oj_conveyor_belt_metadata =
    * @ojtsignore
    */
   function ConveyorBeltCommon(
-    elem, orientation, contentParent, bRtl, buttonInfo, callbackInfo, styleInfo, agentInfo) {
+    elem, options, buttonInfo, callbackInfo, styleInfo, agentInfo) { //  orientation, contentParent, bRtl, buttonInfo, callbackInfo, styleInfo) {
     this._elem = elem;
-    this._orientation = orientation;
-    this._contentParent = contentParent;
-    this._bRtl = bRtl;
+    this._orientation = options.orientation;
+    this._contentParent = options.contentParent;
+    this._bRtl = options.bRtl;
     this._arrowVisibility = buttonInfo.arrowVisibility;
     this._prevButtonStyleClass = buttonInfo.prevButtonStyleClass;
     this._nextButtonStyleClass = buttonInfo.nextButtonStyleClass;
@@ -217,7 +217,7 @@ var __oj_conveyor_belt_metadata =
       self._handleTouchStart(event);
     };
     cbcClass._addBubbleEventListener(this._overflowContainer, 'touchstart',
-                                     this._touchStartListener, true);
+                                    this._touchStartListener, true);
     this._touchMoveListener = function (event) {
       self._handleTouchMove(event);
     };
@@ -593,13 +593,28 @@ var __oj_conveyor_belt_metadata =
    */
   ConveyorBeltCommon._getWheelDelta = function (event) {
     var wheelDelta = 0;
-    if (event.wheelDelta != null) {
-      wheelDelta = event.wheelDelta;
-    } else if (event.deltaY != null) {
-      wheelDelta = -event.deltaY;
+    if (event.deltaY != null || event.deltaX != null) {
+      var deltaX = Math.abs(event.deltaX);
+      var deltaY = Math.abs(event.deltaY);
+      if (deltaX > deltaY) {
+        wheelDelta = -event.deltaX;
+      } else {
+        wheelDelta = -event.deltaY;
+      }
+    } else if (event.wheelDelta != null) {
+      var wheelDeltaX = Math.abs(event.wheelDeltaX);
+      var wheelDeltaY = Math.abs(event.wheelDeltaY);
+      if (wheelDeltaX > wheelDeltaY) {
+        wheelDelta = event.wheelDeltaX;
+      } else {
+        wheelDelta = event.wheelDeltaY;
+      }
     } else {
       wheelDelta = -event.detail;
     }
+    if (event.deltaMode === 1) {
+      wheelDelta *= 5;
+    }
     return wheelDelta;
   };
 
@@ -1281,14 +1296,18 @@ var __oj_conveyor_belt_metadata =
     if (this._needsScroll() && !this._bScrolling) {
       var cbcClass = ConveyorBeltCommon;
       var wheelDelta = cbcClass._getWheelDelta(event);
+      var scroll;
       if (wheelDelta < 0 && !this._atEnd) {
-        bConsumeEvent = true;
-        this._scrollNext();
+        scroll = this._getCurrScroll() + Math.abs(wheelDelta);
       } else if (wheelDelta > 0 && !this._atStart) {
+        scroll = this._getCurrScroll() - wheelDelta;
+      }
+      if (scroll != null) {
         bConsumeEvent = true;
-        this._scrollPrev();
+        this._updateButtonVisibility(scroll);
+        this._setOverflowScroll(scroll);
       }
-    }
+     }
     if (bConsumeEvent) {
       event.preventDefault();
       event.stopPropagation();
@@ -1308,17 +1327,22 @@ var __oj_conveyor_belt_metadata =
     if (this._needsScroll() && !this._bScrolling && eventTouches.length === 1) {
       this._bTouch = true;
       // save off some initial information at the start of a swipe
-      var firstTouch = eventTouches[0];
-      this._touchStartCoord = this._isHorizontal() ? firstTouch.pageX : firstTouch.pageY;
+      this._firstTouch = eventTouches[0];
+      this._touchLastCoord = this._isHorizontal() ? this._firstTouch.pageX : this._firstTouch.pageY;
+
       this._touchStartScroll = this._getCurrScroll();
       this._touchStartNextScroll = this._calcNextScroll();
       this._touchStartPrevScroll = this._calcPrevScroll();
       // FIX : save the initial at start or at end state
       this._touchInitialNotAtEnd = !this._atEnd;
       this._touchInitialNotAtStart = !this._atStart;
+      this._trackingPoints = [];
+      this._addTrackingPoint(this._touchLastCoord);
+      this._targetCoord = 0;
     }
   };
 
+
   /**
    * Handle a touchmove event.
    * @param {Event} event Event object
@@ -1330,9 +1354,9 @@ var __oj_conveyor_belt_metadata =
   ConveyorBeltCommon.prototype._handleTouchMove = function (event) {
     var bHoriz = this._isHorizontal();
     var eventTouches = event.touches;
-    var firstTouch = eventTouches[0];
-    var touchCoord = bHoriz ? firstTouch.pageX : firstTouch.pageY;
-    var diff = touchCoord - this._touchStartCoord;
+    var currentTouch = eventTouches[0];
+    this._touchCurrentCoord = bHoriz ? currentTouch.pageX : currentTouch.pageY;
+    var diff = this._touchCurrentCoord - this._touchLastCoord;
     // in non-RTL, if swiping left or up, scroll next; otherwise scroll prev
     // in RTL, if swiping right or up, scroll next; otherwise scroll prev
     var bNext = (bHoriz && this._bRtl) ? (diff > 0) : (diff < 0);
@@ -1341,38 +1365,24 @@ var __oj_conveyor_belt_metadata =
                                     (!bNext && this._touchInitialNotAtStart);
     // only need to do something if we also received the touchstart and if we can
     // scroll in the swipe direction
-    if (this._bTouch && canScrollInSwipeDirection) {
-      // only scroll next/prev if the swipe is longer than the threshold; if it's
-      // less, then just drag the items with the swipe
-      var cbcClass = ConveyorBeltCommon;
-      var container = this._overflowContainer;
-      var threshold = cbcClass._SWIPE_THRESHOLD *
-                      (bHoriz ? container.offsetWidth : container.offsetHeight);
-
-      // if swiping under the threshold, just move the conveyor with the swipe
-      if (Math.abs(diff) < threshold) {
-        this._setCurrScroll(this._touchStartScroll - diff, true);
-
-        // if we're under the threshold, but we've already scrolled to the end,
-        // then we don't need to continue trying to scroll and we don't need to
-        // reset the scroll position at the end of the touch
-        if ((this._touchInitialNotAtEnd && this._atEnd) ||
-            (this._touchInitialNotAtStart && this._atStart)) {
-          this._bTouch = false;
-        }
+    if (this._bTouch && this._firstTouch.id === currentTouch.id && canScrollInSwipeDirection) {
+      this._addTrackingPoint(this._touchLastCoord);
+      if (bHoriz && this._bRtl) {
+        this._setCurrScroll(this._getCurrScroll() + diff, true);
       } else {
-        // if swiping beyond the threshold, scroll to the next/prev set of items
-        this._setCurrScroll(bNext ? this._touchStartNextScroll : this._touchStartPrevScroll, false);
-        // don't scroll again for this same swipe
+        this._setCurrScroll(this._getCurrScroll() - diff, true);
+      }
+      this._touchLastCoord = this._touchCurrentCoord;
+      // if we're under the threshold, but we've already scrolled to the end,
+      // then we don't need to continue trying to scroll and we don't need to
+      // reset the scroll position at the end of the touch
+      if ((this._touchInitialNotAtEnd && this._atEnd) ||
+          (this._touchInitialNotAtStart && this._atStart)) {
         this._bTouch = false;
       }
-
       // FIX : set a flag indicating we've scrolled for this touch event
       this._scrolledForThisTouch = true;
     }
-
-    // FIX : if we've scrolled for this touch event, consume the event
-    // so that the page doesn't also scroll
     if (this._scrolledForThisTouch) {
       event.preventDefault();
       event.stopPropagation();
@@ -1389,14 +1399,77 @@ var __oj_conveyor_belt_metadata =
    */
   // eslint-disable-next-line no-unused-vars
   ConveyorBeltCommon.prototype._handleTouchEnd = function (event) {
-    // if a full page swipe hasn't happened, scroll back to the original position
-    if (this._bTouch) {
-      this._setCurrScroll(this._touchStartScroll, false);
-    }
     this._bTouch = false;
     // FIX : reset the flag indicating if we've scrolled for this touch
     // event
     this._scrolledForThisTouch = false;
+    if (this._trackingPoints != null) {
+      this._addTrackingPoint(this._touchLastCoord);
+      this._startDecelAnim();
+    }
+  };
+
+  /**
+   * Records movement for the last 100ms
+   * @param {number} coord - x or y coordinate depending on the conveyorbelt orientation
+   */
+  ConveyorBeltCommon.prototype._addTrackingPoint = function (coord) {
+    if (this._trackingPoints == null) {
+      return;
+    }
+    var time = Date.now();
+    while (this._trackingPoints.length > 0) {
+        if (time - this._trackingPoints[0].time <= 100) {
+            break;
+        }
+        this._trackingPoints.shift();
+    }
+    this._trackingPoints.push({ coord, time });
+  };
+
+  /*
+  * Initialize animation of values coming to a stop
+  */
+  ConveyorBeltCommon.prototype._startDecelAnim = function () {
+    var firstPoint = this._trackingPoints[0];
+    var lastPoint = this._trackingPoints[this._trackingPoints.length - 1];
+
+    var offset = lastPoint.coord - firstPoint.coord;
+    var timeOffset = lastPoint.time - firstPoint.time;
+
+    var D = timeOffset / 15;
+
+    this._decVel = offset / D || 0; // prevent NaN
+
+    if (Math.abs(this._decVel) > 1) {
+        this._decelerating = true;
+        requestAnimationFrame(this._stepDecelAnim.bind(this));
+    }
+  };
+
+  /**
+   * Animates values slowing down
+   */
+  ConveyorBeltCommon.prototype._stepDecelAnim = function () {
+    if (!this._decelerating) {
+      return;
+    }
+    var friction = ConveyorBeltCommon._TOUCH_SCROLL_FRICTION;
+    var stopThreshold = ConveyorBeltCommon._TOUCH_SCROLL_STOP_THRESHOLD;
+    this._decVel *= friction;
+
+    this._targetCoord += this._decVel;
+
+    if (Math.abs(this._decVel) > stopThreshold) {
+      if (this._isHorizontal() && this._bRtl) {
+        this._setCurrScroll(this._getCurrScroll() + this._targetCoord, false);
+      } else {
+        this._setCurrScroll(this._getCurrScroll() - this._targetCoord, false);
+      }
+      requestAnimationFrame(this._stepDecelAnim.bind(this));
+    } else {
+      this._decelerating = false;
+    }
   };
 
   /**
@@ -1675,11 +1748,18 @@ var __oj_conveyor_belt_metadata =
    */
   ConveyorBeltCommon._SCROLL_SPEED = 1.1;
   /**
-   * Touch swipe threshold (percentage of conveyor size).
+   * Touch scroll friction.
    * @memberof ConveyorBeltCommon
    * @private
    */
-  ConveyorBeltCommon._SWIPE_THRESHOLD = 0.33;
+  ConveyorBeltCommon._TOUCH_SCROLL_FRICTION = 0.7;
+  /**
+   * Touch scroll stop threshold.
+   * @memberof ConveyorBeltCommon
+   * @private
+   */
+  ConveyorBeltCommon._TOUCH_SCROLL_STOP_THRESHOLD = 0.1;
+
 
   ConveyorBeltCommon._KEYBOARD_KEYS = {
     _UP: 'ArrowUp',
@@ -2240,6 +2320,7 @@ var __oj_conveyor_belt_metadata =
             buttonInfo.nextButtonIcon = nextIcon;
             var styleInfo = {};
             styleInfo.overflowContainerStyleClass = 'oj-conveyorbelt-overflow-container';
+
             styleInfo.contentContainerStyleClass = 'oj-conveyorbelt-content-container';
             styleInfo.itemStyleClass = 'oj-conveyorbelt-item';
             styleInfo.hiddenStyleClass = 'oj-helper-hidden';
@@ -2274,9 +2355,11 @@ var __oj_conveyor_belt_metadata =
             var agentInfo = oj.AgentUtils.getAgentInfo(navigator.userAgent);
             this._cbCommon = new ConveyorBeltCommon(
               elem[0],
-              orientation,
-              contentParentElem,
-              this._bRTL,
+              {
+                orientation: orientation,
+                contentParent: contentParentElem,
+                bRtl: this._bRTL
+              },
               buttonInfo,
               callbackInfo,
               styleInfo,

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

@@ -52,12 +52,12 @@
      * @global
      * @member {string} version JET version numberr
      */
-    version: '10.1.1',
+    version: '10.1.6',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2021-05-05_16-28-41',
+    revision: '2021-12-03_15-08-31',
 
     // 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/ojdataproviderscroller.js

@@ -701,7 +701,8 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojconfig',
       // add card style class to wrapper/transforming div
       if (isCardLayout) {
         // eslint-disable-next-line no-param-reassign
-        item.className = item.className + ' ' + this.m_widget.getItemStyleClass();
+        item.className = item.className + ' oj-listview-card-animated ' +
+          this.m_widget.getItemStyleClass();
       }
       if (!this.shouldUseGridRole()) {
         elem.children().wrapAll('<div></div>'); // @HTMLUpdateOK

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

@@ -3364,7 +3364,12 @@ var __oj_input_date_time_metadata =
             return false;
           case kc.ESCAPE:
             this._hide(this._ON_CLOSE_REASON_CANCELLED);
-            handled = true;
+            // JET-43662 - date picker inside popup is not getting closed on esc key press
+            // The ESC key is handled only when the picker is not inline. When in inline
+            // mode, we need to allow the event to bubble up as we are not doing anything here.
+            if (!this._isInLine) {
+              handled = true;
+            }
             break;// hide on escape
           case kc.PAGE_UP:
             if (event.ctrlKey && event.altKey) {
@@ -3509,7 +3514,12 @@ var __oj_input_date_time_metadata =
             return false;
           case kc.ESCAPE:
             this.hide();
-            handled = true;
+            // JET-43662 - date picker inside popup is not getting closed on esc key press
+            // The ESC key is handled only when the picker is not inline. When in inline
+            // mode, we need to allow the event to bubble up as we are not doing anything here.
+            if (!this._isInLine) {
+              handled = true;
+            }
             break;// hide on escape
           case kc.PAGE_UP:
             if (event.ctrlKey && event.altKey) {
@@ -3595,7 +3605,12 @@ var __oj_input_date_time_metadata =
             return false;
           case kc.ESCAPE:
             this.hide();
-            handled = true;
+            // JET-43662 - date picker inside popup is not getting closed on esc key press
+            // The ESC key is handled only when the picker is not inline. When in inline
+            // mode, we need to allow the event to bubble up as we are not doing anything here.
+            if (!this._isInLine) {
+              handled = true;
+            }
             break;// hide on escape
           case kc.PAGE_UP:
             if (event.altKey) {
@@ -4053,12 +4068,24 @@ var __oj_input_date_time_metadata =
       var stepMonths = this._getStepMonths();
       var self = this;
       var keyDownPrevent = function (evt) {
-        var allowDefaultEvent = false;
-        if (evt.type === 'keydown' && evt.keyCode === $.ui.keyCode.TAB) {
-          allowDefaultEvent = true;
+        if (evt.type === 'keydown') {
+          const kc = $.ui.keyCode;
+          switch (evt.keyCode) {
+            case kc.TAB:
+              // we need to simply allow the default action
+              return true;
+            case kc.ESCAPE:
+              // we need to allow default action when used
+              // as inline picker
+              if (self._isInLine) {
+                return true;
+              }
+              return false;
+            default:
+              // default no-op
+          }
         }
-
-        return allowDefaultEvent;
+        return false;
       };
 
       this._dpDiv.find('[data-handler]').map(function () {

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

@@ -164,7 +164,7 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojdatacollection-common', 'ojs/ojlogge
    */
   DomScroller.prototype.checkViewport = function (forceFetch) {
     if (this._asyncIterator && this._element.clientHeight > 0 &&
-        (forceFetch || !this.isOverflow())) {
+      (forceFetch || !this.isOverflow() || this._isEndReached())) {
       this._checkViewportCount += 1;
       if (this._checkViewportCount === DataCollectionUtils.CHECKVIEWPORT_THRESHOLD) {
         Logger.warn('Viewport not satisfied after multiple fetch, make sure the component is height constrained or specify a scroller.');

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

@@ -5,7 +5,9 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['exports'], function (exports) { 'use strict';
+define(['exports', 'ojs/ojcore-base'], function (exports, oj) { 'use strict';
+
+    oj = oj && Object.prototype.hasOwnProperty.call(oj, 'default') ? oj['default'] : oj;
 
     /**
      * @license
@@ -43,8 +45,17 @@ define(['exports'], function (exports) { 'use strict';
      * @property {'single' | 'multiple'} selectionMode - Whether to allow single or multiple file selection.  Single is the default.
      */
 
-    function pickFiles(callback, fileOptions) {
-        const input = document.createElement('input');
+    let input;
+    const isIOS = oj.AgentUtils.getAgentInfo().os === oj.AgentUtils.OS.IOS;
+    const teardownInput = () => {
+        if (isIOS)
+            document.body.removeChild(input);
+        input = null;
+    };
+    const setupInput = (fileOptions) => {
+        if (input)
+            teardownInput();
+        input = document.createElement('input');
         input.type = 'file';
         if ((fileOptions === null || fileOptions === void 0 ? void 0 : fileOptions.capture) && fileOptions.capture != 'none') {
             input.capture = fileOptions.capture;
@@ -53,8 +64,15 @@ define(['exports'], function (exports) { 'use strict';
         const accept = acceptProp && acceptProp.length ? acceptProp.join(',') : null;
         input.accept = accept;
         input.multiple = (fileOptions === null || fileOptions === void 0 ? void 0 : fileOptions.selectionMode) == 'multiple';
+        input.style.display = 'none';
+        if (isIOS)
+            document.body.appendChild(input);
+    };
+    function pickFiles(callback, fileOptions) {
+        setupInput(fileOptions);
         input.onchange = function () {
             callback(input.files);
+            teardownInput();
         };
         input.click();
     }

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

@@ -311,7 +311,10 @@ define(['ojs/ojcore-base', 'jquery', 'knockout', 'ojs/ojarraytreedataprovider',
                     let doneOrSkip = skipFetch || self._parent._dataFetchComplete;
                     return this._parent
                         ._getDataFromDataProvider(this._params, 'root', doneOrSkip)
-                        .then(function () {
+                        .then(function (res) {
+                        if (res === 'error') {
+                            return Promise.reject("Fetch interrupted due to refresh event");
+                        }
                         self._parent._updateSectionIndex();
                         let updatedParams = new self._parent.FetchByOffsetParameters(self._parent, self._parent._currentBaseOffset, self._params.size, self._params.sortCriteria, self._params.filterCriterion);
                         return self._dataprovider.fetchByOffset(updatedParams).then(function (res) {
@@ -354,7 +357,10 @@ define(['ojs/ojcore-base', 'jquery', 'knockout', 'ojs/ojarraytreedataprovider',
                     return this._parent
                         ._getDataFromDataProvider(this._params, this._parentKey, doneOrSkip)
                         .then(function (value) {
-                        if (value === undefined) {
+                        if (value === 'error') {
+                            return Promise.reject("Fetch interrupted due to refresh event");
+                        }
+                        else if (value === undefined) {
                             self._parent._updateSectionIndex();
                         }
                         return self._dataprovider.fetchByOffset(updatedParams).then(function (res) {
@@ -649,42 +655,51 @@ define(['ojs/ojcore-base', 'jquery', 'knockout', 'ojs/ojarraytreedataprovider',
             return this;
         }
         _getDataFromDataProvider(params, source, skipFetch) {
-            let self = this;
             if (!this._inCurrentFetchingSection(source) || skipFetch) {
-                return Promise.resolve(true);
-            }
-            if (!self._internalIterator) {
-                self._internalIterator = this._dataProvider.fetchFirst(params)[Symbol.asyncIterator]();
-                self._previousTotalSize = 0;
-                self._internalIteratorCacheLength = 0;
-            }
-            if (self._previousTotalSize != self._treeData.length) {
-                self._internalIteratorCacheLength = 0;
-            }
-            let helperFunction = (storedDataLength) => {
-                return self._internalIterator.next().then((result) => {
-                    self._treeData = self._treeData.concat(result['value']['data']);
-                    self._treeMetadata = self._treeMetadata.concat(result['value']['metadata']);
-                    result['value']['metadata'].forEach(function (val) {
-                        self._treeKeyMap.push(val.key);
+                return Promise.resolve('skip');
+            }
+            let iterator = this._internalIterator;
+            if (!this._internalIterator) {
+                iterator = this._dataProvider.fetchFirst(params)[Symbol.asyncIterator]();
+                this._internalIterator = iterator;
+                this._previousTotalSize = 0;
+                this._internalIteratorCacheLength = 0;
+            }
+            if (this._previousTotalSize != this._treeData.length) {
+                this._internalIteratorCacheLength = 0;
+            }
+            return new Promise((resolve) => {
+                this._internalIteratorResolve = resolve;
+                const helperFunction = (storedDataLength, iterator) => {
+                    return this._internalIterator.next().then((result) => {
+                        if (this._internalIterator != null && this._internalIterator === iterator) {
+                            this._treeData = this._treeData.concat(result['value']['data']);
+                            this._treeMetadata = this._treeMetadata.concat(result['value']['metadata']);
+                            result['value']['metadata'].forEach((val) => {
+                                this._treeKeyMap.push(val.key);
+                            });
+                            storedDataLength += result['value']['data'].length;
+                            if (result['done']) {
+                                this._dataFetchComplete = true;
+                            }
+                            else {
+                                this._dataFetchComplete = false;
+                            }
+                            if (result['done'] || storedDataLength >= result['value']['fetchParameters']['size']) {
+                                const remainder = storedDataLength - result['value']['fetchParameters']['size'];
+                                this._internalIteratorCacheLength = Math.max(0, remainder);
+                                this._previousTotalSize = this._treeData.length;
+                                this._internalIteratorResolve(undefined);
+                                this._internalIteratorResolve = null;
+                            }
+                            else {
+                                return helperFunction(storedDataLength, iterator);
+                            }
+                        }
                     });
-                    storedDataLength += result['value']['data'].length;
-                    if (result['done']) {
-                        self._dataFetchComplete = true;
-                    }
-                    else {
-                        self._dataFetchComplete = false;
-                    }
-                    if (result['done'] || storedDataLength >= result['value']['fetchParameters']['size']) {
-                        let remainder = storedDataLength - result['value']['fetchParameters']['size'];
-                        self._internalIteratorCacheLength = Math.max(0, remainder);
-                        self._previousTotalSize = self._treeData.length;
-                        return;
-                    }
-                    return helperFunction(storedDataLength);
-                });
-            };
-            return helperFunction(self._internalIteratorCacheLength);
+                };
+                return helperFunction(this._internalIteratorCacheLength, iterator);
+            });
         }
         _inCurrentFetchingSection(source) {
             if (source === 'root') {
@@ -1604,9 +1619,18 @@ define(['ojs/ojcore-base', 'jquery', 'knockout', 'ojs/ojarraytreedataprovider',
         }
         _addEventListeners(dataprovider) {
             let self = this;
-            dataprovider.addEventListener('refresh', function (event) {
-                self._initialize();
-                self.dispatchEvent(new ojdataprovider.DataProviderRefreshEvent());
+            dataprovider.addEventListener('refresh', (event) => {
+                this._initialize();
+                if (this._internalIteratorResolve != null) {
+                    this._internalIteratorResolve('error');
+                    this._internalIteratorResolve = null;
+                    window.requestAnimationFrame(() => {
+                        this.dispatchEvent(new ojdataprovider.DataProviderRefreshEvent());
+                    });
+                }
+                else {
+                    this.dispatchEvent(new ojdataprovider.DataProviderRefreshEvent());
+                }
             });
             dataprovider.addEventListener('mutate', function (event) {
                 if (event.detail.add) {