@oracle/oraclejet 18.1.0 → 18.1.2

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

@@ -342,7 +342,7 @@
 }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v18.1.0"}' !important;
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v18.1.2"}' !important;
 }
 
 .oj-helper-hidden-accessible {

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: '18.1.0',
+    version: '18.1.2',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2025-05-09_09-09-03',
+    revision: '2025-06-04_16-38-45',
 
     // 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

@@ -6154,18 +6154,22 @@ var __oj_data_grid_metadata =
     let totalHeight = 0;
     let totalWidth = 0;
 
-    if (!this._isCountUnknown('row') && !isHWS) {
-      totalHeight = rowCount * this.m_avgRowHeight; // Known row count & virtual scrolling
-    } else if (this._isCountUnknown('column') && !isHWS) {
-      totalHeight = maxRowKnownCount * this.m_avgRowHeight; // Unknown row count & virtual scrolling
+    if (!isHWS) {
+      if (this.getDataSource().getCount('row') < 0) {
+        totalHeight = maxRowKnownCount * this.m_avgRowHeight;
+      } else {
+        totalHeight = rowCount * this.m_avgRowHeight;
+      }
     } else {
       totalHeight = endRowPixel; // HWS
     }
 
-    if (!this._isCountUnknown('column') && !isHWS) {
-      totalWidth = colCount * this.m_avgColWidth; // Known column count & virtual scrolling
-    } else if (this._isCountUnknown('column') && !isHWS) {
-      totalWidth = maxColKnownCount * this.m_avgColWidth; // Unknown column count & virtual scrolling
+    if (!isHWS) {
+      if (this.getDataSource().getCount('column') < 0) {
+        totalWidth = maxColKnownCount * this.m_avgColWidth;
+      } else {
+        totalWidth = colCount * this.m_avgColWidth;
+      }
     } else {
       totalWidth = endColPixel; // HWS
     }
@@ -17271,7 +17275,8 @@ var __oj_data_grid_metadata =
         headerFragment: headerFragment,
         endHeaderFragment: endHeaderFragment,
         totalDimension: 0,
-        promiseResolve: promiseResolve
+        promiseResolve: promiseResolve,
+        update: false
       };
 
       this.fetchHeaders(axis, start, headerFragment, endHeaderFragment, count, {
@@ -17454,7 +17459,8 @@ var __oj_data_grid_metadata =
         headerFragment,
         endHeaderFragment,
         totalDimension: 0,
-        promiseResolve: promiseResolve
+        promiseResolve: promiseResolve,
+        update: true
       };
 
       this.m_fetchingForUpdate = true;
@@ -17516,6 +17522,7 @@ var __oj_data_grid_metadata =
     // handleInsertRangeCellFetchSuccess expects { offset, count } as commonProps.range
     delete commonProps.range;
     commonProps.range = { offset, count };
+    commonProps.update = true;
     // this ends the task
     this._handleInsertRangeCellFetchSuccess(commonProps, cellSet, cellRange, focusCallback);
   };
@@ -17537,11 +17544,16 @@ var __oj_data_grid_metadata =
     const headerFragment = commonProps.headerFragment;
     const endHeaderFragment = commonProps.endHeaderFragment;
     const insertDimension = axis === 'row' ? 'top' : dir;
+    let isUpdate = commonProps.update || false;
     // freezeIndex rather than m_frozenIndex as during update post deletion m_frozenIndex would be deducted
     // while freezeIndex would retain intact.
-    let freezeIndex = this._hasFrozenRows() ? this.m_options._getFreezeIndex('row') : null;
-    if (axis === 'column') {
-      freezeIndex = this._hasFrozenColumns() ? this.m_options._getFreezeIndex('column') : null;
+    let rowFreezeIndex = null;
+    if (this._hasFrozenRows()) {
+      rowFreezeIndex = isUpdate ? this.m_options._getFreezeIndex('row') : this.m_frozenRowIndex;
+    }
+    let columnFreezeIndex = null;
+    if (this._hasFrozenColumns()) {
+      columnFreezeIndex = isUpdate ? this.m_options._getFreezeIndex('column') : this.m_frozenColIndex;
     }
 
     this.updateHiddenAxisForInsertion(start, count, axis);
@@ -17579,7 +17591,8 @@ var __oj_data_grid_metadata =
         axis === 'column' &&
         this._hasFrozenColumns() &&
         !this.m_fetchingForUpdate &&
-        start === freezeIndex
+        start === columnFreezeIndex + 1 &&
+        isUpdate
       ) {
         if (this.m_colHeaderFrozen) {
           insertPixel = this.getElementWidth(this.m_colHeaderFrozen);
@@ -17590,7 +17603,8 @@ var __oj_data_grid_metadata =
         axis === 'row' &&
         this._hasFrozenRows() &&
         !this.m_fetchingForUpdate &&
-        start === freezeIndex
+        start === rowFreezeIndex + 1 &&
+        isUpdate
       ) {
         if (this.m_rowHeaderFrozen) {
           insertPixel = this.getElementHeight(this.m_rowHeaderFrozen);
@@ -17613,8 +17627,8 @@ var __oj_data_grid_metadata =
 
         index = start + c;
         if (
-          (axis === 'column' && this._hasFrozenColumns() && index <= freezeIndex) ||
-          (axis === 'row' && this._hasFrozenRows() && index <= freezeIndex)
+          (axis === 'column' && this._hasFrozenColumns() && index <= columnFreezeIndex) ||
+          (axis === 'row' && this._hasFrozenRows() && index <= rowFreezeIndex)
         ) {
           className = `${className} ${this.getMappedStyle('frozenHeader')}`;
         }
@@ -17717,16 +17731,24 @@ var __oj_data_grid_metadata =
     let frozenDatabody = this.m_databodyFrozenRow;
     let frozenHeaderRoot = this.m_rowHeaderFrozen;
     let frozenEndHeaderRoot = this.m_rowEndHeaderFrozen;
+    let isUpdate = commonProps.update || false;
     // freezeIndex rather than m_frozenIndex as during update post deletion m_frozenIndex would be deducted
     // while freezeIndex would retain intact.
-    let freezeIndex = this._hasFrozenRows() ? this.m_options._getFreezeIndex('row') : null;
+    let frozenRowIndex = null;
+    if (this._hasFrozenRows()) {
+      frozenRowIndex = isUpdate ? this.m_options._getFreezeIndex('row') : this.m_frozenRowIndex;
+    }
+    let frozenColIndex = null;
+    if (this._hasFrozenColumns()) {
+      frozenColIndex = isUpdate ? this.m_options._getFreezeIndex('column') : this.m_frozenColIndex;
+    }
+
     if (axis === 'column') {
       headerRoot = this.m_colHeader;
       endHeaderRoot = this.m_colEndHeader;
       frozenDatabody = this.m_databodyFrozenCol;
       frozenHeaderRoot = this.m_colHeaderFrozen;
       frozenEndHeaderRoot = this.m_colEndHeaderFrozen;
-      freezeIndex = this._hasFrozenColumns() ? this.m_options._getFreezeIndex('column') : null;
     }
 
     this._signalTaskEnd();
@@ -17749,10 +17771,15 @@ var __oj_data_grid_metadata =
       if (insertReference) {
         topPixel = axis === 'row' ? this.getElementDir(insertReference, 'top') : this.m_startRowPixel;
         leftPixel = axis === 'row' ? this.m_startColPixel : this.getElementDir(insertReference, dir);
-        if (axis === 'column' && this._hasFrozenColumns() && columnStart === freezeIndex) {
+        if (
+          axis === 'column' &&
+          this._hasFrozenColumns() &&
+          columnStart === frozenColIndex &&
+          isUpdate
+        ) {
           leftPixel = this.getElementWidth(this.m_databodyFrozenCol);
         }
-        if (axis === 'row' && this._hasFrozenRows() && rowStart === freezeIndex) {
+        if (axis === 'row' && this._hasFrozenRows() && rowStart === frozenRowIndex && isUpdate) {
           topPixel = this.getElementHeight(this.m_databodyFrozenRow);
         }
       } else {
@@ -17762,7 +17789,7 @@ var __oj_data_grid_metadata =
 
       if (axis === 'column') {
         // if insert is within frozen section.
-        if (this._hasFrozenColumns() && columnStart < freezeIndex + 1) {
+        if (this._hasFrozenColumns() && columnStart < frozenColIndex + 1) {
           if (this.m_databodyFrozenCorner) {
             this._addCellsToFragment(
               newFrozenCornerCellElements,
@@ -17771,11 +17798,11 @@ var __oj_data_grid_metadata =
               topPixel,
               columnStart,
               leftPixel,
-              freezeIndex + 1,
+              frozenRowIndex + 1,
               null
             );
-            rowStart = freezeIndex + 1;
-            rowCount -= freezeIndex + 1;
+            rowStart = frozenRowIndex + 1;
+            rowCount -= frozenRowIndex + 1;
           }
           const returnVal = this._addCellsToFragment(
             newFrozenColCellElements,
@@ -17798,11 +17825,11 @@ var __oj_data_grid_metadata =
               topPixel,
               columnStart,
               leftPixel,
-              freezeIndex + 1,
+              frozenRowIndex + 1,
               null
             );
-            rowStart = freezeIndex + 1;
-            rowCount -= freezeIndex + 1;
+            rowStart = frozenRowIndex + 1;
+            rowCount -= frozenRowIndex + 1;
           }
           const returnVal = this._addCellsToFragment(
             newCellElements,
@@ -17821,7 +17848,7 @@ var __oj_data_grid_metadata =
         }
       } else if (axis === 'row') {
         // if insert is within frozen section.
-        if (this._hasFrozenRows() && rowStart < freezeIndex + 1) {
+        if (this._hasFrozenRows() && rowStart < frozenRowIndex + 1) {
           if (this.m_databodyFrozenCorner) {
             this._addCellsToFragment(
               newFrozenCornerCellElements,
@@ -17831,10 +17858,10 @@ var __oj_data_grid_metadata =
               columnStart,
               leftPixel,
               null,
-              freezeIndex + 1
+              frozenColIndex + 1
             );
-            columnStart = freezeIndex + 1;
-            columnCount -= freezeIndex + 1;
+            columnStart = frozenColIndex + 1;
+            columnCount -= frozenColIndex + 1;
           }
           const returnVal = this._addCellsToFragment(
             newFrozenRowCellElements,
@@ -17858,10 +17885,10 @@ var __oj_data_grid_metadata =
               columnStart,
               leftPixel,
               null,
-              freezeIndex + 1
+              frozenColIndex + 1
             );
-            columnStart = freezeIndex + 1;
-            columnCount -= freezeIndex + 1;
+            columnStart = frozenColIndex + 1;
+            columnCount -= frozenColIndex + 1;
           }
           const returnVal = this._addCellsToFragment(
             newCellElements,
@@ -17908,8 +17935,8 @@ var __oj_data_grid_metadata =
     // are available and insert is done at the end of the frozen section.
     if (this._hasFrozenColumns() || this._hasFrozenRows()) {
       if (
-        (axis === 'column' && this._hasFrozenColumns() && offset < freezeIndex + 1) ||
-        (axis === 'row' && this._hasFrozenRows() && offset < freezeIndex + 1)
+        (axis === 'column' && this._hasFrozenColumns() && offset < frozenColIndex + 1) ||
+        (axis === 'row' && this._hasFrozenRows() && offset < frozenRowIndex + 1)
       ) {
         frozenDimensions = new Array(count).fill(totalDimension / count);
       } else {
@@ -17931,8 +17958,8 @@ var __oj_data_grid_metadata =
     for (let i = indexes.length - 1; i >= 0; i--) {
       let index = indexes[i];
       if (
-        (axis === 'column' && this._hasFrozenColumns() && index < freezeIndex + 1) ||
-        (axis === 'row' && this._hasFrozenRows() && index < freezeIndex + 1)
+        (axis === 'column' && this._hasFrozenColumns() && index < frozenColIndex + 1) ||
+        (axis === 'row' && this._hasFrozenRows() && index < frozenRowIndex + 1)
       ) {
         frozenIndexes.push(index);
         indexes.splice(i, 1);
@@ -17995,8 +18022,24 @@ var __oj_data_grid_metadata =
       }
       if (axis === 'column') {
         this.m_frozenColIndex += frozenIndexes.length;
+        let details = {
+          event: null,
+          ui: {
+            frozenCount: this.m_frozenColIndex + 1
+          }
+        };
+
+        this.fireEvent('columnFreeze', details);
       } else {
         this.m_frozenRowIndex += frozenIndexes.length;
+        let details = {
+          event: null,
+          ui: {
+            frozenCount: this.m_frozenRowIndex + 1
+          }
+        };
+
+        this.fireEvent('rowFreeze', details);
       }
     }
 
@@ -19384,8 +19427,26 @@ var __oj_data_grid_metadata =
       }
       if (axis === 'column') {
         this.m_frozenColIndex -= frozenIndexes.length;
+        if (!isFromUpdate) {
+          let details = {
+            event: null,
+            ui: {
+              frozenCount: this.m_frozenColIndex + 1
+            }
+          };
+          this.fireEvent('columnFreeze', details);
+        }
       } else {
         this.m_frozenRowIndex -= frozenIndexes.length;
+        if (!isFromUpdate) {
+          let details = {
+            event: null,
+            ui: {
+              frozenCount: this.m_frozenRowIndex + 1
+            }
+          };
+          this.fireEvent('rowFreeze', details);
+        }
       }
     }
 

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

@@ -5733,16 +5733,22 @@ var __oj_table_metadata =
       }
       return this._invokeDataFetchRows(updatedOptions);
     } else if (dataprovider == null) {
-      var promiseArray = [];
-      promiseArray.push(this._refreshTableHeader());
-      promiseArray.push(this._refreshTableBody());
-      promiseArray.push(this._refreshTableFooter());
-
-      return Promise.all(promiseArray);
+      return this._renderFallbackTable();
     }
     return Promise.resolve(undefined);
   };
 
+  /**
+   * Renders each area of the Table without triggering a data fetch
+   */
+  Table.prototype._renderFallbackTable = function () {
+    var promiseArray = [];
+    promiseArray.push(this._refreshTableHeader());
+    promiseArray.push(this._refreshTableBody());
+    promiseArray.push(this._refreshTableFooter());
+    return Promise.all(promiseArray);
+  };
+
   /**
    * Initialize the template engine
    * @private
@@ -20604,7 +20610,10 @@ var __oj_table_metadata =
           break;
         }
       }
-      scrollPosition.columnKey = this._getColumnDefs()[index].id;
+      var columnDefs = this._getColumnDefs();
+      if (columnDefs.length > index) {
+        scrollPosition.columnKey = columnDefs[index].id;
+      }
       scrollPosition.columnIndex = index;
       scrollPosition.offsetX = scrollPosition.x - columnLocations[index];
     }
@@ -26497,14 +26506,25 @@ var __oj_table_metadata =
     this._registerDataSourceEventListeners();
     // setup selection change listener to support browser selection.
     this._setupSelectionChangedListener();
+    // save dataprovider info before task is queued, otherwise it may reflect a pending 'refresh'
+    var dataprovider = this._getData();
     this._queueTask(
       function () {
         this._getLayoutManager().notifyTableUpdate(Table._UPDATE._REFRESH);
+        // only perform a real fetch if dataprovider was initialized already
+        if (dataprovider != null) {
+          if (this._isInitFetch) {
+            this._isInitFetch = false;
+            return this._initFetch();
+          }
+          return this._invokeDataFetchRows();
+        }
+        // fall back to basic rendering if no data was available at the time of resource setup
         if (this._isInitFetch) {
           this._isInitFetch = false;
-          return this._initFetch();
+          return this._renderFallbackTable();
         }
-        return this._invokeDataFetchRows();
+        return Promise.resolve(null);
       }.bind(this)
     );
   };

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

@@ -4743,7 +4743,7 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
 
               var index = this._getInsertIndex(
                 parentItem,
-                addEvent.indexes[i],
+                indexes == null ? null : indexes[i],
                 metadata[i].key,
                 finalKeys
               );

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

@@ -38,12 +38,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '18.1.0',
+  version: '18.1.2',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2025-05-09_09-09-03',
+  revision: '2025-06-04_16-38-45',
 
   // This function is only meant to be used outside the library, so quoting the name
   // to avoid renaming is appropriate