@oracle/oraclejet 17.0.1 → 17.0.3

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

@@ -341,7 +341,7 @@
 }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v17.0.1"}' !important;
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v17.0.3"}' !important;
 }
 
 .oj-helper-hidden-accessible {
@@ -10696,6 +10696,13 @@ oj-chart {
   --oj-private-text-field-icon-size: var(--oj-core-icon-size-lg);
 }
 
+.oj-color-invert {
+  --oj-private-text-field-button-icon-color: var(--oj-private-icon-color-default);
+  --oj-private-text-field-button-icon-color-hover: var(--oj-private-icon-color-hover);
+  --oj-private-text-field-button-icon-color-active: var(--oj-private-icon-color-active);
+  --oj-private-text-field-button-icon-color-disabled: var(--oj-private-icon-color-disabled);
+}
+
 .oj-color-invert {
   color: var(--oj-core-text-color-primary);
 }

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

@@ -178,13 +178,34 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojcom
                             params?.includeFilteredRowCount === 'enabled' &&
                             _parent._baseFetchFirstCapability?.totalFilteredRowCount !== 'exact';
                 }
+                _getStaleResult(result) {
+                    return result != null
+                        ? result.value.data?.length > 0
+                            ? new this._parent.CacheAsyncIteratorYieldResult(result.value, -1)
+                            : new this._parent.CacheAsyncIteratorReturnResult(result.value, -1)
+                        : {
+                            value: {
+                                data: [],
+                                metadata: [],
+                                fetchParameters: this.params,
+                                totalFilteredRowCount: -1
+                            },
+                            done: true
+                        };
+                }
                 ['next']() {
                     const params = this.params || {};
                     const size = params.size || -1;
                     const signal = params?.signal;
                     const callback = (resolve) => {
+                        if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                            return resolve(this._getStaleResult());
+                        }
                         if (this._needLocalRowCount && this._cachedOffset === 0) {
                             return resolve(this._checkCachedParamsAndIterate(params, -1).then((result) => {
+                                if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                                    return this._getStaleResult(result);
+                                }
                                 return this._getResult(params, size, this._parent.cache.getSize());
                             }));
                         }
@@ -214,7 +235,10 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojcom
                                 if (this._parent._getSharedIteratorState().fetchOffset < this._cachedOffset) {
                                     const fetchUntilOffset = () => {
                                         return this._checkCachedParamsAndIterate(params, size).then((result) => {
-                                            if (this._parent._getSharedIteratorState().fetchOffset >= this._cachedOffset ||
+                                            if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                                                resolve();
+                                            }
+                                            else if (this._parent._getSharedIteratorState().fetchOffset >= this._cachedOffset ||
                                                 result.done) {
                                                 resolve();
                                             }
@@ -229,7 +253,13 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojcom
                                     resolve();
                                 }
                             }).then(() => {
+                                if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                                    return this._getStaleResult();
+                                }
                                 return this._checkCachedParamsAndIterate(params, size).then((result) => {
+                                    if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                                        return this._getStaleResult(result);
+                                    }
                                     this._cachedOffset = this._parent._getSharedIteratorState().fetchOffset;
                                     return Promise.resolve(this._getFinalResult(result.value, totalFilteredRowCount));
                                 });
@@ -237,6 +267,9 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojcom
                         }
                     }
                     return this._checkCachedParamsAndIterate(params, size).then((result) => {
+                        if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                            return this._getStaleResult(result);
+                        }
                         this._cachedOffset = this._parent._getSharedIteratorState().fetchOffset;
                         return Promise.resolve(this._getFinalResult(result.value, totalFilteredRowCount));
                     });
@@ -267,20 +300,28 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojcom
                         this._parent._getSharedIteratorState().fetchPromise = this.asyncIterator
                             .next()
                             .then((result) => {
-                            if (result.value.fetchParameters?.sortCriteria) {
-                                this._parent._getSharedIteratorState().cachedFetchParams.sortCriteria =
-                                    result.value.fetchParameters?.sortCriteria;
+                            if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                                return this._getStaleResult(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;
-                                });
+                            else {
+                                if (result.value.fetchParameters?.sortCriteria) {
+                                    this._parent._getSharedIteratorState().cachedFetchParams.sortCriteria =
+                                        result.value.fetchParameters?.sortCriteria;
+                                }
+                                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) => {
+                                        if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                                            return this._getStaleResult(result);
+                                        }
+                                        this.cache.addListResult(finalResult);
+                                        return result;
+                                    });
+                                }
                             }
                             return result;
                         });
@@ -423,6 +464,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojcom
             if (params?.signal?.aborted) {
                 const asyncIterable = this.dataProvider.fetchFirst(params);
                 const asyncIterator = asyncIterable[Symbol.asyncIterator]();
+                this._currentAsyncIterator = asyncIterator;
                 return new this.CacheAsyncIterable(this, asyncIterator, null, null);
             }
             if (!this._getSharedIteratorState() ||
@@ -440,6 +482,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojcom
                     asyncIterator: asyncIterator
                 };
             }
+            this._currentAsyncIterator = this._getSharedIteratorState().asyncIterator;
             return new this.CacheAsyncIterable(this, this._getSharedIteratorState().asyncIterator, params, this.cache);
         }
         getCapability(capabilityName) {

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

@@ -37,12 +37,12 @@ define(['ojs/ojlogger', 'ojs/ojwebdrivertest-proxy'], function (Logger, ojwebdri
      * @global
      * @member {string} version JET version numberr
      */
-    version: '17.0.1',
+    version: '17.0.3',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2024-08-23_09-56-34',
+    revision: '2024-09-20_12-33-58',
 
     // 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/ojdatagrid.js

@@ -16322,22 +16322,23 @@ var __oj_data_grid_metadata =
     var requiresAnimation = false;
 
     this.m_processingModelEvent = true;
+    let clearProcessing = true;
 
     if (event.detail) {
       // handle new event
       if (operation === 'delete') {
         this._handleDeleteRangeEvent(event.detail);
-        this.m_processingModelEvent = false;
       }
       if (operation === 'insert') {
         this._handleInsertRangeEvent(event.detail);
+        clearProcessing = false;
       }
       if (operation === 'update') {
         this._handleUpdateRangeEvent(event.detail);
+        clearProcessing = false;
       }
       if (operation === 'refresh') {
         this._handleModelRefreshEvent(event.detail);
-        this.m_processingModelEvent = false;
       }
     } else if (operation === 'insert') {
       this._adjustActive(operation, indexes);
@@ -16392,7 +16393,7 @@ var __oj_data_grid_metadata =
       this._handleModelSyncEvent(event);
     }
 
-    if (!event.detail) {
+    if (clearProcessing) {
       this.m_processingModelEvent = false;
     }
 
@@ -16629,7 +16630,9 @@ var __oj_data_grid_metadata =
     let axis = eventDetail.axis;
     let ranges = eventDetail.ranges;
     if (ranges.length === 0) {
+      this.m_processingModelEvent = false;
       this.fillViewport();
+      this._runModelEventQueue();
       return;
     }
 
@@ -16764,7 +16767,9 @@ var __oj_data_grid_metadata =
       this._resetEditableClone();
       this.applySelection();
       this._resetHeaderHighLight();
+      this.m_processingModelEvent = false;
       this.fillViewport();
+      this._runModelEventQueue();
       return;
     }
 
@@ -16888,25 +16893,21 @@ var __oj_data_grid_metadata =
     ];
     let eventDetail = { axis, ranges, editHeader };
     let hasBrowserFocus = this.m_root.contains(document.activeElement);
+    const focusCallback = () => {
+      if (this._isActiveWithinUpdateRange({ detail: { ranges: [range] } })) {
+        if (!hasBrowserFocus) {
+          this.m_shouldFocus = false;
+        }
+        this._highlightActive();
+      }
+    };
 
     this._handleDeleteRangeEvent(eventDetail);
     // handleInsertRangeCellFetchSuccess expects { offset, count } as commonProps.range
     delete commonProps.range;
     commonProps.range = { offset, count };
-    this._handleInsertRangeCellFetchSuccess(commonProps, cellSet, cellRange);
-
-    if (this._isActiveWithinUpdateRange({ detail: { ranges: [range] } })) {
-      if (!hasBrowserFocus) {
-        this.m_shouldFocus = false;
-      }
-      this._highlightActive();
-    }
-
-    this._runModelEventQueue();
-    if (!this.m_modelEvents?.length) {
-      this.m_processingModelEvent = false;
-    }
-    this._signalTaskEnd();
+    // this ends the task
+    this._handleInsertRangeCellFetchSuccess(commonProps, cellSet, cellRange, focusCallback);
   };
 
   DvtDataGrid.prototype._handleInsertRangeHeaderFetchSuccess = function (
@@ -17071,7 +17072,8 @@ var __oj_data_grid_metadata =
   DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
     commonProps,
     cellSet,
-    cellRanges
+    cellRanges,
+    focusCallback
   ) {
     const range = commonProps.range;
     const axis = commonProps.axis;
@@ -17097,11 +17099,9 @@ var __oj_data_grid_metadata =
       frozenEndHeaderRoot = this.m_colEndHeaderFrozen;
     }
 
-    if (!this.m_modelEvents?.length) {
-      this.m_processingModelEvent = false;
-    }
     this._signalTaskEnd();
     this.m_fetching.cells = false;
+
     if (!dontModifySelection) {
       this.unhighlightSelection();
     }
@@ -17478,6 +17478,10 @@ var __oj_data_grid_metadata =
       this.resizeGrid();
     }
 
+    if (focusCallback) {
+      focusCallback();
+    }
+
     commonProps.promiseResolve();
   };
 
@@ -18257,13 +18261,8 @@ var __oj_data_grid_metadata =
       this._highlightActive();
     }
 
-    this._runModelEventQueue();
-    if (!this.m_modelEvents?.length) {
-      this.m_processingModelEvent = false;
-    }
     // end fetch
     this._signalTaskEnd();
-
     commonProps.promiseResolve();
   };
 

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

@@ -119,24 +119,6 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojdatacollection-common', 'ojs/ojlogg
                         }
                     });
                 }
-                if (detail.add) {
-                    const keys = detail.add.keys;
-                    const keysArray = [...keys];
-                    const metadata = this.callback.getData()?.value.metadata;
-                    const addDetail = { ...detail.add };
-                    metadata?.forEach((data) => {
-                        if (keys.has(data.key) && addAndRemoveKeys.indexOf(data.key) == -1) {
-                            const index = keysArray.indexOf(data.key);
-                            addDetail.addBeforeKeys?.splice(index, 1);
-                            addDetail.data?.splice(index, 1);
-                            addDetail.indexes?.splice(index, 1);
-                            addDetail.keys?.delete(data.key);
-                            addDetail.metadata?.splice(index, 1);
-                            addDetail.parentKeys?.splice(index, 1);
-                        }
-                    });
-                    this.handleItemsAdded(addDetail);
-                }
                 if (detail.remove) {
                     const handleDetailRemove = () => {
                         this.handleItemsRemoved(detail.remove);
@@ -156,6 +138,24 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojdatacollection-common', 'ojs/ojlogg
                         handleDetailRemove();
                     }
                 }
+                if (detail.add) {
+                    const keys = detail.add.keys;
+                    const keysArray = [...keys];
+                    const metadata = this.callback.getData()?.value.metadata;
+                    const addDetail = { ...detail.add };
+                    metadata?.forEach((data) => {
+                        if (keys.has(data.key) && addAndRemoveKeys.indexOf(data.key) == -1) {
+                            const index = keysArray.indexOf(data.key);
+                            addDetail.addBeforeKeys?.splice(index, 1);
+                            addDetail.data?.splice(index, 1);
+                            addDetail.indexes?.splice(index, 1);
+                            addDetail.keys?.delete(data.key);
+                            addDetail.metadata?.splice(index, 1);
+                            addDetail.parentKeys?.splice(index, 1);
+                        }
+                    });
+                    this.handleItemsAdded(addDetail);
+                }
                 if (detail.update) {
                     this.handleItemsUpdated(detail.update);
                 }
@@ -868,7 +868,7 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojdatacollection-common', 'ojs/ojlogg
                             else if (addBeforeKeys != null && addBeforeKeys[i] != null) {
                                 index = this._findIndex(newData.value.metadata, addBeforeKeys[i]);
                             }
-                            if (index > -1 && index < newData.value.data.length) {
+                            if (index > -1 && (index < newData.value.data.length || !this._isLoadMoreOnScroll())) {
                                 newData.value.data.splice(index, 0, data);
                                 newData.value.metadata.splice(index, 0, metadata);
                             }

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

@@ -179,13 +179,34 @@ class CachedIteratorResultsDataProvider {
                         params?.includeFilteredRowCount === 'enabled' &&
                         _parent._baseFetchFirstCapability?.totalFilteredRowCount !== 'exact';
             }
+            _getStaleResult(result) {
+                return result != null
+                    ? result.value.data?.length > 0
+                        ? new this._parent.CacheAsyncIteratorYieldResult(result.value, -1)
+                        : new this._parent.CacheAsyncIteratorReturnResult(result.value, -1)
+                    : {
+                        value: {
+                            data: [],
+                            metadata: [],
+                            fetchParameters: this.params,
+                            totalFilteredRowCount: -1
+                        },
+                        done: true
+                    };
+            }
             ['next']() {
                 const params = this.params || {};
                 const size = params.size || -1;
                 const signal = params?.signal;
                 const callback = (resolve) => {
+                    if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                        return resolve(this._getStaleResult());
+                    }
                     if (this._needLocalRowCount && this._cachedOffset === 0) {
                         return resolve(this._checkCachedParamsAndIterate(params, -1).then((result) => {
+                            if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                                return this._getStaleResult(result);
+                            }
                             return this._getResult(params, size, this._parent.cache.getSize());
                         }));
                     }
@@ -215,7 +236,10 @@ class CachedIteratorResultsDataProvider {
                             if (this._parent._getSharedIteratorState().fetchOffset < this._cachedOffset) {
                                 const fetchUntilOffset = () => {
                                     return this._checkCachedParamsAndIterate(params, size).then((result) => {
-                                        if (this._parent._getSharedIteratorState().fetchOffset >= this._cachedOffset ||
+                                        if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                                            resolve();
+                                        }
+                                        else if (this._parent._getSharedIteratorState().fetchOffset >= this._cachedOffset ||
                                             result.done) {
                                             resolve();
                                         }
@@ -230,7 +254,13 @@ class CachedIteratorResultsDataProvider {
                                 resolve();
                             }
                         }).then(() => {
+                            if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                                return this._getStaleResult();
+                            }
                             return this._checkCachedParamsAndIterate(params, size).then((result) => {
+                                if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                                    return this._getStaleResult(result);
+                                }
                                 this._cachedOffset = this._parent._getSharedIteratorState().fetchOffset;
                                 return Promise.resolve(this._getFinalResult(result.value, totalFilteredRowCount));
                             });
@@ -238,6 +268,9 @@ class CachedIteratorResultsDataProvider {
                     }
                 }
                 return this._checkCachedParamsAndIterate(params, size).then((result) => {
+                    if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                        return this._getStaleResult(result);
+                    }
                     this._cachedOffset = this._parent._getSharedIteratorState().fetchOffset;
                     return Promise.resolve(this._getFinalResult(result.value, totalFilteredRowCount));
                 });
@@ -268,20 +301,28 @@ class CachedIteratorResultsDataProvider {
                     this._parent._getSharedIteratorState().fetchPromise = this.asyncIterator
                         .next()
                         .then((result) => {
-                        if (result.value.fetchParameters?.sortCriteria) {
-                            this._parent._getSharedIteratorState().cachedFetchParams.sortCriteria =
-                                result.value.fetchParameters?.sortCriteria;
+                        if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                            return this._getStaleResult(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;
-                            });
+                        else {
+                            if (result.value.fetchParameters?.sortCriteria) {
+                                this._parent._getSharedIteratorState().cachedFetchParams.sortCriteria =
+                                    result.value.fetchParameters?.sortCriteria;
+                            }
+                            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) => {
+                                    if (this.asyncIterator !== this._parent._currentAsyncIterator) {
+                                        return this._getStaleResult(result);
+                                    }
+                                    this.cache.addListResult(finalResult);
+                                    return result;
+                                });
+                            }
                         }
                         return result;
                     });
@@ -424,6 +465,7 @@ class CachedIteratorResultsDataProvider {
         if (params?.signal?.aborted) {
             const asyncIterable = this.dataProvider.fetchFirst(params);
             const asyncIterator = asyncIterable[Symbol.asyncIterator]();
+            this._currentAsyncIterator = asyncIterator;
             return new this.CacheAsyncIterable(this, asyncIterator, null, null);
         }
         if (!this._getSharedIteratorState() ||
@@ -441,6 +483,7 @@ class CachedIteratorResultsDataProvider {
                 asyncIterator: asyncIterator
             };
         }
+        this._currentAsyncIterator = this._getSharedIteratorState().asyncIterator;
         return new this.CacheAsyncIterable(this, this._getSharedIteratorState().asyncIterator, params, this.cache);
     }
     getCapability(capabilityName) {

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

@@ -38,12 +38,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '17.0.1',
+  version: '17.0.3',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2024-08-23_09-56-34',
+  revision: '2024-09-20_12-33-58',
 
   // 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/ojdatagrid.js

@@ -16320,22 +16320,23 @@ DvtDataGrid.prototype.handleModelEvent = function (event, fromQueue) {
   var requiresAnimation = false;
 
   this.m_processingModelEvent = true;
+  let clearProcessing = true;
 
   if (event.detail) {
     // handle new event
     if (operation === 'delete') {
       this._handleDeleteRangeEvent(event.detail);
-      this.m_processingModelEvent = false;
     }
     if (operation === 'insert') {
       this._handleInsertRangeEvent(event.detail);
+      clearProcessing = false;
     }
     if (operation === 'update') {
       this._handleUpdateRangeEvent(event.detail);
+      clearProcessing = false;
     }
     if (operation === 'refresh') {
       this._handleModelRefreshEvent(event.detail);
-      this.m_processingModelEvent = false;
     }
   } else if (operation === 'insert') {
     this._adjustActive(operation, indexes);
@@ -16390,7 +16391,7 @@ DvtDataGrid.prototype.handleModelEvent = function (event, fromQueue) {
     this._handleModelSyncEvent(event);
   }
 
-  if (!event.detail) {
+  if (clearProcessing) {
     this.m_processingModelEvent = false;
   }
 
@@ -16627,7 +16628,9 @@ DvtDataGrid.prototype._handleInsertRangeEvent = function (eventDetail) {
   let axis = eventDetail.axis;
   let ranges = eventDetail.ranges;
   if (ranges.length === 0) {
+    this.m_processingModelEvent = false;
     this.fillViewport();
+    this._runModelEventQueue();
     return;
   }
 
@@ -16762,7 +16765,9 @@ DvtDataGrid.prototype._handleUpdateRangeEvent = function (eventDetail) {
     this._resetEditableClone();
     this.applySelection();
     this._resetHeaderHighLight();
+    this.m_processingModelEvent = false;
     this.fillViewport();
+    this._runModelEventQueue();
     return;
   }
 
@@ -16886,25 +16891,21 @@ DvtDataGrid.prototype._handleUpdateEditableHeader = function (props, cellSet, ce
   ];
   let eventDetail = { axis, ranges, editHeader };
   let hasBrowserFocus = this.m_root.contains(document.activeElement);
+  const focusCallback = () => {
+    if (this._isActiveWithinUpdateRange({ detail: { ranges: [range] } })) {
+      if (!hasBrowserFocus) {
+        this.m_shouldFocus = false;
+      }
+      this._highlightActive();
+    }
+  };
 
   this._handleDeleteRangeEvent(eventDetail);
   // handleInsertRangeCellFetchSuccess expects { offset, count } as commonProps.range
   delete commonProps.range;
   commonProps.range = { offset, count };
-  this._handleInsertRangeCellFetchSuccess(commonProps, cellSet, cellRange);
-
-  if (this._isActiveWithinUpdateRange({ detail: { ranges: [range] } })) {
-    if (!hasBrowserFocus) {
-      this.m_shouldFocus = false;
-    }
-    this._highlightActive();
-  }
-
-  this._runModelEventQueue();
-  if (!this.m_modelEvents?.length) {
-    this.m_processingModelEvent = false;
-  }
-  this._signalTaskEnd();
+  // this ends the task
+  this._handleInsertRangeCellFetchSuccess(commonProps, cellSet, cellRange, focusCallback);
 };
 
 DvtDataGrid.prototype._handleInsertRangeHeaderFetchSuccess = function (
@@ -17069,7 +17070,8 @@ DvtDataGrid.prototype._handleInsertRangeHeaderFetchSuccess = function (
 DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
   commonProps,
   cellSet,
-  cellRanges
+  cellRanges,
+  focusCallback
 ) {
   const range = commonProps.range;
   const axis = commonProps.axis;
@@ -17095,11 +17097,9 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
     frozenEndHeaderRoot = this.m_colEndHeaderFrozen;
   }
 
-  if (!this.m_modelEvents?.length) {
-    this.m_processingModelEvent = false;
-  }
   this._signalTaskEnd();
   this.m_fetching.cells = false;
+
   if (!dontModifySelection) {
     this.unhighlightSelection();
   }
@@ -17476,6 +17476,10 @@ DvtDataGrid.prototype._handleInsertRangeCellFetchSuccess = function (
     this.resizeGrid();
   }
 
+  if (focusCallback) {
+    focusCallback();
+  }
+
   commonProps.promiseResolve();
 };
 
@@ -18255,13 +18259,8 @@ DvtDataGrid.prototype._handleUpdateRangeFetchSuccess = function (commonProps, ce
     this._highlightActive();
   }
 
-  this._runModelEventQueue();
-  if (!this.m_modelEvents?.length) {
-    this.m_processingModelEvent = false;
-  }
   // end fetch
   this._signalTaskEnd();
-
   commonProps.promiseResolve();
 };