@oracle/oraclejet 15.1.3 → 15.1.4

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

@@ -333,7 +333,7 @@
   visibility: hidden; }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v15.1.3"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v15.1.4"}' !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: '15.1.3',
+    version: '15.1.4',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2023-12-06_06-28-08',
+    revision: '2023-12-21_15-18-51',
 
     // 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

@@ -576,18 +576,24 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
       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();
-      } else if (!this._noHistory) {
-        // Cleanup noHistorySegments after navigating any history-tracking routers
-        noHistorySegments = [];
-      }
-      return p;
-    });
+    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();
+        } else if (!this._noHistory) {
+          // Cleanup noHistorySegments after navigating any history-tracking routers
+          noHistorySegments = [];
+        }
+        return p;
+      })
+      .catch((ex) => {
+        // Clear transitions if transition rejected
+        pendingTransitions = [];
+        throw ex;
+      });
   };
 
   /**
@@ -741,7 +747,7 @@ define(['ojs/ojobservable', 'ojs/ojurlpathadapter', 'ojs/ojlogger'], function (o
         window.history.pushState(null, 'path', newPath);
       }
       goP = this.sync().catch((ex) => {
-        // Rollback transitions if navigation rejected
+        // Clear transitions if transition rejected
         pendingTransitions = [];
         if (this._noHistory) {
           noHistorySegments = prevNoHistorySegments;

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

@@ -13895,29 +13895,16 @@ var __oj_data_grid_metadata =
       }
     }
 
-    if (this._isDisclosureIcon(target)) {
-      this.handleHeaderClickActive(event, null, true);
-      return;
-    }
-
     var selectionMode = this.m_options.getSelectionMode();
     // only perform events on left mouse, (right in rtl culture)
     if (event.button === 0) {
       // if mousedown in an icon it the click event will handle mousedown/up
-      if (
-        (this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortascending')) ||
-          this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdescending'))) &&
-        this._isDOMElementSortable(target)
-      ) {
-        event.preventDefault();
+      if (this._isSortIcon(target) && this._isDOMElementSortable(target)) {
+        this.handleHeaderClickActive(event, null, true);
         this._handleSortIconMouseDown(target);
         return;
-      } else if (
-        this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortIcon')) &&
-        this._isDOMElementSortable(target.lastChild)
-      ) {
-        event.preventDefault();
-        this._handleSortIconMouseDown(target.lastChild);
+      } else if (this._isDisclosureIcon(target)) {
+        this.handleHeaderClickActive(event, null, true);
         return;
       }
 
@@ -14220,19 +14207,7 @@ var __oj_data_grid_metadata =
    */
   DvtDataGrid.prototype.handleHeaderClick = function (event) {
     var target = /** @type {Element} */ (event.target);
-    if (
-      (this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortascending')) ||
-        this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdescending')) ||
-        this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdefault'))) &&
-      this._isDOMElementSortable(target)
-    ) {
-      this._removeTouchSelectionAffordance();
-      this._handleHeaderSort(event);
-      event.preventDefault();
-    } else if (
-      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortIcon')) &&
-      this._isDOMElementSortable(target.lastChild)
-    ) {
+    if (this._isSortIcon(target) && this._isDOMElementSortable(target)) {
       this._removeTouchSelectionAffordance();
       this._handleHeaderSort(event);
       event.preventDefault();
@@ -15185,12 +15160,7 @@ var __oj_data_grid_metadata =
         var contextMenu = document.querySelector('#' + rootId + 'contextmenu');
         if (contextMenu && contextMenu.style.display === 'none') {
           // if touch in an icon it the click event will handle mousedown/up
-          if (
-            (this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortascending')) ||
-              this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdescending')) ||
-              this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdefault'))) &&
-            this._isDOMElementSortable(target)
-          ) {
+          if (this._isSortIcon(target) && this._isDOMElementSortable(target)) {
             if (event.cancelable) {
               event.preventDefault();
             }
@@ -33198,6 +33168,20 @@ var __oj_data_grid_metadata =
     }
   };
 
+  /**
+   * boolean if target is sort icon
+   * @param {Element} target the target being tested
+   * @private
+   */
+  DvtDataGrid.prototype._isSortIcon = function (target) {
+    return (
+      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortascending')) ||
+      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdescending')) ||
+      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdefault')) ||
+      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortIcon'))
+    );
+  };
+
   /**
    * fireExpandRequestEvent
    * @param {Event} event - click event on the headers

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

@@ -223,9 +223,13 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojdatacollection-common', 'ojs/ojlogge
 
   DomScroller.prototype._handleExternalScrollerScrollTop = function (scrollTop, scrollerHeight) {
     if (!this._fetchPromise && this._asyncIterator) {
-      var bounds = this._contentElement.getBoundingClientRect();
-      var bottom = bounds.bottom - this._fetchTrigger - bounds.height * this._fetchThreshold;
-      if (bottom <= scrollerHeight) {
+      var contentBounds = this._contentElement.getBoundingClientRect();
+      var scrollerBottom =
+        this._element === document.body || this._element === document.documentElement
+          ? scrollerHeight
+          : this._element.getBoundingClientRect().bottom;
+      var scrollDiff = contentBounds.bottom - scrollerBottom;
+      if (scrollDiff <= this._fetchTrigger + contentBounds.height * this._fetchThreshold) {
         this._doFetch(scrollTop);
       }
     }

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

@@ -11501,10 +11501,16 @@ var __oj_table_metadata =
       if (activeIndex === -1) {
         // handle select all column header case
         tableHeaderColumn = this._getTableSelectorColumn();
+        if (tableHeaderColumn == null) {
+          return;
+        }
       } else {
         // handle normal column header case
         var headerSelected = false;
         tableHeaderColumn = this._getTableHeaderColumn(activeIndex);
+        if (tableHeaderColumn == null) {
+          return;
+        }
         var selectedHeaderIdxs = this._getSelectedHeaderColumnIdxs();
         for (i = 0; i < selectedHeaderIdxs.length; i++) {
           if (selectedHeaderIdxs[i] === activeIndex) {
@@ -11524,7 +11530,7 @@ var __oj_table_metadata =
           } else {
             stateInfo += this.getTranslatedString('accessibleSortDescending', { id: '' }) + ' ';
           }
-        } else if (column.sortable === Table._OPTION_ENABLED) {
+        } else if (column != null && column.sortable === Table._OPTION_ENABLED) {
           stateInfo += this.getTranslatedString('accessibleSortable', { id: '' }) + ' ';
         }
       }
@@ -11547,10 +11553,16 @@ var __oj_table_metadata =
       if (activeIndex === -1) {
         // handle select all column footer case
         tableFooterCell = this._getTableFooterSelectorCell();
+        if (tableFooterCell == null) {
+          return;
+        }
       } else {
         // handle normal column footer case
         var footerSelected = false;
         tableFooterCell = this._getTableFooterCell(activeIndex);
+        if (tableFooterCell == null) {
+          return;
+        }
         var selectedFooterIdxs = this._getSelectedFooterColumnIdxs();
         for (i = 0; i < selectedFooterIdxs.length; i++) {
           if (selectedFooterIdxs[i] === activeIndex) {
@@ -11579,12 +11591,18 @@ var __oj_table_metadata =
         columnIndex = 0;
       }
       var activeRowElem = this._getTableBodyRow(activeIndex);
+      if (activeRowElem == null) {
+        return;
+      }
       // get 'active' cell in Table
       if (columnIndex === -1) {
         tableCell = this._getTableBodySelectorCell(activeRowElem);
       } else {
         tableCell = this._getTableBodyLogicalCells(null, activeRowElem)[columnIndex];
       }
+      if (tableCell == null) {
+        return;
+      }
 
       // update row context information if changed
       if (activeIndex !== this._accRowIndex || this._accFirstFocus !== false) {
@@ -11636,9 +11654,7 @@ var __oj_table_metadata =
       // populate cell information
       if (columnIndex === -1) {
         // handle row selector cell
-        if (tableCell != null) {
-          label += this._getAccSelectorString(activeRowElem) + ' ';
-        }
+        label += this._getAccSelectorString(activeRowElem) + ' ';
       } else {
         tableHeaderColumn = this._getTableHeaderColumn(columnIndex);
         if (tableHeaderColumn != null) {
@@ -18405,39 +18421,45 @@ var __oj_table_metadata =
         existingCurrentRow == null ||
         (existingCurrentRow.rowKey == null && existingCurrentRow.rowIndex == null);
       if (!isExistingCurrentRowClear) {
-        var existingCurrentRowIndex = existingCurrentRow.rowIndex;
-        var existingCurrentRowKey = this._getRowKeyForDataSourceRowIndex(existingCurrentRowIndex);
+        var existingCurrentRowKey = existingCurrentRow.rowKey;
         var existingCurrentRowIdx = this._getRowIdxForRowKey(existingCurrentRowKey);
 
-        var updateEditable = this._setTableEditable(false, false, 0, true, event);
-        if (updateEditable instanceof Promise) {
-          return updateEditable.then(
-            function (value) {
-              if (value === false) {
-                this._resetCurrentRow(existingCurrentRow, existingCurrentRowIdx, event);
-                return Table._CURRENT_ROW_STATUS._IGNORED;
-              }
-              var existingBodyRow = this._getTableBodyRow(existingCurrentRowIdx);
-              if (existingBodyRow != null) {
-                existingBodyRow.classList.remove(Table.CSS_CLASSES._TABLE_DATA_CURRENT_ROW_CLASS);
-              }
-              this._currentRow = updatedCurrentRow;
+        // end editing if the currently editable rowKey doesn't match the new current rowKey
+        if (
+          this._hasEditableRow() &&
+          (updatedCurrentRow == null ||
+            !oj.KeyUtils.equals(existingCurrentRowKey, updatedCurrentRow.rowKey))
+        ) {
+          var updateEditable = this._setTableEditable(false, false, 0, true, event);
+          if (updateEditable instanceof Promise) {
+            return updateEditable.then(
+              function (value) {
+                if (value === false) {
+                  this._resetCurrentRow(existingCurrentRow, existingCurrentRowIdx, event);
+                  return Table._CURRENT_ROW_STATUS._IGNORED;
+                }
+                var existingBodyRow = this._getTableBodyRow(existingCurrentRowIdx);
+                if (existingBodyRow != null) {
+                  existingBodyRow.classList.remove(Table.CSS_CLASSES._TABLE_DATA_CURRENT_ROW_CLASS);
+                }
+                this._currentRow = updatedCurrentRow;
 
-              this._updateCurrentRow(isClearCurrentRow, localRowIndex, event);
-              if (event == null) {
-                // only scroll to the new current row and highlight it if the Table has focus
-                this._setActiveRow(localRowIndex, event, false, !this._hasFocus());
-              }
-              return Table._CURRENT_ROW_STATUS._UPDATED;
-            }.bind(this),
-            function () {
-              this._resetCurrentRow(existingCurrentRow, existingCurrentRowIdx, event);
-              return Table._CURRENT_ROW_STATUS._VETOED;
-            }.bind(this)
-          );
-        } else if (updateEditable === false) {
-          this._resetCurrentRow(existingCurrentRow, existingCurrentRowIdx, event);
-          return Table._CURRENT_ROW_STATUS._VETOED;
+                this._updateCurrentRow(isClearCurrentRow, localRowIndex, event);
+                if (event == null) {
+                  // only scroll to the new current row and highlight it if the Table has focus
+                  this._setActiveRow(localRowIndex, event, false, !this._hasFocus());
+                }
+                return Table._CURRENT_ROW_STATUS._UPDATED;
+              }.bind(this),
+              function () {
+                this._resetCurrentRow(existingCurrentRow, existingCurrentRowIdx, event);
+                return Table._CURRENT_ROW_STATUS._VETOED;
+              }.bind(this)
+            );
+          } else if (updateEditable === false) {
+            this._resetCurrentRow(existingCurrentRow, existingCurrentRowIdx, event);
+            return Table._CURRENT_ROW_STATUS._VETOED;
+          }
         }
         var existingBodyRow = this._getTableBodyRow(existingCurrentRowIdx);
         if (existingBodyRow != null) {

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

@@ -894,9 +894,28 @@ define(['require', 'exports', 'preact/compat', 'preact/jsx-runtime', 'preact', '
             if (isTemplateSlot) {
                 if (slotNodes[0]?.nodeName === 'TEMPLATE') {
                     const templateNode = slotNodes[0];
-                    propContainer[propName] =
-                        templateNode['render'] ??
-                            this._getSlotRenderer(templateNode, propName, containerPropName);
+                    let renderer = templateNode['render'];
+                    if (renderer) {
+                        propContainer[propName] = renderer;
+                        Object.defineProperties(templateNode, {
+                            render: {
+                                enumerable: true,
+                                get: () => {
+                                    return renderer;
+                                },
+                                set: (newRenderer) => {
+                                    renderer = newRenderer;
+                                    if (newRenderer) {
+                                        this._updateProps([propName], newRenderer);
+                                        this._queueRender();
+                                    }
+                                }
+                            }
+                        });
+                    }
+                    else {
+                        propContainer[propName] = this._getSlotRenderer(templateNode, propName, containerPropName);
+                    }
                 }
                 else {
                     throw new ojcustomelementUtils.JetElementError(this._element, `Slot content for template slot ${slotName} must be a template element.`);

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

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '15.1.3',
+  version: '15.1.4',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2023-12-06_06-28-08',
+  revision: '2023-12-21_15-18-51',
 
   // 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

@@ -576,18 +576,24 @@ CoreRouter.prototype.sync = function () {
     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();
-    } else if (!this._noHistory) {
-      // Cleanup noHistorySegments after navigating any history-tracking routers
-      noHistorySegments = [];
-    }
-    return p;
-  });
+  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();
+      } else if (!this._noHistory) {
+        // Cleanup noHistorySegments after navigating any history-tracking routers
+        noHistorySegments = [];
+      }
+      return p;
+    })
+    .catch((ex) => {
+      // Clear transitions if transition rejected
+      pendingTransitions = [];
+      throw ex;
+    });
 };
 
 /**
@@ -741,7 +747,7 @@ CoreRouter.prototype.go = function (...transitions) {
       window.history.pushState(null, 'path', newPath);
     }
     goP = this.sync().catch((ex) => {
-      // Rollback transitions if navigation rejected
+      // Clear transitions if transition rejected
       pendingTransitions = [];
       if (this._noHistory) {
         noHistorySegments = prevNoHistorySegments;

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

@@ -13911,29 +13911,16 @@ DvtDataGrid.prototype.handleHeaderMouseDown = function (event) {
     }
   }
 
-  if (this._isDisclosureIcon(target)) {
-    this.handleHeaderClickActive(event, null, true);
-    return;
-  }
-
   var selectionMode = this.m_options.getSelectionMode();
   // only perform events on left mouse, (right in rtl culture)
   if (event.button === 0) {
     // if mousedown in an icon it the click event will handle mousedown/up
-    if (
-      (this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortascending')) ||
-        this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdescending'))) &&
-      this._isDOMElementSortable(target)
-    ) {
-      event.preventDefault();
+    if (this._isSortIcon(target) && this._isDOMElementSortable(target)) {
+      this.handleHeaderClickActive(event, null, true);
       this._handleSortIconMouseDown(target);
       return;
-    } else if (
-      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortIcon')) &&
-      this._isDOMElementSortable(target.lastChild)
-    ) {
-      event.preventDefault();
-      this._handleSortIconMouseDown(target.lastChild);
+    } else if (this._isDisclosureIcon(target)) {
+      this.handleHeaderClickActive(event, null, true);
       return;
     }
 
@@ -14236,19 +14223,7 @@ DvtDataGrid.prototype.handleCornerClick = function (event) {
  */
 DvtDataGrid.prototype.handleHeaderClick = function (event) {
   var target = /** @type {Element} */ (event.target);
-  if (
-    (this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortascending')) ||
-      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdescending')) ||
-      this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdefault'))) &&
-    this._isDOMElementSortable(target)
-  ) {
-    this._removeTouchSelectionAffordance();
-    this._handleHeaderSort(event);
-    event.preventDefault();
-  } else if (
-    this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortIcon')) &&
-    this._isDOMElementSortable(target.lastChild)
-  ) {
+  if (this._isSortIcon(target) && this._isDOMElementSortable(target)) {
     this._removeTouchSelectionAffordance();
     this._handleHeaderSort(event);
     event.preventDefault();
@@ -15201,12 +15176,7 @@ DvtDataGrid.prototype.handleHeaderTouchEnd = function (event) {
       var contextMenu = document.querySelector('#' + rootId + 'contextmenu');
       if (contextMenu && contextMenu.style.display === 'none') {
         // if touch in an icon it the click event will handle mousedown/up
-        if (
-          (this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortascending')) ||
-            this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdescending')) ||
-            this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdefault'))) &&
-          this._isDOMElementSortable(target)
-        ) {
+        if (this._isSortIcon(target) && this._isDOMElementSortable(target)) {
           if (event.cancelable) {
             event.preventDefault();
           }
@@ -33214,6 +33184,20 @@ DvtDataGrid.prototype._doDelayedSort = function () {
   }
 };
 
+/**
+ * boolean if target is sort icon
+ * @param {Element} target the target being tested
+ * @private
+ */
+DvtDataGrid.prototype._isSortIcon = function (target) {
+  return (
+    this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortascending')) ||
+    this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdescending')) ||
+    this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortdefault')) ||
+    this.m_utils.containsCSSClassName(target, this.getMappedStyle('sortIcon'))
+  );
+};
+
 /**
  * fireExpandRequestEvent
  * @param {Event} event - click event on the headers

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

@@ -223,9 +223,13 @@ DomScroller.prototype._doFetch = function (scrollTop) {
 
 DomScroller.prototype._handleExternalScrollerScrollTop = function (scrollTop, scrollerHeight) {
   if (!this._fetchPromise && this._asyncIterator) {
-    var bounds = this._contentElement.getBoundingClientRect();
-    var bottom = bounds.bottom - this._fetchTrigger - bounds.height * this._fetchThreshold;
-    if (bottom <= scrollerHeight) {
+    var contentBounds = this._contentElement.getBoundingClientRect();
+    var scrollerBottom =
+      this._element === document.body || this._element === document.documentElement
+        ? scrollerHeight
+        : this._element.getBoundingClientRect().bottom;
+    var scrollDiff = contentBounds.bottom - scrollerBottom;
+    if (scrollDiff <= this._fetchTrigger + contentBounds.height * this._fetchThreshold) {
       this._doFetch(scrollTop);
     }
   }