@oracle/oraclejet 16.0.4 → 16.0.6

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.0.4"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v16.0.6"}' !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.0.4',
+    version: '16.0.6',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2024-04-26_10-29-31',
+    revision: '2024-05-03_09-32-18',
 
     // 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/ojcorerouter.js

@@ -5,7 +5,7 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (ojobservable, UrlPathAdapter, Logger) { 'use strict';
+define(['ojs/ojlogger', 'ojs/ojobservable', 'ojs/ojurlpathadapter'], function (Logger, ojobservable, UrlPathAdapter) { 'use strict';
 
   UrlPathAdapter = UrlPathAdapter && Object.prototype.hasOwnProperty.call(UrlPathAdapter, 'default') ? UrlPathAdapter['default'] : UrlPathAdapter;
 
@@ -79,9 +79,6 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
   // similar to how history-tracking routers use URL segments
   let noHistorySegments = [];
 
-  // Pending transitions array to hold extra transitions passed to go()
-  let pendingTransitions = [];
-
   /**
    * Test if two routes are equivalent. Routes are equivalent if they have the
    * same paths and parameter values.
@@ -564,36 +561,16 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
    * @ojsignature {target: "Type", value: "Promise<CoreRouter.CoreRouterState<D, P>>", for: "returns"}
    */
   CoreRouter.prototype.sync = function () {
-    let route;
-    if (pendingTransitions.length) {
-      // Use the pending transition as the new state to sync
-      const transition = pendingTransitions.shift();
-      const newRoutes = this._getParentRoutes().concat(this._getPendingState(transition));
-      const newPath = urlAdapter.getUrlForRoutes(newRoutes);
-      if (!this._noHistory) {
-        window.history.replaceState(null, 'path', newPath);
-      }
-      route = transition;
-    } else {
-      route = this._getRouteSegment();
-    }
-
     // Transition to the new route, or a default one if no current one exists
-    return this._execute(route || { path: '', params: {} })
-      .then((state) => {
-        // Synchronize the next child router
-        var p = state;
-        var childRouter = this.childRouter;
-        if (childRouter) {
-          p = childRouter.sync();
-        }
-        return p;
-      })
-      .catch((ex) => {
-        // Clear transitions if transition rejected
-        pendingTransitions = [];
-        throw ex;
-      });
+    return this._execute(this._getRouteSegment() || { path: '', params: {} }).then((state) => {
+      // Synchronize the next child router
+      var p = state;
+      var childRouter = this.childRouter;
+      if (childRouter) {
+        p = childRouter.sync();
+      }
+      return p;
+    });
   };
 
   /**
@@ -726,9 +703,6 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
       const path = transitions.map((t) => t.path).join('/');
       Logger.info(`Navigating router(${this._name}) to ${path}`);
 
-      // Use first transition and store remaining for next child router to read
-      const first = transitions[0];
-
       // Get the current routes for all active routers, and compare that to the
       // new routes for this transition.
       const currentPath = urlAdapter.getUrlForRoutes(getActiveRoutes());
@@ -743,15 +717,18 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
         // Cleanup noHistorySegments when navigating any history-tracking routers
         noHistorySegments = [];
         // Insert the new transitions after the current router's route offset
-        const newRoutes = this._getParentRoutes().concat(this._getPendingState(first, true));
+        const newRoutes = this._getParentRoutes().concat(
+          // only first transition is for this router
+          this._getPendingState(transitions[0]),
+          // remaining are for child routers
+          transitions.slice(1)
+        );
         const newPath = urlAdapter.getUrlForRoutes(newRoutes);
         if (currentPath !== newPath) {
           window.history.pushState(null, 'path', newPath);
         }
       }
       goP = this.sync().catch((ex) => {
-        // Clear transitions if transition rejected
-        pendingTransitions = [];
         if (this._noHistory) {
           noHistorySegments = prevNoHistorySegments;
         } else {
@@ -759,7 +736,6 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
         }
         throw ex;
       });
-      pendingTransitions = transitions.slice(1);
     }
     return goP;
   };
@@ -847,10 +823,7 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
    */
   CoreRouter.prototype._setupNavigationListener = function () {
     if (this === rootRouter) {
-      this._popstateHandler = () => {
-        pendingTransitions = [];
-        this.sync();
-      };
+      this._popstateHandler = () => this.sync();
       window.addEventListener('popstate', this._popstateHandler, false);
     }
   };
@@ -875,12 +848,10 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
    * configured states. This CoreRouterState object will similar to the matched configured
    * state, except will have its own path and params values.
    * @param {CoreRouter.Route} transition The transition for the CoreRouterState
-   * @param {boolean} createEmpty Create an empty state object for the transition,
-   * even if a matching route doesn't exist.
    * @return {CoreRouter.RouterState} The CoreRouterState associated for the transition
    * @private
    */
-  CoreRouter.prototype._getPendingState = function (transition, createEmpty) {
+  CoreRouter.prototype._getPendingState = function (transition) {
     var pending;
     var path = transition.path;
     var params = transition.params || {};
@@ -899,13 +870,6 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
         _match: match._match
       };
       Object.freeze(pending);
-    } else if (createEmpty) {
-      pending = {
-        path,
-        params: {},
-        detail: {},
-        pathParams: []
-      };
     }
     return pending;
   };
@@ -1029,6 +993,13 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
    * @export
    */
   CoreRouter.prototype.destroy = function () {
+    if (this.childRouter) {
+      this.childRouter.destroy();
+    }
+
+    this.beforeStateChange.observers.forEach((subscription) => subscription());
+    this.currentState.observers.forEach((subscription) => subscription());
+
     if (this === rootRouter) {
       window.removeEventListener('popstate', this._popstateHandler, false);
       rootRouter = null;

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

@@ -8854,32 +8854,28 @@ var __oj_data_grid_metadata =
    * @param {Object|string} templateContext templateContext is template is used
    * @private
    */
-  DvtDataGrid.prototype._renderContent = function (
-    renderer,
-    context,
-    cell,
-    data,
-    templateContext,
-    headerContentDiv
-  ) {
+  DvtDataGrid.prototype._renderContent = function (renderer, context, cell, data, templateContext) {
+    let shouldAppendContentElement = false;
+    let headerContentDiv = context.contentElement;
     if (renderer != null && typeof renderer === 'function') {
       const returnObj = renderer.call(this, context);
       let element = cell;
       let content = returnObj;
       // if insertContent is provided then returned string or HTMLElement should be wrapped in div.
-      if (returnObj && (returnObj.insert != null || returnObj.insertContent != null)) {
-        if (returnObj.insert == null) {
+      if (returnObj?.insert != null) {
+        content = returnObj.insert;
+      } else if (headerContentDiv != null) {
+        if (returnObj?.insertContent != null) {
           element = headerContentDiv;
           content = returnObj.insertContent;
-        } else {
-          content = returnObj.insert;
+          shouldAppendContentElement = true;
+        } else if (headerContentDiv.hasChildNodes()) {
+          shouldAppendContentElement = true;
+        }
+
+        if (shouldAppendContentElement) {
+          cell.appendChild(headerContentDiv); // @HTMLUpdateOK
         }
-      }
-      if (
-        (context.axis === 'row' || context.axis === 'column') &&
-        (context.contentElement.hasChildNodes() || returnObj?.insertContent != null)
-      ) {
-        cell.appendChild(context.contentElement); // @HTMLUpdateOK
       }
       DataCollectionUtils.applyRendererContent(
         element,
@@ -8890,20 +8886,18 @@ var __oj_data_grid_metadata =
       this._removeFocusFromChildElements(context, cell);
     } else if (renderer != null && typeof renderer === 'object' && this.m_engine) {
       var nodes = this.m_engine.execute(this.m_root, renderer, templateContext, null);
+      shouldAppendContentElement =
+        renderer.slot === 'columnHeaderContentTemplate' ||
+        renderer.slot === 'rowHeaderContentTemplate';
+
       for (var i = 0; i < nodes.length; i++) {
-        if (
-          renderer.slot === 'columnHeaderContentTemplate' ||
-          renderer.slot === 'rowHeaderContentTemplate'
-        ) {
+        if (shouldAppendContentElement) {
           headerContentDiv.appendChild(nodes[i]); // @HTMLUpdateOK
         } else {
           cell.appendChild(nodes[i]); // @HTMLUpdateOK
         }
       }
-      if (
-        renderer.slot === 'columnHeaderContentTemplate' ||
-        renderer.slot === 'rowHeaderContentTemplate'
-      ) {
+      if (shouldAppendContentElement) {
         cell.appendChild(headerContentDiv); // @HTMLUpdateOK
       }
       this._removeFocusFromChildElements(context, cell);
@@ -8920,7 +8914,7 @@ var __oj_data_grid_metadata =
         // eslint-disable-next-line no-param-reassign
         data = '';
       }
-      if (headerContentDiv && (context.axis === 'row' || context.axis === 'column')) {
+      if (headerContentDiv) {
         headerContentDiv.appendChild(document.createTextNode(data.toString())); // @HTMLUpdateOK
         cell.appendChild(headerContentDiv); // @HTMLUpdateOK
       } else {
@@ -9213,13 +9207,16 @@ var __oj_data_grid_metadata =
       // create the header element and append the content to it
       header = document.createElement('div');
 
-      const headerContentDiv = document.createElement('div');
-      headerContentDiv.classList.add(this.getMappedStyle('headerCellContent'));
+      let headerContentDiv;
+      if (axis === 'row' || axis === 'column') {
+        headerContentDiv = document.createElement('div');
+        headerContentDiv.classList.add(this.getMappedStyle('headerCellContent'));
+      }
 
       // build headerContext to pass to renderer
       headerContext = this.createHeaderContext(
         axis,
-        index,
+        isAppend || insert ? index : index - headerExtent + 1,
         headerData,
         headerMetadata,
         header,
@@ -9391,8 +9388,7 @@ var __oj_data_grid_metadata =
         headerContext,
         header,
         headerData,
-        this.buildHeaderTemplateContext(headerContext, headerMetadata),
-        headerContentDiv
+        this.buildHeaderTemplateContext(headerContext, headerMetadata)
       );
 
       // set alignment before inline stlye to ensure inline styles win
@@ -34714,9 +34710,14 @@ var __oj_data_grid_metadata =
 
   // Load translation bundles to handle asynchronous loading for oj-c components.
   // JET-63142 -> JET-64242
+  let translationBundlePromise;
   async function getPreactTranslationPromise() {
+    if (translationBundlePromise) {
+      return translationBundlePromise;
+    }
     const { default: loader } = await new Promise(function (resolve, reject) { require(['@oracle/oraclejet-preact/translationBundle'], function (m) { resolve(_interopNamespace(m)); }, reject) });
-    return ojtranslationbundleutils.getTranslationBundlePromiseFromLoader(loader);
+    translationBundlePromise = ojtranslationbundleutils.getTranslationBundlePromiseFromLoader(loader);
+    return translationBundlePromise;
   }
 
   // import { ImmutableSet } from 'ojs/ojkeyset';
@@ -43055,7 +43056,7 @@ var __oj_data_grid_metadata =
       let adjustedRowIndex = rowIndex === -1 ? 0 : rowIndex;
       let dir = this.getResources().isRTLMode() ? 'right' : 'left';
 
-      let header = this._getHeaderByIndex(adjustedRowIndex, axis, this.m_rowHeaderLevelCount);
+      let header = this._getHeaderByIndex(adjustedRowIndex, axis, this.m_rowHeaderLevelCount - 1);
       let isHeaderWithinSelection = this._isHeaderWithinSelection(header, axis);
       if (rowIndex !== undefined && this.m_dragIndex !== rowIndex) {
         if (this.m_utils.containsCSSClassName(header, this.getMappedStyle('disabledElement'))) {
@@ -43399,7 +43400,11 @@ var __oj_data_grid_metadata =
         let axis = 'column';
         let adjustedColIndex = colIndex === -1 ? 0 : colIndex;
         let dir = this.getResources().isRTLMode() ? 'right' : 'left';
-        let header = this._getHeaderByIndex(adjustedColIndex, axis, this.m_columnHeaderLevelCount);
+        let header = this._getHeaderByIndex(
+          adjustedColIndex,
+          axis,
+          this.m_columnHeaderLevelCount - 1
+        );
         if (this.m_utils.containsCSSClassName(header, this.getMappedStyle('disabledElement'))) {
           this._removeDropTargetLine(axis);
           this._removeDropTargetClass();
@@ -47903,7 +47908,7 @@ var __oj_data_grid_metadata =
       // scroll to left of data region or currently rendered skeletons
       row = rowStart;
       top = rowStartPixel;
-      rowCount = Math.max(this.getFetchCount('row', row), this.m_endRow - row);
+      rowCount = Math.max(skeletonRowEnd, this.m_endRow, 0) - Math.min(skeletonRowStart, row) + 1;
       column = Math.min(skeletonColStart - columnCount, columnStart);
       left = Math.min(
         skeletonColStartPixel,
@@ -47928,7 +47933,7 @@ var __oj_data_grid_metadata =
       } else {
         row = rowStart;
         top = rowStartPixel;
-        rowCount = Math.max(this.getFetchCount('row', row), this.m_endRow - row);
+        rowCount = Math.max(skeletonRowEnd, this.m_endRow, 0) - Math.min(skeletonRowStart, row) + 1;
         column = Math.max(skeletonColEnd + 1, columnStart);
         left = Math.max(skeletonColEndPixel, columnStartPixel);
         columnCount = this.getFetchCount('column', column);
@@ -47938,7 +47943,8 @@ var __oj_data_grid_metadata =
       // scroll above the data region or currently rendered skeletons
       column = columnStart;
       left = columnStartPixel;
-      columnCount = Math.max(this.getFetchCount('column', column), this.m_endCol - column);
+      columnCount =
+        Math.max(skeletonColEnd, this.m_endCol, 0) - Math.min(skeletonColStart, column) + 1;
       row = Math.min(skeletonRowStart - rowCount, rowStart);
       top = Math.min(skeletonRowStartPixel, rowStartPixel + rowCount * this.getDefaultRowHeight());
       rowAppend = false;
@@ -47960,7 +47966,8 @@ var __oj_data_grid_metadata =
       } else {
         column = columnStart;
         left = columnStartPixel;
-        columnCount = Math.max(this.getFetchCount('column', column), this.m_endCol - column);
+        columnCount =
+          Math.max(skeletonColEnd, this.m_endCol, 0) - Math.min(skeletonColStart, column) + 1;
         row = Math.max(skeletonRowEnd + 1, rowStart);
         top = Math.max(skeletonRowEndPixel, rowStartPixel);
         rowCount = this.getFetchCount('row', row);

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

@@ -5039,6 +5039,15 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
         var processSetOptions = this._processSetOptions.pop();
 
         const finishProcessingSetOptions = () => {
+          // JET-66038 - REGRESSION FOR EXPENSETYPEID FIELD 'GETINPUTELEM' ERROR
+          // When this function is executed in a microtask, it's possible that the element has been
+          // removed from the DOM and its resources released since the microtask was queued.  If so,
+          // simply return without doing anything; otherwise we may throw an NPE because we've
+          // already destroyed our internal structures.
+          if (this._bReleasedResources) {
+            return;
+          }
+
           // JET-34601 - SELECT SINGLE- CHANGING DISABLED PROPERTY GIVES A GLOWING EFFECT
           // if we need to refresh, do that before setting a new value
           if (processSetOptions.forRefresh) {
@@ -5171,6 +5180,15 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
         (key === 'value' || key === this._GetValueItemPropertyName())
       ) {
         const processValueAndValueItem = () => {
+          // JET-66038 - REGRESSION FOR EXPENSETYPEID FIELD 'GETINPUTELEM' ERROR
+          // When this function is executed in a microtask, it's possible that the element has been
+          // removed from the DOM and its resources released since the microtask was queued.  If so,
+          // simply return without doing anything; otherwise we may throw an NPE because we've
+          // already destroyed our internal structures.
+          if (this._bReleasedResources) {
+            return;
+          }
+
           // Get the latest value and valueItem
           const _valueItem = this.options[this._GetValueItemPropertyName()];
           const _value = this.options.value;

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

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '16.0.4',
+  version: '16.0.6',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2024-04-26_10-29-31',
+  revision: '2024-05-03_09-32-18',
 
   // 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/ojcorerouter.js

@@ -5,9 +5,9 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
+import { info } from 'ojs/ojlogger';
 import { BehaviorSubject } from 'ojs/ojobservable';
 import UrlPathAdapter from 'ojs/ojurlpathadapter';
-import { info } from 'ojs/ojlogger';
 
 /**
  * An interface describing the object used by {@link CoreRouter} to represent
@@ -79,9 +79,6 @@ let urlAdapter;
 // similar to how history-tracking routers use URL segments
 let noHistorySegments = [];
 
-// Pending transitions array to hold extra transitions passed to go()
-let pendingTransitions = [];
-
 /**
  * Test if two routes are equivalent. Routes are equivalent if they have the
  * same paths and parameter values.
@@ -564,36 +561,16 @@ CoreRouter.prototype._configure = function (routes = []) {
  * @ojsignature {target: "Type", value: "Promise<CoreRouter.CoreRouterState<D, P>>", for: "returns"}
  */
 CoreRouter.prototype.sync = function () {
-  let route;
-  if (pendingTransitions.length) {
-    // Use the pending transition as the new state to sync
-    const transition = pendingTransitions.shift();
-    const newRoutes = this._getParentRoutes().concat(this._getPendingState(transition));
-    const newPath = urlAdapter.getUrlForRoutes(newRoutes);
-    if (!this._noHistory) {
-      window.history.replaceState(null, 'path', newPath);
-    }
-    route = transition;
-  } else {
-    route = this._getRouteSegment();
-  }
-
   // Transition to the new route, or a default one if no current one exists
-  return this._execute(route || { path: '', params: {} })
-    .then((state) => {
-      // Synchronize the next child router
-      var p = state;
-      var childRouter = this.childRouter;
-      if (childRouter) {
-        p = childRouter.sync();
-      }
-      return p;
-    })
-    .catch((ex) => {
-      // Clear transitions if transition rejected
-      pendingTransitions = [];
-      throw ex;
-    });
+  return this._execute(this._getRouteSegment() || { path: '', params: {} }).then((state) => {
+    // Synchronize the next child router
+    var p = state;
+    var childRouter = this.childRouter;
+    if (childRouter) {
+      p = childRouter.sync();
+    }
+    return p;
+  });
 };
 
 /**
@@ -726,9 +703,6 @@ CoreRouter.prototype.go = function (...transitions) {
     const path = transitions.map((t) => t.path).join('/');
     info(`Navigating router(${this._name}) to ${path}`);
 
-    // Use first transition and store remaining for next child router to read
-    const first = transitions[0];
-
     // Get the current routes for all active routers, and compare that to the
     // new routes for this transition.
     const currentPath = urlAdapter.getUrlForRoutes(getActiveRoutes());
@@ -743,15 +717,18 @@ CoreRouter.prototype.go = function (...transitions) {
       // Cleanup noHistorySegments when navigating any history-tracking routers
       noHistorySegments = [];
       // Insert the new transitions after the current router's route offset
-      const newRoutes = this._getParentRoutes().concat(this._getPendingState(first, true));
+      const newRoutes = this._getParentRoutes().concat(
+        // only first transition is for this router
+        this._getPendingState(transitions[0]),
+        // remaining are for child routers
+        transitions.slice(1)
+      );
       const newPath = urlAdapter.getUrlForRoutes(newRoutes);
       if (currentPath !== newPath) {
         window.history.pushState(null, 'path', newPath);
       }
     }
     goP = this.sync().catch((ex) => {
-      // Clear transitions if transition rejected
-      pendingTransitions = [];
       if (this._noHistory) {
         noHistorySegments = prevNoHistorySegments;
       } else {
@@ -759,7 +736,6 @@ CoreRouter.prototype.go = function (...transitions) {
       }
       throw ex;
     });
-    pendingTransitions = transitions.slice(1);
   }
   return goP;
 };
@@ -847,10 +823,7 @@ CoreRouter.prototype._publish = function (state) {
  */
 CoreRouter.prototype._setupNavigationListener = function () {
   if (this === rootRouter) {
-    this._popstateHandler = () => {
-      pendingTransitions = [];
-      this.sync();
-    };
+    this._popstateHandler = () => this.sync();
     window.addEventListener('popstate', this._popstateHandler, false);
   }
 };
@@ -875,12 +848,10 @@ CoreRouter.prototype._isCurrentState = function (state) {
  * configured states. This CoreRouterState object will similar to the matched configured
  * state, except will have its own path and params values.
  * @param {CoreRouter.Route} transition The transition for the CoreRouterState
- * @param {boolean} createEmpty Create an empty state object for the transition,
- * even if a matching route doesn't exist.
  * @return {CoreRouter.RouterState} The CoreRouterState associated for the transition
  * @private
  */
-CoreRouter.prototype._getPendingState = function (transition, createEmpty) {
+CoreRouter.prototype._getPendingState = function (transition) {
   var pending;
   var path = transition.path;
   var params = transition.params || {};
@@ -899,13 +870,6 @@ CoreRouter.prototype._getPendingState = function (transition, createEmpty) {
       _match: match._match
     };
     Object.freeze(pending);
-  } else if (createEmpty) {
-    pending = {
-      path,
-      params: {},
-      detail: {},
-      pathParams: []
-    };
   }
   return pending;
 };
@@ -1029,6 +993,13 @@ CoreRouter.prototype.createChildRouter = function (routes, options = {}) {
  * @export
  */
 CoreRouter.prototype.destroy = function () {
+  if (this.childRouter) {
+    this.childRouter.destroy();
+  }
+
+  this.beforeStateChange.observers.forEach((subscription) => subscription());
+  this.currentState.observers.forEach((subscription) => subscription());
+
   if (this === rootRouter) {
     window.removeEventListener('popstate', this._popstateHandler, false);
     rootRouter = null;