@oracle/oraclejet 12.0.2 → 12.0.5

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
@@ -2973,6 +2973,44 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojla
         }
       },
 
+      /**
+       * Override to release resources held by this component.
+       * It is important to unregister Hammer events
+       * since they live outside of the component's DOM and would cause Detached Dom nodes
+       * when the component is removed.
+       * @memberof oj.editableValue
+       * @instance
+       * @protected
+       */
+      _ReleaseResources: function () {
+        this._super();
+        if (this._IsCustomElement()) {
+          // componentMessaging#releaseResources removes any resources that would
+          // otherwise cause a memory leak, like Hammer.
+          // We do not deactivate component messaging because that is a bigger change, and
+          // more risky to backport.
+          this._getComponentMessaging().releaseResources();
+          this._hammerIsUnregistered = true;
+        }
+      },
+      /**
+       * @memberof oj.editableValue
+       * @instance
+       * @protected
+       */
+      _SetupResources: function () {
+        this._super();
+        // Since initComponentMessaging gets called during component creation, and that activates
+        // all the component strategies which in turn sets up listeners, we only want to
+        // re-set up resources and when we have
+        // released them in ReleaseResources.
+        if (this._IsCustomElement() && (this._hammerIsUnregistered)) {
+          const messaging = this._getComponentMessaging();
+          messaging.setupResources();
+          this._hammerIsUnregistered = false;
+        }
+      },
+
       /**
        * If we have asynchronous converter loading, the input is readonly and a loading indicator
        * is shown to the user.
@@ -3069,6 +3107,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 +3280,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 +3290,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 +3357,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;
@@ -7446,8 +7529,7 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojla
     jqLauncher[0].removeEventListener('change', this._eatChangeAndClickOnPress, true);
 
     if (DomUtils.isTouchSupported()) {
-      jqLauncher.ojHammer().off('press');
-      jqLauncher.ojHammer('destroy');
+      this.releaseResources();
       jqLauncher.off('contextmenu', this._eatContextMenuOnOpenPopupListener);
       this._eatContextMenuOnOpenPopupListener = null;
       this._inPressEvent = null;
@@ -7464,55 +7546,39 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojla
   PopupMessagingStrategy.prototype._registerLauncherEvents = function () {
     var closeEvents;
     var closePopupCallback;
-    var compDefaults;
-    var events;
-    var hammerOptions;
     var jqLauncher = this.GetLauncher();
     var nonPressOpenEvents;
-    var openPopupCallback;
-    var pressEventIndex;
 
-    compDefaults = PopupMessagingStrategy._DEFAULTS_BY_COMPONENT[this.GetComponent().widgetName];
-    events = compDefaults ? compDefaults.events :
-             PopupMessagingStrategy._DEFAULTS_BY_COMPONENT.default.events;
+    const events = this._getPopupEventNamesToRegisterForComp();
 
     // 1. associate the ojPopup component to wrapper <div> for popup content
     // 2. wire up on() event handlers for registered events that open and close popup. E.g., focusin.
     // 3. autoDismissal happens automatically when focus leaves component. For other events like
     // mouseover it's required to call off()
     if (events.open) {
-      openPopupCallback = this._openPopupCallback;
-      if (!openPopupCallback) {
-        openPopupCallback = this._openPopup.bind(this);
-        this._openPopupCallback = openPopupCallback;
+      if (!this._openPopupCallback) {
+        this._openPopupCallback = this._openPopup.bind(this);
       }
 
       // separate out press event, namespace the events string, and attach event handler
-      pressEventIndex = events.open.indexOf('press');
+      const needsPressEvent = this._needsPressEvent(events);
       nonPressOpenEvents =
       this._getNamespacedEvents(events.open.replace('press', ''),
                                 PopupMessagingStrategy._OPEN_NAMESPACE);
-      jqLauncher.on(nonPressOpenEvents, openPopupCallback);
+      jqLauncher.on(nonPressOpenEvents, this._openPopupCallback);
 
       // The pressHold gesture also fires a contextmenu event on Windows 10 touch.
       // Prevent that here for components that use 'press' for popup messaging as
       // the context menu causes the popup message window to close. Note that this
       // means the context menu will be disabled for these components.
-      if (DomUtils.isTouchSupported() && pressEventIndex !== -1) {
+      if (DomUtils.isTouchSupported() && needsPressEvent) {
         this._eatContextMenuOnOpenPopupListener = function () {
           return false;
         };
 
         jqLauncher.on('contextmenu', this._eatContextMenuOnOpenPopupListener);
 
-        // for radios and checkboxes, on ios, press hold brings up popup, but release closes it
-        // and checks it, so in this case we have to eat the click/change events. this happens
-        // in the openPopupCallback
-        hammerOptions = {
-          recognizers: [
-            [Hammer.Press, { time: 750 }]
-          ] };
-        jqLauncher.ojHammer(hammerOptions).on('press', openPopupCallback);
+        this.registerHammerOpenCallbackOnLauncher();
       }
     }
 
@@ -7529,6 +7595,62 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojla
     }
   };
 
+    /**
+     * Symmetrical method to releaseResources. Sets up resources that get
+     * removed in releaseResources.
+     * @private
+     * @memberof oj.PopupMessagingStrategy
+     * @instance
+     */
+    PopupMessagingStrategy.prototype.setupResources = function () {
+      const events = this._getPopupEventNamesToRegisterForComp();
+      const needsPressEvent = this._needsPressEvent(events);
+      if (DomUtils.isTouchSupported() && needsPressEvent) {
+        this.registerHammerOpenCallbackOnLauncher();
+      }
+    };
+
+    /**
+     * Register Hammer Press Event. Make sure you are on touch and you
+     * need the press event before calling this function.
+     * @private
+     * @memberof oj.PopupMessagingStrategy
+     * @instance
+     */
+    PopupMessagingStrategy.prototype.registerHammerOpenCallbackOnLauncher = function () {
+      const jqLauncher = this.GetLauncher();
+      if (jqLauncher == null) {
+        return;
+      }
+      // for radios and checkboxes, on ios, press hold brings up popup, but release closes it
+      // and checks it, so in this case we have to eat the click/change events. this happens
+      // in the openPopupCallback
+      const hammerOptions = {
+        recognizers: [
+          [Hammer.Press, { time: 750 }]
+        ] };
+      jqLauncher.ojHammer(hammerOptions).on('press', this._openPopupCallback);
+    };
+
+    /**
+    * Releases resources that would otherwise leak memory if they were not released
+    * when the component's dom is removed.
+    * For example, Hammer events are put on the document and will result in
+    * detached dom memory leak if not removed.
+    * @private
+    * @memberof oj.PopupMessagingStrategy
+    * @instance
+    */
+    PopupMessagingStrategy.prototype.releaseResources = function () {
+      PopupMessagingStrategy.superclass.update.call(this);
+      const events = this._getPopupEventNamesToRegisterForComp();
+      const needsPressEvent = this._needsPressEvent(events);
+      if (DomUtils.isTouchSupported() && needsPressEvent) {
+        const jqLauncher = this.GetLauncher();
+        jqLauncher.off('press').ojHammer('destroy');
+      }
+    };
+
   /**
    * Turn the events string into an array, add namespace, and turn it back into a string.
    * @param {string} events e.g., "focusin mousedown"
@@ -7603,6 +7725,34 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojla
     return popupPositionOptions;
   };
 
+  /**
+   * Returns the events
+   *
+   * @private
+   * @memberof oj.PopupMessagingStrategy
+   * @instance
+   */
+  PopupMessagingStrategy.prototype._getPopupEventNamesToRegisterForComp = function () {
+    const compDefaults =
+      PopupMessagingStrategy._DEFAULTS_BY_COMPONENT[this.GetComponent().widgetName];
+    return compDefaults ? compDefaults.events :
+      PopupMessagingStrategy._DEFAULTS_BY_COMPONENT.default.events;
+  };
+
+  /**
+   * Returns true if it needs a press event.
+   *
+   * @private
+   * @memberof oj.PopupMessagingStrategy
+   * @instance
+   */
+  PopupMessagingStrategy.prototype._needsPressEvent = function (events) {
+     if (events && events.open) {
+      return events.open.indexOf('press') !== -1;
+     }
+     return false;
+  };
+
   /**
    * Returns a jquery element that a messaging popup is bound to.
    *

package/dist/js/libs/oj/debug/ojjquery-hammer.js

@@ -26,6 +26,7 @@ define(['ojs/ojlogger', 'hammerjs', 'jquery'], function (Logger, Hammer, $) { 'u
               hammer.destroy();
               $el.removeData('ojHammer');
             }
+            $el.off('remove.ojHammer');
           });
 
         default:
@@ -33,7 +34,13 @@ define(['ojs/ojlogger', 'hammerjs', 'jquery'], function (Logger, Hammer, $) { 'u
           return this.each(function () {
             var $el = $(this);
             if (!$el.data('ojHammer')) {
-              $el.data('ojHammer', new Hammer.Manager($el[0], options));
+              const mgr = new Hammer.Manager($el[0], options);
+              $el.on('remove.ojHammer', evt => {
+                if (evt.target === $el[0]) {
+                  mgr.destroy();
+                }
+              });
+              $el.data('ojHammer', mgr);
             }
           });
       }

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/ojlistview.js

@@ -8571,7 +8571,7 @@ var __oj_list_view_metadata =
       scrollElem[0].addEventListener('scroll', this._scrollListener);
 
       // only do this for high-water mark scrolling, other cases we have (and should not care) no knowledge about the scroller
-      if (this.isLoadMoreOnScroll()) {
+      if (this.isLoadMoreOnScroll() && this._getScroller() !== document.documentElement) {
         this._wheelListener = function (event) {
           // add originalEvent for downstream code expecting it
           if (!event.originalEvent) {

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

@@ -708,7 +708,7 @@ define(['exports', 'preact/hooks', 'preact', 'ojs/ojanimation', 'ojs/ojtranslati
     const combineClassNames = (key, l, r) => key === "class" ? classNames([l, r]) : r;
     const mergeInterpolations = (interpolations) => (props) => interpolations.reduce((acc, fn) => mergeDeepWithKey$1(combineClassNames, acc, fn(props)), {});
 
-    /*! *****************************************************************************
+    /******************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any

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

@@ -8198,6 +8198,25 @@ var __oj_select_many_metadata =
         return $(contentStructure.join(''));
       },
 
+      // _OjMultiCombobox
+      _initContainer: function () {
+        _OjMultiCombobox.superclass._initContainer.apply(this, arguments);
+
+        // JET-50535 - focus lost from component when mouse down on dropdown (Similar to JET-47442)
+        // The editable table relies on the focus events from the popup to determine whether
+        // or not the table should be edit mode. Initially when clicking on the combobox,
+        // the initial focus is on the input element. At this point, when one clicks on
+        // an option item, the focus will be lost on mousedown. Since, none of the other elements
+        // in the dropdown are focusable, the focus is transferred to the first focusable ancestor
+        // which in this case happens to be the body element. This results in the focusout event
+        // on the popup. As the selection only happens on the mouseup event, if one keeps the mouse
+        // pressed long enough, the table will exit the edit mode before the selection happens.
+        // Since, we are not relying on the physical focus anyway for selection mechanism, a patchy
+        // solution here would be to prevent the focus transfer when one clicks in the results area.
+        // This way the table would stay in edit mode.
+        this.dropdown.on('mousedown', _ComboUtils.killEvent);
+      },
+
       _opening: function (event, dontUpdateResults) {
         // if beforeExpand is not cancelled
         // beforeExpand event will be triggered in base class _shouldOpen method
@@ -9431,6 +9450,25 @@ var __oj_select_many_metadata =
         this._endSlot = null;
       },
 
+      // _OjSingleCombobox
+      _initContainer: function () {
+        _OjSingleCombobox.superclass._initContainer.apply(this, arguments);
+
+        // JET-50535 - focus lost from component when mouse down on dropdown (Similar to JET-47442)
+        // The editable table relies on the focus events from the popup to determine whether
+        // or not the table should be edit mode. Initially when clicking on the combobox,
+        // the initial focus is on the input element. At this point, when one clicks on
+        // an option item, the focus will be lost on mousedown. Since, none of the other elements
+        // in the dropdown are focusable, the focus is transferred to the first focusable ancestor
+        // which in this case happens to be the body element. This results in the focusout event
+        // on the popup. As the selection only happens on the mouseup event, if one keeps the mouse
+        // pressed long enough, the table will exit the edit mode before the selection happens.
+        // Since, we are not relying on the physical focus anyway for selection mechanism, a patchy
+        // solution here would be to prevent the focus transfer when one clicks in the results area.
+        // This way the table would stay in edit mode.
+        this.dropdown.on('mousedown', _ComboUtils.killEvent);
+      },
+
       _triggerValueUpdatedEvent: function (data, previousValue) {
         if (!this.ojContext._IsCustomElement()) {
           return;
@@ -12744,6 +12782,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