@syncfusion/ej2-navigations 29.2.4 → 29.2.5

package/dist/es6/ej2-navigations.es2015.js

@@ -2364,7 +2364,7 @@ let MenuBase = class MenuBase extends Component {
                     args.item.setAttribute('aria-expanded', 'false');
                     args.item.classList.add('e-menu-caret-icon');
                 }
-                if (this.isMenu && this.template) {
+                if (this.template) {
                     args.item.setAttribute('id', args.curData[args.fields.id].toString());
                     args.item.removeAttribute('data-uid');
                     if (args.item.classList.contains('e-level-1')) {
@@ -11789,8 +11789,9 @@ let TreeView = TreeView_1 = class TreeView extends Component {
                 const rippleIcons = select('.' + ICON, li);
                 this.removeHover();
                 this.setFocusElement(li);
-                if (this.showCheckBox && !li.classList.contains('e-disable')) {
-                    const checkWrapper = closest(target, '.' + CHECKBOXWRAP);
+                const isExpandCollapseIcon = classList.contains(EXPANDABLE) || classList.contains(COLLAPSIBLE);
+                if (this.showCheckBox && !li.classList.contains('e-disable') && !isExpandCollapseIcon) {
+                    const checkWrapper = this.checkOnClick ? select('.' + CHECKBOXWRAP, li) : closest(target, '.' + CHECKBOXWRAP);
                     if (!isNullOrUndefined(checkWrapper)) {
                         const checkElement = select('.' + CHECKBOXFRAME, checkWrapper);
                         this.validateCheckNode(checkWrapper, checkElement.classList.contains(CHECK), li, event.originalEvent);
@@ -12339,6 +12340,15 @@ let TreeView = TreeView_1 = class TreeView extends Component {
     }
     selectNode(li, e, multiSelect) {
         if (isNullOrUndefined(li) || (!this.allowMultiSelection && this.isActive(li) && !isNullOrUndefined(e))) {
+            if (this.checkOnClick) {
+                const checkboxElement = select(' .' + CHECKBOXFRAME, li);
+                if (!isNullOrUndefined(checkboxElement) && checkboxElement.classList.contains(CHECK)) {
+                    addClass([li], ACTIVE);
+                }
+                else {
+                    removeClass([li], ACTIVE);
+                }
+            }
             this.setFocusElement(li);
             return;
         }
@@ -12707,6 +12717,7 @@ let TreeView = TreeView_1 = class TreeView extends Component {
             }
         }
         this.changeState(checkWrap, isCheck ? 'uncheck' : 'check', e, true);
+        this.updateActiveClass(li, isCheck);
         if (this.autoCheck) {
             this.ensureChildCheckState(li);
             this.updateOldCheckedData([this.getNodeData(li)]);
@@ -12722,6 +12733,17 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         }
         this.nodeCheckedEvent(checkWrap, isCheck, e);
     }
+    updateActiveClass(liElement, checkStatus) {
+        if (this.showCheckBox && this.checkOnClick) {
+            if (checkStatus === 'check' || checkStatus === false) {
+                this.removeSelectAll();
+                addClass([liElement], ACTIVE);
+            }
+            else if (checkStatus === 'uncheck' || checkStatus === 'indeterminate' || checkStatus === true) {
+                removeClass([liElement], ACTIVE);
+            }
+        }
+    }
     /**
      * Update checkedNodes when UI interaction happens before the child node renders in DOM
      *
@@ -15761,6 +15783,9 @@ __decorate$8([
 __decorate$8([
     Property(false)
 ], TreeView.prototype, "showCheckBox", void 0);
+__decorate$8([
+    Property(false)
+], TreeView.prototype, "checkOnClick", void 0);
 __decorate$8([
     Property(true)
 ], TreeView.prototype, "autoCheck", void 0);