@oracle/oraclejet 12.0.2 → 12.0.5

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.5"}' !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/ojcomponentcore.js

@@ -200,6 +200,34 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
     }
   };
 
+  /**
+   * 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
+   */
+   ComponentMessaging.prototype.releaseResources = function () {
+    if (this._activated) {
+      $.each(this._strategies, function (i, strategy) {
+        strategy.releaseResources();
+      });
+    }
+  };
+
+  /**
+   * Symmetrical method to releaseResources. Sets up resources that get
+   * removed in releaseResources.
+   * @private
+   */
+   ComponentMessaging.prototype.setupResources = function () {
+    if (this._activated) {
+      $.each(this._strategies, function (i, strategy) {
+        strategy.setupResources();
+      });
+    }
+  };
+
   /**
    * Creates a messaging strategy for the specified type, initializing it with the options provided.
    * @param {string|number} type defined by oj.ComponentMessaging._STRATEGY_TYPE. For example,
@@ -752,6 +780,20 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
   MessagingStrategy.prototype.close = function () {
   };
 
+  /**
+   *
+   * @private
+   */
+   MessagingStrategy.prototype.setupResources = function () {
+  };
+
+  /**
+   *
+   * @private
+   */
+   MessagingStrategy.prototype.releaseResources = function () {
+  };
+
   /**
    * Reinitializes with the new display options and updates component messaging using the new content.
    *
@@ -2437,6 +2479,21 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
   CustomElementBridge.proto = Object.create(oj.BaseCustomElementBridge.proto);
   oj._registerLegacyNamespaceProp('CustomElementBridge', CustomElementBridge);
 
+  const getFocusEventPropagator = function (element, type) {
+    return function (event) {
+      // Ensure that the target is the custom element, not the inner element, so create
+      // a new event and dispatch on the custom element.
+      element.dispatchEvent(new FocusEvent(type, { relatedTarget: event.relatedTarget }));
+    };
+  };
+
+  const getTeardownFunction = function (element, focusPropagator, blurPropagator) {
+    return function () {
+      element.removeEventListener('focus', focusPropagator);
+      element.removeEventListener('blur', blurPropagator);
+    };
+  };
+
   oj.CollectionUtils.copyInto(CustomElementBridge.proto, {
     // Provides a promise for JET's Knockout throttling timeout
     // when knockout is used for the component
@@ -2604,18 +2661,7 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
       }
 
       // Setup blur/focus listeners on inner element so we can trigger on the root custom element for 
-      var getFocusEventPropagator = function (type) {
-        return function (event) {
-          // Ensure that the target is the custom element, not the inner element, so create
-          // a new event and dispatch on the custom element.
-          element.dispatchEvent(new FocusEvent(type, { relatedTarget: event.relatedTarget }));
-        };
-      };
-      var focusElem = this._WIDGET_INSTANCE.__getFocusElement();
-      if (focusElem && focusElem !== element) {
-        focusElem.addEventListener('focus', getFocusEventPropagator('focus'));
-        focusElem.addEventListener('blur', getFocusEventPropagator('blur'));
-      }
+      this._setupFocusPropagation(element);
     },
 
     DefineMethodCallback: function (proto, method, methodMeta) {
@@ -2738,12 +2784,16 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
       if (Components.__GetWidgetConstructor(this._WIDGET_ELEM) && this._WIDGET_INSTANCE) {
         this._WIDGET_INSTANCE.__handleDisconnected();
       }
+
+      this._teardownFocusPropagation(element);
     },
 
     HandleReattached: function (element) {
       // Invoke callback on the superclass
       oj.BaseCustomElementBridge.proto.HandleReattached.call(this, element);
 
+      this._setupFocusPropagation(element);
+
       if (this._WIDGET_INSTANCE) {
         this._WIDGET_INSTANCE.__handleConnected();
       }
@@ -2938,6 +2988,25 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
         elem[prop] = value;
       }
       return isEvent;
+    },
+
+    _setupFocusPropagation: function (element) {
+      // Setup blur/focus listeners on inner element so we can trigger on the root custom element for 
+      const focusElem = this._WIDGET_INSTANCE.__getFocusElement();
+      if (focusElem && focusElem !== element) {
+        const focusPropagator = getFocusEventPropagator(element, 'focus');
+        const blurPropagator = getFocusEventPropagator(element, 'blur');
+        focusElem.addEventListener('focus', focusPropagator);
+        focusElem.addEventListener('blur', blurPropagator);
+        this._teardownFocus = getTeardownFunction(focusElem, focusPropagator, blurPropagator);
+      }
+    },
+
+    _teardownFocusPropagation: function () {
+      if (this._teardownFocus) {
+        this._teardownFocus();
+        this._teardownFocus = null;
+      }
     }
   });
 

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.5',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2022-03-10_18-27-13',
+    revision: '2022-06-14_18-46-31',
 
     // 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

@@ -2778,7 +2778,12 @@ var __oj_input_date_time_metadata =
       childDiv.className = 'oj-datepicker-content';
       dpDiv.appendChild(childDiv);
       this._dpDiv = bindHover($(dpDiv));
-      document.body.appendChild(dpDiv); // @HTMLUpdateOK
+      // Append the dpDiv to the CE wrapper and for widgets simply to the body
+      if (this._IsCustomElement()) {
+        this._dpDiv.appendTo(this.OuterWrapper); // @HTMLUpdateOK
+      } else {
+        this._dpDiv.appendTo(document.body); // @HTMLUpdateOK
+      }
     },
 
     _createPopupDpDiv: function () {
@@ -2884,8 +2889,6 @@ var __oj_input_date_time_metadata =
         // http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
         this._dpDiv.css('display', 'block');
 
-        this._registerSwipeHandler();
-
         // For this to be accessible, the root dom element needs role/aria-labelledby.
         const rootDomElem = this.widget();
         rootDomElem[0].setAttribute('role', 'group');
@@ -2895,7 +2898,6 @@ var __oj_input_date_time_metadata =
         this._processReadOnlyKeyboardEdit();
         if (this.options.readOnly !== true) {
           this._attachTrigger();
-          this._registerSwipeHandler();
         }
       }
 
@@ -2904,11 +2906,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);
@@ -3238,6 +3250,11 @@ var __oj_input_date_time_metadata =
           this._setupResizePopupBind();
         }
       }
+
+      if (this._dpDiv && (this._isInLine || (this.options.readOnly !== true))) {
+        this._registerSwipeHandler();
+      }
+
       return this._super();
     },
 
@@ -3284,6 +3301,8 @@ var __oj_input_date_time_metadata =
       // for non custom element, this is done as first step in destroy
       if (this._IsCustomElement()) {
         this._cleanUpListeners();
+
+        this._unregisterSwipeHandler();
       }
       return this._super();
     },
@@ -4441,6 +4460,12 @@ var __oj_input_date_time_metadata =
       }
     },
 
+    _unregisterSwipeHandler: function () {
+      if (this._dpDiv) {
+        this._dpDiv.off('swiperight swipeleft').ojHammer('destroy');
+      }
+    },
+
     /**
      * If min or max lacks date portion and value contains it, then min + max should use
      * value's date portion
@@ -8863,8 +8888,9 @@ var __oj_input_date_time_metadata =
       },
 
       _getPrependNode: function () {
+        const independentPrependNode = this._IsCustomElement() ? $(this.OuterWrapper) : $('body');
         return this._isIndependentInput() ?
-          $('body') :
+          independentPrependNode :
           $('.oj-popup-content', this._datePickerComp.widget._popUpDpDiv.ojPopup('widget'));
       },
 
@@ -9046,11 +9072,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);
@@ -9318,6 +9351,8 @@ var __oj_input_date_time_metadata =
           var children = group.children;
           for (var index = 0; index < children.length; index++) {
             wheel = children[index];
+            // This calls Wheel#destroy() and this calls off on each
+            // event listener and destroys Hammer.
             wheel.ojDestroy();
           }
         }
@@ -9353,10 +9388,14 @@ var __oj_input_date_time_metadata =
        * @override
        */
       _ReleaseResources: function () {
-        // for non custom element, this is done as first step in destroy
-        if (this._IsCustomElement()) {
-          this._cleanUpListeners();
-        }
+        // Since destroy calls _ReleaseResources, we do here for both CustomElement and non CustomElement
+        // instead of doing it here for CustomElement and in destroy which is only for non CustomElements.
+        this._removeResizePopupBind();
+        // Note: We do not have a symmetrical 'createHammer' call in SetupResources.
+        // We create the timepicker wheels that have the Hammer events
+        // when the user clicks on the timepicker icon, or when
+        // the component's options change.
+        this._destroyHammer();
         return this._super();
       },
 
@@ -9377,8 +9416,6 @@ var __oj_input_date_time_metadata =
           this._triggerNode.remove();
         }
 
-        this._cleanUpListeners();
-        this._destroyHammer();
         if (this._wheelPicker) {
           this._wheelPicker.remove();
           this._clearWheelModels();
@@ -9392,7 +9429,7 @@ var __oj_input_date_time_metadata =
      * @ignore
      * @private
      */
-      _cleanUpListeners: function () {
+     _removeResizePopupBind: function () {
         if (this._resizePopupBind) {
           window.removeEventListener('resize', this._resizePopupBind);
         }
@@ -12162,6 +12199,53 @@ var __oj_input_date_time_metadata =
 
       return retVal;
     },
+
+    /**
+     * @ignore
+     * @protected
+     * @override
+     * @memberof oj.ojInputDateTime
+     */
+    _ReleaseResources: function () {
+      if (this._IsCustomElement()) {
+        // Trigger the ojInputTime's _ReleaseResources() using the ojInputTime instance.
+        // this._timePicker.ojInputTime('destroy') will not work.
+        // jqueryui-base#destroy will throw an error because IsCustomElement() is true
+        // and you cannot call destroy when IsCustomElement is true.
+        if (this._timePicker) {
+          const timePickerInstance = this._timePicker.ojInputTime('instance');
+          if (timePickerInstance) {
+            timePickerInstance._ReleaseResources();
+            this._timePickerResourcesReleased = true;
+          }
+        }
+      }
+      return this._super();
+    },
+
+    /**
+     * @protected
+     * @override
+     * @instance
+     * @memberof! oj.ojInputDateTime
+     */
+    _SetupResources: function () {
+      var ret = this._superApply(arguments);
+      if (this._IsCustomElement()) {
+        // oj-input-date-time's AfterCreate calls createTimepicker, which creates ojInputTime() which
+        // calls InputTime's _SetupResources.
+        // Then oj-input-date-time's SetupResources is called. Only call ojInputTime's _SetupResources
+        // if they were released in ReleaseResources, so check the flag.
+        if (this._timePickerResourcesReleased && this._timePicker) {
+          const timePickerInstance = this._timePicker.ojInputTime('instance');
+          if (timePickerInstance) {
+            timePickerInstance._SetupResources();
+            this._timePickerResourcesReleased = false;
+          }
+        }
+      }
+      return ret;
+    },
     /**
      * @ignore
      * @protected
@@ -12173,6 +12257,8 @@ var __oj_input_date_time_metadata =
       return this._super();
     },
     /**
+     * Called from _destroy. This is for widgets. Cleaning up custom
+     * elements is done in ReleaseResources
      * @ignore
      * @private
      * @memberof oj.ojInputDateTime
@@ -12193,6 +12279,7 @@ var __oj_input_date_time_metadata =
           this._switcherDiv.remove();
         }
     },
+
     /**
      * @ignore
      * @protected

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

@@ -419,6 +419,7 @@ define(['exports', 'ojs/ojvcomponent', 'preact', 'jquery', 'ojs/ojanimation', 'o
                 [PSEvent.POPUP_REFRESH]: () => {
                     $drawerElement.position(this.getDrawerPosition(edge));
                     this.setOverlayDrawersHeight();
+                    PopupService.getInstance().triggerOnDescendents($drawerElement, PopupService.EVENT.POPUP_REFRESH);
                 }
             };
             return PSOptions;

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

@@ -180,6 +180,7 @@ define(['exports', 'ojs/ojvcomponent', 'preact', 'jquery', 'ojs/ojanimation', 'o
                 [PSEvent.POPUP_AUTODISMISS]: (event) => this.autoDismissHandler(event),
                 [PSEvent.POPUP_REFRESH]: () => {
                     $drawerElement.position(this.getDrawerPosition(edge));
+                    PopupService.getInstance().triggerOnDescendents($drawerElement, PopupService.EVENT.POPUP_REFRESH);
                 }
             };
             return PSOptions;