@oracle/oraclejet 16.1.1 → 16.1.3

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

@@ -335,7 +335,7 @@
   visibility: hidden; }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v16.1.1"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v16.1.3"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;

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

@@ -37,12 +37,12 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
      * @global
      * @member {string} version JET version numberr
      */
-    version: '16.1.1',
+    version: '16.1.3',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2024-05-14_16-04-36',
+    revision: '2024-06-13_17-19-40',
 
     // 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

@@ -4835,6 +4835,7 @@ var __oj_data_grid_metadata =
     this.m_handleScrollOverflow = null;
     // this.m_scrollOnRefreshEvent = false;
     this._clearScrollPositionTimeout();
+    this._requiresInitPostScrollFillViewport = false;
 
     // resizing
     this.m_resizing = false;
@@ -4921,6 +4922,8 @@ var __oj_data_grid_metadata =
       this.resizeGrid();
       if (this.m_startRow === 0 && this.m_startCol === 0) {
         this.fillViewport();
+      } else {
+        this._requiresInitPostScrollFillViewport = true;
       }
 
       if (this.isFetchComplete()) {
@@ -6872,12 +6875,17 @@ var __oj_data_grid_metadata =
         self.m_desiredScrollPositionObject = scrollPositionObject;
         self._setScrollPositionTimeout();
         self._initiateScroll(newScrollX, newScrollY);
+        self._requiresInitPostScrollFillViewport = false;
       } else {
         if (self.m_desiredScrollPositionObject != null) {
           self._signalTaskEnd('reached desired location');
         }
         self.m_desiredScrollPositionObject = null;
         self._setScrollPosition();
+        if (self._requiresInitPostScrollFillViewport) {
+          self._requiresInitPostScrollFillViewport = false;
+          self.fillViewport();
+        }
       }
     });
   };
@@ -12592,65 +12600,75 @@ var __oj_data_grid_metadata =
       const startRowPixel = this.m_longScrollRowPixel;
       const startCol = this.m_longScrollColumn;
       const startColPixel = this.m_longScrollColumnPixel;
-
-      // reset ranges, just cleaned up to only set if the header is present
-      if (this.m_hasCells) {
-        this.m_startRow = startRow;
-        this.m_endRow = -1;
-        this.m_startRowPixel = startRowPixel;
-        this.m_endRowPixel = startRowPixel;
-        this.m_startCol = startCol;
-        this.m_endCol = -1;
-        this.m_startColPixel = startColPixel;
-        this.m_endColPixel = startColPixel;
-      }
-
-      if (this.m_hasRowHeader) {
-        this.m_startRowHeader = startRow;
-        this.m_endRowHeader = -1;
-        this.m_startRowHeaderPixel = startRowPixel;
-        this.m_endRowHeaderPixel = startRowPixel;
-      }
-      if (this.m_hasRowEndHeader) {
-        this.m_startRowEndHeader = startRow;
-        this.m_endRowEndHeader = -1;
-        this.m_startRowEndHeaderPixel = startRowPixel;
-        this.m_endRowEndHeaderPixel = startRowPixel;
-      }
-      if (this.m_hasColHeader) {
-        this.m_startColHeader = startCol;
-        this.m_endColHeader = -1;
-        this.m_startColHeaderPixel = startColPixel;
-        this.m_endColHeaderPixel = startColPixel;
-      }
-      if (this.m_hasColEndHeader) {
-        this.m_startColEndHeader = startCol;
-        this.m_endColEndHeader = -1;
-        this.m_startColEndHeaderPixel = startColPixel;
-        this.m_endColEndHeaderPixel = startColPixel;
-      }
-
-      this.m_stopRowFetch = false;
-      this.m_stopRowHeaderFetch = false;
-      this.m_stopRowEndHeaderFetch = false;
-      this.m_stopColumnFetch = false;
-      this.m_stopColumnHeaderFetch = false;
-      this.m_stopColumnEndHeaderFetch = false;
-
+      let needsResetVars = true;
+      // reset vars after fetch return to handle component resize in the intermediate
+      let resetVars = () => {
+        if (needsResetVars) {
+          needsResetVars = false;
+          // need to redraw header borders
+          this.m_resizeRequired = true;
+          // reset ranges, just cleaned up to only set if the header is present
+          if (this.m_hasCells) {
+            this.m_startRow = startRow;
+            this.m_endRow = -1;
+            this.m_startRowPixel = startRowPixel;
+            this.m_endRowPixel = startRowPixel;
+            this.m_startCol = startCol;
+            this.m_endCol = -1;
+            this.m_startColPixel = startColPixel;
+            this.m_endColPixel = startColPixel;
+          }
+
+          if (this.m_hasRowHeader) {
+            this.m_startRowHeader = startRow;
+            this.m_endRowHeader = -1;
+            this.m_startRowHeaderPixel = startRowPixel;
+            this.m_endRowHeaderPixel = startRowPixel;
+          }
+          if (this.m_hasRowEndHeader) {
+            this.m_startRowEndHeader = startRow;
+            this.m_endRowEndHeader = -1;
+            this.m_startRowEndHeaderPixel = startRowPixel;
+            this.m_endRowEndHeaderPixel = startRowPixel;
+          }
+          if (this.m_hasColHeader) {
+            this.m_startColHeader = startCol;
+            this.m_endColHeader = -1;
+            this.m_startColHeaderPixel = startColPixel;
+            this.m_endColHeaderPixel = startColPixel;
+          }
+          if (this.m_hasColEndHeader) {
+            this.m_startColEndHeader = startCol;
+            this.m_endColEndHeader = -1;
+            this.m_startColEndHeaderPixel = startColPixel;
+            this.m_endColEndHeaderPixel = startColPixel;
+          }
+
+          this.m_stopRowFetch = false;
+          this.m_stopRowHeaderFetch = false;
+          this.m_stopRowEndHeaderFetch = false;
+          this.m_stopColumnFetch = false;
+          this.m_stopColumnHeaderFetch = false;
+          this.m_stopColumnEndHeaderFetch = false;
+        }
+      };
       // custom success callback so that we can reset all ranges and fields
       // initiate fetch of headers and cells
       this.fetchHeaders('row', startRow, this.m_rowHeader, this.m_rowEndHeader, undefined, {
         success: function (headerSet, headerRange, endHeaderSet) {
+          resetVars();
           this.handleHeadersFetchSuccessForLongScroll(headerSet, headerRange, endHeaderSet);
         }
       });
       this.fetchHeaders('column', startCol, this.m_colHeader, this.m_colEndHeader, undefined, {
         success: function (headerSet, headerRange, endHeaderSet) {
+          resetVars();
           this.handleHeadersFetchSuccessForLongScroll(headerSet, headerRange, endHeaderSet);
         }
       });
       this.fetchCells(this.m_databody, startRow, startCol, null, null, {
         success: function (cellSet, cellRange) {
+          resetVars();
           this.handleCellsFetchSuccessForLongScroll(
             cellSet,
             cellRange,
@@ -13123,6 +13141,7 @@ var __oj_data_grid_metadata =
     dir,
     scrollPosition
   ) {
+    const context = this.getResources().getMappedAttribute('context');
     var removedHeaders = 0;
     var removedDimensionValue = 0;
     // To make sure we don't get other children divs (like visual indicator)
@@ -13146,7 +13165,6 @@ var __oj_data_grid_metadata =
     while (startPixel + dimensionValue < scrollPosition - threshold) {
       this._remove(element);
       if (isHeader) {
-        const context = this.getResources().getMappedAttribute('context');
         let axis = element[context].axis;
         let elementIndex = element[context].index;
         // remove header/endHeader hidden indicator div belonging to element (if any)
@@ -13200,6 +13218,9 @@ var __oj_data_grid_metadata =
         dimension
       );
 
+      header[context].index += returnVal.extentChange;
+      header[context].extent -= returnVal.extentChange;
+
       removedHeaders += returnVal.extentChange;
       removedDimensionValue += returnVal.dimensionChange;
     }
@@ -13226,6 +13247,7 @@ var __oj_data_grid_metadata =
     className,
     dimension
   ) {
+    const context = this.getResources().getMappedAttribute('context');
     var removedHeaders = 0;
     var removedHeadersDimension = 0;
     // for hidden columns, visual indicator is appended as a child to the header container, so to avoid having them as a last child,
@@ -13246,7 +13268,6 @@ var __oj_data_grid_metadata =
       this._remove(element);
 
       if (isHeader) {
-        const context = this.getResources().getMappedAttribute('context');
         let axis = element[context].axis;
         let elementIndex = element[context].index;
         if (this.isHidden(axis, elementIndex)) {
@@ -13287,6 +13308,8 @@ var __oj_data_grid_metadata =
         dimension
       );
 
+      header[context].extent -= returnVal.extentChange;
+
       removedHeaders += returnVal.extentChange;
       removedHeadersDimension += returnVal.dimensionChange;
     }
@@ -40186,6 +40209,7 @@ var __oj_data_grid_metadata =
      */
     _ComponentCreate: function () {
       this._super();
+      this._isCreate = true;
       this.root = this.element[0];
       this.rootId = this.root.getAttribute('id');
 
@@ -40248,8 +40272,6 @@ var __oj_data_grid_metadata =
         // add context menu before _SetupResources super sets it up
         this._addContextMenu();
 
-        this._isCreate = true;
-
         // data source listeners will be added in SetupResources, but we need them earlier
         // for handling expanded option on rowexpander, and any other rendered content
         // that could trigger a datasource event.
@@ -40493,11 +40515,11 @@ var __oj_data_grid_metadata =
       this._super();
 
       // reset context menu listener if old syntax or if our default internal
-      let shouldResetContextMenuListeners =
+      let shouldRemoveContextMenuListeners =
         !this._IsCustomElement() || this._defaultContextMenu != null;
 
       // unregister existing listeners
-      if (shouldResetContextMenuListeners) {
+      if (shouldRemoveContextMenuListeners) {
         this._ReleaseContextMenu();
       }
       this.releaseResources();
@@ -40528,9 +40550,9 @@ var __oj_data_grid_metadata =
       this.resources.setRTLMode(this._GetReadingDirection());
       this.grid.SetResources(this.resources);
 
-      // addListeners back in before rendering, including context menu
-      // unregister existing listeners
-      if (shouldResetContextMenuListeners) {
+      let shouldAddContextMenuListeners =
+        !this._IsCustomElement() || this._defaultContextMenu != null;
+      if (shouldAddContextMenuListeners) {
         this._SetupContextMenu();
       }
       this.setupResources(false);