@oracle/oraclejet 16.0.6 → 16.1.0

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

@@ -36,6 +36,7 @@ define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery',
             this.bottomClosedWithEsc = false;
             this.overlayDrawerResizeHandler = null;
             this.reflowDrawerResizeHandler = null;
+            this.drawerLayoutResizeHandler = null;
             this.windowResizeHandler = null;
             this.handleResize = true;
             this.state = {
@@ -81,6 +82,10 @@ define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery',
                     this.setBottomOverlayDrawerWidth();
                 }
             };
+            this.drawerLayoutResizeCallback = () => {
+                this.setStartEndOverlayDrawersHeight();
+                this.setBottomOverlayDrawerWidth();
+            };
             this.lockResizeListener = () => {
                 if (this.handleResize) {
                     this.handleResize = false;
@@ -430,6 +435,13 @@ define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery',
         componentWillUnmount() {
             window.removeEventListener(ojdrawerutils.DrawerConstants.stringResize, this.windowResizeHandler);
             this.windowResizeHandler = null;
+            this.removeDrawerLayoutResizeListener();
+        }
+        removeDrawerLayoutResizeListener() {
+            if (this.drawerLayoutResizeHandler) {
+                DomUtils.removeResizeListener(this.rootRef.current, this.drawerLayoutResizeHandler);
+                this.drawerLayoutResizeHandler = null;
+            }
         }
         handleComponentUpdate(prevState) {
             let sides = [
@@ -469,7 +481,7 @@ define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery',
                     const drawerRef = this.getDrawerRef(edge).current;
                     if (drawerRef) {
                         DomUtils.removeResizeListener(drawerRef, this.reflowDrawerResizeHandler);
-                        this.reflowDrawerResizeHandler === null;
+                        this.reflowDrawerResizeHandler = null;
                     }
                     this.returnFocus(edge);
                     if (this.getStateToChangeTo(edge)) {
@@ -537,23 +549,32 @@ define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery',
             }
         }
         animateOpen(edge) {
+            const busyContext = ojet.Context.getContext(this.rootRef.current).getBusyContext();
+            const resolveFunc = busyContext.addBusyState({ description: 'Animation in progress' });
             if (this.getDrawerResolvedDisplayMode(edge) === ojdrawerutils.DrawerConstants.stringReflow) {
-                return AnimationUtils.expand(this.getRefToAnimate(edge).current, ojdrawerutils.DrawerUtils.getAnimationOptions('expand', edge));
+                return AnimationUtils.expand(this.getRefToAnimate(edge).current, ojdrawerutils.DrawerUtils.getAnimationOptions('expand', edge)).then(resolveFunc);
             }
             else {
-                return AnimationUtils.slideIn(this.getRefToAnimate(edge).current, ojdrawerutils.DrawerUtils.getAnimationOptions(ojdrawerutils.DrawerConstants.stringSlideIn, edge)).then(() => {
+                return AnimationUtils.slideIn(this.getRefToAnimate(edge).current, ojdrawerutils.DrawerUtils.getAnimationOptions(ojdrawerutils.DrawerConstants.stringSlideIn, edge))
+                    .then(() => {
                     ojdrawerutils.DrawerUtils.unwrapDrawerClippingArea(this.getDrawerRef(edge).current);
-                });
+                })
+                    .then(resolveFunc);
             }
         }
         animateClose(edge) {
+            const busyContext = ojet.Context.getContext(this.rootRef.current).getBusyContext();
+            const resolveFunc = busyContext.addBusyState({ description: 'Animation in progress' });
             if (this.getDrawerResolvedDisplayMode(edge) === ojdrawerutils.DrawerConstants.stringReflow) {
-                return AnimationUtils.collapse(this.getRefToAnimate(edge).current, ojdrawerutils.DrawerUtils.getAnimationOptions('collapse', edge));
+                return AnimationUtils.collapse(this.getRefToAnimate(edge).current, ojdrawerutils.DrawerUtils.getAnimationOptions('collapse', edge)).then(resolveFunc);
             }
             else {
-                return AnimationUtils.slideOut(this.getRefToAnimate(edge).current, ojdrawerutils.DrawerUtils.getAnimationOptions(ojdrawerutils.DrawerConstants.stringSlideOut, edge)).then(() => {
-                    ojdrawerutils.DrawerUtils.unwrapDrawerClippingArea(this.getDrawerRef(edge).current);
-                });
+                const drawerEl = this.getDrawerRef(edge).current;
+                return AnimationUtils.slideOut(this.getRefToAnimate(edge).current, ojdrawerutils.DrawerUtils.getAnimationOptions(ojdrawerutils.DrawerConstants.stringSlideOut, edge))
+                    .then(() => {
+                    ojdrawerutils.DrawerUtils.unwrapDrawerClippingArea(drawerEl);
+                })
+                    .then(resolveFunc);
             }
         }
         edgeToStateOpenedName(edge) {
@@ -634,6 +655,10 @@ define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery',
             $drawerElement.position(position);
             this.setStartEndOverlayDrawersHeight();
             ojdrawerutils.DrawerUtils.wrapDrawerWithClippingArea(drawerElement, position);
+            if (this.drawerLayoutResizeHandler === null) {
+                this.drawerLayoutResizeHandler = this.drawerLayoutResizeCallback.bind(this);
+            }
+            DomUtils.addResizeListener(this.rootRef.current, this.drawerLayoutResizeHandler, 50, true);
             return this.animateOpen(edge);
         }
         setBottomOverlayDrawerWidth() {
@@ -674,7 +699,8 @@ define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery',
             ojdrawerutils.DrawerUtils.disableBodyOverflow();
             this.elementWithFocusBeforeDrawerCloses = document.activeElement;
             DomUtils.removeResizeListener(this.getDrawerRef(edge).current, this.overlayDrawerResizeHandler);
-            this.overlayDrawerResizeHandler === null;
+            this.overlayDrawerResizeHandler = null;
+            this.removeDrawerLayoutResizeListener();
             ojdrawerutils.DrawerUtils.wrapDrawerWithClippingArea(this.getDrawerRef(edge).current, this.getDrawerPosition(edge));
             return this.animateClose(edge);
         }
@@ -717,11 +743,13 @@ define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery',
         setStartEndOverlayDrawersHeight() {
             const middleSectionHeight = ojdrawerutils.DrawerUtils.getElementHeight(this.middleSectionRef.current) + 'px';
             const startDrawerElement = this.startRef.current;
-            if (startDrawerElement) {
+            if (startDrawerElement &&
+                this.getDrawerResolvedDisplayMode(ojdrawerutils.DrawerConstants.stringStart) != ojdrawerutils.DrawerConstants.stringReflow) {
                 startDrawerElement.style.height = middleSectionHeight;
             }
             const endDrawerElement = this.endRef.current;
-            if (endDrawerElement) {
+            if (endDrawerElement &&
+                this.getDrawerResolvedDisplayMode(ojdrawerutils.DrawerConstants.stringEnd) != ojdrawerutils.DrawerConstants.stringReflow) {
                 endDrawerElement.style.height = middleSectionHeight;
             }
         }

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

@@ -5,7 +5,7 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery', 'ojs/ojanimation', 'ojs/ojcore-base', 'ojs/ojpopup', 'ojs/ojdrawerutils', 'hammerjs'], function (exports, jsxRuntime, ojvcomponent, preact, $, AnimationUtils, ojcoreBase, ojpopup, ojdrawerutils, Hammer) { 'use strict';
+define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery', 'ojs/ojanimation', 'ojs/ojcore-base', 'ojs/ojpopup', 'ojs/ojdrawerutils', 'hammerjs', 'ojs/ojcustomelement-utils'], function (exports, jsxRuntime, ojvcomponent, preact, $, AnimationUtils, ojcoreBase, ojpopup, ojdrawerutils, Hammer, ojcustomelementUtils) { 'use strict';
 
     $ = $ && Object.prototype.hasOwnProperty.call($, 'default') ? $['default'] : $;
     Hammer = Hammer && Object.prototype.hasOwnProperty.call(Hammer, 'default') ? Hammer['default'] : Hammer;
@@ -84,7 +84,8 @@ define(['exports', 'preact/jsx-runtime', 'ojs/ojvcomponent', 'preact', 'jquery',
                 const $drawerElement = $(this.rootRef.current);
                 const status = ZOrderUtils.getStatus($drawerElement);
                 if (status === ZOrderUtils.STATUS.OPEN) {
-                    $drawerElement.detach();
+                    ojcustomelementUtils.CustomElementUtils.cleanComponentBindings($drawerElement[0]);
+                    $drawerElement.remove();
                     const psOptions = {};
                     psOptions[PopupService.OPTION.POPUP] = $drawerElement;
                     this.ignoreUpdate = true;

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

@@ -258,7 +258,11 @@ define(['exports', 'ojs/ojdomutils'], function (exports, DomUtils) { 'use strict
         static wrapDrawerWithClippingArea(drawerElement, position) {
             const clippingAreaEl = $(drawerElement)
                 .wrap(function () {
-                return `<div id="${DrawerConstants.clippingAreaSelector}" style="overflow:hidden; position: absolute"></div>`;
+                const div = document.createElement('div');
+                div.setAttribute('id', DrawerConstants.clippingAreaSelector);
+                div.style.overflow = 'hidden';
+                div.style.position = 'absolute';
+                return $(div);
             })
                 .parent()[0];
             clippingAreaEl.style.setProperty('height', DrawerUtils.getElementHeight(drawerElement) + 'px');
@@ -267,8 +271,10 @@ define(['exports', 'ojs/ojdomutils'], function (exports, DomUtils) { 'use strict
             drawerElement.style.setProperty('position', 'static');
         }
         static unwrapDrawerClippingArea(drawerElement) {
-            drawerElement.style.removeProperty('position');
-            $(drawerElement).unwrap();
+            if (drawerElement) {
+                drawerElement.style.removeProperty('position');
+                $(drawerElement).unwrap();
+            }
         }
     }
 

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

@@ -941,6 +941,13 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-toolkit', 'ojs/ojcontext', 'ojs/ojconfig',
                 _index = indices[i] - i; // "- i" accounts for previously processed operations
                 data.splice(_index, deleteCount);
                 keys.splice(_index, deleteCount);
+                // (For Diagram) handle the case where the current item is removed, to match ListView's behavior.
+                if (
+                  self._component._getCurrentItem &&
+                  detail.keys.has(self._component._getCurrentItem())
+                ) {
+                  self._component._handleRemoveCurrentItem();
+                }
               } else {
                 if (!isUpdate) {
                   // Add Operation
@@ -1854,45 +1861,42 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-toolkit', 'ojs/ojcontext', 'ojs/ojconfig',
        * @return {null}
        */
       _SetLocaleHelpers: function (NumberConverter, ConverterUtils) {
-        // If requireJS is not used, can't rely on internationalization modules.
-        if (dvt.requireJS !== false) {
-          var helpers = {};
-          // Number converter factory for use in formatting default strings
-          helpers.createNumberConverter = function (options) {
-            return new NumberConverter.IntlNumberConverter(options);
-          };
+        var helpers = {};
+        // Number converter factory for use in formatting default strings
+        helpers.createNumberConverter = function (options) {
+          return new NumberConverter.IntlNumberConverter(options);
+        };
 
-          // Iso to date converter to be called for JS that requires Dates
-          helpers.isoToDateConverter = function (input) {
-            if (typeof input === 'string') {
-              var dateWithTimeZone = ConverterUtils.IntlConverterUtils.isoToDate(input);
-              var localIsoTime = dateWithTimeZone.toJSON()
-                ? ConverterUtils.IntlConverterUtils.dateToLocalIso(dateWithTimeZone)
-                : input;
-              return ConverterUtils.IntlConverterUtils.isoToLocalDate(localIsoTime);
-            }
-            return input;
-          };
+        // Iso to date converter to be called for JS that requires Dates
+        helpers.isoToDateConverter = function (input) {
+          if (typeof input === 'string') {
+            var dateWithTimeZone = ConverterUtils.IntlConverterUtils.isoToDate(input);
+            var localIsoTime = dateWithTimeZone.toJSON()
+              ? ConverterUtils.IntlConverterUtils.dateToLocalIso(dateWithTimeZone)
+              : input;
+            return ConverterUtils.IntlConverterUtils.isoToLocalDate(localIsoTime);
+          }
+          return input;
+        };
 
-          // Date to iso converter to be called before passing to the date time converter
-          helpers.dateToIsoWithTimeZoneConverter = function (input) {
-            if (input instanceof Date) {
-              var timeZoneOffest = -1 * input.getTimezoneOffset();
-              var offsetSign = timeZoneOffest >= 0 ? '+' : '-';
-              var offsetHour = Math.floor(Math.abs(timeZoneOffest) / 60);
-              var offsetMinutes = Math.abs(timeZoneOffest) % 60;
-              var isoTimeZone =
-                offsetSign +
-                (offsetHour.toString().length !== 2 ? '0' + offsetHour : offsetHour) +
-                ':' +
-                (offsetMinutes.toString().length !== 2 ? offsetMinutes + '0' : offsetMinutes);
-              return ConverterUtils.IntlConverterUtils.dateToLocalIso(input) + isoTimeZone;
-            }
-            return input;
-          };
+        // Date to iso converter to be called before passing to the date time converter
+        helpers.dateToIsoWithTimeZoneConverter = function (input) {
+          if (input instanceof Date) {
+            var timeZoneOffest = -1 * input.getTimezoneOffset();
+            var offsetSign = timeZoneOffest >= 0 ? '+' : '-';
+            var offsetHour = Math.floor(Math.abs(timeZoneOffest) / 60);
+            var offsetMinutes = Math.abs(timeZoneOffest) % 60;
+            var isoTimeZone =
+              offsetSign +
+              (offsetHour.toString().length !== 2 ? '0' + offsetHour : offsetHour) +
+              ':' +
+              (offsetMinutes.toString().length !== 2 ? offsetMinutes + '0' : offsetMinutes);
+            return ConverterUtils.IntlConverterUtils.dateToLocalIso(input) + isoTimeZone;
+          }
+          return input;
+        };
 
-          this._context.setLocaleHelpers(helpers);
-        }
+        this._context.setLocaleHelpers(helpers);
       },
 
       refresh: function () {

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

@@ -21074,7 +21074,7 @@ define(['exports', 'ojs/ojthemeutils'], function (exports, ThemeUtils) { 'use st
    * Sets the wai-aria active-descendent to be the given displayable.
    * @param {dvt.Displayable} displayable The new active displayable.
    */
-  Context.prototype.setActiveElement = function (displayable) {
+  Context.prototype.setActiveElement = function (displayable, forceNew) {
     // Clear the id of the current active element.  This field is only set if a temp id was applied earlier.
     if (this._activeElement) {
       ToolkitUtils.removeAttrNullNS(this._activeElement.getElem(), 'id');
@@ -21084,7 +21084,7 @@ define(['exports', 'ojs/ojthemeutils'], function (exports, ThemeUtils) { 'use st
     // Get the DOM ID of the elem. If it doesn't have an ID, create one for it.
     var elem = displayable.getElem();
     var id = ToolkitUtils.getAttrNullNS(elem, 'id');
-    if (!id) {
+    if (!id || forceNew) {
       id = Context._generateActiveElementId(displayable);
       ToolkitUtils.setAttrNullNS(elem, 'id', id);
       this._activeElement = displayable;
@@ -28081,15 +28081,15 @@ define(['exports', 'ojs/ojthemeutils'], function (exports, ThemeUtils) { 'use st
 
     // Add hit area to make interaction with scrollbar easier
     var hitAreaSize = Agent.isTouchDevice() ? 8 : 4;
-    var hitArea = new Rect(
+    this._hitArea = new Rect(
       this.getCtx(),
       -hitAreaSize,
       -hitAreaSize,
       this._width + 2 * hitAreaSize,
       this._height + 2 * hitAreaSize
     );
-    hitArea.setInvisibleFill();
-    this.addChild(hitArea);
+    this._hitArea.setInvisibleFill();
+    this.addChild(this._hitArea);
 
     // Add event listeners
     var hasDragTarget = this._dragTarget != null;
@@ -28243,7 +28243,9 @@ define(['exports', 'ojs/ojthemeutils'], function (exports, ThemeUtils) { 'use st
 
     var dragOffset = val - this._prevVal;
     // If the drag target is not the scrollbar, the thumb should move in the opposite direction as the drag target
-    if (this._dragTarget) dragOffset *= -1;
+    if (this._dragTarget && event.target !== this._hitArea) {
+      dragOffset *= -1;
+    }
 
     this._setViewportRange(this._thumbMin + dragOffset, this._thumbMax + dragOffset, 'move');
     this._prevVal = val;

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

@@ -1313,14 +1313,14 @@ define(['exports', 'ojs/ojdvt-toolkit'], function (exports, dvt) { 'use strict';
      */
     OnClick(event) {
       super.OnClick(event);
-      this._processBreadcrumbs(this.GetLogicalObject(event.target));
+      this.processBreadcrumbs(this.GetLogicalObject(event.target));
     }
 
     /**
      * @override
      */
     HandleTouchClickInternal(event) {
-      this._processBreadcrumbs(this.GetLogicalObject(event.target));
+      this.processBreadcrumbs(this.GetLogicalObject(event.target));
     }
 
     /**
@@ -1328,7 +1328,7 @@ define(['exports', 'ojs/ojdvt-toolkit'], function (exports, dvt) { 'use strict';
      * @param {obj} The logical object which was clicked or tapped.
      * @private
      */
-    _processBreadcrumbs(obj) {
+    processBreadcrumbs(obj) {
       if (obj && obj instanceof DvtBreadcrumbsPeer && obj.isDrillable()) {
         // Create the event and fire to callbacks
         var event = dvt.EventFactory.newBreadcrumbsDrillEvent(obj.getId());
@@ -1355,7 +1355,7 @@ define(['exports', 'ojs/ojdvt-toolkit'], function (exports, dvt) { 'use strict';
         }
       } else if (keyCode == dvt.KeyboardEvent.ENTER) {
         var crumb = this._breadcrumbs.getCrumb(this._breadcrumbs.getCurrentCrumbIndex());
-        this._processBreadcrumbs(this.GetLogicalObject(crumb));
+        this.processBreadcrumbs(this.GetLogicalObject(crumb));
       }
 
       // keystrokes are consumed by default, unless we tab out of the breadcrumbs
@@ -4689,11 +4689,18 @@ define(['exports', 'ojs/ojdvt-toolkit'], function (exports, dvt) { 'use strict';
       var iconClass = resources[resourceKey];
       var iconStyle = dvt.ToolkitUtils.getIconStyle(context, iconClass);
       // Create button and hook up click listener
-      var button = new dvt.IconButton(context, 'borderless', {
-        style: iconStyle,
-        size: this._ISOLATE_ICON_SIZE
-      });
-      button.addEvtListener(dvt.MouseEvent.CLICK, callback, false, this);
+      var button = new dvt.IconButton(
+        context,
+        'borderless',
+        {
+          style: iconStyle,
+          size: this._ISOLATE_ICON_SIZE
+        },
+        null,
+        null,
+        callback,
+        this
+      );
       return button;
     }
 
@@ -5153,6 +5160,29 @@ define(['exports', 'ojs/ojdvt-toolkit'], function (exports, dvt) { 'use strict';
       return null;
     }
 
+    /**
+     * Method to fire synthetic drill event. Used by sunburst webdriver.
+     * @param {string} id The series id of the data item.
+     * @param {boolean} shiftKey Whether the shiftkey is pressed on drill.
+     */
+    dispatchItemDrill(id) {
+      var rootNode = this._comp.getRootNode();
+      var obj = DvtTreeNode.getNodeById(rootNode, id);
+      // only if the node is visible
+      if (obj && obj.getDisplayable()) {
+        this._comp.getEventManager().processDrill(obj);
+      } else {
+        // See if it is a breadcrumb
+        var breadcrumb = this._comp.getBreadcrumbs();
+        obj = breadcrumb.getEventManager().GetLogicalObject(breadcrumb.getCrumb(id));
+        if (obj && obj.isDrillable) {
+          breadcrumb.getEventManager().processBreadcrumbs(obj);
+        } else {
+          throw new Error('Invalid id passed into method');
+        }
+      }
+    }
+
     /**
      * Returns the node from the array with the specified index.
      * @param {array} nodes
@@ -5335,7 +5365,7 @@ define(['exports', 'ojs/ojdvt-toolkit'], function (exports, dvt) { 'use strict';
       if (!obj) return;
 
       // Only double click to drill if selectable. Otherwise, drill with single click.
-      if (obj.isSelectable && obj.isSelectable()) this._processDrill(obj, event.shiftKey);
+      if (obj.isSelectable && obj.isSelectable()) this.processDrill(obj, event.shiftKey);
     }
 
     /**
@@ -5349,7 +5379,7 @@ define(['exports', 'ojs/ojdvt-toolkit'], function (exports, dvt) { 'use strict';
       this._processNodeLabel(obj);
 
       // Only drill if not selectable. If selectable, drill with double click.
-      if (obj && !(obj.isSelectable && obj.isSelectable())) this._processDrill(obj, event.shiftKey);
+      if (obj && !(obj.isSelectable && obj.isSelectable())) this.processDrill(obj, event.shiftKey);
     }
 
     /**
@@ -5436,7 +5466,7 @@ define(['exports', 'ojs/ojdvt-toolkit'], function (exports, dvt) { 'use strict';
       }
 
       // Only drill if not selectable. If selectable, drill with double click.
-      if (!(obj.isSelectable && obj.isSelectable())) this._processDrill(obj, event.shiftKey);
+      if (!(obj.isSelectable && obj.isSelectable())) this.processDrill(obj, event.shiftKey);
     }
 
     /**
@@ -5448,7 +5478,7 @@ define(['exports', 'ojs/ojdvt-toolkit'], function (exports, dvt) { 'use strict';
       if (!obj) return;
 
       // Only double click to drill if selectable. Otherwise, drill with single click.
-      if (obj.isSelectable && obj.isSelectable()) this._processDrill(obj, false);
+      if (obj.isSelectable && obj.isSelectable()) this.processDrill(obj, false);
     }
 
     /**
@@ -5469,7 +5499,7 @@ define(['exports', 'ojs/ojdvt-toolkit'], function (exports, dvt) { 'use strict';
      * @param {boolean} shiftKey True if the shift key was pressed.
      * @private
      */
-    _processDrill(obj, shiftKey) {
+    processDrill(obj, shiftKey) {
       // Fire a drill event if drilling is enabled
       if (obj.isDrillReplaceEnabled && obj.isDrillReplaceEnabled()) {
         // Delegate to the view to fire a drill event