@oracle/oraclejet 11.1.0 → 11.1.4

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

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

@@ -4189,11 +4189,20 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
       filterInputText.addEventListener('blur', function (event) {
         $elem.removeClass('oj-focus');
         if (!this._fullScreenPopup) {
-          // don't hide the filter field if tabbing into the dropdown or clicking on an empty area
-          // of the dropdown
-          if ((!event.relatedTarget ||
-               !DomUtils.isAncestor(this._lovDropdown.getElement(), event.relatedTarget)) &&
-              !this._mousedownOnDropdown) {
+          // don't hide the filter field if:
+          // * tabbing into the dropdown, or
+          // * clicking on an empty area of the dropdown, or
+          // * JET-47185 - Acc: SelectSingle loses focus if we switch to other windows - Potential
+          //   Keyboard trap in a dialog
+          //   Alt+Tabbing to other application windows, in which case the document.activeElement
+          //   will still be in the filter field
+          var focusInDropdown = event.relatedTarget &&
+            DomUtils.isAncestor(this._lovDropdown.getElement(), event.relatedTarget);
+          var focusInFilterField = document.activeElement &&
+            DomUtils.isAncestor(filterInputText, document.activeElement);
+          if (!focusInDropdown &&
+              !this._mousedownOnDropdown &&
+              !focusInFilterField) {
             this._showMainField();
           }
         }

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

@@ -1430,6 +1430,19 @@ var __oj_select_many_metadata =
       event.preventDefault();
     },
 
+    /**
+     * Creates a kill event handler that supports exception.
+     *
+     * @param {string} selector An exception selector. If the event target matches this selector
+     *                          the event will not be killed.
+     * @param {Event} event The event object that needs to be killed
+     */
+    killEventWithException: function (selector, event) {
+      if ($(event.target).is(selector)) return;
+      // If the element is not an exception, kill the event
+      _ComboUtils.killEvent(event);
+    },
+
     // _ComboUtils
     /*
        * Produces a query function that works with a local array
@@ -15010,6 +15023,28 @@ var __oj_select_many_metadata =
         return $(contentStructure.join(''));
       },
 
+      // _OjMultiSelect
+      _initContainer: function () {
+        _OjMultiSelect.superclass._initContainer.apply(this, arguments);
+
+
+        // JET-47442 - validation error popup unexpectedly while creating the new labor schedule
+        // The editable table relies on the focus events from the popup to determine whether
+        // or not the table should be edit mode. In select-many, when there is a search field
+        // and it is focused, the focus stays in the popup. At this point, when one clicks on
+        // an option item, the focus will be lost on mousedown. Since, none of the other elements
+        // in the dropdown are focusable, the focus is transferred to the first focusable ancestor
+        // which in this case happens to be the body element. This results in the focusout event
+        // on the popup. As the selection only happens on the mouseup event, if one keeps the mouse
+        // pressed long enough, the table will exit the edit mode before the selection happens.
+        // Since, we are not relying on the physical focus anyway for selection mechanism, a patchy
+        // solution here would be to prevent the focus transfer when one clicks in the results area.
+        // This way the table would stay in edit mode. One important thing is to allow focus transfer
+        // when one clicks on the search field, we only want to prevent it in the rest of the region
+        // in the dropdown.
+        this.dropdown.on('mousedown', _ComboUtils.killEventWithException.bind(null, '.oj-listbox-input'));
+      },
+
       // _OjMultiSelect
       // eslint-disable-next-line no-unused-vars
       _enable: function (enabled) {
@@ -15422,6 +15457,22 @@ var __oj_select_many_metadata =
         this.selection.on('blur', function (e) {
           self._testClear(e);
         });
+
+        // JET-47442 - validation error popup unexpectedly while creating the new labor schedule
+        // The editable table relies on the focus events from the popup to determine whether
+        // or not the table should be edit mode. In select-one, when there is a search field
+        // and it is focused, the focus stays in the popup. At this point, when one clicks on
+        // an option item, the focus will be lost on mousedown. Since, none of the other elements
+        // in the dropdown are focusable, the focus is transferred to the first focusable ancestor
+        // which in this case happens to be the body element. This results in the focusout event
+        // on the popup. As the selection only happens on the mouseup event, if one keeps the mouse
+        // pressed long enough, the table will exit the edit mode before the selection happens.
+        // Since, we are not relying on the physical focus anyway for selection mechanism, a patchy
+        // solution here would be to prevent the focus transfer when one clicks in the results area.
+        // This way the table would stay in edit mode. One important thing is to allow focus transfer
+        // when one clicks on the search field, we only want to prevent it in the rest of the region
+        // in the dropdown.
+        this.dropdown.on('mousedown', _ComboUtils.killEventWithException.bind(null, '.oj-listbox-input'));
       },
 
       // _OjSingleSelect

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/ojtemplateengine.js

@@ -5,21 +5,38 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['knockout', 'ojs/ojcore', 'ojs/ojkoshared', 'ojs/ojhtmlutils', 'ojs/ojlogger', 'ojs/ojcustomelement-utils', 'preact', 'ojs/ojcore-base'], function (ko, oj, BindingProviderImpl, HtmlUtils, Logger, ojcustomelementUtils, preact, oj$1) { 'use strict';
+define(['knockout', 'ojs/ojcore', 'ojs/ojkoshared', 'ojs/ojhtmlutils', 'ojs/ojlogger', 'ojs/ojcustomelement-utils', 'preact', 'ojs/ojcore-base', 'ojs/ojcontext'], function (ko, oj, BindingProviderImpl, HtmlUtils, Logger, ojcustomelementUtils, preact, oj$1, Context) { 'use strict';
 
     oj = oj && Object.prototype.hasOwnProperty.call(oj, 'default') ? oj['default'] : oj;
     BindingProviderImpl = BindingProviderImpl && Object.prototype.hasOwnProperty.call(BindingProviderImpl, 'default') ? BindingProviderImpl['default'] : BindingProviderImpl;
     oj$1 = oj$1 && Object.prototype.hasOwnProperty.call(oj$1, 'default') ? oj$1['default'] : oj$1;
+    Context = Context && Object.prototype.hasOwnProperty.call(Context, 'default') ? Context['default'] : Context;
 
     const ROW = Symbol('row');
     class PreactTemplate {
         static executeVDomTemplate(templateElement, context) {
+            const busyContext = Context.getContext(templateElement).getBusyContext();
+            const customThrottle = (callback, timeout) => {
+                let timeoutInstance;
+                return () => {
+                    if (!timeoutInstance) {
+                        const busyStateResolve = busyContext.addBusyState({
+                            description: 'pending changes for the template element'
+                        });
+                        timeoutInstance = setTimeout(() => {
+                            timeoutInstance = undefined;
+                            callback();
+                            busyStateResolve();
+                        }, timeout);
+                    }
+                };
+            };
             const computedVNode = ko.pureComputed({
                 read: () => {
                     return templateElement.render(context.$current);
                 }
             })
-                .extend({ rateLimit: 0 });
+                .extend({ rateLimit: { timeout: 0, method: customThrottle } });
             const vNode = computedVNode();
             PreactTemplate._extendTemplate(templateElement, PreactTemplate._ROW_CACHE_FACTORY, (renderer) => {
                 templateElement._cachedRows.forEach((rowItem) => {

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

@@ -450,7 +450,7 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojthemeutils', 'ojs/ojcomponentcore',
           if (!this._hasInitialFocusHandler) { // Don't add more than one initial focus handler (for the case where toolbar is refreshed but not yet focused)
                 // defer setting up button-specific event handling until the first focusin event is triggered
             this._focusinListener = function (event) { // eslint-disable-line no-unused-vars
-              self._handleInitialFocus();
+              self._handleInitialFocus(event.target);
             };
             elem.addEventListener('focusin', this._focusinListener, true);
             this._hasInitialFocusHandler = true;
@@ -531,7 +531,7 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojthemeutils', 'ojs/ojcomponentcore',
 
       // For custom element only, we setup this handler for any focusin event on the toolbar. We then remove this handler, and setup the rest of the handlers we need
       // once all of our children have finished being initialized.
-      _handleInitialFocus: function () {
+      _handleInitialFocus: function (targetElement) {
         // Private, not an override (not in base class).  Method name unquoted so will be safely optimized (renamed) by GCC as desired.
         var self = this;
         var elem = this.element[0];
@@ -619,7 +619,18 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojthemeutils', 'ojs/ojcomponentcore',
         }
 
         this._initTabindexes(this._lastTabStop == null);
-        this._getButtonFocusElem(this.$enabledButtons[0]).focus();
+        if (this.$enabledButtons && this.$enabledButtons.length > 0) {
+          if (targetElement) {
+            let targetButton =
+              targetElement.nodeName === 'INPUT' ? targetElement.parentElement : targetElement;
+              targetButton.focus();
+          } else {
+            let btn = this._getButtonFocusElem(this.$enabledButtons[0]);
+            if (btn) {
+              btn.focus();
+            }
+          }
+        }
       },
 
       // Update list of enabled buttons and refresh tabindex settings

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/ojvcomponent-template.js

@@ -5,7 +5,7 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevaluator', 'ojs/ojcustomelement-utils', 'preact', 'ojs/ojvcomponent-template', 'ojs/ojcontext', 'ojs/ojdataproviderhandler', 'ojs/ojbindpropagation'], function (exports, Logger, HtmlUtils, CspExpressionEvaluator, ojcustomelementUtils, preact, VComponentTemplate, Context, ojdataproviderhandler, ojbindpropagation) { 'use strict';
+define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevaluator', 'ojs/ojcustomelement-utils', 'preact', 'ojs/ojcontext', 'ojs/ojdataproviderhandler', 'ojs/ojbindpropagation'], function (exports, Logger, HtmlUtils, CspExpressionEvaluator, ojcustomelementUtils, preact, Context, ojdataproviderhandler, ojbindpropagation) { 'use strict';
 
     CspExpressionEvaluator = CspExpressionEvaluator && Object.prototype.hasOwnProperty.call(CspExpressionEvaluator, 'default') ? CspExpressionEvaluator['default'] : CspExpressionEvaluator;
     Context = Context && Object.prototype.hasOwnProperty.call(Context, 'default') ? Context['default'] : Context;
@@ -40,8 +40,8 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevalua
             }
         }
         render() {
-            return (preact.h(preact.Fragment, null, this.state.view && this.state.data
-                ? VComponentTemplate.executeFragment(null, this.state.view, this.state.data, this.forceUpdate.bind(this), this.props.bindingProvider)
+            return (preact.h(preact.Fragment, null, this.state.view && this.state.data && this.props.executeFragment
+                ? this.props.executeFragment(null, this.state.view, this.state.data, this.forceUpdate.bind(this), this.props.bindingProvider)
                 : null));
         }
     }
@@ -298,7 +298,8 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevalua
             const bindDomConfig = { view: nodes, data: context };
             const bindDomProps = {
                 config: Promise.resolve(bindDomConfig),
-                bindingProvider: engineContext[BINDING_PROVIDER]
+                bindingProvider: engineContext[BINDING_PROVIDER],
+                executeFragment: this.executeFragment.bind(this)
             };
             return preact.h(BindDom, bindDomProps);
         }
@@ -498,6 +499,10 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevalua
                 {
                     key: 'bindingProvider',
                     value: { type: 3, value: engineContext[BINDING_PROVIDER] }
+                },
+                {
+                    key: 'executeFragment',
+                    value: { type: 3, value: this.executeFragment.bind(this) }
                 }
             ]);
         }
@@ -709,8 +714,8 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevalua
                             }
                         });
                         if (existingCallbackExpr && !callbackExprEvaluator) {
-                            callbackExprEvaluator = this._cspEvaluator.createEvaluator(existingCallbackExpr)
-                                .evaluate;
+                            callbackExprEvaluator =
+                                this._cspEvaluator.createEvaluator(existingCallbackExpr).evaluate;
                         }
                         const existingCallback = callbackExprEvaluator
                             ? callbackExprEvaluator([bindingContext, bindingContext.$data])

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

@@ -1375,10 +1375,12 @@ class BufferingDataProvider {
             detailAdd.metadata.forEach((metadata, idx) => {
                 const addBeforeKey = this._addToMergedArrays({ metadata: detailAdd.metadata[idx], data: detailAdd.data[idx] }, true, detailAdd.addBeforeKeys[idx]);
                 if (detailAdd.addBeforeKeys[idx] && !addBeforeKey) {
-                    this.lastIterator.mergedItemArray.splice(this.lastIterator.mergedItemArray.length, 0, {
-                        data: detailAdd.data[idx],
-                        metadata: detailAdd.metadata[idx]
-                    });
+                    if (this.lastIterator && this.lastIterator.mergedItemArray) {
+                        this.lastIterator.mergedItemArray.splice(this.lastIterator.mergedItemArray.length, 0, {
+                            data: detailAdd.data[idx],
+                            metadata: detailAdd.metadata[idx]
+                        });
+                    }
                 }
                 detailAdd.addBeforeKeys[idx] = addBeforeKey;
             });
@@ -1399,10 +1401,12 @@ class BufferingDataProvider {
                     this._removeFromMergedArrays(detailUpdate.metadata[idx].key, true);
                     addBeforeKeys[idx] = this._addToMergedArrays({ data: currData, metadata: detailUpdate.metadata[idx] }, true);
                     if (!addBeforeKeys[idx]) {
-                        this.lastIterator.mergedItemArray.splice(this.lastIterator.mergedItemArray.length, 0, {
-                            data: currData,
-                            metadata: detailUpdate.metadata[idx]
-                        });
+                        if (this.lastIterator && this.lastIterator.mergedItemArray) {
+                            this.lastIterator.mergedItemArray.splice(this.lastIterator.mergedItemArray.length, 0, {
+                                data: currData,
+                                metadata: detailUpdate.metadata[idx]
+                            });
+                        }
                     }
                 }
             });