@syncfusion/ej2-navigations 17.2.55-1205479 → 17.3.14-96615

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

@@ -1,16 +1,16 @@
-import { Animation, Browser, ChildProperty, Collection, Complex, Component, Draggable, Droppable, Event, EventHandler, KeyboardEvents, L10n, NotifyPropertyChanges, Property, Touch, addClass, append, attributes, blazorTemplates, classList, closest, compile, createElement, detach, extend, formatUnit, getElement, getInstance, getUniqueID, getValue, isBlazor, isNullOrUndefined, isUndefined, isVisible, matches, remove, removeClass, resetBlazorTemplate, rippleEffect, select, selectAll, setStyleAttribute, setValue, updateBlazorTemplate } from '@syncfusion/ej2-base';
+import { Animation, Browser, ChildProperty, Collection, Complex, Component, Draggable, Droppable, Event, EventHandler, KeyboardEvents, L10n, NotifyPropertyChanges, Property, Touch, addClass, append, attributes, blazorTemplates, classList, closest, compile, createElement, detach, extend, formatUnit, getElement, getInstance, getRandomId, getUniqueID, getValue, isBlazor, isNullOrUndefined, isUndefined, isVisible, matches, remove, removeClass, resetBlazorTemplate, rippleEffect, select, selectAll, setStyleAttribute, setValue, updateBlazorTemplate } from '@syncfusion/ej2-base';
 import { ListBase } from '@syncfusion/ej2-lists';
 import { Popup, calculatePosition, createSpinner, fit, getScrollableParent, getZindexPartial, hideSpinner, isCollide, showSpinner } from '@syncfusion/ej2-popups';
 import { Button, createCheckBox, rippleMouseHandler } from '@syncfusion/ej2-buttons';
 import { DataManager, Query } from '@syncfusion/ej2-data';
 import { Input } from '@syncfusion/ej2-inputs';
 
-var __decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 const CLS_ROOT = 'e-hscroll';
 const CLS_RTL = 'e-rtl';
 const CLS_DISABLE = 'e-overlay';
@@ -194,7 +194,6 @@ let HScroll = class HScroll extends Component {
         let navLeftItem = this.createElement('div', { className: CLS_NAVLEFTARROW + ' ' + CLS_NAVARROW + ' e-icons' });
         navEle.appendChild(navLeftItem);
         nav.appendChild(navItem);
-        nav.setAttribute('tabindex', '0');
         element.appendChild(nav);
         element.insertBefore(navEle, element.firstChild);
         if (this.ieCheck) {
@@ -473,12 +472,12 @@ HScroll = __decorate([
     NotifyPropertyChanges
 ], HScroll);
 
-var __decorate$1 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __decorate$1 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 const CLS_ROOT$1 = 'e-vscroll';
 const CLS_RTL$1 = 'e-rtl';
 const CLS_DISABLE$1 = 'e-overlay';
@@ -899,12 +898,12 @@ VScroll = __decorate$1([
     NotifyPropertyChanges
 ], VScroll);
 
-var __decorate$2 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __decorate$2 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 const ENTER = 'enter';
 const ESCAPE = 'escape';
 const FOCUSED = 'e-focused';
@@ -951,6 +950,17 @@ __decorate$2([
 __decorate$2([
     Property('items')
 ], FieldSettings.prototype, "children", void 0);
+const REGX_IOS = /(ipad|iphone|ipod touch)/i;
+const REGX_BROWSER = {
+    OPERA: /(opera|opr)(?:.*version|)[ /]([\w.]+)/i,
+    EDGE: /(edge)(?:.*version|)[ /]([\w.]+)/i,
+    CHROME: /(chrome|crios)[ /]([\w.]+)/i,
+    PANTHOMEJS: /(phantomjs)[ /]([\w.]+)/i,
+    SAFARI: /(safari)[ /]([\w.]+)/i,
+    WEBKIT: /(webkit)[ /]([\w.]+)/i,
+    MSIE: /(msie|trident) ([\w.]+)/i,
+    MOZILLA: /(mozilla)(?:.*? rv:([\w.]+)|)/i
+};
 /**
  * Specifies menu items.
  */
@@ -1122,7 +1132,7 @@ let MenuBase = class MenuBase extends Component {
                     EventHandler.add(target, 'click', this.menuHeaderClickHandler, this);
                 }
                 else {
-                    if (Browser.isIos) {
+                    if (this.menuIos()) {
                         new Touch(target, { tapHold: this.touchHandler.bind(this) });
                     }
                     else {
@@ -1132,6 +1142,7 @@ let MenuBase = class MenuBase extends Component {
             }
             this.targetElement = target;
             if (!this.isMenu) {
+                EventHandler.add(this.targetElement, 'scroll', this.scrollHandler, this);
                 for (let parent of getScrollableParent(this.targetElement)) {
                     EventHandler.add(parent, 'scroll', this.scrollHandler, this);
                 }
@@ -1148,6 +1159,22 @@ let MenuBase = class MenuBase extends Component {
         this.wireKeyboardEvent(wrapper);
         this.rippleFn = rippleEffect(wrapper, { selector: '.' + ITEM });
     }
+    menuIos() {
+        return this.getValue('isIos', REGX_IOS);
+    }
+    getValue(key, regX) {
+        const browserDetails = typeof window !== 'undefined' ? window.browserDetails : {};
+        if (typeof navigator !== 'undefined' && navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1 && Browser.isTouch === true && !REGX_BROWSER.CHROME.test(navigator.userAgent)) {
+            browserDetails['isIos'] = true;
+            browserDetails['isDevice'] = true;
+            browserDetails['isTouch'] = true;
+            browserDetails['isPointer'] = true;
+        }
+        if ('undefined' === typeof browserDetails[`${key}`]) {
+            return browserDetails[`${key}`] = regX.test(Browser.userAgent);
+        }
+        return browserDetails[`${key}`];
+    }
     wireKeyboardEvent(element) {
         let keyConfigs = {
             downarrow: DOWNARROW,
@@ -1906,10 +1933,13 @@ let MenuBase = class MenuBase extends Component {
                 this.clickHandler(e);
             }
         }
+        else if (this.isMenu && this.showItemOnClick) {
+            this.removeLIStateByClass([FOCUSED], [wrapper].concat(this.getPopups()));
+        }
         if (this.isMenu) {
             if (!this.showItemOnClick && (trgt.parentElement !== wrapper && !closest(trgt, '.e-' + this.getModuleName() + '-popup'))
                 && (!cli || (cli && !this.getIndex(cli.id, true).length))) {
-                this.removeLIStateByClass([FOCUSED, SELECTED], [wrapper]);
+                this.removeLIStateByClass([FOCUSED], [wrapper]);
                 if (this.navIdx.length) {
                     this.isClosed = true;
                     this.closeMenu(null, e);
@@ -1971,6 +2001,9 @@ let MenuBase = class MenuBase extends Component {
         return false;
     }
     menuHeaderClickHandler(e) {
+        if (closest(e.target, '.e-menu-wrapper').querySelector('ul.e-menu-parent').id !== this.element.id) {
+            return;
+        }
         this.element.classList.contains('e-hide-menu') ? this.openHamburgerMenu(e) : this.closeHamburgerMenu(e);
     }
     clickHandler(e) {
@@ -1981,9 +2014,16 @@ let MenuBase = class MenuBase extends Component {
             let wrapper = this.getWrapper();
             let trgt = e.target;
             let cli = this.cli = this.getLI(trgt);
+            let regex = new RegExp('-ej2menu-(.*)-popup');
             let cliWrapper = cli ? closest(cli, '.e-' + this.getModuleName() + '-wrapper') : null;
             let isInstLI = cli && cliWrapper && (this.isMenu ? this.getIndex(cli.id, true).length > 0
                 : wrapper.firstElementChild.id === cliWrapper.firstElementChild.id);
+            if (cli && cliWrapper && this.isMenu) {
+                let cliWrapperId = cliWrapper.id ? regex.exec(cliWrapper.id)[1] : cliWrapper.querySelector('.e-menu-parent').id;
+                if (this.element.id !== cliWrapperId) {
+                    return;
+                }
+            }
             if (isInstLI && e.type === 'click' && !cli.classList.contains(HEADER)) {
                 this.setLISelected(cli);
                 let navIdx = this.getIndex(cli.id, true);
@@ -2045,7 +2085,11 @@ let MenuBase = class MenuBase extends Component {
                     this.menuHeaderClickHandler(e);
                 }
                 else {
-                    if (trgt.tagName !== 'UL' || trgt.parentElement !== wrapper) {
+                    if (trgt.tagName !== 'UL' || (this.isMenu ? trgt.parentElement.classList.contains('e-menu-wrapper') &&
+                        !this.getIndex(trgt.querySelector('.' + ITEM).id, true).length : trgt.parentElement !== wrapper)) {
+                        if (!cli) {
+                            this.removeLIStateByClass([SELECTED], [wrapper]);
+                        }
                         if (!cli || !cli.querySelector('.' + CARET)) {
                             this.closeMenu(null, e);
                         }
@@ -2058,7 +2102,7 @@ let MenuBase = class MenuBase extends Component {
         if (this.showSubMenu) {
             let idx = this.navIdx.concat(this.cliIdx);
             let item = this.getItem(idx);
-            if (item[this.getField('children', idx.length - 1)] &&
+            if (item && item[this.getField('children', idx.length - 1)] &&
                 item[this.getField('children', idx.length - 1)].length) {
                 if (e.type === 'mouseover' || (Browser.isDevice && this.isMenu)) {
                     this.setLISelected(this.cli);
@@ -2106,6 +2150,13 @@ let MenuBase = class MenuBase extends Component {
         }
         return items;
     }
+    setItems(newItems, navIdx) {
+        let items = this.getItems(navIdx);
+        items.splice(0, items.length);
+        for (let i = 0; i < newItems.length; i++) {
+            items.splice(i, 0, newItems[i]);
+        }
+    }
     getIdx(ul, li, skipHdr = true) {
         let idx = Array.prototype.indexOf.call(ul.querySelectorAll('li'), li);
         if (this.isMenu && this.template && this.isBlazor()) {
@@ -2214,8 +2265,8 @@ let MenuBase = class MenuBase extends Component {
                                 idx = navIdx.pop();
                                 item = this.getItems(navIdx);
                                 this.insertAfter([item[idx]], item[idx].text);
-                                item = this.getItems(navIdx);
                                 this.removeItem(item, navIdx, idx);
+                                this.setItems(item, navIdx);
                             }
                             navIdx.length = 0;
                         }
@@ -2273,6 +2324,7 @@ let MenuBase = class MenuBase extends Component {
                 }
             }
             if (!this.isMenu) {
+                EventHandler.remove(this.targetElement, 'scroll', this.scrollHandler);
                 for (let parent of getScrollableParent(this.targetElement)) {
                     EventHandler.remove(parent, 'scroll', this.scrollHandler);
                 }
@@ -2437,8 +2489,28 @@ let MenuBase = class MenuBase extends Component {
         let idx;
         let navIdx;
         let disabled = DISABLED;
+        let skipItem;
         for (let i = 0; i < items.length; i++) {
             navIdx = this.getIndex(items[i], isUniqueId);
+            if (this.navIdx.length) {
+                if (navIdx.length !== 1) {
+                    skipItem = false;
+                    for (let i = 0, len = navIdx.length - 1; i < len; i++) {
+                        if (navIdx[i] !== this.navIdx[i]) {
+                            skipItem = true;
+                            break;
+                        }
+                    }
+                    if (skipItem) {
+                        continue;
+                    }
+                }
+            }
+            else {
+                if (navIdx.length !== 1) {
+                    continue;
+                }
+            }
             idx = navIdx.pop();
             ul = this.getUlByNavIdx(navIdx.length);
             if (ul) {
@@ -2707,12 +2779,12 @@ MenuBase = __decorate$2([
  * Navigation Common modules
  */
 
-var __decorate$3 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __decorate$3 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 const CLS_VERTICAL = 'e-vertical';
 const CLS_ITEMS = 'e-toolbar-items';
 const CLS_ITEM = 'e-toolbar-item';
@@ -3220,7 +3292,8 @@ let Toolbar = class Toolbar extends Component {
         }
         if (!eventArgs.cancel) {
             this.trigger('clicked', eventArgs, (clickedArgs) => {
-                if (!isNullOrUndefined(this.popObj) && isPopupElement && !clickedArgs.cancel && this.overflowMode === 'Popup') {
+                if (!isNullOrUndefined(this.popObj) && isPopupElement && !clickedArgs.cancel && this.overflowMode === 'Popup' &&
+                    clickedArgs.item && clickedArgs.item.type !== 'Input') {
                     this.popObj.hide({ name: 'FadeOut', duration: 100 });
                 }
             });
@@ -3405,8 +3478,7 @@ let Toolbar = class Toolbar extends Component {
                         this.removePositioning();
                     }
                     if (this.checkOverflow(ele, innerItems) || priorityCheck) {
-                        this.createPopupEle(ele, [].slice.call(selectAll('.' + CLS_ITEMS + ' .' + CLS_ITEM, ele)));
-                        this.element.querySelector('.' + CLS_TBARNAV).setAttribute('tabIndex', '0');
+                        this.setOverflowAttributes(ele);
                     }
                     this.toolbarAlign(innerItems);
                     break;
@@ -3429,13 +3501,17 @@ let Toolbar = class Toolbar extends Component {
                         if (this.tbarAlign) {
                             this.removePositioning();
                         }
-                        this.createPopupEle(ele, [].slice.call(selectAll('.' + CLS_ITEMS + ' .' + CLS_ITEM, ele)));
-                        this.element.querySelector('.' + CLS_TBARNAV).setAttribute('tabIndex', '0');
+                        this.setOverflowAttributes(ele);
                     }
                     this.toolbarAlign(innerItems);
             }
         }
     }
+    setOverflowAttributes(ele) {
+        this.createPopupEle(ele, [].slice.call(selectAll('.' + CLS_ITEMS + ' .' + CLS_ITEM, ele)));
+        this.element.querySelector('.' + CLS_TBARNAV).setAttribute('tabIndex', '0');
+        this.element.querySelector('.' + CLS_TBARNAV).setAttribute('role', 'list');
+    }
     separator() {
         let element = this.element;
         let eleItem = [].slice.call(element.querySelectorAll('.' + CLS_SEPARATOR));
@@ -3773,6 +3849,7 @@ let Toolbar = class Toolbar extends Component {
         let navItem = this.createElement('div', { className: CLS_POPUPDOWN + ' e-icons' });
         nav.appendChild(navItem);
         nav.setAttribute('tabindex', '0');
+        nav.setAttribute('role', 'list');
         element.appendChild(nav);
     }
     tbarPriRef(inEle, indx, sepPri, el, des, elWid, wid, ig) {
@@ -4399,6 +4476,7 @@ let Toolbar = class Toolbar extends Component {
                 case 'Button':
                     dom = this.buttonRendering(item, innerEle);
                     dom.setAttribute('tabindex', '-1');
+                    dom.setAttribute('aria-label', (item.text || item.tooltipText));
                     innerEle.appendChild(dom);
                     innerEle.addEventListener('click', this.itemClick.bind(this));
                     break;
@@ -4732,12 +4810,12 @@ Toolbar = __decorate$3([
  * Toolbar modules
  */
 
-var __decorate$4 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __decorate$4 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 const CLS_ACRDN_ROOT = 'e-acrdn-root';
 const CLS_ROOT$2 = 'e-accordion';
 const CLS_ITEM$1 = 'e-acrdn-item';
@@ -4887,12 +4965,12 @@ let Accordion = class Accordion extends Component {
      * @private
      */
     render() {
+        this.initializeheaderTemplate();
+        this.initializeItemTemplate();
         this.initialize();
         this.renderControl();
         this.wireEvents();
-        if (isBlazor()) {
-            this.renderComplete();
-        }
+        this.renderComplete();
     }
     initialize() {
         let width = formatUnit(this.width);
@@ -4933,6 +5011,51 @@ let Accordion = class Accordion extends Component {
             });
         }
     }
+    templateParser(template) {
+        if (template) {
+            try {
+                if (document.querySelectorAll(template).length) {
+                    return compile(document.querySelector(template).innerHTML.trim());
+                }
+            }
+            catch (error) {
+                return compile(template);
+            }
+        }
+        return undefined;
+    }
+    initializeheaderTemplate() {
+        if (this.headerTemplate) {
+            this.headerTemplateFn = this.templateParser(this.headerTemplate);
+        }
+    }
+    initializeItemTemplate() {
+        if (this.itemTemplate) {
+            this.itemTemplateFn = this.templateParser(this.itemTemplate);
+        }
+    }
+    getheaderTemplate() {
+        return this.headerTemplateFn;
+    }
+    getItemTemplate() {
+        return this.itemTemplateFn;
+    }
+    updateContentBlazorTemplate(item, index) {
+        if (this.itemTemplate && isBlazor() && !this.isStringTemplate) {
+            updateBlazorTemplate(this.element.id + '_itemTemplate', 'ItemTemplate', this, false);
+        }
+        if (item && item.content && isBlazor() && !this.isStringTemplate && item.content.indexOf('<div>Blazor') === 0) {
+            updateBlazorTemplate(this.element.id + index + '_content', 'ContentTemplate', item);
+        }
+    }
+    updateHeaderBlazorTemplate(item, index) {
+        if (this.headerTemplate && isBlazor() && !this.isStringTemplate) {
+            updateBlazorTemplate(this.element.id + '_headerTemplate', 'HeaderTemplate', this, false);
+        }
+        if (item && item.header && isBlazor() && !this.isStringTemplate && item.header.indexOf('<div>Blazor') === 0) {
+            updateBlazorTemplate(this.element.id + index + '_header', 'HeaderTemplate', item);
+        }
+    }
     focusIn(e) {
         e.target.parentElement.classList.add(CLS_ITEMFOCUS);
     }
@@ -4950,13 +5073,15 @@ let Accordion = class Accordion extends Component {
             innerEles = this.element.children;
         }
         let items = [];
+        /* tslint:disable */
         [].slice.call(innerEles).forEach((el) => {
             items.push({
-                header: (el.childElementCount > 0 && el.children[0]) ? (el.children[0]).innerHTML : '',
-                content: (el.childElementCount > 1 && el.children[1]) ? (el.children[1]).innerHTML : ''
+                header: (el.childElementCount > 0 && el.children[0]) ? (el.children[0]) : '',
+                content: (el.childElementCount > 1 && el.children[1]) ? (el.children[1]) : ''
             });
             el.parentNode.removeChild(el);
         });
+        /* tslint:enable */
         if (rootEle) {
             this.element.removeChild(rootEle);
         }
@@ -4985,31 +5110,42 @@ let Accordion = class Accordion extends Component {
     renderItems() {
         let ele = this.element;
         let innerItem;
+        let innerDataSourceItem;
         if (isNullOrUndefined(this.initExpand)) {
             this.initExpand = [];
         }
         if (!isNullOrUndefined(this.trgtEle)) {
             this.ctrlTemplate();
         }
-        let items = this.items;
-        if (ele && items.length > 0) {
-            items.forEach((item, index) => {
-                innerItem = this.renderInnerItem(item, index);
-                ele.appendChild(innerItem);
-                let blazorContain = Object.keys(window);
-                if (item.header && blazorContain.indexOf('Blazor') > -1 && !this.isStringTemplate
-                    && item.header.indexOf('<div>Blazor') === 0) {
-                    updateBlazorTemplate(this.element.id + index + '_header', 'HeaderTemplate', item);
-                }
-                if (innerItem.childElementCount > 0) {
-                    EventHandler.add(innerItem.querySelector('.' + CLS_HEADER), 'focus', this.focusIn, this);
-                    EventHandler.add(innerItem.querySelector('.' + CLS_HEADER), 'blur', this.focusOut, this);
+        if (this.dataSource.length > 0) {
+            this.dataSource.forEach((item, index) => {
+                innerDataSourceItem = this.renderInnerItem(item, index);
+                ele.appendChild(innerDataSourceItem);
+                if (innerDataSourceItem.childElementCount > 0) {
+                    EventHandler.add(innerDataSourceItem.querySelector('.' + CLS_HEADER), 'focus', this.focusIn, this);
+                    EventHandler.add(innerDataSourceItem.querySelector('.' + CLS_HEADER), 'blur', this.focusOut, this);
                 }
             });
+            this.updateHeaderBlazorTemplate();
+        }
+        else {
+            let items = this.items;
+            if (ele && items.length > 0) {
+                items.forEach((item, index) => {
+                    innerItem = this.renderInnerItem(item, index);
+                    ele.appendChild(innerItem);
+                    this.updateHeaderBlazorTemplate(item, index);
+                    if (innerItem.childElementCount > 0) {
+                        EventHandler.add(innerItem.querySelector('.' + CLS_HEADER), 'focus', this.focusIn, this);
+                        EventHandler.add(innerItem.querySelector('.' + CLS_HEADER), 'blur', this.focusOut, this);
+                    }
+                });
+            }
         }
     }
     clickHandler(e) {
         let trgt = e.target;
+        let items = this.getItems();
         let eventArgs = {};
         let index;
         let tglIcon;
@@ -5038,17 +5174,13 @@ let Accordion = class Accordion extends Component {
         let acrdActive = [];
         index = this.getIndexByItem(acrdnItem);
         if (acrdnCtnItem) {
-            eventArgs.item = this.items[this.getIndexByItem(acrdnCtnItem)];
+            eventArgs.item = items[this.getIndexByItem(acrdnCtnItem)];
         }
         eventArgs.originalEvent = e;
         let ctnCheck = !isNullOrUndefined(tglIcon) && acrdnItem.childElementCount <= 1;
         if (ctnCheck && (isNullOrUndefined(acrdnCtn) || !isNullOrUndefined(select('.' + CLS_HEADER + ' .' + CLS_TOOGLEICN, acrdnCtnItem)))) {
             acrdnItem.appendChild(this.contentRendering(index));
-            let blazorContain = Object.keys(window);
-            if (eventArgs.item.content && blazorContain.indexOf('Blazor') > -1 && !this.isStringTemplate
-                && eventArgs.item.content.indexOf('<div>Blazor') === 0) {
-                updateBlazorTemplate(this.element.id + index + '_content', 'ContentTemplate', eventArgs.item);
-            }
+            this.updateContentBlazorTemplate(eventArgs.item, index);
             this.ariaAttrUpdate(acrdnItem);
         }
         this.trigger('clicked', eventArgs);
@@ -5154,9 +5286,10 @@ let Accordion = class Accordion extends Component {
     }
     headerEleGenerate() {
         let header = this.createElement('div', { className: CLS_HEADER, id: getUniqueID('acrdn_header') });
+        let items = this.getItems();
         let ariaAttr = {
-            'tabindex': '0', 'role': 'heading', 'aria-expanded': 'false', 'aria-selected': 'false',
-            'aria-disabled': 'false', 'aria-level': this.items.length.toString()
+            'tabindex': '0', 'role': 'heading', 'aria-selected': 'false',
+            'aria-disabled': 'false', 'aria-level': items.length.toString()
         };
         attributes(header, ariaAttr);
         return header;
@@ -5165,6 +5298,17 @@ let Accordion = class Accordion extends Component {
         let innerEle;
         innerEle = this.createElement('div', { className: CLS_ITEM$1 });
         innerEle.id = getUniqueID('acrdn_item');
+        attributes(innerEle, { 'aria-expanded': 'false' });
+        if (this.headerTemplate) {
+            let ctnEle = this.headerEleGenerate();
+            let hdrEle = this.createElement('div', { className: CLS_HEADERCTN });
+            ctnEle.appendChild(hdrEle);
+            append(this.getheaderTemplate()(item, this, 'headerTemplate', this.element.id + '_headerTemplate', false), hdrEle);
+            innerEle.appendChild(ctnEle);
+            ctnEle.appendChild(this.toggleIconGenerate());
+            this.add(innerEle, CLS_SLCT);
+            return innerEle;
+        }
         if (item.header && this.angularnativeCondiCheck(item, 'header')) {
             let ctnEle = this.headerEleGenerate();
             let hdrEle = this.createElement('div', { className: CLS_HEADERCTN });
@@ -5179,7 +5323,12 @@ let Accordion = class Accordion extends Component {
             }
         }
         if (item.cssClass) {
-            innerEle.classList.add(item.cssClass);
+            let acrdnClass = item.cssClass;
+            let arcdnClassList = [];
+            arcdnClassList = acrdnClass.split(' ');
+            arcdnClassList.forEach((el) => {
+                addClass([innerEle], el);
+            });
         }
         if (item.iconCss) {
             let hdrIcnEle = this.createElement('div', { className: CLS_HEADERICN });
@@ -5226,7 +5375,6 @@ let Accordion = class Accordion extends Component {
         }
     }
     fetchElement(ele, value, index, isHeader) {
-        let blazorContain = Object.keys(window);
         let templateFn;
         let temString;
         try {
@@ -5238,8 +5386,14 @@ let Accordion = class Accordion extends Component {
             }
         }
         catch (e) {
-            if (typeof (value) === 'string' && blazorContain.indexOf('Blazor') > -1 && value.indexOf('<div>Blazor') !== 0) {
+            if (typeof (value) === 'string' && isBlazor() && value.indexOf('<div>Blazor') !== 0) {
                 ele.innerHTML = value;
+                /* tslint:disable */
+            }
+            else if (!isNullOrUndefined(this.trgtEle) && (value instanceof (HTMLElement))) {
+                ele.appendChild(value);
+                ele.firstElementChild.style.display = '';
+                /* tslint:enable */
             }
             else {
                 templateFn = compile(value);
@@ -5279,17 +5433,24 @@ let Accordion = class Accordion extends Component {
         let content = select('.' + CLS_CONTENT, itemEle);
         header.setAttribute('aria-controls', content.id);
         content.setAttribute('aria-labelledby', header.id);
+        content.setAttribute('role', 'definition');
     }
     contentRendering(index) {
-        let content = this.items[index].content;
         let itemcnt = this.createElement('div', { className: CLS_CONTENT + ' ' + CLS_CTNHIDE, id: getUniqueID('acrdn_panel') });
         attributes(itemcnt, { 'aria-hidden': 'true' });
         let ctn = this.createElement('div', { className: CLS_CTENT });
-        itemcnt.appendChild(this.fetchElement(ctn, content, index, false));
+        if (this.dataSource.length > 0) {
+            append(this.getItemTemplate()(this.dataSource[index], this, 'itemTemplate', this.element.id + '_itemTemplate', false), ctn);
+            itemcnt.appendChild(ctn);
+        }
+        else {
+            itemcnt.appendChild(this.fetchElement(ctn, this.items[index].content, index, false));
+        }
         return itemcnt;
     }
     expand(trgt) {
         let eventArgs;
+        let items = this.getItems();
         let trgtItemEle = closest(trgt, '.' + CLS_ITEM$1);
         if (isNullOrUndefined(trgt) || (isVisible(trgt) && trgt.getAttribute('e-animate') !== 'true') || trgtItemEle.classList.contains(CLS_DISABLE$3)) {
             return;
@@ -5303,7 +5464,7 @@ let Accordion = class Accordion extends Component {
         };
         let icon = select('.' + CLS_TOOGLEICN, trgtItemEle).firstElementChild;
         eventArgs = { element: trgtItemEle,
-            item: this.items[this.getIndexByItem(trgtItemEle)],
+            item: items[this.getIndexByItem(trgtItemEle)],
             index: this.getIndexByItem(trgtItemEle),
             content: trgtItemEle.querySelector('.' + CLS_CONTENT),
             isExpanded: true };
@@ -5365,7 +5526,8 @@ let Accordion = class Accordion extends Component {
         if (progress === 'end') {
             this.add(trgtItemEle, CLS_ACTIVE);
             trgt.setAttribute('aria-hidden', 'false');
-            attributes(trgt.previousElementSibling, { 'aria-selected': 'true', 'aria-expanded': 'true' });
+            attributes(trgtItemEle, { 'aria-expanded': 'true' });
+            attributes(trgt.previousElementSibling, { 'aria-selected': 'true' });
             icon.classList.remove(CLS_TOGANIMATE);
             this.trigger('expanded', eventArgs);
         }
@@ -5396,6 +5558,7 @@ let Accordion = class Accordion extends Component {
     }
     collapse(trgt) {
         let eventArgs;
+        let items = this.getItems();
         let trgtItemEle = closest(trgt, '.' + CLS_ITEM$1);
         if (isNullOrUndefined(trgt) || !isVisible(trgt) || trgtItemEle.classList.contains(CLS_DISABLE$3)) {
             return;
@@ -5407,7 +5570,7 @@ let Accordion = class Accordion extends Component {
         };
         let icon = select('.' + CLS_TOOGLEICN, trgtItemEle).firstElementChild;
         eventArgs = { element: trgtItemEle,
-            item: this.items[this.getIndexByItem(trgtItemEle)],
+            item: items[this.getIndexByItem(trgtItemEle)],
             index: this.getIndexByItem(trgtItemEle),
             content: trgtItemEle.querySelector('.' + CLS_CONTENT),
             isExpanded: false };
@@ -5474,7 +5637,8 @@ let Accordion = class Accordion extends Component {
             icon.classList.remove(CLS_TOGANIMATE);
             this.remove(trgtItemEle, CLS_ACTIVE);
             trgt.setAttribute('aria-hidden', 'true');
-            attributes(trgt.previousElementSibling, { 'aria-selected': 'false', 'aria-expanded': 'false' });
+            attributes(trgtItemEle, { 'aria-expanded': 'false' });
+            attributes(trgt.previousElementSibling, { 'aria-selected': 'false' });
             this.trigger('expanded', eventArgs);
         }
     }
@@ -5487,15 +5651,26 @@ let Accordion = class Accordion extends Component {
         return 'accordion';
     }
     itemAttribUpdate() {
+        let items = this.getItems();
         let itemEle = this.getItemElements();
-        let itemLen = this.items.length;
+        let itemLen = items.length;
         itemEle.forEach((ele) => {
             select('.' + CLS_HEADER, ele).setAttribute('aria-level', '' + itemLen);
         });
     }
+    getItems() {
+        let items;
+        if (this.itemTemplate && this.headerTemplate) {
+            items = this.dataSource;
+        }
+        else {
+            items = this.items;
+        }
+        return items;
+    }
     /**
      * Adds new item to the Accordion with the specified index of the Accordion.
-     * @param  {AccordionItemModel} item - Item array that is to be added to the Accordion.
+     * @param  {AccordionItemModel | Object} item - Item array that is to be added to the Accordion.
      * @param  {number} index - Number value that determines where the item should be added.
      * By default, item is added at the last index if the index is not specified.
      * @returns void
@@ -5503,11 +5678,12 @@ let Accordion = class Accordion extends Component {
     addItem(item, index) {
         let ele = this.element;
         let itemEle = this.getItemElements();
+        let items = this.getItems();
         if (isNullOrUndefined(index)) {
-            index = this.items.length;
+            index = items.length;
         }
         if (ele.childElementCount >= index) {
-            this.items.splice(index, 0, item);
+            items.splice(index, 0, item);
             let innerItemEle = this.renderInnerItem(item, index);
             if (ele.childElementCount === index) {
                 ele.appendChild(innerItemEle);
@@ -5515,13 +5691,14 @@ let Accordion = class Accordion extends Component {
             else {
                 ele.insertBefore(innerItemEle, itemEle[index]);
             }
+            this.updateHeaderBlazorTemplate();
             EventHandler.add(innerItemEle.querySelector('.' + CLS_HEADER), 'focus', this.focusIn, this);
             EventHandler.add(innerItemEle.querySelector('.' + CLS_HEADER), 'blur', this.focusOut, this);
             this.itemAttribUpdate();
         }
         this.expandedItems = [];
         this.expandedItemRefresh(ele);
-        if (item.expanded) {
+        if (item && item.expanded) {
             this.expandItem(true, index);
         }
     }
@@ -5541,12 +5718,13 @@ let Accordion = class Accordion extends Component {
     removeItem(index) {
         let itemEle = this.getItemElements();
         let ele = itemEle[index];
+        let items = this.getItems();
         if (isNullOrUndefined(ele)) {
             return;
         }
         this.restoreContent(index);
         detach(ele);
-        this.items.splice(index, 1);
+        items.splice(index, 1);
         this.itemAttribUpdate();
         this.expandedItems = [];
         this.expandedItemRefresh(this.element);
@@ -5656,17 +5834,14 @@ let Accordion = class Accordion extends Component {
     }
     itemExpand(isExpand, ele, index) {
         let ctn = ele.children[1];
+        let items = this.getItems();
         if (ele.classList.contains(CLS_DISABLE$3)) {
             return;
         }
         if (isNullOrUndefined(ctn) && isExpand) {
             ctn = this.contentRendering(index);
             ele.appendChild(ctn);
-            let blazorContain = Object.keys(window);
-            let item = this.items[index];
-            if (item.content && blazorContain.indexOf('Blazor') > -1 && !this.isStringTemplate && item.content.indexOf('<div>Blazor') === 0) {
-                updateBlazorTemplate(this.element.id + index + '_content', 'ContentTemplate', item);
-            }
+            this.updateContentBlazorTemplate(items[index], index);
             this.ariaAttrUpdate(ele);
         }
         else if (isNullOrUndefined(ctn)) {
@@ -5696,8 +5871,9 @@ let Accordion = class Accordion extends Component {
     }
     updateItem(item, index) {
         if (!isNullOrUndefined(item)) {
-            let itemObj = this.items[index];
-            this.items.splice(index, 1);
+            let items = this.getItems();
+            let itemObj = items[index];
+            items.splice(index, 1);
             this.restoreContent(index);
             detach(item);
             this.addItem(itemObj, index);
@@ -5716,6 +5892,7 @@ let Accordion = class Accordion extends Component {
      */
     onPropertyChanged(newProp, oldProp) {
         let acrdn = this.element;
+        let isRefresh = false;
         for (let prop of Object.keys(newProp)) {
             switch (prop) {
                 case 'items':
@@ -5744,11 +5921,20 @@ let Accordion = class Accordion extends Component {
                         }
                     }
                     else {
-                        this.destroyItems();
-                        this.renderItems();
-                        this.initItemExpand();
+                        isRefresh = true;
                     }
                     break;
+                case 'dataSource':
+                    isRefresh = true;
+                    break;
+                case 'headerTemplate':
+                    this.initializeheaderTemplate();
+                    isRefresh = true;
+                    break;
+                case 'itemTemplate':
+                    this.initializeItemTemplate();
+                    isRefresh = true;
+                    break;
                 case 'enableRtl':
                     newProp.enableRtl ? this.add(acrdn, CLS_RTL$3) : this.remove(acrdn, CLS_RTL$3);
                     break;
@@ -5771,11 +5957,25 @@ let Accordion = class Accordion extends Component {
                     break;
             }
         }
+        if (isRefresh) {
+            this.destroyItems();
+            this.renderItems();
+            this.initItemExpand();
+        }
     }
 };
 __decorate$4([
     Collection([], AccordionItem)
 ], Accordion.prototype, "items", void 0);
+__decorate$4([
+    Property([])
+], Accordion.prototype, "dataSource", void 0);
+__decorate$4([
+    Property()
+], Accordion.prototype, "itemTemplate", void 0);
+__decorate$4([
+    Property()
+], Accordion.prototype, "headerTemplate", void 0);
 __decorate$4([
     Property('100%')
 ], Accordion.prototype, "width", void 0);
@@ -5811,12 +6011,12 @@ Accordion = __decorate$4([
  * Accordion all modules
  */
 
-var __decorate$5 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __decorate$5 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 /// <reference path='../common/menu-base-model.d.ts'/>
 /**
  * The ContextMenu is a graphical user interface that appears on the user right click/touch hold operation.
@@ -5917,12 +6117,12 @@ ContextMenu = __decorate$5([
  * ContextMenu modules
  */
 
-var __decorate$6 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __decorate$6 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 /// <reference path='../common/menu-base-model.d.ts'/>
 const VMENU = 'e-vertical';
 const SCROLLABLE = 'e-scrollable';
@@ -6162,14 +6362,15 @@ Menu = __decorate$6([
  * Menu modules
  */
 
-var __decorate$7 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __decorate$7 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 const CLS_TAB = 'e-tab';
 const CLS_HEADER$1 = 'e-tab-header';
+const CLS_BLA_TEM = 'blazor-template';
 const CLS_CONTENT$1 = 'e-content';
 const CLS_NEST$1 = 'e-nested';
 const CLS_ITEMS$1 = 'e-items';
@@ -6207,6 +6408,7 @@ const CLS_VERTICAL$1 = 'e-vertical';
 const CLS_VLEFT = 'e-vertical-left';
 const CLS_VRIGHT = 'e-vertical-right';
 const CLS_HBOTTOM = 'e-horizontal-bottom';
+const CLS_FILL = 'e-fill-mode';
 class TabActionSettings extends ChildProperty {
 }
 __decorate$7([
@@ -6364,6 +6566,7 @@ let Tab = class Tab extends Component {
      */
     render() {
         this.btnCls = this.createElement('span', { className: CLS_ICONS + ' ' + CLS_ICON_CLOSE, attrs: { title: this.title } });
+        this.tabId = this.element.id.length > 0 ? ('-' + this.element.id) : getRandomId();
         this.renderContainer();
         this.wireEvents();
         this.initRender = false;
@@ -6413,7 +6616,7 @@ let Tab = class Tab extends Component {
     renderHeader() {
         let hdrPlace = this.headerPlacement;
         let tabItems = [];
-        this.hdrEle = select('.' + CLS_HEADER$1, this.element);
+        this.hdrEle = this.getTabHeader();
         this.addVerticalClass();
         if (!this.isTemplate) {
             tabItems = this.parseObject(this.items, 0);
@@ -6431,12 +6634,13 @@ let Tab = class Tab extends Component {
                 while (this.hdrEle.firstElementChild) {
                     detach(this.hdrEle.firstElementChild);
                 }
-                this.hdrEle.appendChild(this.createElement('div', { className: CLS_ITEMS$1 }));
+                let tabItems = this.createElement('div', { className: CLS_ITEMS$1 });
+                this.hdrEle.appendChild(tabItems);
                 hdrItems.forEach((item, index) => {
                     this.lastIndex = index;
                     let attr = {
-                        className: CLS_ITEM$2, id: CLS_ITEM$2 + '_' + index,
-                        attrs: { role: 'tab', 'aria-controls': CLS_CONTENT$1 + '_' + index, 'aria-selected': 'false' }
+                        className: CLS_ITEM$2, id: CLS_ITEM$2 + this.tabId + '_' + index,
+                        attrs: { role: 'tab', 'aria-controls': CLS_CONTENT$1 + this.tabId + '_' + index, 'aria-selected': 'false' }
                     };
                     let txt = this.createElement('span', {
                         className: CLS_TEXT, innerHTML: item, attrs: { 'role': 'presentation' }
@@ -6445,8 +6649,8 @@ let Tab = class Tab extends Component {
                         className: CLS_TEXT_WRAP, innerHTML: txt + this.btnCls.outerHTML
                     }).outerHTML;
                     let wrap = this.createElement('div', { className: CLS_WRAP, innerHTML: cont, attrs: { tabIndex: '-1' } });
-                    select('.' + CLS_ITEMS$1, this.element).appendChild(this.createElement('div', attr));
-                    selectAll('.' + CLS_ITEM$2, this.element)[index].appendChild(wrap);
+                    tabItems.appendChild(this.createElement('div', attr));
+                    selectAll('.' + CLS_ITEM$2, tabItems)[index].appendChild(wrap);
                 });
             }
         }
@@ -6461,6 +6665,7 @@ let Tab = class Tab extends Component {
         this.tbObj.isStringTemplate = true;
         this.tbObj.createElement = this.createElement;
         this.tbObj.appendTo(this.hdrEle);
+        attributes(this.hdrEle, { 'aria-label': 'tab-header' });
         for (let i = 0; i < this.items.length; i++) {
             let item = this.items[i];
             if (item.headerTemplate && isBlazor() && !this.isStringTemplate &&
@@ -6480,8 +6685,8 @@ let Tab = class Tab extends Component {
             for (let i = 0; i < hdrItem.length; i++) {
                 if (contents.length - 1 >= i) {
                     contents.item(i).className += CLS_ITEM$2;
-                    attributes(contents.item(i), { 'role': 'tabpanel', 'aria-labelledby': CLS_ITEM$2 + '_' + i });
-                    contents.item(i).id = CLS_CONTENT$1 + '_' + i;
+                    attributes(contents.item(i), { 'role': 'tabpanel', 'aria-labelledby': CLS_ITEM$2 + this.tabId + '_' + i });
+                    contents.item(i).id = CLS_CONTENT$1 + this.tabId + '_' + i;
                 }
             }
         }
@@ -6546,13 +6751,13 @@ let Tab = class Tab extends Component {
             let wrap = this.createElement('div', { className: CLS_WRAP, attrs: wrapAttrs });
             wrap.appendChild(tCont);
             if (this.itemIndexArray === []) {
-                this.itemIndexArray.push(CLS_ITEM$2 + '_' + this.lastIndex);
+                this.itemIndexArray.push(CLS_ITEM$2 + this.tabId + '_' + this.lastIndex);
             }
             else {
-                this.itemIndexArray.splice((index + i), 0, CLS_ITEM$2 + '_' + this.lastIndex);
+                this.itemIndexArray.splice((index + i), 0, CLS_ITEM$2 + this.tabId + '_' + this.lastIndex);
             }
             let attrObj = {
-                id: CLS_ITEM$2 + '_' + this.lastIndex, role: 'tab', 'aria-selected': 'false'
+                id: CLS_ITEM$2 + this.tabId + '_' + this.lastIndex, role: 'tab', 'aria-selected': 'false'
             };
             let tItem = { htmlAttributes: attrObj, template: wrap };
             tItem.cssClass = item.cssClass + ' ' + disabled + ' ' + ((css !== '') ? 'e-i' + pos : '') + ' ' + ((!txtEmpty) ? CLS_ICON : '');
@@ -6570,14 +6775,11 @@ let Tab = class Tab extends Component {
         (this.isIconAlone) ? this.element.classList.add(CLS_ICON_TAB) : this.element.classList.remove(CLS_ICON_TAB);
         return tItems;
     }
-    removeActiveClass(id) {
-        let hdrActEle = selectAll(':root .' + CLS_HEADER$1 + ' .' + CLS_TB_ITEM + '.' + CLS_ACTIVE$1, this.element)[0];
-        let selectEle = select('.' + CLS_HEADER$1, this.element);
-        if (this.headerPlacement === 'Bottom') {
-            hdrActEle = selectAll(':root .' + CLS_HEADER$1 + ' .' + CLS_TB_ITEM + '.' + CLS_ACTIVE$1, selectEle)[0];
-        }
-        if (!isNullOrUndefined(hdrActEle)) {
-            hdrActEle.classList.remove(CLS_ACTIVE$1);
+    removeActiveClass() {
+        let tabHeader = this.getTabHeader();
+        if (tabHeader) {
+            let tabItems = selectAll('.' + CLS_TB_ITEM + '.' + CLS_ACTIVE$1, tabHeader);
+            [].slice.call(tabItems).forEach((node) => node.classList.remove(CLS_ACTIVE$1));
         }
     }
     checkPopupOverflow(ele) {
@@ -6636,8 +6838,10 @@ let Tab = class Tab extends Component {
         let checkRTL = this.enableRtl || this.element.classList.contains(CLS_RTL$4);
         if (this.isPopup || prev <= current) {
             if (this.animation.previous.effect === 'SlideLeftIn') {
-                animation = { name: 'SlideLeftOut',
-                    duration: this.animation.previous.duration, timingFunction: this.animation.previous.easing };
+                animation = {
+                    name: 'SlideLeftOut',
+                    duration: this.animation.previous.duration, timingFunction: this.animation.previous.easing
+                };
             }
             else {
                 animation = null;
@@ -6645,8 +6849,10 @@ let Tab = class Tab extends Component {
         }
         else {
             if (this.animation.next.effect === 'SlideRightIn') {
-                animation = { name: 'SlideRightOut',
-                    duration: this.animation.next.duration, timingFunction: this.animation.next.easing };
+                animation = {
+                    name: 'SlideRightOut',
+                    duration: this.animation.next.duration, timingFunction: this.animation.next.easing
+                };
             }
             else {
                 animation = null;
@@ -6756,11 +6962,24 @@ let Tab = class Tab extends Component {
             }
         }
     }
+    getTabHeader() {
+        let headers = [].slice.call(this.element.children).filter((e) => e.classList.contains(CLS_HEADER$1));
+        if (headers.length > 0) {
+            return headers[0];
+        }
+        else {
+            let wrap = [].slice.call(this.element.children).filter((e) => !e.classList.contains(CLS_BLA_TEM))[0];
+            if (!wrap) {
+                return undefined;
+            }
+            return [].slice.call(wrap.children).filter((e) => e.classList.contains(CLS_HEADER$1))[0];
+        }
+    }
     getEleIndex(item) {
-        return Array.prototype.indexOf.call(selectAll('.' + CLS_HEADER$1 + ' .' + CLS_TB_ITEM, this.element), item);
+        return Array.prototype.indexOf.call(selectAll('.' + CLS_TB_ITEM, this.getTabHeader()), item);
     }
     extIndex(id) {
-        return id.replace(CLS_ITEM$2 + '_', '');
+        return id.replace(CLS_ITEM$2 + this.tabId + '_', '');
     }
     expTemplateContent() {
         this.templateEle.forEach((eleStr) => {
@@ -6844,10 +7063,10 @@ let Tab = class Tab extends Component {
     getTrgContent(cntEle, no) {
         let ele;
         if (this.element.classList.contains(CLS_NEST$1)) {
-            ele = select('.' + CLS_NEST$1 + '> .' + CLS_CONTENT$1 + ' > #' + CLS_CONTENT$1 + '_' + no, this.element);
+            ele = select('.' + CLS_NEST$1 + '> .' + CLS_CONTENT$1 + ' > #' + CLS_CONTENT$1 + this.tabId + '_' + no, this.element);
         }
         else {
-            ele = this.findEle(cntEle.children, CLS_CONTENT$1 + '_' + no);
+            ele = this.findEle(cntEle.children, CLS_CONTENT$1 + this.tabId + '_' + no);
         }
         return ele;
     }
@@ -6895,7 +7114,9 @@ let Tab = class Tab extends Component {
         this.select(this.selectedItem);
     }
     setOrientation(place, ele) {
-        if (place === 'Bottom' && Array.prototype.indexOf.call(this.element.children, ele) !== 1) {
+        let headerPos = Array.prototype.indexOf.call(this.element.children, ele);
+        let contentPos = Array.prototype.indexOf.call(this.element.children, this.element.querySelector('.' + CLS_CONTENT$1));
+        if (place === 'Bottom' && (contentPos > headerPos)) {
             this.element.appendChild(ele);
         }
         else {
@@ -6917,10 +7138,13 @@ let Tab = class Tab extends Component {
         }
     }
     setContentHeight(val) {
+        if (this.element.classList.contains(CLS_FILL)) {
+            removeClass([this.element], [CLS_FILL]);
+        }
         if (isNullOrUndefined(this.cntEle)) {
             return;
         }
-        let hdrEle = select('.' + CLS_HEADER$1, this.element);
+        let hdrEle = this.getTabHeader();
         if (this.heightAdjustMode === 'None') {
             if (this.height === 'auto') {
                 return;
@@ -6932,8 +7156,9 @@ let Tab = class Tab extends Component {
             }
         }
         else if (this.heightAdjustMode === 'Fill') {
+            addClass([this.element], [CLS_FILL]);
             setStyleAttribute(this.element, { 'height': '100%' });
-            setStyleAttribute(this.cntEle, { 'height': 'auto' });
+            setStyleAttribute(this.cntEle, { 'height': '100%' });
         }
         else if (this.heightAdjustMode === 'Auto') {
             let cnt = selectAll('.' + CLS_CONTENT$1 + ' > .' + CLS_ITEM$2, this.element);
@@ -6949,8 +7174,8 @@ let Tab = class Tab extends Component {
                 this.cntEle = select('.' + CLS_CONTENT$1, this.element);
                 if (val === true) {
                     this.cntEle.appendChild(this.createElement('div', {
-                        id: (CLS_CONTENT$1 + '_' + 0), className: CLS_ITEM$2 + ' ' + CLS_ACTIVE$1,
-                        attrs: { 'role': 'tabpanel', 'aria-labelledby': CLS_ITEM$2 + '_' + 0 }
+                        id: (CLS_CONTENT$1 + this.tabId + '_' + 0), className: CLS_ITEM$2 + ' ' + CLS_ACTIVE$1,
+                        attrs: { 'role': 'tabpanel', 'aria-labelledby': CLS_ITEM$2 + this.tabId + '_' + 0 }
                     }));
                 }
                 let ele = this.cntEle.children.item(0);
@@ -6978,18 +7203,10 @@ let Tab = class Tab extends Component {
             parseFloat(cs.getPropertyValue('margin-top')) + parseFloat(cs.getPropertyValue('margin-bottom'));
     }
     setActiveBorder() {
-        let trg;
         let bar;
         let scrollCnt;
-        let trgHdrEle;
-        if (this.headerPlacement === 'Bottom') {
-            trgHdrEle = select('.' + CLS_HEADER$1, this.element);
-            trg = select('.' + CLS_TB_ITEM + '.' + CLS_ACTIVE$1, trgHdrEle);
-        }
-        else {
-            trgHdrEle = select('.' + CLS_HEADER$1, this.element);
-            trg = select('.' + CLS_TB_ITEM + '.' + CLS_ACTIVE$1, this.element);
-        }
+        let trgHdrEle = this.getTabHeader();
+        let trg = select('.' + CLS_TB_ITEM + '.' + CLS_ACTIVE$1, trgHdrEle);
         if (trg === null) {
             return;
         }
@@ -7025,7 +7242,7 @@ let Tab = class Tab extends Component {
         }
     }
     setActive(value) {
-        this.tbItem = selectAll('.' + CLS_HEADER$1 + ' .' + CLS_TB_ITEM, this.element);
+        this.tbItem = selectAll('.' + CLS_TB_ITEM, this.getTabHeader());
         let trg = this.tbItem[value];
         if (value >= 0) {
             this.setProperties({ selectedItem: value }, true);
@@ -7042,20 +7259,20 @@ let Tab = class Tab extends Component {
             if (!isNullOrUndefined(prev)) {
                 prev.removeAttribute('aria-controls');
             }
-            attributes(trg, { 'aria-controls': CLS_CONTENT$1 + '_' + value });
+            attributes(trg, { 'aria-controls': CLS_CONTENT$1 + this.tabId + '_' + value });
         }
         let id = trg.id;
-        this.removeActiveClass(id);
+        this.removeActiveClass();
         trg.classList.add(CLS_ACTIVE$1);
         trg.setAttribute('aria-selected', 'true');
         let no = Number(this.extIndex(id));
         if (isNullOrUndefined(this.prevActiveEle)) {
-            this.prevActiveEle = CLS_CONTENT$1 + '_' + no;
+            this.prevActiveEle = CLS_CONTENT$1 + this.tabId + '_' + no;
         }
         attributes(this.element, { 'aria-activedescendant': id });
         if (this.isTemplate) {
             if (select('.' + CLS_CONTENT$1, this.element).children.length > 0) {
-                let trg = this.findEle(select('.' + CLS_CONTENT$1, this.element).children, CLS_CONTENT$1 + '_' + no);
+                let trg = this.findEle(select('.' + CLS_CONTENT$1, this.element).children, CLS_CONTENT$1 + this.tabId + '_' + no);
                 if (!isNullOrUndefined(trg)) {
                     trg.classList.add(CLS_ACTIVE$1);
                 }
@@ -7067,8 +7284,8 @@ let Tab = class Tab extends Component {
             let item = this.getTrgContent(this.cntEle, this.extIndex(id));
             if (isNullOrUndefined(item)) {
                 this.cntEle.appendChild(this.createElement('div', {
-                    id: CLS_CONTENT$1 + '_' + this.extIndex(id), className: CLS_ITEM$2 + ' ' + CLS_ACTIVE$1,
-                    attrs: { role: 'tabpanel', 'aria-labelledby': CLS_ITEM$2 + '_' + this.extIndex(id) }
+                    id: CLS_CONTENT$1 + this.tabId + '_' + this.extIndex(id), className: CLS_ITEM$2 + ' ' + CLS_ACTIVE$1,
+                    attrs: { role: 'tabpanel', 'aria-labelledby': CLS_ITEM$2 + this.tabId + '_' + this.extIndex(id) }
                 }));
                 let eleTrg = this.getTrgContent(this.cntEle, this.extIndex(id));
                 let itemIndex = Array.prototype.indexOf.call(this.itemIndexArray, trg.id);
@@ -7090,7 +7307,7 @@ let Tab = class Tab extends Component {
             previousIndex: this.prevIndex,
             selectedItem: trg,
             selectedIndex: value,
-            selectedContent: select('#' + CLS_CONTENT$1 + '_' + this.selectingID, this.content),
+            selectedContent: select('#' + CLS_CONTENT$1 + this.tabId + '_' + this.selectingID, this.content),
             isSwiped: this.isSwipeed
         };
         if (!this.initRender || this.selectedItem !== 0) {
@@ -7099,7 +7316,7 @@ let Tab = class Tab extends Component {
     }
     setItems(items) {
         this.isReplace = true;
-        this.tbItems = select('.' + CLS_HEADER$1 + ' .' + CLS_TB_ITEMS, this.element);
+        this.tbItems = select('.' + CLS_TB_ITEMS, this.getTabHeader());
         this.tbObj.items = this.parseObject(items, 0);
         this.tbObj.dataBind();
         this.isReplace = false;
@@ -7206,9 +7423,9 @@ let Tab = class Tab extends Component {
         }
         this.element.classList.add(CLS_FOCUS);
         let trg = e.target;
-        let actEle = select('.' + CLS_HEADER$1 + ' .' + CLS_ACTIVE$1, this.element);
-        let tabItem = selectAll('.' + CLS_TB_ITEM + ':not(.' + CLS_TB_POPUP + ')', this.element);
-        this.popEle = select('.' + CLS_HEADER$1 + ' .' + CLS_TB_POP, this.element);
+        let tabHeader = this.getTabHeader();
+        let actEle = select('.' + CLS_ACTIVE$1, tabHeader);
+        this.popEle = select('.' + CLS_TB_POP, tabHeader);
         if (!isNullOrUndefined(this.popEle)) {
             this.popObj = this.popEle.ej2_instances[0];
         }
@@ -7306,8 +7523,8 @@ let Tab = class Tab extends Component {
                 let property = Object.keys(newProp.items[index])[0];
                 let oldVal = Object(oldProp.items[index])[property];
                 let newVal = Object(newProp.items[index])[property];
-                let hdrItem = select('.' + CLS_TB_ITEMS + ' #' + CLS_ITEM$2 + '_' + index, this.element);
-                let cntItem = select('.' + CLS_CONTENT$1 + ' #' + CLS_CONTENT$1 + '_' + index, this.element);
+                let hdrItem = select('.' + CLS_TB_ITEMS + ' #' + CLS_ITEM$2 + this.tabId + '_' + index, this.element);
+                let cntItem = select('.' + CLS_CONTENT$1 + ' #' + CLS_CONTENT$1 + this.tabId + '_' + index, this.element);
                 if (property === 'header' || property === 'headerTemplate') {
                     let icon = (isNullOrUndefined(this.items[index].header) ||
                         isNullOrUndefined(this.items[index].header.iconCss)) ? '' : this.items[index].header.iconCss;
@@ -7367,6 +7584,10 @@ let Tab = class Tab extends Component {
                 this.reRenderItems();
             }
             else {
+                let items = newProp.items;
+                for (let i = 0; i < items.length; i++) {
+                    this.resetBlazorTemplates(items[i], i);
+                }
                 this.setItems(newProp.items);
                 if (this.templateEle.length > 0) {
                     this.expTemplateContent();
@@ -7380,6 +7601,17 @@ let Tab = class Tab extends Component {
             }
         }
     }
+    resetBlazorTemplates(item, index) {
+        if (!isBlazor()) {
+            return;
+        }
+        if (item.headerTemplate && !this.isStringTemplate && (item.headerTemplate).indexOf('<div>Blazor') === 0) {
+            resetBlazorTemplate(this.element.id + index + '_' + 'headerTemplate', 'HeaderTemplate');
+        }
+        if (item.content && !this.isStringTemplate && item.content.indexOf('<div>Blazor') === 0) {
+            resetBlazorTemplate(this.element.id + index + '_' + 'content', 'ContentTemplate');
+        }
+    }
     /**
      * Enables or disables the specified Tab item. On passing value as `false`, the item will be disabled.
      * @param  {number} index - Index value of target Tab item.
@@ -7452,7 +7684,7 @@ let Tab = class Tab extends Component {
             if (!isNullOrUndefined(this.bdrLine)) {
                 this.bdrLine.classList.add(CLS_HIDDEN$1);
             }
-            this.tbItems = select('.' + CLS_HEADER$1 + ' .' + CLS_TB_ITEMS, this.element);
+            this.tbItems = select('.' + CLS_TB_ITEMS, this.getTabHeader());
             this.isAdd = true;
             let tabItems = this.parseObject(items, index);
             this.isAdd = false;
@@ -7468,7 +7700,8 @@ let Tab = class Tab extends Component {
                 if (this.isTemplate && !isNullOrUndefined(item.header) && !isNullOrUndefined(item.header.text)) {
                     let no = lastEleIndex + place;
                     let ele = this.createElement('div', {
-                        id: CLS_CONTENT$1 + '_' + no, className: CLS_ITEM$2, attrs: { role: 'tabpanel', 'aria-labelledby': CLS_ITEM$2 + '_' + no }
+                        id: CLS_CONTENT$1 + this.tabId + '_' + no, className: CLS_ITEM$2,
+                        attrs: { role: 'tabpanel', 'aria-labelledby': CLS_ITEM$2 + this.tabId + '_' + no }
                     });
                     this.cntEle.insertBefore(ele, this.cntEle.children[(index + place)]);
                     let eleTrg = this.getTrgContent(this.cntEle, no.toString());
@@ -7500,11 +7733,12 @@ let Tab = class Tab extends Component {
         let removeArgs = { removedItem: trg, removedIndex: index, cancel: false };
         this.trigger('removing', removeArgs, (tabRemovingArgs) => {
             if (!tabRemovingArgs.cancel) {
+                this.resetBlazorTemplates(this.items[index], index);
                 this.tbObj.removeItems(index);
                 this.items.splice(index, 1);
                 this.itemIndexArray.splice(index, 1);
                 this.refreshActiveBorder();
-                let cntTrg = select('#' + CLS_CONTENT$1 + '_' + this.extIndex(trg.id), select('.' + CLS_CONTENT$1, this.element));
+                let cntTrg = select('#' + CLS_CONTENT$1 + this.tabId + '_' + this.extIndex(trg.id), select('.' + CLS_CONTENT$1, this.element));
                 if (!isNullOrUndefined(cntTrg)) {
                     detach(cntTrg);
                 }
@@ -7589,8 +7823,9 @@ let Tab = class Tab extends Component {
      * @returns void.
      */
     select(args) {
-        this.tbItems = select('.' + CLS_HEADER$1 + ' .' + CLS_TB_ITEMS, this.element);
-        this.tbItem = selectAll('.' + CLS_HEADER$1 + ' .' + CLS_TB_ITEM, this.element);
+        let tabHeader = this.getTabHeader();
+        this.tbItems = select('.' + CLS_TB_ITEMS, tabHeader);
+        this.tbItem = selectAll('.' + CLS_TB_ITEM, tabHeader);
         this.content = select('.' + CLS_CONTENT$1, this.element);
         this.prevItem = this.tbItem[this.prevIndex];
         if (isNullOrUndefined(this.selectedItem) || (this.selectedItem < 0) || (this.tbItem.length <= this.selectedItem) || isNaN(this.selectedItem)) {
@@ -7614,10 +7849,12 @@ let Tab = class Tab extends Component {
             previousIndex: this.prevIndex,
             selectedItem: this.tbItem[this.selectedItem],
             selectedIndex: this.selectedItem,
-            selectedContent: !isNullOrUndefined(this.content) ? select('#' + CLS_CONTENT$1 + '_' + this.selectedID, this.content) : null,
+            selectedContent: !isNullOrUndefined(this.content) ?
+                select('#' + CLS_CONTENT$1 + this.tabId + '_' + this.selectedID, this.content) : null,
             selectingItem: trg,
             selectingIndex: args,
-            selectingContent: !isNullOrUndefined(this.content) ? select('#' + CLS_CONTENT$1 + '_' + this.selectingID, this.content) : null,
+            selectingContent: !isNullOrUndefined(this.content) ?
+                select('#' + CLS_CONTENT$1 + this.tabId + '_' + this.selectingID, this.content) : null,
             isSwiped: this.isSwipeed,
             cancel: false
         };
@@ -7815,12 +8052,12 @@ Tab = __decorate$7([
  * Tab modules
  */
 
-var __decorate$8 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __decorate$8 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var TreeView_1;
 const ROOT = 'e-treeview';
 const CONTROL = 'e-control';
@@ -7970,6 +8207,7 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         this.disableNode = [];
         this.parentNodeCheck = [];
         this.expandChildren = [];
+        this.isFieldChange = false;
         this.mouseDownStatus = false;
     }
     /**
@@ -8340,13 +8578,13 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         let childCheckedElement;
         for (let i = 0; i < indeterminate.length; i++) {
             let node = closest(indeterminate[i], '.' + LISTITEM);
-            let parentData = this.getTreeData(node);
-            let id = parentData[0][this.fields.id].toString();
+            let nodeId = node.getAttribute('data-uid').toString();
             if (this.dataType === 1) {
-                childCheckedElement = this.getChildNodes(this.treeData, id);
+                childCheckedElement = new DataManager(this.treeData).
+                    executeLocal(new Query().where(this.fields.parentID, 'equal', nodeId, true));
             }
             else {
-                childCheckedElement = getValue(this.fields.child.toString(), parentData[0]);
+                childCheckedElement = this.getChildNodes(this.treeData, nodeId);
             }
             let count = 0;
             if (childCheckedElement) {
@@ -9011,7 +9249,8 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         let eUids = this.expandedNodes;
         if (this.isInitalExpand && eUids.length > 0) {
             this.setProperties({ expandedNodes: [] }, true);
-            if (this.fields.dataSource instanceof DataManager) {
+            // tslint:disable
+            if (this.fields.dataSource instanceof DataManager && (this.fields.dataSource.adaptorName !== 'BlazorAdaptor')) {
                 this.expandGivenNodes(eUids);
             }
             else {
@@ -9067,11 +9306,13 @@ let TreeView = TreeView_1 = class TreeView extends Component {
     afterFinalized() {
         this.doSelectionAction();
         this.updateCheckedProp();
-        this.isLoaded = true;
         this.isAnimate = true;
         this.isInitalExpand = false;
-        let eventArgs = { data: this.treeData };
-        this.trigger('dataBound', eventArgs);
+        if (!this.isLoaded || this.isFieldChange) {
+            let eventArgs = { data: this.treeData };
+            this.trigger('dataBound', eventArgs);
+        }
+        this.isLoaded = true;
     }
     doSelectionAction() {
         let sNodes = selectAll('.' + SELECTED$1, this.element);
@@ -9235,7 +9476,12 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         removeClass([liEle], NODECOLLAPSED);
         let id = liEle.getAttribute('data-uid');
         if (!isNullOrUndefined(id) && this.expandedNodes.indexOf(id) === -1) {
-            this.expandedNodes.push(id);
+            if (this.isBlazorPlatform) {
+                this.setProperties({ expandedNodes: [].concat([], this.expandedNodes, [id]) }, true);
+            }
+            else {
+                this.expandedNodes.push(id);
+            }
         }
     }
     collapseNode(currLi, icon, e) {
@@ -9318,7 +9564,14 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         }
         let index = this.expandedNodes.indexOf(liEle.getAttribute('data-uid'));
         if (index > -1) {
-            this.expandedNodes.splice(index, 1);
+            if (this.isBlazorPlatform) {
+                let removeVal = this.expandedNodes.slice(0);
+                removeVal.splice(index, 1);
+                this.setProperties({ expandedNodes: [].concat([], removeVal) }, true);
+            }
+            else {
+                this.expandedNodes.splice(index, 1);
+            }
         }
     }
     disableExpandAttr(liEle) {
@@ -9367,6 +9620,9 @@ let TreeView = TreeView_1 = class TreeView extends Component {
                 mapper.dataSource.executeQuery(this.getQuery(mapper, parentLi.getAttribute('data-uid'))).then((e) => {
                     this.treeList.pop();
                     childItems = e.result;
+                    if (this.dataType === 1) {
+                        this.dataType = 2;
+                    }
                     this.loadChild(childItems, mapper, eicon, parentLi, expandChild, callback, loaded);
                     if (this.nodeTemplate && this.isBlazorPlatform && !this.isStringTemplate) {
                         this.updateBlazorTemplate();
@@ -10300,6 +10556,7 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         }
         this.setTouchClass();
         this.setProperties({ selectedNodes: [], checkedNodes: [], expandedNodes: [] }, true);
+        this.checkedElement = [];
         this.isLoaded = false;
         this.setDataBinding();
     }
@@ -10377,14 +10634,14 @@ let TreeView = TreeView_1 = class TreeView extends Component {
             newText = observedArgs.cancel ? observedArgs.oldText : observedArgs.newText;
             let newData = setValue(this.editFields.text, newText, this.editData);
             if (!isNullOrUndefined(this.nodeTemplateFn)) {
-                txtEle.innerHTML = '';
+                txtEle.innerText = '';
                 let tempArr = this.nodeTemplateFn(newData, undefined, undefined, this.element.id + 'nodeTemplate', this.isStringTemplate);
                 tempArr = Array.prototype.slice.call(tempArr);
                 append(tempArr, txtEle);
                 this.updateBlazorTemplate();
             }
             else {
-                txtEle.innerHTML = newText;
+                txtEle.innerText = newText;
             }
             if (isInput) {
                 removeClass([liEle], EDITING);
@@ -10527,24 +10784,27 @@ let TreeView = TreeView_1 = class TreeView extends Component {
                 }
                 let eventArgs = this.getDragEvent(e.event, this, null, e.target, null, virtualEle, level);
                 if (eventArgs.draggedNode.classList.contains(EDITING)) {
+                    this.dragObj.intDestroy(e.event);
                     this.dragCancelAction(virtualEle);
                 }
                 else {
                     this.trigger('nodeDragStart', eventArgs, (observedArgs) => {
                         if (observedArgs.cancel) {
+                            this.dragObj.intDestroy(e.event);
                             this.dragCancelAction(virtualEle);
                         }
                         else {
                             this.dragStartAction = true;
                         }
+                        if (isBlazor()) {
+                            e.bindEvents(getElement(e.dragElement));
+                        }
                     });
                 }
             },
             drag: (e) => {
-                if ((this.isBlazorPlatform && this.dragStartAction) || !this.isBlazorPlatform) {
-                    this.dragObj.setProperties({ cursorAt: { top: (!isNullOrUndefined(e.event.targetTouches) || Browser.isDevice) ? 60 : -20 } });
-                    this.dragAction(e, virtualEle);
-                }
+                this.dragObj.setProperties({ cursorAt: { top: (!isNullOrUndefined(e.event.targetTouches) || Browser.isDevice) ? 60 : -20 } });
+                this.dragAction(e, virtualEle);
             },
             dragStop: (e) => {
                 removeClass([this.element], DRAGGING);
@@ -10610,15 +10870,18 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         }
         if (dropRoot) {
             let dropLi = closest(e.target, '.' + LISTITEM);
+            let checkWrapper = closest(e.target, '.' + CHECKBOXWRAP);
+            let collapse = closest(e.target, '.' + COLLAPSIBLE);
+            let expand = closest(e.target, '.' + EXPANDABLE);
             if (!dropRoot.classList.contains(ROOT) || (dropWrap &&
                 (!dropLi.isSameNode(this.dragLi) && !this.isDescendant(this.dragLi, dropLi)))) {
-                if (dropLi && e && (e.event.offsetY < 7)) {
+                if ((dropLi && e && (!expand && !collapse) && (e.event.offsetY < 7) && !checkWrapper) || (((expand && e.event.offsetY < 5) || (collapse && e.event.offsetX < 3)))) {
                     addClass([icon], DROPNEXT);
                     let virEle = this.createElement('div', { className: SIBLING });
                     let index = this.fullRowSelect ? (1) : (0);
                     dropLi.insertBefore(virEle, dropLi.children[index]);
                 }
-                else if (dropLi && e && (e.target.offsetHeight > 0 && e.event.offsetY > (e.target.offsetHeight - 10))) {
+                else if ((dropLi && e && (!expand && !collapse) && (e.target.offsetHeight > 0 && e.event.offsetY > (e.target.offsetHeight - 10)) && !checkWrapper) || (((expand && e.event.offsetY > 19) || (collapse && e.event.offsetX > 19)))) {
                     addClass([icon], DROPNEXT);
                     let virEle = this.createElement('div', { className: SIBLING });
                     let index = this.fullRowSelect ? (2) : (1);
@@ -10717,7 +10980,10 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         this.triggerEvent();
     }
     appendNode(dropTarget, dragLi, dropLi, e, dragObj, offsetY) {
-        if (!dragLi.classList.contains('e-disable') && !dropLi.classList.contains('e-disable')) {
+        let checkWrapper = closest(dropTarget, '.' + CHECKBOXWRAP);
+        let collapse = closest(e.target, '.' + COLLAPSIBLE);
+        let expand = closest(e.target, '.' + EXPANDABLE);
+        if (!dragLi.classList.contains('e-disable') && !checkWrapper && ((expand && e.event.offsetY < 5) || (collapse && e.event.offsetX < 3) || (expand && e.event.offsetY > 19) || (collapse && e.event.offsetX > 19) || (!expand && !collapse))) {
             if (dropTarget.nodeName === 'LI') {
                 this.dropAsSiblingNode(dragLi, dropLi, e, dragObj);
             }
@@ -10726,10 +10992,16 @@ let TreeView = TreeView_1 = class TreeView extends Component {
                     this.dropAsSiblingNode(dragLi, dropLi, e, dragObj);
                 }
             }
+            else if ((dropTarget.classList.contains('e-icon-collapsible')) || (dropTarget.classList.contains('e-icon-expandable'))) {
+                this.dropAsSiblingNode(dragLi, dropLi, e, dragObj);
+            }
             else {
                 this.dropAsChildNode(dragLi, dropLi, dragObj, null, e, offsetY);
             }
         }
+        else {
+            this.dropAsChildNode(dragLi, dropLi, dragObj, null, e, offsetY, true);
+        }
     }
     dropAsSiblingNode(dragLi, dropLi, e, dragObj) {
         let dropUl = closest(dropLi, '.' + PARENTITEM);
@@ -10742,7 +11014,21 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         else if (e.event.offsetY < 2) {
             pre = true;
         }
-        dropUl.insertBefore(dragLi, pre ? e.target : e.target.nextElementSibling);
+        else if (e.target.classList.contains('e-icon-expandable') || (e.target.classList.contains('e-icon-collapsible'))) {
+            if ((e.event.offsetY < 5) || (e.event.offsetX < 3)) {
+                pre = true;
+            }
+            else if ((e.event.offsetY > 15) || (e.event.offsetX > 17)) {
+                pre = false;
+            }
+        }
+        if ((e.target.classList.contains('e-icon-expandable')) || (e.target.classList.contains('e-icon-collapsible'))) {
+            var target = e.target.closest('li');
+            dropUl.insertBefore(dragLi, pre ? target : target.nextElementSibling);
+        }
+        else {
+            dropUl.insertBefore(dragLi, pre ? e.target : e.target.nextElementSibling);
+        }
         this.moveData(dragLi, dropLi, dropUl, pre, dragObj);
         this.updateElement(dragParentUl, dragParentLi);
         this.updateAriaLevel(dragLi);
@@ -10754,15 +11040,15 @@ let TreeView = TreeView_1 = class TreeView extends Component {
             this.updateInstance();
         }
     }
-    dropAsChildNode(dragLi, dropLi, dragObj, index, e, pos) {
+    dropAsChildNode(dragLi, dropLi, dragObj, index, e, pos, isCheck) {
         let dragParentUl = closest(dragLi, '.' + PARENTITEM);
         let dragParentLi = closest(dragParentUl, '.' + LISTITEM);
         let dropParentUl = closest(dropLi, '.' + PARENTITEM);
-        if (e && (pos < 7)) {
+        if (e && (pos < 7) && !isCheck) {
             dropParentUl.insertBefore(dragLi, dropLi);
             this.moveData(dragLi, dropLi, dropParentUl, true, dragObj);
         }
-        else if (e && (e.target.offsetHeight > 0 && pos > (e.target.offsetHeight - 10))) {
+        else if (e && (e.target.offsetHeight > 0 && pos > (e.target.offsetHeight - 10)) && !isCheck) {
             dropParentUl.insertBefore(dragLi, dropLi.nextElementSibling);
             this.moveData(dragLi, dropLi, dropParentUl, false, dragObj);
         }
@@ -11661,6 +11947,7 @@ let TreeView = TreeView_1 = class TreeView extends Component {
      * @returns void
      * @private
      */
+    // tslint:disable-next-line:max-func-body-length
     onPropertyChanged(newProp, oldProp) {
         for (let prop of Object.keys(newProp)) {
             switch (prop) {
@@ -11701,10 +11988,14 @@ let TreeView = TreeView_1 = class TreeView extends Component {
                     break;
                 case 'expandedNodes':
                     this.isAnimate = false;
-                    this.setProperties({ expandedNodes: [] }, true);
+                    if (!this.isBlazorPlatform) {
+                        this.setProperties({ expandedNodes: [] }, true);
+                    }
                     this.collapseAll();
                     this.isInitalExpand = true;
-                    this.setProperties({ expandedNodes: isNullOrUndefined(newProp.expandedNodes) ? [] : newProp.expandedNodes }, true);
+                    if (!this.isBlazorPlatform) {
+                        this.setProperties({ expandedNodes: isNullOrUndefined(newProp.expandedNodes) ? [] : newProp.expandedNodes }, true);
+                    }
                     this.doExpandAction();
                     this.isInitalExpand = false;
                     this.isAnimate = true;
@@ -11718,11 +12009,13 @@ let TreeView = TreeView_1 = class TreeView extends Component {
                     break;
                 case 'fields':
                     this.isAnimate = false;
+                    this.isFieldChange = true;
                     this.initialRender = true;
                     this.updateListProp(this.fields);
                     this.reRenderNodes();
                     this.initialRender = false;
                     this.isAnimate = true;
+                    this.isFieldChange = false;
                     break;
                 case 'fullRowSelect':
                     this.setFullRow(this.fullRowSelect);
@@ -11771,7 +12064,9 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         this.setCssClass(this.cssClass, null);
         this.setDragAndDrop(false);
         this.setFullRow(false);
-        this.element.innerHTML = '';
+        if (this.ulElement && this.ulElement.parentElement) {
+            this.ulElement.parentElement.removeChild(this.ulElement);
+        }
         super.destroy();
     }
     /**
@@ -11789,7 +12084,7 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         nodes = JSON.parse(JSON.stringify(nodes));
         let dropLi = this.getElement(target);
         this.preventExpand = preventTargetExpand;
-        if (this.fields.dataSource instanceof DataManager) {
+        if (this.fields.dataSource instanceof DataManager && (this.fields.dataSource.adaptorName !== 'BlazorAdaptor')) {
             let dropUl;
             let icon = dropLi ? dropLi.querySelector('.' + ICON) : null;
             let proxy = this;
@@ -11826,7 +12121,7 @@ let TreeView = TreeView_1 = class TreeView extends Component {
         if (this.showCheckBox && dropLi) {
             this.ensureParentCheckState(dropLi);
         }
-        if (this.fields.dataSource instanceof DataManager === false) {
+        if ((this.fields.dataSource instanceof DataManager === false) || (this.fields.dataSource instanceof DataManager) && (this.fields.dataSource.adaptorName === 'BlazorAdaptor')) {
             this.preventExpand = false;
             this.triggerEvent();
         }
@@ -11933,50 +12228,12 @@ let TreeView = TreeView_1 = class TreeView extends Component {
      */
     getAllCheckedNodes() {
         let checkNodes = this.checkedNodes;
-        let newCheck = [];
-        let i = 0;
-        let id = this.fields.id;
-        for (i; i < this.treeData.length; i++) {
-            //Checks if isChecked is enabled while node is not loaded in DOM
-            let checked = null;
-            let childNode = null;
-            let isLoaded = this.element.querySelector('[data-uid="' + this.treeData[i][id].toString() + '"]');
-            if (isLoaded && isLoaded.querySelector('.e-list-item') === null) {
-                //Checks if isChecked is enabled for parent
-                if (this.getTreeData()[i][this.fields.isChecked] === true
-                    && this.checkedElement.indexOf(this.getTreeData()[i][id].toString()) === -1) {
-                    newCheck.push(this.treeData[i][id].toString());
-                    checked = 2;
-                }
-                //Checks for child nodes with isChecked enabled
-                if (checked !== 2) {
-                    checked = 1;
-                }
-                childNode = this.getChildNodes(this.getTreeData(), this.getTreeData()[i][id].toString());
-                (childNode !== null && this.autoCheck) ? this.allCheckNode(childNode, newCheck, checked) : childNode = null;
-            }
-        }
-        i = 0;
-        //Gets checked nodes based on UI interaction
-        while (i < checkNodes.length) {
-            if (newCheck.indexOf(checkNodes[i]) !== -1) {
-                i++;
-                continue;
-            }
-            newCheck.push(checkNodes[i]);
-            //Gets all child which is not loaded while parent is checked
-            let parentNode = this.element.querySelector('[data-uid="' + checkNodes[i] + '"]');
-            if (parentNode && parentNode.querySelector('.e-list-item') === null) {
-                let child = this.getChildNodes(this.treeData, checkNodes[i].toString());
-                (child && this.autoCheck) ? this.allCheckNode(child, newCheck) : child = null;
-            }
-            i++;
-        }
-        return newCheck;
+        return checkNodes;
     }
     /**
      * Get the node's data such as id, text, parentID, selected, isChecked, and expanded by passing the node element or it's ID.
      * @param  {string | Element} node - Specifies ID of TreeView node/TreeView node.
+     * @BlazorType NodeData
      */
     getNode(node) {
         let ele = this.getElement(node);
@@ -12201,12 +12458,12 @@ TreeView = TreeView_1 = __decorate$8([
  * TreeView modules
  */
 
-var __decorate$9 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
+var __decorate$9 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 const CONTROL$1 = 'e-control';
 const ROOT$1 = 'e-sidebar';
 const DOCKER = 'e-dock';
@@ -12871,5 +13128,5 @@ Sidebar = __decorate$9([
  * Navigation all modules
  */
 
-export { MenuAnimationSettings, HScroll, VScroll, Item, Toolbar, AccordionActionSettings, AccordionAnimationSettings, AccordionItem, Accordion, ContextMenu, Menu, TabActionSettings, TabAnimationSettings, Header, TabItem, Tab, FieldsSettings, ActionSettings, NodeAnimationSettings, TreeView, Sidebar };
+export { MenuAnimationSettings, MenuItem, HScroll, VScroll, Item, Toolbar, AccordionActionSettings, AccordionAnimationSettings, AccordionItem, Accordion, ContextMenu, Menu, TabActionSettings, TabAnimationSettings, Header, TabItem, Tab, FieldsSettings, ActionSettings, NodeAnimationSettings, TreeView, Sidebar };
 //# sourceMappingURL=ej2-navigations.es2015.js.map