@oracle/oraclejet 16.1.0 → 16.1.2

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.0"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v16.1.2"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;

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

@@ -1020,7 +1020,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                 });
             }
             const offset = params.offset;
-            const isFetchAll = params.size == null || params.size === -1;
+            const isFetchToEnd = params.size == null || params.size === -1;
             const size = params.size;
             const mergedItems = [];
             const { submitting, submitted, unsubmitted } = this._getEditBufferCounts();
@@ -1030,36 +1030,42 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
             let baseItemArray = [];
             let done = false;
             let unbufferedResultsToIgnore = 0;
-            if (isFetchAll) {
-                results = await this.dataProvider.fetchByOffset(params);
-                if (this.editBuffer.isEmpty(true)) {
-                    return results;
-                }
+            if (this.editBuffer.isEmpty(true)) {
+                return await this.dataProvider.fetchByOffset(params);
             }
-            else if (offset + size > numAdds) {
+            else if (isFetchToEnd || offset + size > numAdds) {
                 const numRemoves = unsubmitted.numRemoves + submitting.numRemoves;
                 const numMoveAdds = unsubmitted.numMoveAdds + submitting.numMoveAdds;
                 const numSubmittedOrSubmittingAdds = submitting.numAdds + submitted.numAdds;
-                let overrideParams;
+                let overrideOffset;
+                let overrideSize;
                 if (numRemoves > 0 || numMoveAdds > 0 || numSubmittedOrSubmittingAdds > 0) {
-                    overrideParams = {
-                        offset: 0,
-                        size: offset +
-                            size +
-                            numRemoves +
-                            numMoveAdds +
-                            numSubmittedOrSubmittingAdds -
-                            Math.max(numUnsubmittedAdds - offset, 0)
+                    overrideOffset = {
+                        offset: 0
                     };
+                    if (!isFetchToEnd) {
+                        overrideSize = {
+                            size: offset +
+                                size +
+                                numRemoves +
+                                numMoveAdds +
+                                numSubmittedOrSubmittingAdds -
+                                Math.max(numUnsubmittedAdds - offset, 0)
+                        };
+                    }
                     unbufferedResultsToIgnore = Math.max(offset - numAdds, 0);
                 }
                 else if (numUnsubmittedAdds > 0) {
-                    overrideParams = {
-                        offset: Math.max(offset - numUnsubmittedAdds, 0),
-                        size: size - Math.max(numUnsubmittedAdds - offset, 0)
+                    overrideOffset = {
+                        offset: Math.max(offset - numUnsubmittedAdds, 0)
                     };
+                    if (!isFetchToEnd) {
+                        overrideSize = {
+                            size: size - Math.max(numUnsubmittedAdds - offset, 0)
+                        };
+                    }
                 }
-                const underlyingFetchParams = { ...params, ...overrideParams };
+                const underlyingFetchParams = { ...params, ...overrideOffset, ...overrideSize };
                 results = await this.dataProvider.fetchByOffset(underlyingFetchParams);
             }
             if (results) {
@@ -1067,9 +1073,9 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                 done = results.done;
             }
             if (offset < numAdds) {
-                mergedItems.push(...this._getAllAdds().slice(offset, offset + size));
+                mergedItems.push(...this._getAllAdds().slice(offset, isFetchToEnd ? undefined : offset + size));
             }
-            for (let index = 0; index < baseItemArray.length && (isFetchAll || mergedItems.length < size); index++) {
+            for (let index = 0; index < baseItemArray.length && (isFetchToEnd || mergedItems.length < size); index++) {
                 const item = baseItemArray[index];
                 const key = item.metadata.key;
                 if (this.editBuffer.isUpdateTransformed(key) ||
@@ -1085,11 +1091,11 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                     mergedItems.push(updatedItem ? updatedItem.item : item);
                 }
             }
-            if (!done && (isFetchAll || mergedItems.length < size)) {
+            if (!done && (isFetchToEnd || mergedItems.length < size)) {
                 const nextParams = {
                     ...params,
                     offset: params.offset + mergedItems.length,
-                    size: isFetchAll ? params.size : params.size - mergedItems.length
+                    size: isFetchToEnd ? params.size : params.size - mergedItems.length
                 };
                 let extraResults = await this._fetchFromOffset(nextParams);
                 mergedItems.push(...extraResults.results);

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.0',
+    version: '16.1.2',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2024-05-03_10-41-36',
+    revision: '2024-05-30_17-48-01',
 
     // 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

@@ -12592,65 +12592,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 +13133,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 +13157,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 +13210,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 +13239,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 +13260,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 +13300,8 @@ var __oj_data_grid_metadata =
         dimension
       );
 
+      header[context].extent -= returnVal.extentChange;
+
       removedHeaders += returnVal.extentChange;
       removedHeadersDimension += returnVal.dimensionChange;
     }