@oracle/oraclejet 12.1.0 → 12.1.3

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

@@ -91,6 +91,11 @@ let DrawerPopup = DrawerPopup_1 = class DrawerPopup extends Component {
                 }
             }
         };
+        this.refreshHandler = (edge) => {
+            const $drawerElement = $(this.rootRef.current);
+            $drawerElement.position(this.getDrawerPosition(edge));
+            PopupService.getInstance().triggerOnDescendents($drawerElement, PopupService.EVENT.POPUP_REFRESH);
+        };
         this.getFocusables = () => {
             return this.rootRef.current.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"]), video');
         };
@@ -183,9 +188,7 @@ let DrawerPopup = DrawerPopup_1 = class DrawerPopup extends Component {
             [PSEvent.POPUP_BEFORE_CLOSE]: () => this.beforeCloseHandler(edge),
             [PSEvent.POPUP_AFTER_CLOSE]: () => this.afterCloseHandler(prevState),
             [PSEvent.POPUP_AUTODISMISS]: (event) => this.autoDismissHandler(event),
-            [PSEvent.POPUP_REFRESH]: () => {
-                $drawerElement.position(this.getDrawerPosition(edge));
-            }
+            [PSEvent.POPUP_REFRESH]: () => this.refreshHandler(edge)
         };
         return PSOptions;
     }

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

@@ -2982,6 +2982,44 @@ oj.__registerWidget('oj.editableValue', $.oj.baseComponent,
       }
     },
 
+    /**
+     * 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.
@@ -7500,8 +7538,7 @@ PopupMessagingStrategy.prototype._unregisterLauncherEvents = function () {
   jqLauncher[0].removeEventListener('change', this._eatChangeAndClickOnPress, true);
 
   if (isTouchSupported()) {
-    jqLauncher.ojHammer().off('press');
-    jqLauncher.ojHammer('destroy');
+    this.releaseResources();
     jqLauncher.off('contextmenu', this._eatContextMenuOnOpenPopupListener);
     this._eatContextMenuOnOpenPopupListener = null;
     this._inPressEvent = null;
@@ -7518,55 +7555,39 @@ PopupMessagingStrategy.prototype._unregisterLauncherEvents = function () {
 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 (isTouchSupported() && pressEventIndex !== -1) {
+    if (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: [
-          [Press, { time: 750 }]
-        ] };
-      jqLauncher.ojHammer(hammerOptions).on('press', openPopupCallback);
+      this.registerHammerOpenCallbackOnLauncher();
     }
   }
 
@@ -7583,6 +7604,62 @@ PopupMessagingStrategy.prototype._registerLauncherEvents = function () {
   }
 };
 
+  /**
+   * 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 (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: [
+        [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 (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"
@@ -7657,6 +7734,34 @@ PopupMessagingStrategy.prototype._getPopupPosition = function () {
   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_esm/ojgantt-toolkit.js

@@ -9806,7 +9806,7 @@ DvtGanttTaskNode.prototype._setSelected = function(selected, enforceDOMLayering,
   if (!isInitial && options.selectionBehavior === 'highlightDependencies') {
     var viewport = this._gantt.getViewPort();
     var dataLayoutManager = this._gantt.getDataLayoutManager();
-    dataLayoutManager.renderViewportDependencyLines(viewport, 'vpc_translate', selected ? this.getLayoutObject() : null);
+    dataLayoutManager.renderViewportDependencyLines(viewport, 'vpc_translate', { taskObj: this.getLayoutObject(), isSelected: selected });
   }
 };
 
@@ -12597,12 +12597,13 @@ DvtGanttDataLayoutManager.prototype.getLayoutObjectsInBBox = function(bbox)
  * Based on current task selection, return a set of tasks connected to them
  * via dependencies. If targetTaskObj is specified, then that task is ensured to be included in the selection.
  * @param {string} action The action that triggered the viewport change. One of the DvtGanttDataLayoutManager.VPC_X strings.
- * @param {Object=} targetTaskObj The target selected task. This should only be specified if the target task
- *    is not in the selectionHandler's current selection (yet), i.e. this rendering is triggered by a task selection gesture
+ * @param {Object=} targetTask The target selected (or de-selected) task, of the shape { taskObj: taskObj, isSelected: boolean }.
+ *    This should only be specified if the target task is not in the selectionHandler's current selection (yet),
+ *    i.e. this rendering is triggered by a task selection/deselection gesture.
  * @returns {Object} { taskObjs: Array(taskObjs), dependencyObjs: Set(depObjs) }
  * @private
  */
-DvtGanttDataLayoutManager.prototype._getSelectionDependencies = function (action, targetTaskObj) {
+DvtGanttDataLayoutManager.prototype._getSelectionDependencies = function (action, targetTask) {
   var idTaskObjMap = this._createIdObjMap(this._rowObjs, 'taskObjs');
   var taskObjsSelected;
   if (action === DvtGanttDataLayoutManager.VPC_REFRESH) {
@@ -12612,40 +12613,42 @@ DvtGanttDataLayoutManager.prototype._getSelectionDependencies = function (action
   } else {
     taskObjsSelected = this._gantt.getSelectionHandler().getSelection().map(taskNode => taskNode.getLayoutObject());
   }
-  if (targetTaskObj) {
-    // targetTaskObj is specified if this rendering is triggered by a task selection gesture
-    // and so it's not in the selectionHandler's current selection (yet)
-    taskObjsSelected.push(targetTaskObj);
+
+  if (targetTask) {
+    // targetTask is specified if this rendering is triggered by a task selection (or de-selection) gesture
+    // The selectionHandler's selection is not up to date at this point yet.
+    if (targetTask.isSelected) {
+      taskObjsSelected.push(targetTask.taskObj);
+    } else {
+      taskObjsSelected = taskObjsSelected.filter(t => t !== targetTask.taskObj);
+    }
   }
 
-  var visitedTaskObjs = new Set();
-  var visitedDependencyObjs = new Set();
-  // Traverse dependencies to find connected tasks
-  var dfs = (taskObj) => {
+  var traverse = (taskObj, direction, visitedTaskObjs, visitedDependencyObjs) => {
     if (taskObj == null || visitedTaskObjs.has(taskObj) || !idTaskObjMap.has(taskObj['id'])) {
       return;
     }
-
     visitedTaskObjs.add(taskObj);
-    var taskObjNeighbors = new Set(taskObj.predecessorDepObjs.map(d => d.predecessorTaskObj).concat(
-      taskObj.successorDepObjs.map(d => d.successorTaskObj)
-    ));
-    taskObjNeighbors.forEach(t => dfs(t));
+    var taskObjNeighbors;
+    if (direction === 'up') {
+      taskObjNeighbors = taskObj.predecessorDepObjs.map(d => d.predecessorTaskObj);
+      taskObj.predecessorDepObjs.forEach(d => visitedDependencyObjs.add(d));
+    } else {
+      taskObjNeighbors = taskObj.successorDepObjs.map(d => d.successorTaskObj);
+      taskObj.successorDepObjs.forEach(d => visitedDependencyObjs.add(d));
+    }
+    taskObjNeighbors.forEach(t => traverse(t, direction, visitedTaskObjs, visitedDependencyObjs));
   };
 
-  // Start with each selected task and traverse its dependencies
-  taskObjsSelected.forEach(taskObj => dfs(taskObj));
-
-  visitedTaskObjs.forEach(taskObj => {
-    var predecessorDepObjs = taskObj.predecessorDepObjs;
-    predecessorDepObjs.forEach(depObj => {
-      visitedDependencyObjs.add(depObj);
-    });
-    var successorDepObjs = taskObj.successorDepObjs;
-    successorDepObjs.forEach(depObj => {
-      visitedDependencyObjs.add(depObj);
-    });
-  });
+  // Start with each selected task and traverse its dependencies upstream and downstream
+  var visitedTaskObjs = new Set();
+  var visitedDependencyObjs = new Set();
+  taskObjsSelected.forEach(taskObj => traverse(taskObj, 'up', visitedTaskObjs, visitedDependencyObjs));
+  // New set for tracking visited downstream tasks
+  var visitedDownstreamTaskObjs = new Set();
+  taskObjsSelected.forEach(taskObj => traverse(taskObj, 'down', visitedDownstreamTaskObjs, visitedDependencyObjs));
+  // merge upstream and downstream tasks objs
+  visitedDownstreamTaskObjs.forEach(t => visitedTaskObjs.add(t));
 
   return { taskObjs: Array.from(visitedTaskObjs), dependencyObjs: visitedDependencyObjs };
 };
@@ -12689,9 +12692,10 @@ DvtGanttDataLayoutManager.prototype.highlightTasks = function(taskObjs)
  * Renders viewport related dependency lines
  * @param {Object} viewport Object describing the viewport, of shape {minRowInd: number, maxRowInd: number, viewStartTime: number, viewEndTime: number}
  * @param {string} action The action that triggered the viewport change. One of the DvtGanttDataLayoutManager.VPC_X strings.
- * @param {Object=} targetTaskObj The task that got selected by the user that triggered this call (optional)
+ * @param {Object=} targetTask The task that got selected (or de-selected) by the user that triggered this call (optional).
+ *     This should be of the shape { taskObj: taskObj, isSelected: boolean }
  */
-DvtGanttDataLayoutManager.prototype.renderViewportDependencyLines = function (viewport, action, targetTaskObj) {
+DvtGanttDataLayoutManager.prototype.renderViewportDependencyLines = function (viewport, action, targetTask) {
   var dependenciesContainer = this._gantt.getDependenciesContainer();
   if (dependenciesContainer) {
     dependenciesContainer.removeChildren();
@@ -12701,7 +12705,7 @@ DvtGanttDataLayoutManager.prototype.renderViewportDependencyLines = function (vi
   if (this._gantt.getOptions()['selectionBehavior'] === 'highlightDependencies') {
     // "highlightDependencies" selection behavior: only dependencies related to the selected tasks are shown
     // and dim all other tasks
-    var selectionDeps = this._getSelectionDependencies(action, targetTaskObj);
+    var selectionDeps = this._getSelectionDependencies(action, targetTask);
     this.highlightTasks(selectionDeps.taskObjs);
     dependencyObjs = selectionDeps.dependencyObjs;
   } else {

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

@@ -27,6 +27,7 @@ if (Hammer) {
             hammer.destroy();
             $el.removeData('ojHammer');
           }
+          $el.off('remove.ojHammer');
         });
 
       default:
@@ -34,7 +35,13 @@ if (Hammer) {
         return this.each(function () {
           var $el = $(this);
           if (!$el.data('ojHammer')) {
-            $el.data('ojHammer', new Manager($el[0], options));
+            const mgr = new 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_esm/ojlistview.js

@@ -8575,7 +8575,7 @@ const _ojListView = _ListViewUtils.clazz(Object, /** @lends oj._ojListView.proto
     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_esm/ojmessagebanner.js

@@ -713,7 +713,7 @@ var mergeDeepWithKey$1 = mergeDeepWithKey;
 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_esm/ojselectcombobox.js

@@ -8208,6 +8208,25 @@ const _OjMultiCombobox = _ComboUtils.clazz(_AbstractMultiChoice,
       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
@@ -9441,6 +9460,25 @@ const _OjSingleCombobox = _ComboUtils.clazz(_AbstractSingleChoice,
       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;

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

@@ -96,7 +96,7 @@ class StreamListContentHandler extends IteratingDataProviderContentHandler {
         }
         const vnodes = this.renderItem(key, index, data);
         this.decorateItem(vnodes, key, index, initialFetch, visible);
-        return vnodes;
+        return vnodes[0];
     }
     renderItem(key, index, data) {
         const renderer = this.callback.getItemRenderer();
@@ -228,7 +228,7 @@ class StreamListTreeContentHandler extends IteratingTreeDataProviderContentHandl
         }
         const vnodes = this.renderItem(metadata, index, data);
         this.decorateItem(vnodes, metadata, index, initialFetch, visible);
-        return vnodes;
+        return vnodes[0];
     }
     renderItem(metadata, index, data) {
         const key = metadata.key;

package/dist/js/libs/oj/main-template.js

@@ -15,9 +15,9 @@
   requirejs.config({
     // Path mappings for the logical module names
     paths: {
-      'ojs': 'libs/oj/v12.1.0/min@insertESLevelPath@',
-      'ojL10n': 'libs/oj/v12.1.0/ojL10n',
-      'ojtranslations': 'libs/oj/v12.1.0/resources',
+      'ojs': 'libs/oj/v12.1.3/min@insertESLevelPath@',
+      'ojL10n': 'libs/oj/v12.1.3/ojL10n',
+      'ojtranslations': 'libs/oj/v12.1.3/resources',
       
   'knockout': 'libs/knockout/knockout-3.5.1',
   'jquery': 'libs/jquery/jquery-3.6.0.min',