@oracle/oraclejet 12.0.2 → 12.1.1

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

@@ -1228,11 +1228,33 @@ var __oj_checkboxset_metadata =
    * @since 5.0.0
    */
       GetFocusElement: function () {
+        // JET-48463 - oj-table issue where focus is lost
+        // GetFocusElement() needs to return the correct readonly element
+        // If _GetReadonlyFocusElement() returns null, fallback to the
+        // enabled element logic.
+        if (this.options.readOnly === true) {
+          const readonlyFocusElement = this._GetReadonlyFocusElement();
+          if (readonlyFocusElement) {
+            return readonlyFocusElement;
+          }
+        }
         // We need :disabled here so that we don't try to focus on an element that isn't focusable.
         // :focusable doesn't work because this is called before the custom element is fully upgraded
         // and is still hidden in the DOM.
         return this._GetContentElement().not(':disabled').first()[0];
       },
+      /**
+       * oj-checkboxset doesn't use .oj-text-field-readonly for the focusable readonly content,
+       * so we need to use a different selector.
+       * @memberof oj.ojCheckboxset
+       * @instance
+       * @override
+       * @protected
+       * @return {Element|null}
+       */
+      _GetReadonlyFocusElement: function () {
+        return this.widget()[0].querySelector('.oj-form-control-container');
+      },
   /**
    * Sets the disabled option onto the dom.
    * This is a no-op for checkboxset since its root dom element is a div, and disabled is

package/dist/js/libs/oj/debug_esm/ojconverter-datetime.js

@@ -504,7 +504,8 @@ const RelativeDateTimeFormatter = (function () {
         'year';
     }
     var intlRelativeCnv = new Intl.RelativeTimeFormat(getLocale(), { numeric: style });
-    var format = intlRelativeCnv.format(units[field], field);
+    var val = diff >= 0 ? units[field] : -units[field];
+    var format = intlRelativeCnv.format(val, field);
     return format;
   }
 

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

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '12.0.2',
+  version: '12.1.1',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2022-03-10_18-27-13',
+  revision: '2022-04-29_18-31-21',
 
   // 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/ojcustomelement-utils.js

@@ -803,8 +803,8 @@ const fromSymbolizedValue = (value) => {
     return value;
 };
 const convertEmptyStringToUndefined = (element, propertyMeta, value) => {
-    const elementState = CustomElementUtils.getElementState(element);
-    if (elementState.getBindingProviderType() === 'preact') {
+    if (!element ||
+        CustomElementUtils.getElementState(element).getBindingProviderType() === 'preact') {
         const types = ElementUtils.getSupportedTypes(propertyMeta.type);
         if (!types.string || propertyMeta.enumValues) {
             return undefined;

package/dist/js/libs/oj/debug_esm/ojdatacollection-common.js

@@ -8,7 +8,7 @@
 import oj from 'ojs/ojcore-base';
 import { getNoJQFocusHandlers as getNoJQFocusHandlers$1 } from 'ojs/ojdomutils';
 import { error } from 'ojs/ojlogger';
-import { getFocusableElementsInNode as getFocusableElementsInNode$1, checkVisibility, disableElement as disableElement$1, disableAllFocusableElements as disableAllFocusableElements$1, enableAllFocusableElements as enableAllFocusableElements$1, getLogicalChildPopup as getLogicalChildPopup$1 } from 'ojs/ojkeyboardfocus-utils';
+import { getFocusableElementsInNode as getFocusableElementsInNode$1, checkVisibility, disableElement as disableElement$1, disableAllFocusableElements as disableAllFocusableElements$1, enableAllFocusableElements as enableAllFocusableElements$1, getActionableElementsInNode as getActionableElementsInNode$1, getLogicalChildPopup as getLogicalChildPopup$1 } from 'ojs/ojkeyboardfocus-utils';
 
 /**
  * This class contains utility methods used by the data collection components (DataGrid, Listview, and Table).
@@ -26,11 +26,6 @@ DataCollectionUtils._TAB_INDEX = 'tabIndex';
  */
 DataCollectionUtils._DATA_OJ_TABMOD = 'data-oj-tabmod';
 
-/**
- * @private
- */
-DataCollectionUtils._FOCUSABLE_ELEMENTS_QUERY = "input, select, button, a[href], textarea, object, [tabIndex]:not([tabIndex='-1'])";
-
 /**
  * @private
  */
@@ -108,21 +103,13 @@ DataCollectionUtils.isFromDefaultSelector = function (event) {
 };
 
 /**
- * Finds all the focusable elements in a node including ones with tabmod on them (disabled by us)
+ * Finds all the actionable elements in a node including ones with tabmod on them (disabled by us)
  * @param {Element} element
  * @return {Element[]} An array of the enabled elements
  * @private
  */
-DataCollectionUtils.getFocusableElementsIncludingDisabled = function (element) {
-  var inputElems = [];
-  let nodes = element.querySelectorAll(DataCollectionUtils._FOCUSABLE_ELEMENTS_QUERY + ',[' + DataCollectionUtils._DATA_OJ_TABMOD + ']');
-  for (var i = 0; i < nodes.length; i++) {
-    var elem = nodes[i];
-    if (!elem.disabled && elem.style.display !== 'none') {
-      inputElems.push(elem);
-    }
-  }
-  return inputElems;
+DataCollectionUtils.getActionableElementsInNode = function (element) {
+  return getActionableElementsInNode$1(element);
 };
 
 /**
@@ -781,9 +768,9 @@ const disableElement = DataCollectionUtils.disableElement;
 const disableAllFocusableElements = DataCollectionUtils.disableAllFocusableElements;
 const disableDefaultBrowserStyling = DataCollectionUtils.disableDefaultBrowserStyling;
 const enableAllFocusableElements = DataCollectionUtils.enableAllFocusableElements;
+const getActionableElementsInNode = DataCollectionUtils.getActionableElementsInNode;
 const getAddEventKeysResult = DataCollectionUtils.getAddEventKeysResult;
 const getDefaultScrollBarWidth = DataCollectionUtils.getDefaultScrollBarWidth;
-const getFocusableElementsIncludingDisabled = DataCollectionUtils.getFocusableElementsIncludingDisabled;
 const isElementOrAncestorFocusable = DataCollectionUtils.isElementOrAncestorFocusable;
 const isIterateAfterDoneNotAllowed = DataCollectionUtils.isIterateAfterDoneNotAllowed;
 const getFocusableElementsInNode = DataCollectionUtils.getFocusableElementsInNode;
@@ -815,4 +802,4 @@ const isElementInScrollerBounds = DataCollectionUtils.isElementInScrollerBounds;
 const getEventDetail = DataCollectionUtils.getEventDetail;
 const isRequestIdleCallbackSupported = DataCollectionUtils.isRequestIdleCallbackSupported;
 
-export { CHECKVIEWPORT_THRESHOLD, KEYBOARD_KEYS, applyMergedInlineStyles, applyStyleObj, areKeySetsEqual, calculateOffsetTop, containsKey, convertStringToStyleObj, disableAllFocusableElements, disableDefaultBrowserStyling, disableElement, enableAllFocusableElements, getAddEventKeysResult, getDefaultScrollBarWidth, getEventDetail, getFocusableElementsInNode, getFocusableElementsIncludingDisabled, getLogicalChildPopup, getNoJQFocusHandlers, handleActionablePrevTab, handleActionableTab, isArrowDownKeyEvent, isArrowLeftKeyEvent, isArrowRightKeyEvent, isArrowUpKeyEvent, isClickthroughDisabled, isElementInScrollerBounds, isElementOrAncestorFocusable, isEndKeyEvent, isEnterKeyEvent, isEscapeKeyEvent, isEventClickthroughDisabled, isF2KeyEvent, isFromDefaultSelector, isHomeKeyEvent, isIterateAfterDoneNotAllowed, isLetterAKeyEvent, isMobileTouchDevice, isNumberFiveKeyEvent, isRequestIdleCallbackSupported, isSpaceBarKeyEvent, isTabKeyEvent };
+export { CHECKVIEWPORT_THRESHOLD, KEYBOARD_KEYS, applyMergedInlineStyles, applyStyleObj, areKeySetsEqual, calculateOffsetTop, containsKey, convertStringToStyleObj, disableAllFocusableElements, disableDefaultBrowserStyling, disableElement, enableAllFocusableElements, getActionableElementsInNode, getAddEventKeysResult, getDefaultScrollBarWidth, getEventDetail, getFocusableElementsInNode, getLogicalChildPopup, getNoJQFocusHandlers, handleActionablePrevTab, handleActionableTab, isArrowDownKeyEvent, isArrowLeftKeyEvent, isArrowRightKeyEvent, isArrowUpKeyEvent, isClickthroughDisabled, isElementInScrollerBounds, isElementOrAncestorFocusable, isEndKeyEvent, isEnterKeyEvent, isEscapeKeyEvent, isEventClickthroughDisabled, isF2KeyEvent, isFromDefaultSelector, isHomeKeyEvent, isIterateAfterDoneNotAllowed, isLetterAKeyEvent, isMobileTouchDevice, isNumberFiveKeyEvent, isRequestIdleCallbackSupported, isSpaceBarKeyEvent, isTabKeyEvent };

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

@@ -16,7 +16,7 @@ import 'ojs/ojbutton';
 import oj$1 from 'ojs/ojcore-base';
 import { _OJ_CONTAINER_ATTR, subtreeAttached, __GetWidgetConstructor } from 'ojs/ojcomponentcore';
 import Context from 'ojs/ojcontext';
-import { isMobileTouchDevice, applyMergedInlineStyles, disableAllFocusableElements, enableAllFocusableElements, getFocusableElementsInNode, getFocusableElementsIncludingDisabled, handleActionableTab, handleActionablePrevTab, disableDefaultBrowserStyling } from 'ojs/ojdatacollection-common';
+import { isMobileTouchDevice, applyMergedInlineStyles, disableAllFocusableElements, enableAllFocusableElements, getFocusableElementsInNode, getActionableElementsInNode, handleActionableTab, handleActionablePrevTab, disableDefaultBrowserStyling } from 'ojs/ojdatacollection-common';
 import { setScrollLeft, getCSSTimeUnitAsMillis, isTouchSupported, removeResizeListener, addResizeListener } from 'ojs/ojdomutils';
 import { __getTemplateEngine } from 'ojs/ojconfig';
 import { CustomElementUtils } from 'ojs/ojcustomelement-utils';
@@ -16035,7 +16035,7 @@ DvtDataGrid.prototype.getLabelledBy = function (activeObject, prevActiveObject,
     }
   }
 
-  let focusableElems = getFocusableElementsIncludingDisabled(element);
+  let focusableElems = getActionableElementsInNode(element);
   if (focusableElems && focusableElems.length > 0) {
     statesArray.push({ key: 'accessibleContainsControls' });
   }
@@ -22231,6 +22231,11 @@ DvtDataGrid.prototype.handleContextMenuResize = function (event, id, val, target
       if (this._getResizeHeaderMode(this.m_resizingElement) === 'column') {
         if (this._isDOMElementResizable(this.m_resizingElement)) {
           if (isHeaderLabel) {
+            if (this.m_utils.containsCSSClassName(this.m_resizingElement,
+              this.getMappedStyle('columnendheaderlabel'))) {
+                // as resizing width on colEndHeaderLabel essentially changes rowHeader width and not rowEndHeader.
+                end = false;
+            }
             this.resizeRowWidth(value, value - initialWidth, end, isHeaderLabel);
             this._fireResizeEvent(event, initialWidth, initialHeight, value, initialHeight, value);
           } else {
@@ -22254,6 +22259,11 @@ DvtDataGrid.prototype.handleContextMenuResize = function (event, id, val, target
       } else if (this._isDOMElementResizable(this.m_resizingElement)) {
         let newElementHeight = this.getNewElementHeight('row', initialHeight, end, deltaHeight, isHeaderLabel);
         if (isHeaderLabel) {
+          if (this.m_utils.containsCSSClassName(this.m_resizingElement,
+            this.getMappedStyle('rowendheaderlabel'))) {
+              // as resizing height on rowEndHeaderLabel essentially changes columnHeader height and not columnEndHeader.
+              end = false;
+          }
           this.resizeColHeight(newElementHeight, newElementHeight - initialHeight, end);
           this._fireResizeEvent(event, initialWidth, initialHeight, initialWidth, value, value);
         } else {
@@ -22814,14 +22824,18 @@ DvtDataGrid.prototype._isHeaderSelected = function (context, axis) {
 };
 
 /**
- * Clear all header highlight
- */
- DvtDataGrid.prototype._clearHeaderHighLight = function () {
-  const someSelectedHeaders = this.m_root.querySelectorAll('.' + this.getMappedStyle('headerPartialSelected'));
+* Clear all header highlight
+*/
+DvtDataGrid.prototype._clearHeaderHighLight = function () {
+  const someSelectedSelector = '.' + this.getMappedStyle('headerPartialSelected')
+  + '.' + this.getMappedStyle('headercell');
+  const someSelectedHeaders = this.m_root.querySelectorAll(someSelectedSelector);
   for (let i = 0; i < someSelectedHeaders.length; i++) {
     someSelectedHeaders[i].classList.remove(this.getMappedStyle('headerPartialSelected'));
   }
-  const allSelectedHeaders = this.m_root.querySelectorAll('.' + this.getMappedStyle('headerAllSelected'));
+  const allSelectedSelector = '.' + this.getMappedStyle('headerAllSelected')
+    + '.' + this.getMappedStyle('headercell');
+  const allSelectedHeaders = this.m_root.querySelectorAll(allSelectedSelector);
   for (let i = 0; i < allSelectedHeaders.length; i++) {
     allSelectedHeaders[i].classList.remove(this.getMappedStyle('headerAllSelected'));
   }

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

@@ -2919,11 +2919,21 @@ oj.__registerWidget('oj.ojInputDate', $.oj.inputBase, {
     // passing in true to indicate that we want to show the popup of showOn is set
     // to 'focus'. If this isn't a custom element, we don't want to override the
     // focus functions.
+    // Also, when readonly is true, we just want to focus on the readonly element,
+    // as the popup isn't an issue.
     if (this._IsCustomElement()) {
       let comp = this._getRootElement();
-      let inputElem = this.GetFocusElement();
-      comp.focus = function () {
-        inputElem.focus(true);
+      // We need the input element here regardless of readonly state.
+      let inputElem = this._GetContentElement()[0];
+      comp.focus = () => {
+        const focusElem = this.GetFocusElement();
+        // we only want to call .focus(true) if it's the input elem that we added
+        // the custom focus callback on.
+        if (focusElem === inputElem) {
+          inputElem.focus(true);
+        } else {
+          focusElem.focus();
+        }
       };
 
       let proto = Object.getPrototypeOf(inputElem);
@@ -9061,11 +9071,18 @@ oj.__registerWidget('oj.ojInputTime', $.oj.inputBase,
       // passing in true to indicate that we want to show the popup of showOn is set
       // to 'focus'.  If this isn't a custom element, we don't want to override the
       // focus functions.
+      // Also, when readonly is true, we just want to focus on the readonly element,
+      // as the popup isn't an issue.
       if (this._IsCustomElement()) {
         let comp = this._getRootElement();
-        let inputElem = this.GetFocusElement();
-        comp.focus = function () {
-          inputElem.focus(true);
+        // We need the input element here regardless of readonly state.
+        let inputElem = this._GetContentElement()[0];
+        comp.focus = () => {
+          if (this.options.readOnly === true) {
+            this.GetFocusElement().focus(); // This should be the readonly focus element.
+          } else {
+            inputElem.focus(true);
+          }
         };
 
         let proto = Object.getPrototypeOf(inputElem);

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

@@ -3440,6 +3440,7 @@ oj.__registerWidget('oj.ojDiagram', $.oj.dvtBaseComponent,
        * @instance
        * @ojsignature [{target:"Type", value:"<K1>", for:"genericTypeParameters"},
        *               {target:"Type", value:"K1", for:"nodeId"}]
+       * @ojdeprecated {since: '12.1.0', description: 'The oj-before-expand event has been deprecated.  Lazy loading of data can be done through the data provider.'}
        */
       beforeExpand: null,
       /**
@@ -3453,6 +3454,7 @@ oj.__registerWidget('oj.ojDiagram', $.oj.dvtBaseComponent,
        * @instance
        * @ojsignature [{target:"Type", value:"<K1>", for:"genericTypeParameters"},
        *               {target:"Type", value:"K1", for:"nodeId"}]
+       * @ojdeprecated {since: '12.1.0', description: 'The oj-expand event has been deprecated.  Use on-expanded-changed instead.'}
        */
       expand: null,
       /**
@@ -3467,6 +3469,7 @@ oj.__registerWidget('oj.ojDiagram', $.oj.dvtBaseComponent,
        * @instance
        * @ojsignature [{target:"Type", value:"<K1>", for:"genericTypeParameters"},
        *               {target:"Type", value:"K1", for:"nodeId"}]
+       * @ojdeprecated {since: '12.1.0', description: 'The oj-before-collapse event has been deprecated.  Lazy loading of data can be done through the data provider.'}
        */
       beforeCollapse: null,
       /**
@@ -3480,6 +3483,7 @@ oj.__registerWidget('oj.ojDiagram', $.oj.dvtBaseComponent,
        * @instance
        * @ojsignature [{target:"Type", value:"<K1>", for:"genericTypeParameters"},
        *               {target:"Type", value:"K1", for:"nodeId"}]
+       * @ojdeprecated {since: '12.1.0', description: 'The oj-collapse event has been deprecated.  Use on-expanded-changed instead.'}
        */
       collapse: null
     },

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

@@ -3293,22 +3293,13 @@ import { getDeviceRenderMode } from 'ojs/ojconfig';
     },
 
     _disableBodyOverflow: function () {
-      var body = $(document.body);
-      this._origBodyOverflow = {
-        x: body.css('overflow-x'),
-        y: body.css('overflow-y')
-      };
-      body.css('overflow-x', 'hidden');
-      body.css('overflow-y', 'hidden');
+      var body = document.body;
+      body.classList.add('oj-dialog-sheet-animating');
     },
 
     _restoreBodyOverflow: function () {
-      if (this._origBodyOverflow) {
-        var body = $(document.body);
-        body.css('overflow-x', this._origBodyOverflow.x);
-        body.css('overflow-y', this._origBodyOverflow.y);
-        this._origBodyOverflow = null;
-      }
+      var body = document.body;
+      body.classList.remove('oj-dialog-sheet-animating');
     },
 
     _destroyCloseButton: function () {