@oracle/oraclejet 12.0.2 → 12.0.3

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":"v12.0.2"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v12.0.3"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;
@@ -13478,6 +13478,10 @@ oj-dialog {
     max-height: -webkit-fill-available;
     height: -webkit-fill-available; } }
 
+/* disable body scroll while animating a sheet dialog */
+.oj-dialog-sheet-animating {
+  overflow: hidden !important; }
+
 .oj-dialog.oj-resizable {
   position: absolute; }
 
@@ -18122,26 +18126,19 @@ oj-progress-circle {
 
 @keyframes circleLength {
   0% {
-    -webkit-clip-path: polygon(21.1% 0, 21.1% 0, 21.1% 0, 50% 50%, 78.9% 0, 78.9% 0, 78.9% 0);
-            clip-path: polygon(21.1% 0, 21.1% 0, 21.1% 0, 50% 50%, 78.9% 0, 78.9% 0, 78.9% 0); }
+    clip-path: polygon(21.1% 0, 21.1% 0, 21.1% 0, 50% 50%, 78.9% 0, 78.9% 0, 78.9% 0); }
   6.25% {
-    -webkit-clip-path: polygon(0 0, 0 0, 0 0, 50% 50%, 100% 0, 100% 0, 100% 0);
-            clip-path: polygon(0 0, 0 0, 0 0, 50% 50%, 100% 0, 100% 0, 100% 0); }
+    clip-path: polygon(0 0, 0 0, 0 0, 50% 50%, 100% 0, 100% 0, 100% 0); }
   43.75% {
-    -webkit-clip-path: polygon(0 0, 0 100%, 0 100%, 50% 50%, 100% 100%, 100% 100%, 100% 0);
-            clip-path: polygon(0 0, 0 100%, 0 100%, 50% 50%, 100% 100%, 100% 100%, 100% 0); }
+    clip-path: polygon(0 0, 0 100%, 0 100%, 50% 50%, 100% 100%, 100% 100%, 100% 0); }
   50% {
-    -webkit-clip-path: polygon(0 0, 0 100%, 21.1% 100%, 50% 50%, 78.9% 100%, 100% 100%, 100% 0);
-            clip-path: polygon(0 0, 0 100%, 21.1% 100%, 50% 50%, 78.9% 100%, 100% 100%, 100% 0); }
+    clip-path: polygon(0 0, 0 100%, 21.1% 100%, 50% 50%, 78.9% 100%, 100% 100%, 100% 0); }
   56.25% {
-    -webkit-clip-path: polygon(0 0, 0 100%, 0 100%, 50% 50%, 100% 100%, 100% 100%, 100% 0);
-            clip-path: polygon(0 0, 0 100%, 0 100%, 50% 50%, 100% 100%, 100% 100%, 100% 0); }
+    clip-path: polygon(0 0, 0 100%, 0 100%, 50% 50%, 100% 100%, 100% 100%, 100% 0); }
   93.75% {
-    -webkit-clip-path: polygon(0 0, 0 0, 0 0, 50% 50%, 100% 0, 100% 0, 100% 0);
-            clip-path: polygon(0 0, 0 0, 0 0, 50% 50%, 100% 0, 100% 0, 100% 0); }
+    clip-path: polygon(0 0, 0 0, 0 0, 50% 50%, 100% 0, 100% 0, 100% 0); }
   100% {
-    -webkit-clip-path: polygon(21.1% 0, 21.1% 0, 21.1% 0, 50% 50%, 78.9% 0, 78.9% 0, 78.9% 0);
-            clip-path: polygon(21.1% 0, 21.1% 0, 21.1% 0, 50% 50%, 78.9% 0, 78.9% 0, 78.9% 0); } }
+    clip-path: polygon(21.1% 0, 21.1% 0, 21.1% 0, 50% 50%, 78.9% 0, 78.9% 0, 78.9% 0); } }
 
 /* progress circle            */
 /* -------------------------- */

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

@@ -1224,11 +1224,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/ojcore-base.js

@@ -37,12 +37,12 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
      * @global
      * @member {string} version JET version numberr
      */
-    version: '12.0.2',
+    version: '12.0.3',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2022-03-10_18-27-13',
+    revision: '2022-04-12_09-27-22',
 
     // 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/ojcustomelement-utils.js

@@ -803,8 +803,8 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojcontext', 'ojs/ojlogger', 'ojs/ojth
         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/ojdatacollection-common.js

@@ -25,11 +25,6 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojdomutils', 'ojs/ojlogger', 'ojs/ojk
    */
   DataCollectionUtils._DATA_OJ_TABMOD = 'data-oj-tabmod';
 
-  /**
-   * @private
-   */
-  DataCollectionUtils._FOCUSABLE_ELEMENTS_QUERY = "input, select, button, a[href], textarea, object, [tabIndex]:not([tabIndex='-1'])";
-
   /**
    * @private
    */
@@ -107,21 +102,13 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojdomutils', 'ojs/ojlogger', 'ojs/ojk
   };
 
   /**
-   * 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 ojkeyboardfocusUtils.getActionableElementsInNode(element);
   };
 
   /**
@@ -780,9 +767,9 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojdomutils', 'ojs/ojlogger', 'ojs/ojk
   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;
@@ -826,11 +813,11 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojdomutils', 'ojs/ojlogger', 'ojs/ojk
   exports.disableDefaultBrowserStyling = disableDefaultBrowserStyling;
   exports.disableElement = disableElement;
   exports.enableAllFocusableElements = enableAllFocusableElements;
+  exports.getActionableElementsInNode = getActionableElementsInNode;
   exports.getAddEventKeysResult = getAddEventKeysResult;
   exports.getDefaultScrollBarWidth = getDefaultScrollBarWidth;
   exports.getEventDetail = getEventDetail;
   exports.getFocusableElementsInNode = getFocusableElementsInNode;
-  exports.getFocusableElementsIncludingDisabled = getFocusableElementsIncludingDisabled;
   exports.getLogicalChildPopup = getLogicalChildPopup;
   exports.getNoJQFocusHandlers = getNoJQFocusHandlers;
   exports.handleActionablePrevTab = handleActionablePrevTab;

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

@@ -16021,7 +16021,7 @@ var __oj_data_grid_metadata =
       }
     }
 
-    let focusableElems = DataCollectionUtils.getFocusableElementsIncludingDisabled(element);
+    let focusableElems = DataCollectionUtils.getActionableElementsInNode(element);
     if (focusableElems && focusableElems.length > 0) {
       statesArray.push({ key: 'accessibleContainsControls' });
     }
@@ -22800,14 +22800,18 @@ var __oj_data_grid_metadata =
   };
 
   /**
-   * 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/ojdatetimepicker.js

@@ -2904,11 +2904,21 @@ var __oj_input_date_time_metadata =
       // 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);
@@ -9046,11 +9056,18 @@ var __oj_input_date_time_metadata =
         // 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/ojdialog.js

@@ -3285,22 +3285,13 @@ define(['ojs/ojpopupcore', 'ojs/ojbutton', 'jqueryui-amd/widgets/mouse', 'jquery
       },
 
       _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 () {

package/dist/js/libs/oj/debug/ojdvt-timecomponent.js

@@ -178,38 +178,41 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojtimeaxis-toolkit'], function (exp
      * @param {string} type The raw data object type. Must be either 'series', 'item', 'row', or 'task'
      * @return {object} The sanitized data
      */
-    static sanitizeData(data, type) {
-      var seriesCopy;
-      var itemCopy;
-      var isSeriesData = type === 'series' || type === 'row';
+     static sanitizeData(data, type) {
+      const sanitizeNoTemplateItemData = (item) => {
+        if (item._itemData.taskId) {
+          // Specifically for Gantt with row data supplied and no task template,
+          // _itemData does not have the task's id prop (it has the taskId prop)
+          const itemCopy = Object.assign({}, item._itemData);
+          itemCopy.id = itemCopy.taskId;
+          delete itemCopy.taskId;
+          return itemCopy;
+        }
+        return item._itemData;
+      };
+      const sanitizeItemData = (item) => {
+        const itemCopy = Object.assign({}, item);
+        delete itemCopy._itemData;
+        return itemCopy;
+      };
+      const isSeriesData = type === 'series' || type === 'row';
       if (isSeriesData) {
-        var itemProp = type === 'series' ? 'items' : 'tasks';
-        if (data[itemProp].length > 0) {
-          if (data[itemProp][0]._noTemplate) {
-            seriesCopy = dvt.JsonUtils.clone(data, null, {itemProp: true});
-            seriesCopy[itemProp] = seriesCopy[itemProp].map((item) => {
-              return item._itemData;
-            });
-            return seriesCopy;
-          } else if (data[itemProp][0]._itemData) {
-            seriesCopy = dvt.JsonUtils.clone(data, null, {itemProp: true});
-            seriesCopy[itemProp] = seriesCopy[itemProp].map((item) => {
-              itemCopy = dvt.JsonUtils.clone(item);
-              delete itemCopy._itemData;
-              return itemCopy;
-            });
-            return seriesCopy;
+        const itemProp = type === 'series' ? 'items' : 'tasks';
+        const items = data[itemProp];
+        if (items.length > 0) {
+          const seriesCopy = Object.assign({}, data._noTemplate ? data._itemData : data);
+          if (items[0]._noTemplate) {
+            seriesCopy[itemProp] = data[itemProp].map(sanitizeNoTemplateItemData);
+          } else if (items[0]._itemData) {
+            seriesCopy[itemProp] = data[itemProp].map(sanitizeItemData);
           }
-          return data;
+          return seriesCopy;
         }
-      }
-      else {
+      } else {
         if (data._noTemplate) {
-          return data._itemData;
+          return sanitizeNoTemplateItemData(data);
         } else if (data._itemData) {
-          itemCopy = dvt.JsonUtils.clone(data);
-          delete itemCopy._itemData;
-          return itemCopy;
+          return sanitizeItemData(data);
         }
       }
       return data;
@@ -480,7 +483,7 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojtimeaxis-toolkit'], function (exp
             event.wheelDeltaX = -wheelEvent.deltaX / TimeComponent.SCROLL_LINE_HEIGHT; // number of lines scrolled per mouse wheel click
         }
 
-        if (wheelDelta) { // if vertical mouse wheel amount is defined, non null, non zero 
+        if (wheelDelta) { // if vertical mouse wheel amount is defined, non null, non zero
           var compPagePos = this.getCtx().getStageAbsolutePosition();
           if (this._isVertical)
             var compLoc = event.pageY - compPagePos.y - this.getStartYOffset();

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

@@ -5,16 +5,16 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['exports', 'ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojlabel', 'ojs/ojthemeutils', 'ojs/ojcontext', 'ojs/ojlogger', 'ojs/ojvalidator-required', 'ojs/ojlabelledbyutils', 'ojs/ojtranslation', 'ojs/ojmessaging', 'ojs/ojconverterutils', 'ojs/ojvalidation-error', 'ojs/ojpopup', 'hammerjs', 'ojs/ojjquery-hammer', 'ojs/ojdomutils', 'ojs/ojanimation', 'ojs/ojfocusutils'], function (exports, oj, Components, $, ojlabel, ojthemeutils, Context, Logger, RequiredValidator, LabelledByUtils, Translations, Message, ConverterUtils, ojvalidationError, ojpopup, Hammer, ojjqueryHammer, DomUtils, AnimationUtils, FocusUtils) { 'use strict';
+define(['exports', 'ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojlabel', 'ojs/ojthemeutils', 'ojs/ojfocusutils', 'ojs/ojcontext', 'ojs/ojlogger', 'ojs/ojvalidator-required', 'ojs/ojlabelledbyutils', 'ojs/ojtranslation', 'ojs/ojmessaging', 'ojs/ojconverterutils', 'ojs/ojvalidation-error', 'ojs/ojpopup', 'hammerjs', 'ojs/ojjquery-hammer', 'ojs/ojdomutils', 'ojs/ojanimation'], function (exports, oj, Components, $, ojlabel, ojthemeutils, FocusUtils, Context, Logger, RequiredValidator, LabelledByUtils, Translations, Message, ConverterUtils, ojvalidationError, ojpopup, Hammer, ojjqueryHammer, DomUtils, AnimationUtils) { 'use strict';
 
   oj = oj && Object.prototype.hasOwnProperty.call(oj, 'default') ? oj['default'] : oj;
   $ = $ && Object.prototype.hasOwnProperty.call($, 'default') ? $['default'] : $;
+  FocusUtils = FocusUtils && Object.prototype.hasOwnProperty.call(FocusUtils, 'default') ? FocusUtils['default'] : FocusUtils;
   Context = Context && Object.prototype.hasOwnProperty.call(Context, 'default') ? Context['default'] : Context;
   RequiredValidator = RequiredValidator && Object.prototype.hasOwnProperty.call(RequiredValidator, 'default') ? RequiredValidator['default'] : RequiredValidator;
   LabelledByUtils = LabelledByUtils && Object.prototype.hasOwnProperty.call(LabelledByUtils, 'default') ? LabelledByUtils['default'] : LabelledByUtils;
   Message = Message && Object.prototype.hasOwnProperty.call(Message, 'default') ? Message['default'] : Message;
   ConverterUtils = ConverterUtils && Object.prototype.hasOwnProperty.call(ConverterUtils, 'default') ? ConverterUtils['default'] : ConverterUtils;
-  FocusUtils = FocusUtils && Object.prototype.hasOwnProperty.call(FocusUtils, 'default') ? FocusUtils['default'] : FocusUtils;
 
   /**
    * Base class for rendering the 'inside' labels. This is so InsideLabelStrategy
@@ -3069,6 +3069,20 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojla
             this._placeholderOptionChanged(flags);
             break;
 
+          case 'readOnly':
+            if (this._retainFocusOnReadonlyChange) {
+              // This setTimeout call is needed to allow the dom to update before we
+              // get the focus element (or the element will still be hidden).
+              setTimeout(() => {
+                this.GetFocusElement().focus();
+                if (this._resolveBusyStateFocusRestore) {
+                  this._resolveBusyStateFocusRestore();
+                  delete this._resolveBusyStateFocusRestore;
+                }
+              }, 0);
+            }
+            break;
+
           case 'title':
             // Ignore title attribute for custom element components.
             if (!this._IsCustomElement()) {
@@ -3228,6 +3242,9 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojla
       },
 
       /**
+       * JET-48463 - If we are in readonly mode, we call _GetReadonlyFocusElement, and fall back to
+       * _GetContentElement()[0] if _GetReadonlyFocusElement happens to return null.
+       * If not readonly, we just return _GetContentElement()[0]
        * @memberof oj.editableValue
        * @instance
        * @override
@@ -3235,7 +3252,20 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojla
        * @since 5.0.0
        */
       GetFocusElement: function () {
-        return this._GetContentElement()[0];
+        return this.options.readOnly === true ?
+          this._GetReadonlyFocusElement() || this._GetContentElement()[0] :
+          this._GetContentElement()[0];
+      },
+
+      /**
+       * Returns the readonly focus element if there is a readonly specific element, otherwise null
+       * @memberof oj.editableValue
+       * @instance
+       * @protected
+       * @return {Element|null}
+       */
+      _GetReadonlyFocusElement: function () {
+        return this._getReadonlyDiv();
       },
 
       /**
@@ -3289,6 +3319,21 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojla
             }
             break;
           case 'readOnly':
+            this._retainFocusOnReadonlyChange = FocusUtils.containsFocus(this.widget()[0]);
+            if (this._retainFocusOnReadonlyChange) {
+              if (!this._resolveBusyStateFocusRestore) {
+                var domElem = this.element[0];
+                var busyContext = Context.getContext(domElem).getBusyContext();
+                var description = 'Waiting for focus on the component ';
+
+                if (domElem && domElem.id) {
+                  description += `with id="${domElem.id}" `;
+                }
+                description += 'to be restored.';
+                this._resolveBusyStateFocusRestore =
+                  busyContext.addBusyState({ description: description });
+              }
+            }
             this._addRemoveOjReadOnlyClassOnLabel(document.getElementById(this.options.labelledBy),
               value);
             break;

package/dist/js/libs/oj/debug/ojkeyboardfocus-utils.js

@@ -52,13 +52,28 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojpopupcore', 'ojs/ojdomuti
     return !(element.offsetHeight === 0 || element.offsetWidth === 0);
   };
 
+  /**
+   * @export
+   */
+  const getActionableElementsInNode = function (element) {
+    var actionableElems = [];
+    let nodes = element.querySelectorAll(_ACTIONABLE_ELEMENTS_QUERY);
+    for (var i = 0; i < nodes.length; i++) {
+      var elem = nodes[i];
+      if (!elem.disabled && elem.style.display !== 'none') {
+        actionableElems.push(elem);
+      }
+    }
+    return actionableElems;
+  };
+
   /**
    * @export
    */
   const isActionableElement = function (node) {
     var parentNode = node.parentNode;
     if (parentNode != null) {
-      var nodes = parentNode.querySelectorAll(_ACTIONABLE_ELEMENTS_QUERY);
+      var nodes = getActionableElementsInNode(parentNode);
       for (var i = 0; i < nodes.length; i++) {
         if (nodes[0] === node) {
           return true;
@@ -212,6 +227,7 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojpopupcore', 'ojs/ojdomuti
   exports.disableAllFocusableElements = disableAllFocusableElements;
   exports.disableElement = disableElement;
   exports.enableAllFocusableElements = enableAllFocusableElements;
+  exports.getActionableElementsInNode = getActionableElementsInNode;
   exports.getFocusableElementsInNode = getFocusableElementsInNode;
   exports.getLogicalChildPopup = getLogicalChildPopup;
   exports.isActionableElement = isActionableElement;

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

@@ -1197,6 +1197,16 @@ var __oj_radioset_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;
+            }
+          }
           // JET-43430 - dynamic form focus issue for radio buttonset
           // When tabbing through, the input element that is currently checked will be focused if
           // one is available. Otherwise the first input element will be given focus. We need to
@@ -1212,6 +1222,18 @@ var __oj_radioset_metadata =
           // If there is no checked inputs, simply return the first enabled input
           return this._GetContentElement().not(':disabled').first()[0];
         },
+        /**
+         * oj-radioset doesn't use .oj-text-field-readonly for the focusable readonly content,
+         * so we need to use a different selector.
+         * @memberof oj.ojRadioset
+         * @instance
+         * @override
+         * @protected
+         * @return {Element|null}
+         */
+        _GetReadonlyFocusElement: function () {
+          return this.widget()[0].querySelector('.oj-form-control-container');
+        },
         /**
          * Whether the component is required.
          *

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

@@ -12744,6 +12744,25 @@ var __oj_select_many_metadata =
         }
       },
 
+      /**
+       * combobox-many doesn't use .oj-text-field-readonly for the focusable readonly content,
+       * so we need to use a different selector.  Combobox-one doesn't need this override,
+       * so we just return the default readonly element.
+       * @memberof! _OjMultiCombobox
+       * @instance
+       * @override
+       * @protected
+       * @return {Element|null}
+       */
+      _GetReadonlyFocusElement: function () {
+        if (this.multiple) {
+          return this.widget()[0].querySelector('.oj-combobox-accessible-container');
+        }
+
+        // For oj-combobox-one return the default element
+        return this._super();
+      },
+
       // 19670748, dropdown popup should be closed on subtreeDetached notification.
       _NotifyDetached: function () {
         this._superApply(arguments);

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

@@ -514,11 +514,11 @@ define(['exports', 'preact', 'ojs/ojvcomponent', 'ojs/ojtranslation', 'ojs/ojdat
             }
             if (data == null) {
                 return (preact.h(ojvcomponent.Root, { ref: this.setRootElement },
-                    preact.h("div", { role: 'list', "data-oj-context": true, tabIndex: 0, "aria-label": Translations.getTranslatedString('oj-ojStreamList.msgFetchingData') }, content)));
+                    preact.h("div", { role: "list", "data-oj-context": true, tabIndex: 0, "aria-label": Translations.getTranslatedString('oj-ojStreamList.msgFetchingData') }, content)));
             }
             else {
                 return (preact.h(ojvcomponent.Root, { ref: this.setRootElement },
-                    preact.h("div", { role: 'list', "data-oj-context": true, onClick: this._handleClick, onKeyDown: this._handleKeyDown, onfocusin: this._handleFocusIn, onfocusout: this._handleFocusOut }, content)));
+                    preact.h("div", { role: "list", "data-oj-context": true, onClick: this._handleClick, onKeyDown: this._handleKeyDown, onfocusin: this._handleFocusIn, onfocusout: this._handleFocusOut }, content)));
             }
         }
         _doBlur() {
@@ -569,7 +569,7 @@ define(['exports', 'preact', 'ojs/ojvcomponent', 'ojs/ojtranslation', 'ojs/ojdat
                 className += ' oj-stream-list-child-skeleton';
             }
             return (preact.h("div", { class: className, key: key },
-                preact.h("div", { class: 'oj-stream-list-skeleton-content oj-animation-skeleton' })));
+                preact.h("div", { class: "oj-stream-list-skeleton-content oj-animation-skeleton" })));
         }
         _applySkeletonExitAnimation(skeletons) {
             const resolveFunc = this.addBusyState('apply skeleton exit animations');
@@ -1069,7 +1069,7 @@ define(['exports', 'preact', 'ojs/ojvcomponent', 'ojs/ojtranslation', 'ojs/ojdat
         }
         _isInFocusableElementsList(target, item) {
             let found = false;
-            const nodes = DataCollectionUtils.getFocusableElementsIncludingDisabled(item);
+            const nodes = DataCollectionUtils.getActionableElementsInNode(item);
             nodes.forEach(function (node) {
                 if (node === target) {
                     found = true;

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

@@ -674,6 +674,19 @@ var __oj_switch_metadata =
 
       // P R O T E C T E D    C O N S T A N T S   A N D   M E T H O D S
 
+      /**
+       * oj-switch doesn't use .oj-text-field-readonly for the focusable readonly content,
+       * so we need to use a different selector.
+       * @memberof oj.ojSwitch
+       * @instance
+       * @override
+       * @protected
+       * @return {Element|null}
+       */
+      _GetReadonlyFocusElement: function () {
+        return this.widget()[0].querySelector('.oj-switch-thumb');
+      },
+
       /**
        * @private
        * @const