@oracle/oraclejet 10.1.1 → 10.1.6

package/dist/js/libs/oj/debug_es5/ojconveyorbelt.js

@@ -124,11 +124,12 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojthemeutils', 'ojs/ojcomponentcore',
    */
 
 
-  function ConveyorBeltCommon(elem, orientation, contentParent, bRtl, buttonInfo, callbackInfo, styleInfo, agentInfo) {
+  function ConveyorBeltCommon(elem, options, buttonInfo, callbackInfo, styleInfo, agentInfo) {
+    //  orientation, contentParent, bRtl, buttonInfo, callbackInfo, styleInfo) {
     this._elem = elem;
-    this._orientation = orientation;
-    this._contentParent = contentParent;
-    this._bRtl = bRtl;
+    this._orientation = options.orientation;
+    this._contentParent = options.contentParent;
+    this._bRtl = options.bRtl;
     this._arrowVisibility = buttonInfo.arrowVisibility;
     this._prevButtonStyleClass = buttonInfo.prevButtonStyleClass;
     this._nextButtonStyleClass = buttonInfo.nextButtonStyleClass;
@@ -632,14 +633,32 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojthemeutils', 'ojs/ojcomponentcore',
   ConveyorBeltCommon._getWheelDelta = function (event) {
     var wheelDelta = 0;
 
-    if (event.wheelDelta != null) {
-      wheelDelta = event.wheelDelta;
-    } else if (event.deltaY != null) {
-      wheelDelta = -event.deltaY;
+    if (event.deltaY != null || event.deltaX != null) {
+      var deltaX = Math.abs(event.deltaX);
+      var deltaY = Math.abs(event.deltaY);
+
+      if (deltaX > deltaY) {
+        wheelDelta = -event.deltaX;
+      } else {
+        wheelDelta = -event.deltaY;
+      }
+    } else if (event.wheelDelta != null) {
+      var wheelDeltaX = Math.abs(event.wheelDeltaX);
+      var wheelDeltaY = Math.abs(event.wheelDeltaY);
+
+      if (wheelDeltaX > wheelDeltaY) {
+        wheelDelta = event.wheelDeltaX;
+      } else {
+        wheelDelta = event.wheelDeltaY;
+      }
     } else {
       wheelDelta = -event.detail;
     }
 
+    if (event.deltaMode === 1) {
+      wheelDelta *= 5;
+    }
+
     return wheelDelta;
   };
   /**
@@ -1389,14 +1408,20 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojthemeutils', 'ojs/ojcomponentcore',
 
       var wheelDelta = cbcClass._getWheelDelta(event);
 
-      if (wheelDelta < 0 && !this._atEnd) {
-        bConsumeEvent = true;
+      var scroll;
 
-        this._scrollNext();
+      if (wheelDelta < 0 && !this._atEnd) {
+        scroll = this._getCurrScroll() + Math.abs(wheelDelta);
       } else if (wheelDelta > 0 && !this._atStart) {
+        scroll = this._getCurrScroll() - wheelDelta;
+      }
+
+      if (scroll != null) {
         bConsumeEvent = true;
 
-        this._scrollPrev();
+        this._updateButtonVisibility(scroll);
+
+        this._setOverflowScroll(scroll);
       }
     }
 
@@ -1421,14 +1446,19 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojthemeutils', 'ojs/ojcomponentcore',
     if (this._needsScroll() && !this._bScrolling && eventTouches.length === 1) {
       this._bTouch = true; // save off some initial information at the start of a swipe
 
-      var firstTouch = eventTouches[0];
-      this._touchStartCoord = this._isHorizontal() ? firstTouch.pageX : firstTouch.pageY;
+      this._firstTouch = eventTouches[0];
+      this._touchLastCoord = this._isHorizontal() ? this._firstTouch.pageX : this._firstTouch.pageY;
       this._touchStartScroll = this._getCurrScroll();
       this._touchStartNextScroll = this._calcNextScroll();
       this._touchStartPrevScroll = this._calcPrevScroll(); // FIX : save the initial at start or at end state
 
       this._touchInitialNotAtEnd = !this._atEnd;
       this._touchInitialNotAtStart = !this._atStart;
+      this._trackingPoints = [];
+
+      this._addTrackingPoint(this._touchLastCoord);
+
+      this._targetCoord = 0;
     }
   };
   /**
@@ -1445,9 +1475,9 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojthemeutils', 'ojs/ojcomponentcore',
     var bHoriz = this._isHorizontal();
 
     var eventTouches = event.touches;
-    var firstTouch = eventTouches[0];
-    var touchCoord = bHoriz ? firstTouch.pageX : firstTouch.pageY;
-    var diff = touchCoord - this._touchStartCoord; // in non-RTL, if swiping left or up, scroll next; otherwise scroll prev
+    var currentTouch = eventTouches[0];
+    this._touchCurrentCoord = bHoriz ? currentTouch.pageX : currentTouch.pageY;
+    var diff = this._touchCurrentCoord - this._touchLastCoord; // in non-RTL, if swiping left or up, scroll next; otherwise scroll prev
     // in RTL, if swiping right or up, scroll next; otherwise scroll prev
 
     var bNext = bHoriz && this._bRtl ? diff > 0 : diff < 0; // determine whether the conveyor can be scrolled in the direction of the swipe
@@ -1455,35 +1485,26 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojthemeutils', 'ojs/ojcomponentcore',
     var canScrollInSwipeDirection = bNext && this._touchInitialNotAtEnd || !bNext && this._touchInitialNotAtStart; // only need to do something if we also received the touchstart and if we can
     // scroll in the swipe direction
 
-    if (this._bTouch && canScrollInSwipeDirection) {
-      // only scroll next/prev if the swipe is longer than the threshold; if it's
-      // less, then just drag the items with the swipe
-      var cbcClass = ConveyorBeltCommon;
-      var container = this._overflowContainer;
-      var threshold = cbcClass._SWIPE_THRESHOLD * (bHoriz ? container.offsetWidth : container.offsetHeight); // if swiping under the threshold, just move the conveyor with the swipe
-
-      if (Math.abs(diff) < threshold) {
-        this._setCurrScroll(this._touchStartScroll - diff, true); // if we're under the threshold, but we've already scrolled to the end,
-        // then we don't need to continue trying to scroll and we don't need to
-        // reset the scroll position at the end of the touch
-
+    if (this._bTouch && this._firstTouch.id === currentTouch.id && canScrollInSwipeDirection) {
+      this._addTrackingPoint(this._touchLastCoord);
 
-        if (this._touchInitialNotAtEnd && this._atEnd || this._touchInitialNotAtStart && this._atStart) {
-          this._bTouch = false;
-        }
+      if (bHoriz && this._bRtl) {
+        this._setCurrScroll(this._getCurrScroll() + diff, true);
       } else {
-        // if swiping beyond the threshold, scroll to the next/prev set of items
-        this._setCurrScroll(bNext ? this._touchStartNextScroll : this._touchStartPrevScroll, false); // don't scroll again for this same swipe
+        this._setCurrScroll(this._getCurrScroll() - diff, true);
+      }
 
+      this._touchLastCoord = this._touchCurrentCoord; // if we're under the threshold, but we've already scrolled to the end,
+      // then we don't need to continue trying to scroll and we don't need to
+      // reset the scroll position at the end of the touch
 
+      if (this._touchInitialNotAtEnd && this._atEnd || this._touchInitialNotAtStart && this._atStart) {
         this._bTouch = false;
       } // FIX : set a flag indicating we've scrolled for this touch event
 
 
       this._scrolledForThisTouch = true;
-    } // FIX : if we've scrolled for this touch event, consume the event
-    // so that the page doesn't also scroll
-
+    }
 
     if (this._scrolledForThisTouch) {
       event.preventDefault();
@@ -1502,15 +1523,87 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojthemeutils', 'ojs/ojcomponentcore',
 
 
   ConveyorBeltCommon.prototype._handleTouchEnd = function (event) {
-    // if a full page swipe hasn't happened, scroll back to the original position
-    if (this._bTouch) {
-      this._setCurrScroll(this._touchStartScroll, false);
-    }
-
     this._bTouch = false; // FIX : reset the flag indicating if we've scrolled for this touch
     // event
 
     this._scrolledForThisTouch = false;
+
+    if (this._trackingPoints != null) {
+      this._addTrackingPoint(this._touchLastCoord);
+
+      this._startDecelAnim();
+    }
+  };
+  /**
+   * Records movement for the last 100ms
+   * @param {number} coord - x or y coordinate depending on the conveyorbelt orientation
+   */
+
+
+  ConveyorBeltCommon.prototype._addTrackingPoint = function (coord) {
+    if (this._trackingPoints == null) {
+      return;
+    }
+
+    var time = Date.now();
+
+    while (this._trackingPoints.length > 0) {
+      if (time - this._trackingPoints[0].time <= 100) {
+        break;
+      }
+
+      this._trackingPoints.shift();
+    }
+
+    this._trackingPoints.push({
+      coord: coord,
+      time: time
+    });
+  };
+  /*
+  * Initialize animation of values coming to a stop
+  */
+
+
+  ConveyorBeltCommon.prototype._startDecelAnim = function () {
+    var firstPoint = this._trackingPoints[0];
+    var lastPoint = this._trackingPoints[this._trackingPoints.length - 1];
+    var offset = lastPoint.coord - firstPoint.coord;
+    var timeOffset = lastPoint.time - firstPoint.time;
+    var D = timeOffset / 15;
+    this._decVel = offset / D || 0; // prevent NaN
+
+    if (Math.abs(this._decVel) > 1) {
+      this._decelerating = true;
+      requestAnimationFrame(this._stepDecelAnim.bind(this));
+    }
+  };
+  /**
+   * Animates values slowing down
+   */
+
+
+  ConveyorBeltCommon.prototype._stepDecelAnim = function () {
+    if (!this._decelerating) {
+      return;
+    }
+
+    var friction = ConveyorBeltCommon._TOUCH_SCROLL_FRICTION;
+    var stopThreshold = ConveyorBeltCommon._TOUCH_SCROLL_STOP_THRESHOLD;
+    this._decVel *= friction;
+    this._targetCoord += this._decVel;
+
+    if (Math.abs(this._decVel) > stopThreshold) {
+      if (this._isHorizontal() && this._bRtl) {
+        this._setCurrScroll(this._getCurrScroll() + this._targetCoord, false);
+      } else {
+        this._setCurrScroll(this._getCurrScroll() - this._targetCoord, false);
+      }
+
+      requestAnimationFrame(this._stepDecelAnim.bind(this));
+    } else {
+      this._decelerating = false;
+    }
   };
   /**
    * Handle a DOM scroll event.
@@ -1824,12 +1917,19 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojthemeutils', 'ojs/ojcomponentcore',
 
   ConveyorBeltCommon._SCROLL_SPEED = 1.1;
   /**
-   * Touch swipe threshold (percentage of conveyor size).
+   * Touch scroll friction.
+   * @memberof ConveyorBeltCommon
+   * @private
+   */
+
+  ConveyorBeltCommon._TOUCH_SCROLL_FRICTION = 0.7;
+  /**
+   * Touch scroll stop threshold.
    * @memberof ConveyorBeltCommon
    * @private
    */
 
-  ConveyorBeltCommon._SWIPE_THRESHOLD = 0.33;
+  ConveyorBeltCommon._TOUCH_SCROLL_STOP_THRESHOLD = 0.1;
   ConveyorBeltCommon._KEYBOARD_KEYS = {
     _UP: 'ArrowUp',
     _UP_IE: 'Up',
@@ -2432,7 +2532,11 @@ define(['ojs/ojcore-base', 'jquery', 'ojs/ojthemeutils', 'ojs/ojcomponentcore',
           }
 
           var agentInfo = oj.AgentUtils.getAgentInfo(navigator.userAgent);
-          this._cbCommon = new ConveyorBeltCommon(elem[0], orientation, contentParentElem, this._bRTL, buttonInfo, callbackInfo, styleInfo, agentInfo);
+          this._cbCommon = new ConveyorBeltCommon(elem[0], {
+            orientation: orientation,
+            contentParent: contentParentElem,
+            bRtl: this._bRTL
+          }, buttonInfo, callbackInfo, styleInfo, agentInfo);
         }
 
         var cbCommon = this._cbCommon;

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

@@ -59,13 +59,13 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
      * @global
      * @member {string} version JET version numberr
      */
-    version: '10.1.1',
+    version: '10.1.6',
 
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2021-05-05_16-28-41',
+    revision: '2021-12-03_15-08-31',
     // This function is only meant to be used outside the library, so quoting the name
     // to avoid renaming is appropriate
     noConflict: function noConflict() {

package/dist/js/libs/oj/debug_es5/ojdataprovider.js

@@ -7,7 +7,7 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 

package/dist/js/libs/oj/debug_es5/ojdataprovideradapter.js

@@ -13,7 +13,7 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 

package/dist/js/libs/oj/debug_es5/ojdataproviderscroller.js

@@ -724,7 +724,7 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojconfig',
 
     if (isCardLayout) {
       // eslint-disable-next-line no-param-reassign
-      item.className = item.className + ' ' + this.m_widget.getItemStyleClass();
+      item.className = item.className + ' oj-listview-card-animated ' + this.m_widget.getItemStyleClass();
     }
 
     if (!this.shouldUseGridRole()) {

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

@@ -3370,9 +3370,15 @@ define(['ojs/ojcore', 'jquery', 'ojs/ojeditablevalue', 'ojs/ojinputtext', 'ojs/o
             return false;
 
           case kc.ESCAPE:
-            this._hide(this._ON_CLOSE_REASON_CANCELLED);
+            this._hide(this._ON_CLOSE_REASON_CANCELLED); // JET-43662 - date picker inside popup is not getting closed on esc key press
+            // The ESC key is handled only when the picker is not inline. When in inline
+            // mode, we need to allow the event to bubble up as we are not doing anything here.
+
+
+            if (!this._isInLine) {
+              handled = true;
+            }
 
-            handled = true;
             break;
           // hide on escape
 
@@ -3540,8 +3546,14 @@ define(['ojs/ojcore', 'jquery', 'ojs/ojeditablevalue', 'ojs/ojinputtext', 'ojs/o
             return false;
 
           case kc.ESCAPE:
-            this.hide();
-            handled = true;
+            this.hide(); // JET-43662 - date picker inside popup is not getting closed on esc key press
+            // The ESC key is handled only when the picker is not inline. When in inline
+            // mode, we need to allow the event to bubble up as we are not doing anything here.
+
+            if (!this._isInLine) {
+              handled = true;
+            }
+
             break;
           // hide on escape
 
@@ -3658,8 +3670,14 @@ define(['ojs/ojcore', 'jquery', 'ojs/ojeditablevalue', 'ojs/ojinputtext', 'ojs/o
             return false;
 
           case kc.ESCAPE:
-            this.hide();
-            handled = true;
+            this.hide(); // JET-43662 - date picker inside popup is not getting closed on esc key press
+            // The ESC key is handled only when the picker is not inline. When in inline
+            // mode, we need to allow the event to bubble up as we are not doing anything here.
+
+            if (!this._isInLine) {
+              handled = true;
+            }
+
             break;
           // hide on escape
 
@@ -4163,13 +4181,29 @@ define(['ojs/ojcore', 'jquery', 'ojs/ojeditablevalue', 'ojs/ojinputtext', 'ojs/o
       var self = this;
 
       var keyDownPrevent = function keyDownPrevent(evt) {
-        var allowDefaultEvent = false;
+        if (evt.type === 'keydown') {
+          var kc = $.ui.keyCode;
 
-        if (evt.type === 'keydown' && evt.keyCode === $.ui.keyCode.TAB) {
-          allowDefaultEvent = true;
+          switch (evt.keyCode) {
+            case kc.TAB:
+              // we need to simply allow the default action
+              return true;
+
+            case kc.ESCAPE:
+              // we need to allow default action when used
+              // as inline picker
+              if (self._isInLine) {
+                return true;
+              }
+
+              return false;
+
+            default: // default no-op
+
+          }
         }
 
-        return allowDefaultEvent;
+        return false;
       };
 
       this._dpDiv.find('[data-handler]').map(function () {