@oracle/oraclejet 11.0.6 → 11.1.1

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

@@ -111,7 +111,22 @@ define(['ojs/ojcore-base', 'ojs/ojmap', 'ojs/ojset', 'ojs/ojdataprovider', 'ojs/
 
     /**
      * @typedef {Object} ArrayDataProvider.Options
-     * @property {ArrayDataProvider.SortComparators=} sortComparators - Optional sortComparator to use for sort.
+     * @property {ArrayDataProvider.SortComparators=} sortComparators - Optional sortComparator for custom sort.
+     * <p>
+     * Sort follows JavaScript's localeCompare <code>{numeric: true}</code>.
+     * Please check {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare#numeric_sorting|String.prototype.localeCompare()} for details.
+     * </p>
+     * <p>
+     * For numbers, we convert them into strings then compare them with localeCompare.
+     * If you want to sort floating point numbers correctly, sortComparator can be used to do a custom sort.
+     * </p>
+     * <p>
+     * For null and undefined values, we convert them into string which is 'null' and 'undefined'.
+     * The sorting behavior for undefined and null values will be changed in version 12.0.0.
+     * </p>
+     * <p>
+     * In version 12.0.0, null and undefined values will be considered as the largest values during sorting.
+     * </p>
      * @property {SortCriterion=} implicitSort - Optional array of {@link SortCriterion} used to specify sort information when the data loaded into the dataprovider is already sorted.
      * This is used for cases where we would like display some indication that the data is already sorted.
      * For example, ojTable will display the column sort indicator for the corresponding column in either ascending or descending order upon initial render.
@@ -138,6 +153,48 @@ define(['ojs/ojcore-base', 'ojs/ojmap', 'ojs/ojset', 'ojs/ojdataprovider', 'ojs/
      *  {target: "Type", value: "string | string[]", for: "keyAttributes"},
      *  {target: "Type", value: "string[]", for: "textFilterAttributes"},
      * ]
+     * @ojtsexample <caption>Examples for sortComparator</caption>
+     * // Custom comparator for date
+     * let comparator = function (a, b) {
+     *    if (a === b) {
+     *      return 0;
+     *    }
+     *
+     *    var dateA = new Date(a).getTime();
+     *    var dateB = new Date(b).getTime();
+     *    return dateA > dateB ? 1 : -1;
+     * };
+     * // Then create an ArrayDataProvider object and set Date field to use the this comparator
+     * this.dataprovider = new ArrayDataProvider(JSON.parse(deptArray), {
+     *    keyAttributes: "DepartmentId",
+     *    sortComparators: { comparators: new Map().set("Date", comparator) },
+     * });
+     * @ojtsexample
+     * // Custom comparator for number
+     * let comparator = function (a, b) {
+     *    return a - b;
+     *  };
+     * // Then create an ArrayDataProvider object and set Date field to use the this comparator
+     * this.dataprovider = new ArrayDataProvider(JSON.parse(deptArray), {
+     *    keyAttributes: "DepartmentId",
+     *    sortComparators: { comparators: new Map().set("Date", comparator) },
+     * });
+     * @ojtsexample
+     * // Custom comparator for numnbers with null/undefined
+     * let comparator = function (a, b) {
+     *     if (a === null || a === undefined) {
+     *       return 1;
+     *     }
+     *     if (b === null || b === undefined) {
+     *       return -1;
+     *     }
+     *     return a - b;
+     *  };
+     * // Then create an ArrayDataProvider object and set Date field to use the this comparator
+     * this.dataprovider = new ArrayDataProvider(JSON.parse(deptArray), {
+     *    keyAttributes: "DepartmentId",
+     *    sortComparators: { comparators: new Map().set("Date", comparator) },
+     * });
      */
 
     /**

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

@@ -5,11 +5,10 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap', 'ojs/ojset', 'ojs/ojcomponentcore'], function (oj, ojdataprovider, ojeventtarget, ojMap, ojSet, ojcomponentcore) { 'use strict';
+define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap', 'ojs/ojcomponentcore'], function (oj, ojdataprovider, ojeventtarget, ojMap, ojcomponentcore) { 'use strict';
 
     oj = oj && Object.prototype.hasOwnProperty.call(oj, 'default') ? oj['default'] : oj;
     ojMap = ojMap && Object.prototype.hasOwnProperty.call(ojMap, 'default') ? ojMap['default'] : ojMap;
-    ojSet = ojSet && Object.prototype.hasOwnProperty.call(ojSet, 'default') ? ojSet['default'] : ojSet;
 
     /**
      * @preserve Copyright 2013 jQuery Foundation and other contributors
@@ -613,7 +612,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                     this._baseIterator = _baseIterator;
                     this._params = _params;
                     this.firstBaseKey = null;
-                    this.mergedAddKeySet = new ojSet();
+                    this.mergedAddKeySet = new Set();
                     this.mergedItemArray = [];
                     this.nextOffset = 0;
                     if (this._params == null) {
@@ -678,7 +677,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
         }
         _fetchByKeysFromBuffer(params) {
             const results = new ojMap();
-            const unresolvedKeys = new ojSet();
+            const unresolvedKeys = new Set();
             params.keys.forEach((key) => {
                 const editItem = this.editBuffer.getItem(key);
                 if (editItem) {
@@ -787,7 +786,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                     else {
                         sortCriteria = params.sortCriteria;
                     }
-                    this._mergeEdits(baseItemArray, newItemArray, params.filterCriterion, sortCriteria, params.offset === 0, new ojSet(), baseResults.done);
+                    this._mergeEdits(baseItemArray, newItemArray, params.filterCriterion, sortCriteria, params.offset === 0, new Set(), baseResults.done);
                     let actualReturnSize = newItemArray.length;
                     for (const newItem of newItemArray) {
                         if (this._isItemRemoved(newItem.metadata.key)) {
@@ -825,7 +824,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
         containsKeys(params) {
             const bufferResult = this._fetchByKeysFromBuffer(params);
             const unresolvedKeys = bufferResult.unresolvedKeys;
-            const results = new ojSet();
+            const results = new Set();
             bufferResult.results.forEach((value, key) => {
                 results.add(key);
             });
@@ -973,7 +972,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
             const detail = {
                 add: {
                     data: [item.data],
-                    keys: new ojSet().add(item.metadata.key),
+                    keys: new Set().add(item.metadata.key),
                     metadata: [item.metadata],
                     addBeforeKeys: [addBeforeKey]
                 }
@@ -1021,7 +1020,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
             const detail = {
                 remove: {
                     data: item.data ? [item.data] : null,
-                    keys: new ojSet().add(item.metadata.key),
+                    keys: new Set().add(item.metadata.key),
                     metadata: [item.metadata]
                 }
             };
@@ -1034,7 +1033,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
             const detail = {
                 update: {
                     data: [item.data],
-                    keys: new ojSet().add(item.metadata.key),
+                    keys: new Set().add(item.metadata.key),
                     metadata: [item.metadata]
                 }
             };
@@ -1061,10 +1060,10 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
         _addEventDetail(detail, detailType, detailItem, detailAddBeforeKey) {
             if (detail[detailType] == null) {
                 if (detailType === 'add') {
-                    detail[detailType] = { data: [], keys: new ojSet(), metadata: [], addBeforeKeys: [] };
+                    detail[detailType] = { data: [], keys: new Set(), metadata: [], addBeforeKeys: [] };
                 }
                 else {
-                    detail[detailType] = { data: [], keys: new ojSet(), metadata: [] };
+                    detail[detailType] = { data: [], keys: new Set(), metadata: [] };
                 }
             }
             detail[detailType].keys.add(detailItem.metadata.key);
@@ -1076,7 +1075,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
         }
         resetUnsubmittedItem(key) {
             const unsubmittedItems = this.editBuffer.getUnsubmittedItems();
-            const keySet = new ojSet();
+            const keySet = new Set();
             const editItemMap = new ojMap();
             const editItem = unsubmittedItems.get(key);
             if (editItem) {
@@ -1181,15 +1180,15 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
         }
         _initDetails(details, newDetails, bEmpty) {
             if (details.add) {
-                newDetails.add = { keys: new ojSet() };
+                newDetails.add = { keys: new Set() };
                 this._initDetail(details.add, newDetails.add, bEmpty, true);
             }
             if (details.remove) {
-                newDetails.remove = { keys: new ojSet() };
+                newDetails.remove = { keys: new Set() };
                 this._initDetail(details.remove, newDetails.remove, bEmpty);
             }
             if (details.update) {
-                newDetails.update = { keys: new ojSet() };
+                newDetails.update = { keys: new Set() };
                 this._initDetail(details.update, newDetails.update, bEmpty);
             }
         }
@@ -1258,7 +1257,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                                 this.lastSortCriteria.length === 0) {
                                 let removeDetail = newDetails.remove;
                                 if (!removeDetail) {
-                                    removeDetail = { keys: new ojSet(), data: [], metadata: [] };
+                                    removeDetail = { keys: new Set(), data: [], metadata: [] };
                                     newDetails.remove = removeDetail;
                                 }
                                 const submittingItem = submittingItems.get(key);
@@ -1272,7 +1271,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                                 newDetails.remove = removeDetail;
                                 let addDetail = newDetails.add;
                                 if (!addDetail) {
-                                    addDetail = { keys: new ojSet(), data: [], metadata: [], addBeforeKeys: [] };
+                                    addDetail = { keys: new Set(), data: [], metadata: [], addBeforeKeys: [] };
                                     newDetails.add = addDetail;
                                 }
                                 this._pushDetail(key, details.add, newDetails.add);
@@ -1307,7 +1306,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                                 this.lastSortCriteria.length) {
                                 let removeDetail = newDetails.remove;
                                 if (!removeDetail) {
-                                    removeDetail = { keys: new ojSet(), data: [], metadata: [] };
+                                    removeDetail = { keys: new Set(), data: [], metadata: [] };
                                     newDetails.remove = removeDetail;
                                 }
                                 const submittingItem = submittingItems.get(key);
@@ -1320,7 +1319,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                                 }
                                 let addDetail = newDetails.add;
                                 if (!addDetail) {
-                                    addDetail = { keys: new ojSet(), data: [], metadata: [], addBeforeKeys: [] };
+                                    addDetail = { keys: new Set(), data: [], metadata: [], addBeforeKeys: [] };
                                     newDetails.add = addDetail;
                                 }
                                 if (editItem) {
@@ -1348,7 +1347,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
         }
         _handleRefreshEvent(event) {
             const unsubmittedItems = this.editBuffer.getUnsubmittedItems();
-            const keySet = new ojSet();
+            const keySet = new Set();
             unsubmittedItems.forEach((editItem) => {
                 if (editItem.operation === 'remove' || editItem.operation === 'update') {
                     keySet.add(editItem.item.metadata.key);

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

@@ -17201,8 +17201,14 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-axis', 'ojs/ojlegend-toolkit'
     if (obj && obj.isDrillable && obj.isDrillable()) {
       var id = obj.getId();
       if (obj instanceof DvtChartObjPeer) {
-        this.FireEvent(dvt.EventFactory.newChartDrillEvent(id.id != null ? id.id : id, obj.getSeries(), obj.getGroup(), 'item'));
+        // when clicked on line and area instead of marker, chart fires seriesDrill
+        if (obj.getGroupIndex() === -1) {
+          this.FireEvent(dvt.EventFactory.newChartDrillEvent(id, obj.getSeries(), null, 'series'));
+        } else {
+          this.FireEvent(dvt.EventFactory.newChartDrillEvent(id.id != null ? id.id : id, obj.getSeries(), obj.getGroup(), 'item'));
+        }
       } else if (obj instanceof DvtChartPieSlice) {
+        // chart does not use DvtChartObjPeer for pieslice
         var subType = id.series === '_dvtOther' ? 'multiSeries' : 'item';
         this.FireEvent(dvt.EventFactory.newChartDrillEvent(id.id, id.series, id.group, subType));
       }

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

@@ -939,7 +939,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @ojshortdesc The CSS style object defining the style of the label.
    * @memberof! oj.ojChart.PieCenter
    * @type {Object=}
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", jsdocOverride: true}
    * @default {}
    */
   /**
@@ -1137,7 +1137,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @property {string} label The pieCenter label.
    * @property {number} totalValue The total of all values in the pie chart.
    * @property {Element} componentElement The chart element.
-   * @ojsignature [{target: "Type", value: "CSSStyleDeclaration=", for: "labelStyle", jsdocOverride: true}]
+   * @ojsignature [{target: "Type", value: "Partial<CSSStyleDeclaration>=", for: "labelStyle", jsdocOverride: true}]
    */
 
   /**
@@ -1302,6 +1302,9 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @property {number} index The zero-based index of the current item
    * @property {Object} data The data object for the current item
    * @property {any} key The key of the current item
+   * @ojsignature [{target:"Type", value:"<K = any,D = any>", for:"genericTypeParameters"},
+   * {target:"Type", value:"D", for:"data", jsdocOverride: true},
+   * {target:"Type", value:"K", for:"key", jsdocOverride: true}]
    */
 
    // Slots
@@ -2426,7 +2429,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @ojshortdesc The CSS style object defining the style of the legend text.
    * @memberof! oj.ojChart.Legend
    * @type {Object=}
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", jsdocOverride: true}
    * @default {}
    */
   /**
@@ -2470,7 +2473,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @ojshortdesc The CSS style object defining the style of the title.
    * @memberof! oj.ojChart.Legend
    * @type {Object=}
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", jsdocOverride: true}
    * @default {}
    */
   /**
@@ -2600,7 +2603,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @ojshortdesc The CSS inline style to apply to the whisker stems.
    * @memberof! oj.ojChart.BoxPlotDefaults
    * @type {Object=}
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", jsdocOverride: true}
    * @default {}
    */
   /**
@@ -2621,7 +2624,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @ojtypedefmember
    * @memberof! oj.ojChart.BoxPlotDefaults
    * @type {Object=}
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", jsdocOverride: true}
    * @default {}
    */
   /**
@@ -2650,7 +2653,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @ojtypedefmember
    * @memberof! oj.ojChart.BoxPlotDefaults
    * @type {Object=}
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", jsdocOverride: true}
    * @default {}
    */
 
@@ -3011,7 +3014,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @ojshortdesc The CSS style object defining the style of the data label. See the Help documentation for more information.
    * @memberof! oj.ojChart.StyleDefaults
    * @type {(Object|Array.<Object>)=}
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration|Array.<CSSStyleDeclaration>", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>|Array.<Partial<CSSStyleDeclaration>>", jsdocOverride: true}
    * @default null
    */
   /**
@@ -3035,7 +3038,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @ojshortdesc The CSS style object defining the style of the stack label.
    * @memberof! oj.ojChart.StyleDefaults
    * @type {Object=}
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", jsdocOverride: true}
    * @default {}
    */
   /**
@@ -3079,7 +3082,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @ojshortdesc The CSS style object defining the style of the labels in the tooltip.
    * @memberof! oj.ojChart.StyleDefaults
    * @type {Object=}
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", jsdocOverride: true}
    * @default {}
    */
   /**
@@ -3091,7 +3094,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @ojshortdesc The CSS style object defining the style of the values in the tooltip.
    * @memberof! oj.ojChart.StyleDefaults
    * @type {Object=}
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", jsdocOverride: true}
    * @default {}
    */
   /**
@@ -3386,7 +3389,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @property {string=} svgClassName The CSS style class to apply to the data item. The style class and inline style will override any other styling specified through the properties. For tooltips and hover interactivity, it's recommended to also pass a representative color to the item color attribute.
    * @property {Object=} svgStyle The inline style to apply to the data item. The style class and inline style will override any other styling specified through the properties. For tooltips and hover interactivity, it's recommended to also pass a representative color to the item color attribute. Only SVG CSS style properties are supported.
    * @property {number=} value The value of the data item.
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration", for: "svgStyle", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", for: "svgStyle", jsdocOverride: true}
    */
 
    // Slots
@@ -3457,7 +3460,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @property {Object=} svgStyle The inline style to apply to the reference object. The style class and inline style will override any other styling specified through the properties. Only SVG CSS style properties are supported.
    * @property {("area"|"line")=} type="line" The type of reference object being shown.
    * @property {number=} value The value of a reference line.
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration", for: "svgStyle", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", for: "svgStyle", jsdocOverride: true}
    */
 
   /**
@@ -3473,6 +3476,9 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @property {Object} data The data object for the current item.
    * @property {number} index The zero-based index of the current item.
    * @property {any} key The key of the current item.
+   * @ojsignature [{target:"Type", value:"<K = any,D = any>", for:"genericTypeParameters"},
+   * {target:"Type", value:"D", for:"data", jsdocOverride: true},
+   * {target:"Type", value:"K", for:"key", jsdocOverride: true}]
    */
 
   // METHOD TYPEDEFS
@@ -3663,7 +3669,7 @@ define(['ojs/ojcore-base', 'ojs/ojdvt-base', 'ojs/ojcomponentcore', 'jquery', 'o
    * @memberof! oj.ojSparkChartItem
    * @instance
    * @type {Object=}
-   * @ojsignature {target: "Type", value: "CSSStyleDeclaration", jsdocOverride: true}
+   * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", jsdocOverride: true}
    * @default {}
    *
    * @example <caption>Initialize the spark chart item with the
@@ -8361,7 +8367,7 @@ var __oj_spark_chart_item_metadata =
        * @memberof oj.ojSparkChart
        * @instance
        * @type {Object=}
-       * @ojsignature {target: "Type", value: "CSSStyleDeclaration", jsdocOverride: true}
+       * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", jsdocOverride: true}
        * @default {}
        *
        * @example <caption>Initialize the spark chart with the <code class="prettyprint">area-svg-style</code> attribute specified:</caption>
@@ -8407,7 +8413,7 @@ var __oj_spark_chart_item_metadata =
        * @memberof oj.ojSparkChart
        * @instance
        * @type {Object=}
-       * @ojsignature {target: "Type", value: "CSSStyleDeclaration", jsdocOverride: true}
+       * @ojsignature {target: "Type", value: "Partial<CSSStyleDeclaration>", jsdocOverride: true}
        * @default {}
        *
        * @example <caption>Initialize the spark chart with the <code class="prettyprint">svg-style</code> attribute specified:</caption>

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

@@ -1129,6 +1129,11 @@ var __oj_checkboxset_metadata =
       // attribute of the rendered chekcboxes, let's make sure the checkboxset
       // has an ID
           $element.uniqueId();
+          // Retrieve the tabindex from the container and store it in an instance variable.
+          // Also we need to remove the tabindex from the container so that it will not receive
+          // focus
+          this._externalTabIndex = this.element.attr('tabindex') || 0;
+          this.element.removeAttr('tabindex');
           // Async step that generates oj-option if DateProvider is used.
           // RadioCheckboxUtils will set this._optionsDataProvider, this._optionsDataListener
           // and this._optionsDataArray.
@@ -1166,7 +1171,7 @@ var __oj_checkboxset_metadata =
           if (this.options.readOnly) {
             let domElem = this.element[0];
             let wrapperDom = domElem.querySelector('.oj-checkboxset-wrapper');
-            wrapperDom.setAttribute('tabindex', 0);
+            wrapperDom.setAttribute('tabindex', this._externalTabIndex);
           }
           this._on(this._events);
           this._setup();
@@ -1417,6 +1422,9 @@ var __oj_checkboxset_metadata =
             // The value is needed for accessibiliy of the image used for the checkbox
             checkbox.setAttribute('value', ojoption.value);
             checkbox.setAttribute('id', checkboxId);
+            // Need to transfer the tabindex to the input element
+            // All the input element will have the same tabindex
+            checkbox.setAttribute('tabindex', this._externalTabIndex);
             // in readonly mode, if a option is selected, the <oj-option> will be surrounded by <label> tag
             // if a option is selected, we can set attribute for the previous label and there is no need to create a new label
             // if a option is not selected, we need to create a new label.
@@ -2063,7 +2071,7 @@ var __oj_checkboxset_metadata =
               var wrapperDom = this.element[0].querySelector('.oj-checkboxset-wrapper');
               var val = this.options.value;
               if (this.options.readOnly) {
-                wrapperDom.setAttribute('tabindex', 0);
+                wrapperDom.setAttribute('tabindex', this._externalTabIndex);
                 this.element.addClass('oj-read-only');
               } else {
                 // remove tabindex and role

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

@@ -3880,13 +3880,26 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
             }
 
             for (i = 0, j = removeAttr.length; i < j; i++) {
-              element.removeAttr(removeAttr[i]);
+              // csp error to removeAttribute('style') (which element.removeAttr will do),
+              // so instead set it to null
+              if (removeAttr[i] === 'style') {
+                element[0].style = null;
+              } else {
+                element.removeAttr(removeAttr[i]);
+              }
             }
 
             var attributeKeys = Object.keys(attributes);
             for (i = 0; i < attributeKeys.length; i++) {
               var attribute = attributeKeys[i];
-              element.attr(attribute, attributes[attribute].attr); // @HTMLUpdateOK
+              var emptyStyle = attribute === 'style' && attributes[attribute].attr === '';
+              if (!emptyStyle) {
+                element.attr(attribute, attributes[attribute].attr); // @HTMLUpdateOK
+              } else {
+                // csp error to setAttribute('style', '') (which element.attr will do),
+                // so instead set it to null
+                element[0].style = null;
+              }
             }
           }
         });

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

@@ -93,7 +93,7 @@ define(['require', 'exports', 'ojs/ojcore-base', 'ojL10n!ojtranslations/nls/ojtr
    * Changes the current locale
    * @method setLocale
    * @param {string} locale (language code and subtags separated by dash)
-   * @param {function(): void} callback this optional callback will be invoked when the framework is done loading
+   * @param {function(): void} [callback] this optional callback will be invoked when the framework is done loading
    * its translated resources and Locale Elements for the newly specified locale.
    * @return {undefined}
    * @export

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

@@ -191,6 +191,7 @@ define(['ojs/ojcore-base', 'ojs/ojlogger'], function (oj, Logger) { 'use strict'
    * <b>This constructor should never be invoked by the application code directly.</b>
    * @hideconstructor
    * @param {Element=} hostNode DOM element associated with this busy context
+   * @param {Context} context The oj.Context instance
    * @export
    * @constructor oj.BusyContext
    * @ojtsmodule
@@ -199,8 +200,8 @@ define(['ojs/ojcore-base', 'ojs/ojlogger'], function (oj, Logger) { 'use strict'
    * @since 2.1.0
    * @classdesc Framework service for querying the busy state of components on the page.
    */
-  const BusyContext = function (hostNode) {
-    this.Init(hostNode);
+  const BusyContext = function (hostNode, context) {
+    this.Init(hostNode, context);
   };
 
   oj.Object.createSubclass(BusyContext, oj.Object, 'oj.BusyContext');
@@ -255,13 +256,15 @@ define(['ojs/ojcore-base', 'ojs/ojlogger'], function (oj, Logger) { 'use strict'
 
   /**
    * @param {Element=} hostNode DOM element associated with this busy context
+   * @param {Context=} context The oj.Context object
    * @instance
    * @protected
    */
-  BusyContext.prototype.Init = function (hostNode) {
+  BusyContext.prototype.Init = function (hostNode, context) {
     BusyContext.superclass.Init.call(this);
 
     this._hostNode = hostNode;
+    this._context = context;
 
     /**
      * Busy states cache.
@@ -863,11 +866,9 @@ define(['ojs/ojcore-base', 'ojs/ojlogger'], function (oj, Logger) { 'use strict'
    * @return {oj.BusyContext} returns the nearest parent context
    */
   BusyContext.prototype._getParentBusyContext = function () {
-    if (this._hostNode) {
-      var parentContext = oj.Context.getContext(oj.Context.getParentElement(this._hostNode));
-      if (parentContext) {
-        return parentContext.getBusyContext();
-      }
+    var parentContext = this._context.getParentContext();
+    if (parentContext) {
+      return parentContext.getBusyContext();
     }
 
     return null;
@@ -1100,6 +1101,20 @@ define(['ojs/ojcore-base', 'ojs/ojlogger'], function (oj, Logger) { 'use strict'
     this._node = node;
   };
 
+  /**
+   * Get the parent context given the element
+   * @ignore
+   * @private
+   * @param {Element} element
+   * @return Context The parent context
+   */
+  Context.prototype.getParentContext = function () {
+    if (this._node) {
+      return Context.getContext(Context.getParentElement(this._node));
+    }
+    return null;
+  };
+
   /**
    * Returns the closest enclosing JET context for a node.
    * Any DOM element may be designated by the page author as a host of JET context.
@@ -1171,7 +1186,9 @@ define(['ojs/ojcore-base', 'ojs/ojlogger'], function (oj, Logger) { 'use strict'
    * @returns {oj.BusyContext} busy state context
    */
   Context.prototype.getBusyContext = function () {
-    if (!this._busyContext) { this._busyContext = new BusyContext(this._node); }
+    if (!this._busyContext) {
+      this._busyContext = new BusyContext(this._node, this);
+    }
 
     return this._busyContext;
   };
@@ -1220,7 +1237,7 @@ define(['ojs/ojcore-base', 'ojs/ojlogger'], function (oj, Logger) { 'use strict'
 
   /**
    * @ignore
-   * @public
+   * @private
    * @param {Element} element target
    * @return {Element} the logical parent of an element accounting for open popups
    * @memberof oj.Context

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

@@ -37,12 +37,12 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
      * @global
      * @member {string} version JET version numberr
      */
-    version: '11.0.6',
+    version: '11.1.1',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2021-09-29_09-41-08',
+    revision: '2021-10-20_11-25-28',
 
     // This function is only meant to be used outside the library, so quoting the name
     // to avoid renaming is appropriate
@@ -1875,8 +1875,11 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
       if (Array.isArray(obj1)) {
         return OjObject._compareArrayValues(obj1, obj2);
       } else if (obj1.constructor === Object) {
+        // create new Set for cyclic detection. This may also be passed in from
+        // __innerEquals
+        const set = arguments[2] || new Set();
         // for now invoke innerEquals and in the future if there are issues then resolve them
-        return OjObject.__innerEquals(obj1, obj2);
+        return OjObject.__innerEquals(obj1, obj2, set);
       } else if (obj1.valueOf && typeof obj1.valueOf === 'function') {
         // test cases for Boolean, String, Number, Date
         // Note if some future JavaScript constructors
@@ -1966,11 +1969,19 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
   };
 
 
-  OjObject.__innerEquals = function (obj1, obj2) {
+  OjObject.__innerEquals = function (obj1, obj2, set = new Set()) {
     if (obj1 === obj2) {
       return true;
     }
 
+    // Catch cyclic comparisons
+    if (set.has(obj1) || set.has(obj2)) {
+      Logger.warn('cyclic dependency detected', obj1, obj2);
+      return false;
+    }
+    set.add(obj1);
+    set.add(obj2);
+
     if (!(obj1 instanceof Object) || !(obj2 instanceof Object)) {
       return false;
     }
@@ -1997,7 +2008,7 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
             return false;
           }
 
-          if (!OjObject.compareValues(obj1[prop], obj2[prop])) {
+          if (!OjObject.compareValues(obj1[prop], obj2[prop], set)) {
             return false;
           }
         }