@oracle/oraclejet 11.0.6 → 11.1.1

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

@@ -4328,7 +4328,6 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
           var data = addEvent.data;
           var metadata = addEvent.metadata;
           var keys = [];
-          var afterKeys;
           var parentKeys = addEvent.parentKeys;
           var indexes = addEvent.indexes;
           var i = 0;
@@ -4365,21 +4364,18 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
               self._changeNodeToParent(parentItem);
             }
           });
-          // afterKeys is deprecated, but continue to support it until we can remove it.
-          // forEach can be called on both array and set.
-          var afterKeyIter = addEvent.addBeforeKeys ? addEvent.addBeforeKeys : addEvent.afterKeys;
-          if (afterKeyIter) {
-            afterKeys = [];
-            afterKeyIter.forEach(function (key) {
-              afterKeys.push(key);
-            });
-          }
-
+          const initialKeys = this._getAllTreeviewKeys();
+          const finalKeys = DataCollectionUtils.getAddEventKeysResult(initialKeys, addEvent, true);
           if (data != null && keys.length > 0 && data.length > 0 &&
             keys.length === data.length && (indexes == null || indexes.length === data.length)) {
             for (i = 0; i < data.length; i++) {
-              var index = (indexes == null) ? this._getIndex(afterKeys, i) + 1 : indexes[i];
               var parentKey = parentKeys[i];
+              var index = this._getInsertIndex(metadata[i].key, parentKey, finalKeys);
+              if (index === null) {
+                // cannot find index, skip this iteration
+                // eslint-disable-next-line no-continue
+                continue;
+              }
               var parentItem = this._getItemByKey(parentKey);
               var subtree;
               if (parentKey == null) {
@@ -4396,6 +4392,43 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
             }
           }
         },
+        _getInsertIndex: function (key, parentKey, finalKeys) {
+          let parent;
+          if (!parentKey) {
+             parent = this.element[0];
+          } else {
+             parent = this._getItemByKey(parentKey);
+          }
+          // bad parent key or do not have parentKey yet
+          // potnetially parent added out of order real gross
+          if (!parent) {
+             return null;
+          }
+          let finalKeysIndex = finalKeys.indexOf(key);
+          if (finalKeysIndex === -1) {
+            return null;
+          }
+          let childItems = this._getChildItems(parent);
+          // assume insert at end
+          let index = childItems.length;
+          for (let i = 0; i < childItems.length; i++) {
+             let child = childItems[i];
+             let childKey = this._getKey(child);
+             if (finalKeys.indexOf(childKey) > finalKeysIndex) {
+               index = i;
+               break;
+             }
+          }
+          return index;
+       },
+        _getAllTreeviewKeys: function () {
+          const keys = [];
+          const items = this._getItems();
+          for (let i = 0; i < items.length; i++) {
+            keys.push(this._getKey(items[i]));
+          }
+          return keys;
+        },
         handleModelChangeEvent: function (event) {
           var changeEvent = event.detail.update;
           var data = changeEvent.data;

package/dist/js/libs/oj/debug/ojvcomponent-template.js

@@ -5,7 +5,7 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevaluator', 'ojs/ojcustomelement-utils', 'preact', 'ojs/ojvcomponent-template', 'ojs/ojcontext', 'ojs/ojdataproviderhandler', 'ojs/ojbindpropagation'], function (exports, Logger, HtmlUtils, CspExpressionEvaluator, ojcustomelementUtils, preact, VComponentTemplate, Context, ojdataproviderhandler, ojbindpropagation) { 'use strict';
+define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevaluator', 'ojs/ojcustomelement-utils', 'preact', 'ojs/ojcontext', 'ojs/ojdataproviderhandler', 'ojs/ojbindpropagation'], function (exports, Logger, HtmlUtils, CspExpressionEvaluator, ojcustomelementUtils, preact, Context, ojdataproviderhandler, ojbindpropagation) { 'use strict';
 
     CspExpressionEvaluator = CspExpressionEvaluator && Object.prototype.hasOwnProperty.call(CspExpressionEvaluator, 'default') ? CspExpressionEvaluator['default'] : CspExpressionEvaluator;
     Context = Context && Object.prototype.hasOwnProperty.call(Context, 'default') ? Context['default'] : Context;
@@ -40,8 +40,8 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevalua
             }
         }
         render() {
-            return (preact.h(preact.Fragment, null, this.state.view && this.state.data
-                ? VComponentTemplate.executeFragment(null, this.state.view, this.state.data, this.forceUpdate.bind(this), this.props.bindingProvider)
+            return (preact.h(preact.Fragment, null, this.state.view && this.state.data && this.props.executeFragment
+                ? this.props.executeFragment(null, this.state.view, this.state.data, this.forceUpdate.bind(this), this.props.bindingProvider)
                 : null));
         }
     }
@@ -217,6 +217,8 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevalua
                         return this._createBindTemplateNode(engineContext, node);
                     case 'oj-defer':
                         return this._createDeferNode(engineContext, node);
+                    case 'template':
+                        return this._createTemplateWithRenderCallback(engineContext, node);
                 }
             }
             return null;
@@ -263,11 +265,41 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevalua
                 }
             }, [templateProps]);
         }
+        _createTemplateWithRenderCallback(engineContext, node) {
+            const templateAlias = node.getAttribute('data-oj-as');
+            const getAstFromCacheFunc = this._getAstViaCache.bind(this);
+            const evaluator = this._cspEvaluator;
+            const renderProp = {
+                key: 'render',
+                value: {
+                    type: 3,
+                    value: (itemContext) => {
+                        const ctx = Object.assign({}, engineContext[BINDING_CONTEXT], {
+                            $current: itemContext
+                        });
+                        if (templateAlias)
+                            ctx[templateAlias] = itemContext;
+                        const engineContextForRenderProp = {
+                            [BINDING_CONTEXT]: ctx,
+                            [BINDING_PROVIDER]: engineContext[BINDING_PROVIDER],
+                            [COMPONENT_ELEMENT]: engineContext[COMPONENT_ELEMENT],
+                            [UNWRAP_EXTRAS]: engineContext[UNWRAP_EXTRAS]
+                        };
+                        const templateAst = getAstFromCacheFunc(engineContextForRenderProp, node);
+                        return evaluator.evaluate(templateAst, { $context: ctx, $h: preact.h });
+                    }
+                }
+            };
+            let props = this._getElementProps(engineContext, node);
+            props.push(renderProp);
+            return this._createHFunctionCallNode('template', [{ type: 10, properties: props }]);
+        }
         _createDeferContent(engineContext, nodes, context) {
             const bindDomConfig = { view: nodes, data: context };
             const bindDomProps = {
                 config: Promise.resolve(bindDomConfig),
-                bindingProvider: engineContext[BINDING_PROVIDER]
+                bindingProvider: engineContext[BINDING_PROVIDER],
+                executeFragment: this.executeFragment.bind(this)
             };
             return preact.h(BindDom, bindDomProps);
         }
@@ -302,23 +334,7 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevalua
             ];
             let props = this._getElementProps(engineContext, node);
             props = props.concat(deferProps);
-            return {
-                type: 4,
-                callee: {
-                    type: 1,
-                    name: '$h'
-                },
-                arguments: [
-                    {
-                        type: 3,
-                        value: 'oj-defer'
-                    },
-                    {
-                        type: 10,
-                        properties: props
-                    }
-                ]
-            };
+            return this._createHFunctionCallNode('oj-defer', [{ type: 10, properties: props }]);
         }
         _createIfExpressionNode(engineContext, node) {
             if (!node.hasAttribute('test')) {
@@ -385,21 +401,10 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevalua
             const tagName = node.tagName;
             const localName = tagName.toLowerCase();
             const metadataProps = ojcustomelementUtils.CustomElementUtils.getPropertiesForElementTag(tagName);
-            return {
-                type: 4,
-                callee: {
-                    type: 1,
-                    name: '$h'
-                },
-                arguments: [
-                    {
-                        type: 3,
-                        value: localName
-                    },
-                    this._createPossiblyProvidedAndConsumedProperties(localName, engineContext, metadataProps, props),
-                    this._createAst(engineContext, Array.from(node.childNodes))
-                ]
-            };
+            return this._createHFunctionCallNode(localName, [
+                this._createPossiblyProvidedAndConsumedProperties(localName, engineContext, metadataProps, props),
+                this._createAst(engineContext, Array.from(node.childNodes))
+            ]);
         }
         _createPossiblyProvidedAndConsumedProperties(localTagName, engineContext, metadataProps, props) {
             const propertyObjectNode = {
@@ -494,29 +499,17 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevalua
                 {
                     key: 'bindingProvider',
                     value: { type: 3, value: engineContext[BINDING_PROVIDER] }
+                },
+                {
+                    key: 'executeFragment',
+                    value: { type: 3, value: this.executeFragment.bind(this) }
                 }
             ]);
         }
         _createComponentNode(engineContext, node, component, extraProps) {
             let props = this._getElementProps(engineContext, node);
             props = extraProps ? props.concat(extraProps) : props;
-            return {
-                type: 4,
-                callee: {
-                    type: 1,
-                    name: '$h'
-                },
-                arguments: [
-                    {
-                        type: 3,
-                        value: component
-                    },
-                    {
-                        type: 10,
-                        properties: props
-                    }
-                ]
-            };
+            return this._createHFunctionCallNode(component, [{ type: 10, properties: props }]);
         }
         _createPropertyNode(engineContext, key, value, postprocess) {
             return {
@@ -721,8 +714,8 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevalua
                             }
                         });
                         if (existingCallbackExpr && !callbackExprEvaluator) {
-                            callbackExprEvaluator = this._cspEvaluator.createEvaluator(existingCallbackExpr)
-                                .evaluate;
+                            callbackExprEvaluator =
+                                this._cspEvaluator.createEvaluator(existingCallbackExpr).evaluate;
                         }
                         const existingCallback = callbackExprEvaluator
                             ? callbackExprEvaluator([bindingContext, bindingContext.$data])
@@ -784,6 +777,22 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevalua
                 arguments: extaArgs ? _CONTEXT_PARAM.concat(extaArgs) : _CONTEXT_PARAM
             };
         }
+        _createHFunctionCallNode(elementName, extraArgs) {
+            return {
+                type: 4,
+                callee: {
+                    type: 1,
+                    name: '$h'
+                },
+                arguments: [
+                    {
+                        type: 3,
+                        value: elementName
+                    },
+                    ...extraArgs
+                ]
+            };
+        }
         _getAttribute(engineContext, key, value) {
             const expr = ojcustomelementUtils.AttributeUtils.getExpressionInfo(value).expr;
             return {

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

@@ -394,7 +394,7 @@ define(['exports', 'preact', 'ojs/ojvcomponent', 'ojs/ojcore-base', 'ojs/ojdatac
                     vnode.props['data-oj-key-type'] = 'number';
                 }
                 const styleClasses = this.getItemStyleClass(visible, x, y, this.newItemsTracker.has(key), initialFetch);
-                const classProp = vnode.props.className ? 'className' : 'class';
+                const classProp = vnode.props.class ? 'class' : 'className';
                 const currentClasses = vnode.props[classProp]
                     ? [vnode.props[classProp], ...styleClasses]
                     : styleClasses;
@@ -1083,7 +1083,7 @@ define(['exports', 'preact', 'ojs/ojvcomponent', 'ojs/ojcore-base', 'ojs/ojdatac
         _restoreCurrentItem(items) {
             if (this.currentKey != null) {
                 for (const curr of items) {
-                    if (this.contentHandler.getKey(curr) == this.currentKey) {
+                    if (curr.key == this.currentKey) {
                         const elem = curr.element;
                         this._setFocus(elem, false);
                         this.currentItem = elem;
@@ -1091,7 +1091,7 @@ define(['exports', 'preact', 'ojs/ojvcomponent', 'ojs/ojcore-base', 'ojs/ojdatac
                     }
                 }
                 if ((this.currentItem == null || this.currentItem.parentNode == null) && items.length > 0) {
-                    this.currentKey = this.contentHandler.getKey(items[0]);
+                    this.currentKey = items[0].key;
                     const elem = items[0].element;
                     this._setFocus(elem, false);
                     this.currentItem = elem;

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

@@ -112,7 +112,22 @@ import { warn } from 'ojs/ojlogger';
 
 /**
  * @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.
@@ -139,6 +154,48 @@ import { warn } from 'ojs/ojlogger';
  *  {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_esm/ojbufferingdataprovider.js

@@ -9,7 +9,6 @@ import oj from 'ojs/ojcore-base';
 import { FilterFactory, DataProviderMutationEvent, DataProviderRefreshEvent } from 'ojs/ojdataprovider';
 import { GenericEvent, EventTargetMixin } from 'ojs/ojeventtarget';
 import ojMap from 'ojs/ojmap';
-import ojSet from 'ojs/ojset';
 import 'ojs/ojcomponentcore';
 
 /**
@@ -614,7 +613,7 @@ class BufferingDataProvider {
                 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) {
@@ -679,7 +678,7 @@ class BufferingDataProvider {
     }
     _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) {
@@ -788,7 +787,7 @@ class BufferingDataProvider {
                 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)) {
@@ -826,7 +825,7 @@ class BufferingDataProvider {
     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);
         });
@@ -974,7 +973,7 @@ class BufferingDataProvider {
         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]
             }
@@ -1022,7 +1021,7 @@ class BufferingDataProvider {
         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]
             }
         };
@@ -1035,7 +1034,7 @@ class BufferingDataProvider {
         const detail = {
             update: {
                 data: [item.data],
-                keys: new ojSet().add(item.metadata.key),
+                keys: new Set().add(item.metadata.key),
                 metadata: [item.metadata]
             }
         };
@@ -1062,10 +1061,10 @@ class BufferingDataProvider {
     _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);
@@ -1077,7 +1076,7 @@ class BufferingDataProvider {
     }
     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) {
@@ -1182,15 +1181,15 @@ class BufferingDataProvider {
     }
     _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);
         }
     }
@@ -1259,7 +1258,7 @@ class BufferingDataProvider {
                             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);
@@ -1273,7 +1272,7 @@ class BufferingDataProvider {
                             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);
@@ -1308,7 +1307,7 @@ class BufferingDataProvider {
                             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);
@@ -1321,7 +1320,7 @@ class BufferingDataProvider {
                             }
                             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) {
@@ -1349,7 +1348,7 @@ class BufferingDataProvider {
     }
     _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_esm/ojchart-toolkit.js

@@ -17204,8 +17204,14 @@ DvtChartEventManager.prototype.processDrillEvent = function (obj) {
   if (obj && obj.isDrillable && obj.isDrillable()) {
     var id = obj.getId();
     if (obj instanceof DvtChartObjPeer) {
-      this.FireEvent(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(EventFactory.newChartDrillEvent(id, obj.getSeries(), null, 'series'));
+      } else {
+        this.FireEvent(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(EventFactory.newChartDrillEvent(id.id, id.series, id.group, subType));
     }