@oracle/oraclejet 16.0.6 → 16.1.0

package/dist/js/libs/oj/debug/ojcspexpressionevaluator-internal.js

@@ -82,6 +82,9 @@ define(['exports', 'ojs/ojexpparser'], function (exports, ojexpparser) { 'use st
       '||': function (a, b) {
         return a || b();
       },
+      '??': function (a, b) {
+        return a ?? b();
+      },
       '&&': function (a, b) {
         return a && b();
       },
@@ -141,6 +144,12 @@ define(['exports', 'ojs/ojexpparser'], function (exports, ojexpparser) { 'use st
       },
       '%': function (a, b) {
         return a % b;
+      },
+      '**': function (a, b) {
+        return a ** b;
+      },
+      instanceof: function (a, b) {
+        return a instanceof b;
       }
     };
 
@@ -159,6 +168,9 @@ define(['exports', 'ojs/ojexpparser'], function (exports, ojexpparser) { 'use st
       },
       '...': function (a) {
         return new _Spread(a);
+      },
+      typeof: function (a) {
+        return typeof a;
       }
     };
 
@@ -171,24 +183,24 @@ define(['exports', 'ojs/ojexpparser'], function (exports, ojexpparser) { 'use st
     // eslint-disable-next-line consistent-return
     function _evaluate(node, contexts) {
       switch (node.type) {
-        case 1: // Identifier
+        case ojexpparser.IDENTIFIER:
           return _getValue(contexts, node.name);
 
-        case 2: // 'MemberExpression'
+        case ojexpparser.MEMBER_EXP:
           return _evaluateMember(node, contexts)[1];
 
-        case 3: // 'Literal'
+        case ojexpparser.LITERAL:
           return node.value;
 
-        case 4: // 'CallExpression'
+        case ojexpparser.CALL_EXP:
           var caller;
           var fn;
           var assign;
           switch (node.callee.type) {
-            case 1: // Identifier
+            case ojexpparser.IDENTIFIER:
               assign = _getValueWithContext(contexts, node.callee.name);
               break;
-            case 2: // 'MemberExpression'
+            case ojexpparser.MEMBER_EXP:
               assign = _evaluateMember(node.callee, contexts);
               break;
             default:
@@ -203,10 +215,19 @@ define(['exports', 'ojs/ojexpparser'], function (exports, ojexpparser) { 'use st
           }
           return fn.apply(caller, _evaluateArray(node.arguments, contexts));
 
-        case 5: // 'UnaryExpression'
-          return _unops[node.operator](_evaluate(node.argument, contexts));
+        case ojexpparser.UNARY_EXP:
+          var testValue;
+          try {
+            testValue = _evaluate(node.argument, contexts);
+          } catch (e) {
+            // Undefined identifier will throw an error, don't report it
+            if (node.argument.type !== ojexpparser.IDENTIFIER) {
+              throw e;
+            }
+          }
+          return _unops[node.operator](testValue);
 
-        case 6: // 'BinaryExpression'
+        case ojexpparser.BINARY_EXP:
           if (node.operator === '=') {
             return _evaluateAssignment(node.left, contexts, _evaluate(node.right, contexts));
           }
@@ -215,26 +236,26 @@ define(['exports', 'ojs/ojexpparser'], function (exports, ojexpparser) { 'use st
             _evaluate(node.right, contexts)
           );
 
-        case 7: // 'LogicalExpression':
+        case ojexpparser.LOGICAL_EXP:
           return _binops[node.operator](_evaluate(node.left, contexts), function () {
             return _evaluate(node.right, contexts);
           });
 
-        case 8: // 'ConditionalExpression'
+        case ojexpparser.CONDITIONAL_EXP:
           return _evaluate(node.test, contexts)
             ? _evaluate(node.consequent, contexts)
             : _evaluate(node.alternate, contexts);
 
-        case 9: // 'ArrayExpression'
+        case ojexpparser.ARRAY_EXP:
           return _evaluateArray(node.elements, contexts);
 
-        case 10: // 'ObjectExpression'
+        case ojexpparser.OBJECT_EXP:
           return _evaluateObjectExpression(node, contexts);
 
-        case 11: // 'FunctionExpression'
+        case ojexpparser.FUNCTION_EXP:
           return _evaluateFunctionExpression(node, contexts);
 
-        case 12: // 'ConstructorExpression'
+        case ojexpparser.NEW_EXP:
           return _evaluateConstructorExpression(node, contexts);
 
         default:
@@ -256,8 +277,8 @@ define(['exports', 'ojs/ojexpparser'], function (exports, ojexpparser) { 'use st
 
     function _evaluateMember(node, contexts) {
       var object = _evaluate(node.object, contexts);
-      if (!object && node.conditional) {
-        // handle conditional chaining operator: test?.prop
+      if (!object && node.optional) {
+        // handle optional chaining operator: test?.prop
         return [];
       } else if (node.computed) {
         return [object, object[_evaluate(node.property, contexts)]];
@@ -267,7 +288,8 @@ define(['exports', 'ojs/ojexpparser'], function (exports, ojexpparser) { 'use st
 
     function _evaluateObjectExpression(node, contexts) {
       return node.properties.reduce(function (acc, curr) {
-        acc[curr.key] = _evaluate(curr.value, contexts);
+        const key = ojexpparser.getKeyValue(curr.key);
+        acc[key] = _evaluate(curr.value, contexts);
         return acc;
       }, {});
     }
@@ -292,7 +314,7 @@ define(['exports', 'ojs/ojexpparser'], function (exports, ojexpparser) { 'use st
 
     function _evaluateAssignment(node, contexts, val) {
       switch (node.type) {
-        case 1: // 'Identifier'
+        case ojexpparser.IDENTIFIER:
           var name = node.name;
           var target = _getContextForIdentifier(contexts, name);
           if (!target) {
@@ -300,7 +322,7 @@ define(['exports', 'ojs/ojexpparser'], function (exports, ojexpparser) { 'use st
           }
           target[name] = val;
           break;
-        case 2: // 'MemberExpression'
+        case ojexpparser.MEMBER_EXP:
           var key = node.computed ? _evaluate(node.property, contexts) : node.property.name;
           _evaluateMember(node, contexts)[0][key] = val;
           break;

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

@@ -52,8 +52,11 @@ define(['ojs/ojcspexpressionevaluator-internal', 'ojs/ojkoshared'], function (oj
    *  <li>Literals, e.g. <code>[['abc']]</code>.</li>
    *  <li>Function callbacks, e.g. <code>[[getColor('customer', id)]]</code>.</li>
    *  <li>Unary operators are limited to '-', '+', '~', '!' and '...', e.g. <code>[[-100]]</code>.</li>
+   *  <li>Instanceof or typeof operators such as <code>'date instanceof Date'</code></li>
    *  <li>Binary operators, e.g. <code>[[value + '.png']]</code>.</li>
+   *  <li>Exponentiation (**) such as <code>'3 ** 4'</code></li>
    *  <li>Logical operators, e.g. <code>[[a && b]]</code> or <code>[[a || b]]</code>.</li>
+   *  <li>Nullish coalescing operator (??) such as <code>'value ?? "default value"'</code></li>
    *  <li>Conditional or ternary operators, e.g. <code>[[test ? consequent : alternate]]</code>.</li>
    *  <li>Optional chaining operators, e.g. <code>[[a?.b]]</code>.</li>
    *  <li>Array literals, e.g. <code>[a, b, c]</code>.</li>
@@ -71,12 +74,9 @@ define(['ojs/ojcspexpressionevaluator-internal', 'ojs/ojkoshared'], function (oj
    *  <li>Assignment operators of any types such as <code>'='</code> or <code>'+='</code> or <code>'|='</code></li>
    *  <li>Blocks of code such as <code>'if (...){}'</code></li>
    *  <li>Comma operator (,) such as <code>'(expr1, expr2)'</code></li>
-   *  <li>Exponentiation (**) such as <code>' 3 ** 4'</code></li>
    *  <li>in operator such as <code>'prop in testObject'</code></li>
    *  <li>Increment/decrement operators such as <code>'x++'</code> or <code>'x--'</code></li>
    *  <li>Inline regular expressions such as <code>'testString.match(/abc/i)'</code></li>
-   *  <li>Instanceof or typeof operators such as <code>'date instanceof Date'</code></li>
-   *  <li>Nullish coalescing operator (??) such as <code>'value ?? "default value"'</code></li>
    *  <li>Spread operator (...) such as <code>'sum(...arrayValue)'</code></li>
    * <ul>
    * </h2>

package/dist/js/libs/oj/debug/ojcustomelement-utils.js

@@ -347,6 +347,9 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojcustomelement-registry', 'ojs/ojcon
             }
             return true;
         }
+        static cleanComponentBindings(element) {
+            CustomElementUtils.getElementState(element)?.getBindingProviderCleanNode()(element);
+        }
         static getClassSet(strClass) {
             if (strClass) {
                 const arClasses = strClass.split(/\s+/).filter((cls) => cls.length > 0);

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

@@ -2412,9 +2412,10 @@ var __oj_data_grid_metadata =
    * @param {string=} arg2 - key to extract in the value of object[arg1]
    * @param {string=} arg3 - key to extract in the value of object[arg1][arg2]
    * @param {string=} arg4 - key to extract in the value of object[arg1][arg2][arg3]
+   * @param {string=} arg5 - key to extract in the value of object[arg1][arg2][arg3][arg4]
    * @return {string|number|Object|boolean|null}
    */
-  DvtDataGridOptions.prototype.extract = function (arg1, arg2, arg3, arg4) {
+  DvtDataGridOptions.prototype.extract = function (arg1, arg2, arg3, arg4, arg5) {
     if (arg1 != null) {
       var val1 = this.options[arg1];
       if (arg2 != null && val1 != null) {
@@ -2422,7 +2423,11 @@ var __oj_data_grid_metadata =
         if (arg3 != null && val2 != null) {
           var val3 = val2[arg3];
           if (arg4 != null && val3 != null) {
-            return val3[arg4];
+            var val4 = val3[arg4];
+            if (arg5 != null && val4 != null) {
+              return val4[arg5];
+            }
+            return val4;
           }
           return val3;
         }
@@ -2884,10 +2889,13 @@ var __oj_data_grid_metadata =
     if (axis === 'cell') {
       v = this.extract('cell', 'alignment', property);
     } else if (label) {
-      v = this.getRawProperty('alignment', axis, label)[property];
+      v = this.extract('header', axis, 'label', 'alignment', property);
     } else {
       v = this.extract('header', axis, 'alignment', property);
     }
+    if (v == null) {
+      v = 'auto';
+    }
     if (obj != null) {
       return this.evaluate(v, obj);
     }
@@ -19204,6 +19212,7 @@ var __oj_data_grid_metadata =
     for (let i = 0; i < sections.length; i++) {
       headers.push(...sections[i].getElementsByClassName(className));
     }
+
     for (var i = 0; i < headers.length; i++) {
       var header = headers[i];
       var headerKey = this._getKey(header);
@@ -22013,7 +22022,7 @@ var __oj_data_grid_metadata =
             let i = 1;
             while (newElement != null && this.isHeaderHidden(newElement)) {
               newIndex = index - 1 - i;
-              newElement = this._getHeaderByIndex(newIndex - 1, axis, level);
+              newElement = this._getHeaderByIndex(newIndex, axis, level);
               i += 1;
             }
             newIndex =
@@ -39903,8 +39912,8 @@ var __oj_data_grid_metadata =
        * @instance
        * @property {'columnHeaderHeight' | 'columnEndHeaderHeight' | 'rowHeaderWidth' | 'rowEndHeaderWidth'| 'columnWidth' | 'rowHeight'} dimension the dimension for which resize is occurring
        * @property {number} size the new size of the cell with direction implied for which resize is occurring
-       * @property {Array<number>| undefined} level the level of the cell for which resize is occurring (only set if dimension = 'columnWidth' | 'rowHeight')
-       * @property {Array<number> | undefined} indices array of indexs for which resize is occurring (only set if dimension = 'columnHeaderHeight' | 'columnEndHeaderHeight' | 'rowHeaderWidth' | 'rowEndHeaderWidth'| 'columnWidth')
+       * @property {Array<number>| undefined} levels array of levels of the header / header label for which resize is occurring (only set if dimension = 'columnHeaderHeight' | 'columnEndHeaderHeight' | 'rowHeaderWidth' | 'rowEndHeaderWidth')
+       * @property {Array<number> | undefined} indices array of indexes for which resize is occurring (only set if dimension = 'columnWidth' | 'rowHeight')
        */
       cellResize: null,
 
@@ -42995,17 +43004,19 @@ var __oj_data_grid_metadata =
         this.getMappedStyle('endheadercell')
       );
       if (!isEndHeader) {
-        if (!headersUnderLevel[headerLevel]) {
-          headersUnderLevel[headerLevel] = [];
-        }
         if ((headerLevelCount > 1 && headerLevel >= level) || headerLevelCount === 1) {
+          // assign array only if the headerLevel conditions are met. JET-65934
+          if (!headersUnderLevel[headerLevel]) {
+            headersUnderLevel[headerLevel] = [];
+          }
           headersUnderLevel[headerLevel].push(headers[i]);
         }
       } else if (isEndHeader) {
-        if (!endHeadersUnderLevel[headerLevel]) {
-          endHeadersUnderLevel[headerLevel] = [];
-        }
         if ((endHeaderLevelCount > 1 && headerLevel >= level) || endHeaderLevelCount === 1) {
+          // assign array only if the headerLevel conditions are met. JET-65934
+          if (!endHeadersUnderLevel[headerLevel]) {
+            endHeadersUnderLevel[headerLevel] = [];
+          }
           endHeadersUnderLevel[headerLevel].push(headers[i]);
         }
       }
@@ -45293,7 +45304,7 @@ var __oj_data_grid_metadata =
           'row'
         );
         if (this.m_endRowHeader !== -1 && headers && Object.keys(headers).length) {
-          headers = headers[0];
+          headers = headers[Object.keys(headers)];
           header = headers[headers.length - 1];
         } else if (this.m_endRowEndHeader !== -1 && endHeaders && Object.keys(endHeaders).length) {
           endHeaders = endHeaders[0];
@@ -45388,7 +45399,7 @@ var __oj_data_grid_metadata =
           'column'
         );
         if (this.m_endColHeader !== -1 && headers && Object.keys(headers).length) {
-          headers = headers[0];
+          headers = headers[Object.keys(headers)];
           header = headers[headers.length - 1];
         } else if (this.m_endColEndHeader !== -1 && endHeaders && Object.keys(endHeaders).length) {
           endHeaders = endHeaders[0];
@@ -45848,7 +45859,7 @@ var __oj_data_grid_metadata =
       databodyFrozenColDirValue = this.getElementDir(this.m_databody, dir);
     }
     let databodyFrozenRowWidth = this.getElementWidth(this.m_databody);
-    if (this.m_databodyFrozenRow) {
+    if (this.m_databodyFrozenRow && this._hasFrozenRows()) {
       databodyFrozenRowWidth = this.getElementWidth(this.m_databodyFrozenRow);
     }
 
@@ -46060,7 +46071,7 @@ var __oj_data_grid_metadata =
       databodyFrozenRowTop = this.getElementDir(this.m_databody, 'top');
     }
     let databodyFrozenColHeight = this.getElementHeight(this.m_databody);
-    if (this.m_databodyFrozenCol) {
+    if (this.m_databodyFrozenCol && this._hasFrozenColumns()) {
       databodyFrozenColHeight = this.getElementHeight(this.m_databodyFrozenCol);
     }
 
@@ -46445,7 +46456,7 @@ var __oj_data_grid_metadata =
     let frozenColWidth = this.getElementWidth(this.m_databodyFrozenCol);
     let databodyFrozenRowWidth = this.getElementWidth(this.m_databody);
 
-    if (this.m_databodyFrozenRow) {
+    if (this.m_databodyFrozenRow && this._hasFrozenRows()) {
       databodyFrozenRowWidth = this.getElementWidth(this.m_databodyFrozenRow);
     }
     const databodyFrozenColDirValue = this.getElementDir(this.m_databodyFrozenCol, dir);
@@ -46645,7 +46656,7 @@ var __oj_data_grid_metadata =
     let databodyFrozenRowTop = this.getElementDir(this.m_databodyFrozenRow, 'top');
 
     let databodyFrozenColHeight = this.getElementHeight(this.m_databody);
-    if (this.m_databodyFrozenCol) {
+    if (this.m_databodyFrozenCol && this._hasFrozenColumns()) {
       databodyFrozenColHeight = this.getElementHeight(this.m_databodyFrozenCol);
     }
 
@@ -46656,8 +46667,8 @@ var __oj_data_grid_metadata =
     let frozenCornerCells = [];
 
     let { headers, endHeaders } = this._getRowHeadersToUnFreeze(index + 1);
-    let headerShiftStartIndex = this.m_columnHeaderLevelCount > 1 ? frozenIndex + 1 : index + 1;
-    let endHeaderShiftStartIndex = this.m_columnEndHeaderLevelCount > 1 ? frozenIndex + 1 : index + 1;
+    let headerShiftStartIndex = this.m_rowHeaderLevelCount > 1 ? frozenIndex + 1 : index + 1;
+    let endHeaderShiftStartIndex = this.m_rowEndHeaderLevelCount > 1 ? frozenIndex + 1 : index + 1;
 
     let startLoop = 0;
     if (this._hasFrozenColumns()) {
@@ -46837,7 +46848,7 @@ var __oj_data_grid_metadata =
           headers.push(...indexHeaders);
         }
       } else {
-        for (let j = startIndex; j < this.m_frozenColIndex; ) {
+        for (let j = startIndex; j <= this.m_frozenColIndex; ) {
           let container = this._getHeaderContainer(
             j,
             0,
@@ -46857,7 +46868,7 @@ var __oj_data_grid_metadata =
           endHeaders.push(...indexHeaders);
         }
       } else {
-        for (let j = startIndex; j < this.m_frozenColIndex; ) {
+        for (let j = startIndex; j <= this.m_frozenColIndex; ) {
           let container = this._getHeaderContainer(
             j,
             0,
@@ -46884,7 +46895,7 @@ var __oj_data_grid_metadata =
           headers.push(...indexHeaders);
         }
       } else {
-        for (let j = startIndex; j < this.m_frozenRowIndex; ) {
+        for (let j = startIndex; j <= this.m_frozenRowIndex; ) {
           let container = this._getHeaderContainer(
             j,
             0,
@@ -46905,7 +46916,7 @@ var __oj_data_grid_metadata =
           endHeaders.push(...indexHeaders);
         }
       } else {
-        for (let j = startIndex; j < this.m_frozenRowIndex; ) {
+        for (let j = startIndex; j <= this.m_frozenRowIndex; ) {
           let container = this._getHeaderContainer(
             j,
             0,

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

@@ -2156,6 +2156,7 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojdatacoll
   };
 
   IteratingDataProviderContentHandler.LOAD_MORE_SKELETONS_ROW_COUNT = 3;
+  IteratingDataProviderContentHandler.MAX_SKELETON_COLUMN = 10;
 
   /**
    * Adjust the load more skeleton in the case of component resize/reattach
@@ -2261,7 +2262,10 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojdatacoll
     var lastItem = this.m_root.lastElementChild;
     var cardWidthWithMargin = cardDim.width + this.getMargin();
     var width = this._getRootElementWidth(true);
-    var count = Math.floor((width - lastItem.offsetLeft - cardWidthWithMargin) / cardWidthWithMargin);
+    var count = Math.min(
+      IteratingDataProviderContentHandler.MAX_SKELETON_COLUMN,
+      Math.floor((width - lastItem.offsetLeft - cardWidthWithMargin) / cardWidthWithMargin)
+    );
     if (count > 0) {
       var container = this._renderSkeletons(count);
       container.style.visibility = 'hidden';
@@ -2281,7 +2285,13 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojdatacoll
       var cardDimension = this._getCardDimension();
       var cardWidth =
         cardDimension === undefined ? this.getDefaultSkeletonDimension().width : cardDimension.width;
-      count = cardWidth === 0 ? 0 : Math.floor(width / (cardWidth + this.getMargin()));
+      count =
+        cardWidth === 0
+          ? 0
+          : Math.min(
+              IteratingDataProviderContentHandler.MAX_SKELETON_COLUMN,
+              Math.floor(width / (cardWidth + this.getMargin()))
+            );
     } else {
       count = IteratingDataProviderContentHandler.LOAD_MORE_SKELETONS_ROW_COUNT;
     }

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

@@ -1220,7 +1220,8 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas', 'ojs/ojkeyboa
       }
 
       DvtDiagramLink._renderLinkLabels(diagram, this.getData(), this);
-      this.setAriaRole('img');
+      //JET-63792 OATB Structure error - Nested
+      this.setAriaRole(this._getCustomRenderer('renderer') ? 'region' : 'img');
       this.UpdateAriaLabel();
       this._diagram.getEventManager().associate(this, this);
     }
@@ -3491,7 +3492,9 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas', 'ojs/ojkeyboa
       DvtDiagramNode._renderNodeLabels(this._diagram, nodeData, this);
       this._setDraggableStyleClass();
       DvtDiagramNode._renderContainerButton(this._diagram, nodeData, this);
-      this.setAriaRole(this.isDisclosed() ? 'group' : 'img');
+      //JET-63792 OATB Structure error - Nested
+      var disclosedRole = renderer ? 'region' : 'img';
+      this.setAriaRole(this.isDisclosed() ? 'group' : disclosedRole);
       this.UpdateAriaLabel();
       this._diagram.getEventManager().associate(this, this);
     }
@@ -4154,10 +4157,10 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas', 'ojs/ojkeyboa
      * @protected
      * Updates accessibility attributes on selection event
      */
-    UpdateAriaLabel() {
-      if (!dvt.Agent.deferAriaCreation()) {
+    UpdateAriaLabel(bForce) {
+      if (!dvt.Agent.deferAriaCreation() || bForce) {
         var desc = this.getAriaLabel();
-        if (desc) this.setAriaProperty('label', desc);
+        if (desc) this.setAriaProperty('label', desc, bForce);
       }
     }
 
@@ -5800,6 +5803,21 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas', 'ojs/ojkeyboa
       if (!this._component.isPanning()) super.ShowFocusEffect(event, obj);
     }
 
+    /**
+     * @override
+     */
+    setFocus(navigable) {
+      super.setFocus(navigable);
+      var prevItem = this._component.getOptions().currentItem;
+      var currentItem = navigable ? navigable.getId() : prevItem;
+      this._component.getOptions().currentItem = currentItem;
+      if (!DvtDiagramDataUtils.compareValues(this._component.getCtx(), currentItem, prevItem)) {
+        this._component.dispatchEvent(
+          new dvt.EventFactory.newOptionChangeEvent('currentItem', currentItem)
+        );
+      }
+    }
+
     /**
      * @override
      */
@@ -10515,6 +10533,20 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas', 'ojs/ojkeyboa
       var calcViewBounds;
       if (!bEmptyDiagram) {
         this.removeChild(this._oldPanZoomCanvas);
+
+        var options = this.getOptions();
+        // If current item is invalid on initial render, null it out
+        // This matches ListView's current behavior
+        if (
+          this._renderCount === 1 &&
+          options.currentItem !== null &&
+          !this.getObjectById(options.currentItem)
+        ) {
+          this.dispatchEvent(new dvt.EventFactory.newOptionChangeEvent('currentItem', null));
+        } else {
+          this.setCurrentItem(options.currentItem);
+        }
+
         this._processHighlighting();
         this._processInitialSelections();
         this._updateKeyboardFocusEffect();
@@ -10606,6 +10638,23 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas', 'ojs/ojkeyboa
       }
     }
 
+    /**
+     * Sets the currentItem
+     * @param { string|number } item id of the current item
+     */
+    setCurrentItem(item, forceDefault) {
+      var navigable = this.getObjectById(item);
+      if (!navigable && forceDefault) {
+        var arNodes = this.GetRootNodeObjects();
+        if (arNodes.length > 0) {
+          navigable = this.getEventManager().getKeyboardHandler().getDefaultNavigable(arNodes);
+        }
+      }
+      if (navigable || item == null) {
+        this.getEventManager().setFocus(navigable);
+      }
+    }
+
     /**
      * Fit and position diagram content into container if necessary
      * @param {Object} panZoomState optional the panZoomState to set the diagram to.
@@ -11130,6 +11179,15 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas', 'ojs/ojkeyboa
       return this._links.get(id);
     }
 
+    /**
+     * Gets a node or link by id
+     * @param {string} id node or link id
+     * @return {DvtDiagramNode|DvtDiagramLink} diagram node or link
+     */
+    getObjectById(id) {
+      return this.getNodeById(id) || this.getLinkById(id);
+    }
+
     /**
      * Gets an array of link ids
      * @return {array} array of link ids
@@ -11821,6 +11879,11 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas', 'ojs/ojkeyboa
         } else {
           this.render(this.getOptions(), this.Width, this.Height);
           this.dispatchEvent(new dvt.EventFactory.newEvent('expand', nodeId));
+          // JET-50126 JAWS, Container expand collapse state not read out consistently
+          var displayable = this.getNodeById(nodeId).getDisplayable();
+          displayable.setAriaRole('group', true);
+          displayable.UpdateAriaLabel(true);
+          this.getEventManager().getCtx().setActiveElement(displayable, true);
         }
       }
     }
@@ -11852,6 +11915,15 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas', 'ojs/ojkeyboa
       if (triggerEvent) {
         this.render(this.getOptions(), this.Width, this.Height);
         this.dispatchEvent(new dvt.EventFactory.newEvent('collapse', nodeId));
+        // JET-50126 JAWS, Container expand collapse state not read out consistently
+        var displayable = this.getNodeById(nodeId).getDisplayable();
+        displayable.setAriaRole('img', true);
+        displayable.UpdateAriaLabel(true);
+        this.getEventManager().getCtx().setActiveElement(displayable, true);
+        var currentItem = this.getOptions().currentItem;
+        if (!this.getObjectById(currentItem)) {
+          this.setCurrentItem(null, true);
+        }
       }
     }
 

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

@@ -39,6 +39,10 @@ var __oj_diagram_metadata =
       "type": "string",
       "value": ""
     },
+    "currentItem": {
+      "type": "any",
+      "writeback": true
+    },
     "data": {
       "type": "object",
       "extension": {
@@ -1314,7 +1318,20 @@ var __oj_diagram_link_metadata =
        * myDiagram.animationOnDisplay="auto";
        */
       animationOnDisplay: 'none',
-
+      /**
+       * The node or link that should receive focus.  Note that if the current item is set to something invalid or to
+       * something hidden inside a collapsed parent node, then the value is not applied.
+       * @ojshortdesc Specifies the node or link that should receive focus.
+       * @expose
+       * @name currentItem
+       * @memberof oj.ojDiagram
+       * @instance
+       * @type {any=}
+       * @ojsignature {target:"Type", value:"K1|K2"}
+       * @default null
+       * @ojwriteback
+       */
+      currentItem: null,
       /**
        * Provides support for HTML5 Drag and Drop events. Please refer to <a href="https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Drag_and_drop">third party documentation</a> on HTML5 Drag and Drop to learn how to use it.
        * @ojshortdesc Used to customize the drag and drop features.
@@ -3961,13 +3978,16 @@ var __oj_diagram_link_metadata =
     },
 
     _GetOptimizedOptions: function () {
-      return this._super().concat('panZoomState');
+      return this._super().concat(['panZoomState', 'currentItem']);
     },
 
     _UpdateNoRenderOptions: function (options) {
       if (options.panZoomState !== undefined) {
         this._component.panZoom(options.panZoomState);
       }
+      if (options.currentItem !== undefined) {
+        this._component.setCurrentItem(options.currentItem);
+      }
       this._super(options);
     },
 
@@ -4237,6 +4257,24 @@ var __oj_diagram_link_metadata =
       this._super(options);
     },
 
+    /**
+     * Gets the current item.
+     * @private
+     * @memberof oj.ojDiagram
+     */
+    _getCurrentItem: function () {
+      return this._component.getOptions().currentItem;
+    },
+
+    /**
+     * Handles data deletion of the current item.
+     * @private
+     * @memberof oj.ojDiagram
+     */
+    _handleRemoveCurrentItem: function () {
+      return this._component.setCurrentItem(null, true);
+    },
+
     /**
      * Resets the panZoom state if the beforePanZoomReset event is not veto'd
      * @ignore

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

@@ -3992,6 +3992,7 @@ define(['ojs/ojpopupcore', 'ojs/ojbutton', 'jqueryui-amd/widgets/mouse', 'jquery
         var element = this.element;
         var status = oj.ZOrderUtils.getStatus(element);
         if (status === oj.ZOrderUtils.STATUS.OPEN) {
+          ojcustomelementUtils.CustomElementUtils.cleanComponentBindings(element[0]);
           element.remove();
         }
       },