@oracle/oraclejet 11.1.5 → 11.1.8

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

@@ -2713,7 +2713,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 () {
@@ -2816,13 +2821,10 @@ var __oj_input_date_time_metadata =
         // Set display:block in place of inst._dpDiv.show() which won't work on disconnected elements
         // http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
         this._dpDiv.css('display', 'block');
-
-        this._registerSwipeHandler();
       } else {
         this._processReadOnlyKeyboardEdit();
         if (this.options.readOnly !== true) {
           this._attachTrigger();
-          this._registerSwipeHandler();
         }
       }
 
@@ -2831,11 +2833,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);
@@ -3124,6 +3136,11 @@ var __oj_input_date_time_metadata =
           this._setupResizePopupBind();
         }
       }
+
+      if (this._dpDiv && (this._isInLine || (this.options.readOnly !== true))) {
+        this._registerSwipeHandler();
+      }
+
       return this._super();
     },
 
@@ -3170,6 +3187,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();
     },
@@ -4352,6 +4371,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
@@ -8741,8 +8766,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'));
       },
 
@@ -8924,11 +8950,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);
@@ -9196,6 +9229,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();
           }
         }
@@ -9231,10 +9266,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();
       },
 
@@ -9255,8 +9294,6 @@ var __oj_input_date_time_metadata =
           this._triggerNode.remove();
         }
 
-        this._cleanUpListeners();
-        this._destroyHammer();
         if (this._wheelPicker) {
           this._wheelPicker.remove();
           this._clearWheelModels();
@@ -9270,7 +9307,7 @@ var __oj_input_date_time_metadata =
      * @ignore
      * @private
      */
-      _cleanUpListeners: function () {
+     _removeResizePopupBind: function () {
         if (this._resizePopupBind) {
           window.removeEventListener('resize', this._resizePopupBind);
         }
@@ -12006,6 +12043,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
@@ -12017,6 +12101,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
@@ -12037,6 +12123,7 @@ var __oj_input_date_time_metadata =
           this._switcherDiv.remove();
         }
     },
+
     /**
      * @ignore
      * @protected

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

@@ -11233,18 +11233,9 @@ define(['exports', 'ojs/ojthemeutils'], function (exports, ThemeUtils) { 'use st
         width = TextUtils._getCanvasTextWidth(context, textString, cssStyle);
       } else {
         // Properties that are supported in <canvas> elements by browser
-        // Chrome supports letterSpacing, wordSpacing, and fontVariantNumeric
-        // Safari supports only supports fontVariantNumeric
+        // Chrome and Safari supports only support fontVariantNumeric
         // Firefox supports none
-        if (Agent.browser === 'chrome') {
-          if (TextUtils._letterSpacing != letterSpacing || (TextUtils._wordSpacing != wordSpacing) || (TextUtils._fontVariantNumeric != fontVariantNumeric)) {
-            TextUtils._clearCanvasContext();
-            TextUtils._setSpacing(wordSpacing, letterSpacing, fontVariantNumeric);
-          }
-          TextUtils._storeCanvasContext();
-          TextUtils._attachCanvas(context);
-          width = TextUtils._getCanvasTextWidth(context, textString, cssStyle);
-        } else if (Agent.browser === 'safari' && isLetterSpacingNormal && isWordSpacingNormal) {
+        if ((Agent.browser === 'safari' || Agent.browser === 'chrome') && isLetterSpacingNormal && isWordSpacingNormal) {
           if (TextUtils._fontVariantNumeric != fontVariantNumeric) {
             TextUtils._clearCanvasContext();
             TextUtils._setSpacing(wordSpacing, letterSpacing, fontVariantNumeric);

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;
@@ -7431,8 +7514,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;
@@ -7449,55 +7531,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();
       }
     }
 
@@ -7514,6 +7580,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"
@@ -7588,6 +7710,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/ojlistview.js

@@ -5188,6 +5188,11 @@ var __oj_list_view_metadata =
           y: event.originalEvent.changedTouches[0].pageY
         };
       }
+
+      // mouse down on input element inside item should trigger actionable mode
+      if (this._isInputElement(target.get(0))) {
+        this._enterActionableMode(item);
+      }
     },
 
     /**
@@ -5246,19 +5251,21 @@ var __oj_list_view_metadata =
      * Enters actionable mode
      * @private
      */
-    _enterActionableMode: function () {
-      var current = this.m_active.elem;
+    _enterActionableMode: function (item) {
+      var current = (item === undefined) ? this.m_active.elem : item;
 
-      // in case content has been updated under the cover
-      this.disableAllTabbableElements(current);
+      if (current) {
+        // in case content has been updated under the cover
+        this.disableAllTabbableElements(current);
 
-      // re-enable all tabbable elements
-      this._enableAllTabbableElements(current);
+        // re-enable all tabbable elements
+        this._enableAllTabbableElements(current);
 
-      // only go into actionable mode if there is something to focus
-      var first = current.find('[data-first]');
-      if (first.length > 0) {
-        this._setActionableMode(true);
+        // only go into actionable mode if there is something to focus
+        var first = current.find('[data-first]');
+        if (first.length > 0) {
+          this._setActionableMode(true);
+        }
       }
     },
 
@@ -5270,7 +5277,9 @@ var __oj_list_view_metadata =
       this._setActionableMode(false);
 
       // disable all tabbable elements in the item again
-      this.disableAllTabbableElements(this.m_active.elem);
+      if (this.m_active) {
+        this.disableAllTabbableElements(this.m_active.elem);
+      }
     },
 
     /**
@@ -5311,7 +5320,7 @@ var __oj_list_view_metadata =
           }
 
           if (this._isActionableMode() && this.m_active != null &&
-            this.m_active.elem.get(0) !== item.get(0)) {
+            this.m_active.elem.get(0) !== item.get(0) && !this._isInputElement(target.get(0))) {
             // click on item other than current focus item should exit actionable mode
             this._exitActionableMode();
           }
@@ -5361,12 +5370,6 @@ var __oj_list_view_metadata =
             this._fireActionEvent(item.get(0), event);
           }
 
-          // click on input element inside item should trigger actionable mode
-          if (this._isInputElement(target.get(0))) {
-            this._enterActionableMode();
-            return;
-          }
-
           // clicking on header will expand/collapse item
           this._handleHeaderClick(event, target, item);
         }
@@ -7115,7 +7118,8 @@ var __oj_list_view_metadata =
           }
           current.removeClass('oj-focus-highlight');
         }
-      } else if ((key === ' ' || key === 'Spacebar' || key === this.SPACE_KEY) && this._isSelectionEnabled()) {
+      } else if ((key === ' ' || key === 'Spacebar' || key === this.SPACE_KEY) &&
+        this._isSelectionEnabled() && !this._isInputElement(event.target)) {
         ctrlKey = this._ctrlEquivalent(event);
         shiftKey = event.shiftKey;
         if (shiftKey && !ctrlKey && this.m_selectionFrontier != null &&