@wavemaker/app-runtime-wm-build 11.4.0-next.140429 → 11.4.0-next.140433

app-runtime-wm-build/wmmobile/scripts/wm-mobileloader.js

@@ -11229,7 +11229,7 @@
             if (openedDialogs.indexOf(ref) !== -1) {
                 openedDialogs.splice(openedDialogs.indexOf(ref), 1);
             }
-            if (openedDialogs.length === 0 && core$1.isMobileApp()) {
+            if (openedDialogs.length === 0 && (core$1.isMobile() || core$1.isMobileApp())) {
                 var parentSelector = $("body > app-root")[0];
                 parentSelector.removeAttribute("aria-hidden");
             }
@@ -13440,21 +13440,19 @@
         __proto__: null,
         default: search_build
     });
-    var tagName$1o = "div";
+    var tagName$1o = "ul";
     transpiler.register("wm-tree", (function() {
         return {
             pre: function(attrs) {
-                return "<" + tagName$1o + " wmTree " + transpiler.getAttrMarkup(attrs) + ">";
+                return "<" + tagName$1o + ' wmTree class="ztree" ' + transpiler.getAttrMarkup(attrs) + ">";
             },
             post: function() {
                 return "</" + tagName$1o + ">";
             }
         };
     }));
-    var tree_build = function() {};
-    var tree_build$1 = Object.freeze({
-        __proto__: null,
-        default: tree_build
+    var tree_build = Object.freeze({
+        __proto__: null
     });
     var tagName$1n = "div";
     transpiler.register("wm-card", (function() {
@@ -16435,7 +16433,7 @@
     exports.tileBuild = tile_build$1;
     exports.timeBuild = time_build$1;
     exports.topNavBuild = topNav_build$1;
-    exports.treeBuild = tree_build$1;
+    exports.treeBuild = tree_build;
     exports.videoBuild = video_build$1;
     exports.wizardBuild = wizard_build$1;
     exports.wizardStepBuild = wizardStep_build$1;
@@ -22781,10 +22779,10 @@
 }));
 
 (function(global, factory) {
-    typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@angular/core"), require("@angular/common"), require("@wm/components/base"), require("@wm/core")) : typeof define === "function" && define.amd ? define("@wm/components/basic/tree", [ "exports", "@angular/core", "@angular/common", "@wm/components/base", "@wm/core" ], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, 
+    typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@angular/core"), require("@angular/common"), require("@wm/components/base")) : typeof define === "function" && define.amd ? define("@wm/components/basic/tree", [ "exports", "@angular/core", "@angular/common", "@wm/components/base" ], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, 
     factory((global.wm = global.wm || {}, global.wm.components = global.wm.components || {}, 
-    global.wm.components.basic = global.wm.components.basic || {}, global.wm.components.basic.tree = {}), global.ng.core, global.ng.common, global.wm.components.base, global.wm.core));
-})(this, (function(exports, core$1, common, base, core) {
+    global.wm.components.basic = global.wm.components.basic || {}, global.wm.components.basic.tree = {}), global.ng.core, global.ng.common, global.wm.components.base));
+})(this, (function(exports, core, common, base) {
     "use strict";
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -23161,352 +23159,333 @@
             value: 0
         }, base.PROP_NUMBER) ], [ "treeicons", base.PROP_STRING ] ]));
     };
-    var defaultTreeIconClass = "plus-minus";
-    var ICON_CLASSES = {
-        folder: {
-            expanded: "wi-folder-open",
-            collapsed: "wi-folder"
-        },
-        "circle-plus-minus": {
-            expanded: "wi-remove-circle-outline",
-            collapsed: "wi-add-circle-outline"
-        },
-        chevron: {
-            expanded: "wi-keyboard-arrow-down",
-            collapsed: "wi-keyboard-arrow-right"
-        },
-        menu: {
-            expanded: "wi-arrow-down",
-            collapsed: "wi-arrow-right"
-        },
-        triangle: {
-            expanded: "wi-arrow-drop-down-circle",
-            collapsed: "wi-play-circle-filled"
-        },
-        "expand-collapse": {
-            expanded: "wi-expand-less",
-            collapsed: "wi-expand-more"
-        },
-        "plus-minus": {
-            expanded: "wi-minus",
-            collapsed: "wi-plus"
-        }
-    };
     var WIDGET_INFO = {
         widgetType: "wm-tree",
         hostClass: "app-tree"
     };
-    var TreeDirective = function(_super) {
-        __extends(TreeDirective, _super);
-        function TreeDirective(inj, binddatavalue, bindnodelabel, bindnodeicon, bindnodechildren, bindnodeid) {
+    var defaultTreeIconClass = "plus-minus";
+    var TreeComponent = function(_super) {
+        __extends(TreeComponent, _super);
+        function TreeComponent(inj) {
             var _this = _super.call(this, inj, WIDGET_INFO) || this;
-            _this.binddatavalue = binddatavalue;
-            _this.bindnodelabel = bindnodelabel;
-            _this.bindnodeicon = bindnodeicon;
-            _this.bindnodechildren = bindnodechildren;
-            _this.bindnodeid = bindnodeid;
+            _this.setting = {
+                data: {
+                    simpleData: {
+                        enable: true
+                    }
+                },
+                view: {
+                    dblClickExpand: false,
+                    fontCss: {
+                        "font-awesome": true
+                    },
+                    switchIcon: {}
+                },
+                check: {},
+                callback: {}
+            };
             base.styler(_this.nativeElement, _this, base.APPLY_STYLES_TYPE.CONTAINER);
-            _this.bindEvents();
             return _this;
         }
-        TreeDirective.prototype.onPropertyChange = function(key, nv, ov) {
+        TreeComponent.prototype.onPropertyChange = function(key, nv, ov) {
             switch (key) {
               case "dataset":
                 this.nodes = this.getNodes(nv);
-                this._selectNode = undefined;
+                if (this.level > 0) {
+                    this.expandTree(this.level, this.nodes, 0);
+                }
                 this.renderTree();
                 break;
 
-              case "nodeicon":
-              case "nodelabel":
-              case "nodechildren":
-              case "orderby":
-                this.renderTree();
+              case "levels":
+                if (nv > 0) {
+                    this.level = nv;
+                }
                 break;
 
               case "treeicons":
-                this.changeTreeIcons(nv, ov);
+                this.treeicon = nv;
                 break;
 
-              case "datavalue":
-                this.selectById(nv);
+              case "nodelabel":
+                this.nodelabel = nv;
+                break;
+
+              case "icon":
+                this.nodeicon = nv;
+
+              case "orderby":
+                this.renderTree();
+                break;
+
+              case "class":
+                this.treeClass = nv;
                 break;
 
               default:
                 _super.prototype.onPropertyChange.call(this, key, nv, ov);
+                break;
             }
         };
-        TreeDirective.prototype.constructNodes = function(nodes, parent, levels, deep, _evalDataValue) {
+        TreeComponent.prototype.expandTree = function(level, node, childLevel) {
             var _this = this;
-            var $ul = $("<ul></ul>");
-            var _iconClses = ICON_CLASSES[this.treeicons || defaultTreeIconClass];
-            var _expr = this.binddatavalue || this.datavalue;
-            var _iconCls, _cls;
-            _cls = levels > 0 ? " expanded " : " collapsed ";
-            _iconCls = _cls + (levels > 0 ? _iconClses.expanded : _iconClses.collapsed);
-            deep = deep || 0;
-            parent.append($ul);
-            nodes.forEach((function(node, idx) {
-                var $li = $("<li></li>"), $iconNode = $("<i></i>"), nodeLabel = base.getEvaluatedData(node, {
-                    field: _this.nodelabel,
-                    bindExpression: _this.bindnodelabel
-                }, _this.viewParent) || node.label, nodeIcon = base.getEvaluatedData(node, {
-                    field: _this.nodeicon,
-                    bindExpression: _this.bindnodeicon
-                }, _this.viewParent) || node.icon, nodeChildren = base.getEvaluatedData(node, {
-                    field: _this.nodechildren,
-                    bindExpression: _this.bindnodechildren
-                }, _this.viewParent) || node.children;
-                var nodeIdValue = base.getEvaluatedData(node, {
-                    field: _this.nodeid,
-                    bindExpression: _this.bindnodeid
-                }, _this.viewParent);
-                if (nodeIdValue === undefined) {
-                    nodeIdValue = node.children;
-                }
-                var isNodeMatched = false, expandCollapseIcon;
-                $li.data("nodedata", node).append($iconNode).append('<span class="title">' + nodeLabel + "</span>").appendTo($ul);
-                if (_this.bindnodeid || _this.nodeid) {
-                    isNodeMatched = _this.binddatavalue ? nodeIdValue === _evalDataValue : nodeIdValue === _expr;
-                    if (nodeIdValue !== undefined) {
-                        $li.attr("id", nodeIdValue);
-                    }
-                } else if (_this.binddatavalue) {
-                    isNodeMatched = !!core.$parseExpr(_expr)(_this, node);
-                }
-                if (!_this._selectNode) {
-                    if (_expr === "FirstNode" && idx === 0 || !deep && _expr === "LastNode" && idx === nodes.length - 1 || isNodeMatched) {
-                        _this._selectNode = $li;
-                        _this.datavalue = nodeIdValue;
-                    }
-                }
-                if (nodeIcon) {
-                    $iconNode.addClass(nodeIcon);
-                }
-                if (nodeChildren && nodeChildren.length) {
-                    $li.addClass("parent-node " + _cls);
-                    expandCollapseIcon = $('<i class="wi ' + _iconCls + '"></i>');
-                    if (nodeIcon) {
-                        $iconNode.addClass(nodeIcon);
-                    }
-                    $li.prepend(expandCollapseIcon);
-                    _this.constructNodes(nodeChildren, $li, levels - 1, deep + 1, _evalDataValue);
+            node.map((function(childNode) {
+                if ("children" in childNode && !("open" in childNode) && childLevel < level) {
+                    childNode["open"] = true;
+                    _this.expandTree(level, childNode.children, childLevel + 1);
                 } else {
-                    if (!nodeIcon) {
-                        $iconNode.addClass("leaf-node");
-                    }
-                    $li.addClass("leaf-node");
+                    childLevel = 0;
+                    return;
                 }
             }));
         };
-        TreeDirective.prototype.getNodesFromString = function(value) {
+        TreeComponent.prototype.setTreeTemplate = function(value) {
+            if (value === "Classic") {
+                this.setting.check["enable"] = false;
+            } else if (value === "Checkbox") {
+                this.setting.check["enable"] = true;
+                this.setting.check["chkStyle"] = "checkbox";
+            } else if (value === "Radio") {
+                this.setting.check["enable"] = true;
+                this.setting.check["chkStyle"] = "radio";
+                this.setting.check["radioType"] = "all";
+            }
+        };
+        TreeComponent.prototype.getNodesFromString = function(value) {
             return value.split(",").map((function(item) {
                 return {
-                    label: item && item.trim()
+                    name: item && item.trim()
                 };
             }));
         };
-        TreeDirective.prototype.getNodes = function(newVal) {
+        TreeComponent.prototype.getNodes = function(newVal) {
             var nodes;
-            if (_.isString(newVal) && !_.isEmpty(newVal)) {
+            if (_.isArray(newVal)) {
+                nodes = base.getOrderedDataset(newVal, this.orderby);
+            } else if (_.isObject(newVal)) {
+                nodes = [ newVal ];
+            } else if (_.isString(newVal) && !_.isEmpty(newVal)) {
                 newVal = newVal.trim();
                 if (newVal) {
                     nodes = this.getNodesFromString(newVal);
                 }
-            } else if (_.isArray(newVal)) {
-                newVal = base.getOrderedDataset(newVal, this.orderby);
-                nodes = newVal;
-            } else if (_.isObject(newVal)) {
-                nodes = [ newVal ];
             }
             return nodes;
         };
-        TreeDirective.prototype.changeTreeIcons = function(nv, ov) {
-            var $el = $(this.nativeElement);
-            nv = nv || defaultTreeIconClass;
-            ov = ov || defaultTreeIconClass;
-            $el.find("i.expanded").removeClass(ICON_CLASSES[ov].expanded).addClass(ICON_CLASSES[nv].expanded);
-            $el.find("i.collapsed").removeClass(ICON_CLASSES[ov].collapsed).addClass(ICON_CLASSES[nv].collapsed);
-        };
-        TreeDirective.prototype.toggleExpandCollapseNode = function($event, $i, $li) {
-            var treeIcons = ICON_CLASSES[this.treeicons || defaultTreeIconClass];
-            var $liPath = this.findSelectedNodeParent($li);
-            var path = "";
-            $liPath.each((function(i, el) {
-                var current = $(el).children(".title").text();
-                path = "/" + (current + path);
-            }));
-            var eventParams = {
-                $event: $event,
-                $item: $li.data("nodedata"),
-                $path: path
-            };
-            if ($i.hasClass("collapsed")) {
-                $i.removeClass("collapsed " + treeIcons.collapsed).addClass("expanded " + treeIcons.expanded);
-                $li.removeClass("collapsed").addClass("expanded");
-                this.invokeEventCallback("expand", eventParams);
-            } else if ($i.hasClass("expanded")) {
-                $i.removeClass("expanded " + treeIcons.expanded).addClass("collapsed " + treeIcons.collapsed);
-                $li.removeClass("expanded").addClass("collapsed");
-                this.invokeEventCallback("collapse", eventParams);
-            }
+        TreeComponent.prototype.setNodeclasses = function(treeId, treeNode) {
+            return treeNode.icon ? {
+                add: [ "" + treeNode.icon ]
+            } : "";
         };
-        TreeDirective.prototype.renderTree = function(forceRender) {
+        TreeComponent.prototype.setNodeData = function(nodes, depth, level, parentNode, type) {
             var _this = this;
-            var docFrag, $li, $liPath, data, path = "";
-            var levels = +this.nativeElement.getAttribute("levels") || 0, $el = $(this.nativeElement);
-            $el.empty();
-            if (forceRender) {
-                this._selectNode = undefined;
-            }
-            if (this.nodes && this.nodes.length) {
-                docFrag = document.createDocumentFragment();
-                this.constructNodes(this.nodes, $(docFrag), levels, 0, this.datavalue);
-                $el.append(docFrag);
-            }
-            if (this._selectNode) {
-                $li = this._selectNode;
-                $li.addClass("selected");
-                data = $li.data("nodedata");
-                $liPath = this.findSelectedNodeParent($li);
-                if (!$liPath.length) {
-                    $liPath = $li;
-                }
-                $liPath.each((function(i, el) {
-                    var $current = $(el), $i = $current.children("i.collapsed"), $title = $current.children(".title");
-                    _this.toggleExpandCollapseNode(undefined, $i, $current);
-                    path = "/" + ($title.text() + path);
+            if (depth === 0) {
+                nodes.map((function(node) {
+                    if (node.children) {
+                        _this.setNodeData(node.children, depth, level, parentNode, type);
+                    }
+                    if (node.icon && _this.nodelabel == "icon") {
+                        node[type] = node.icon;
+                    } else if (node.name && _this.nodelabel == "name") {
+                        node[type] = node.name;
+                    } else {
+                        return;
+                    }
+                }));
+            } else {
+                nodes.map((function(node) {
+                    if (node.children && level > 1) {
+                        if (depth === level) {
+                            parentNode = node;
+                        }
+                        _this.setNodeData(node.children, depth, level - 1, parentNode, type);
+                    }
+                    if (level === 1 && (type === "name" ? _this.nodelabel.includes("label") || _this.nodelabel.includes("name") : _this.nodeicon.includes("label") || _this.nodeicon.includes("name"))) {
+                        parentNode[type] = node.name || node.label;
+                        return;
+                    } else if (level === 1 && node.icon !== undefined && (type === "name" ? _this.nodelabel.includes("icon") : _this.nodeicon.includes("icon"))) {
+                        parentNode[type] = node.icon;
+                        return;
+                    } else {
+                        return;
+                    }
                 }));
-                this.selecteditem = core.getClonedObject(data) || {};
-                this.selecteditem.path = path;
-                this.invokeEventCallback("select", {
-                    $event: undefined,
-                    $item: data,
-                    $path: path
-                });
-                core.$appDigest();
             }
         };
-        TreeDirective.prototype.selectNode = function(evt, value) {
-            var _this = this;
-            var target = evt && $(evt.target), $el = $(this.nativeElement), $li = _.isObject(value) ? value : $el.find('li[id="' + value + '"]').first();
-            var data, path = "", $liPath, nodeAction;
-            $el.find(".selected").removeClass("selected");
-            if (!$li.length) {
-                return;
-            }
-            $li.addClass("selected");
-            data = $li.data("nodedata");
-            nodeAction = data[this.nodeaction || "action"];
-            $liPath = target ? target.parents(".app-tree li") : this.findSelectedNodeParent($li);
-            $liPath.each((function(i, el) {
-                var current = $(el).children(".title").text();
-                path = "/" + (current + path);
-            }));
-            $li.parentsUntil($el, "li.parent-node.collapsed").each((function(index, el) {
-                var $current = $(el), $i = $current.children("i.collapsed");
-                _this.toggleExpandCollapseNode(undefined, $i, $current);
-            }));
-            this.selecteditem = core.getClonedObject(data) || {};
-            this.selecteditem.path = path;
-            if (target) {
-                if (this.nodeid || this.bindnodeid) {
-                    this.datavalue = base.getEvaluatedData(data, {
-                        field: this.nodeid,
-                        bindExpression: this.bindnodeid
-                    }, this.viewParent);
-                } else {
-                    this.datavalue = core.getClonedObject(data) || {};
-                }
+        TreeComponent.prototype.changeTreeIcons = function(nv) {
+            var eleClose = $('ul[name="' + this.name + '"] li span.button.switch');
+            $(eleClose).map((function(idx, ele) {
+                $(ele).addClass(nv);
+                $(ele).on("click", (function(e) {
+                    setTimeout((function() {
+                        $(ele).addClass(nv);
+                    }), 0);
+                }));
+            }));
+        };
+        TreeComponent.prototype.getPath = function(treeNode, path) {
+            if (treeNode.getParentNode() === null) {
+                path = "/" + treeNode.name + path;
             } else {
-                this.datavalue = value;
+                path = this.getPath(treeNode.getParentNode(), path) + "/" + treeNode.name;
             }
-            if (nodeAction) {
-                core.$parseEvent(nodeAction)(this);
+            return path;
+        };
+        TreeComponent.prototype.onClick = function(event, treeId, treeNode, clickFlag) {
+            var treeObj = $.fn.zTree.getZTreeObj("" + this.name);
+            if (this.nodeclick === "expand") {
+                treeObj.expandNode(treeNode, treeNode.open ? false : true, false, true);
+                this.changeTreeIcons(this.treeicon || defaultTreeIconClass);
+                var path = this.getPath(treeNode, "");
+                var eventParams = {
+                    $event: event,
+                    $item: treeNode,
+                    $path: path
+                };
+                this.invokeEventCallback("select", eventParams);
+                if (treeNode.open) {} else {
+                    this.invokeEventCallback("collapse", eventParams);
+                }
             }
-            this.invokeEventCallback("select", {
-                $event: evt,
-                $item: data,
-                $path: path
-            });
-            core.$appDigest();
         };
-        TreeDirective.prototype.bindEvents = function() {
+        TreeComponent.prototype.onExpand = function(event, treeId, treeNode) {
+            var self = this;
+            treeNode.children ? treeNode.children.map((function(el) {
+                if (el.isParent) {
+                    var ele_1 = $("#" + el.tId + "_switch");
+                    $(ele_1).addClass(self.treeicon || defaultTreeIconClass);
+                    $(ele_1).on("click", (function(e) {
+                        setTimeout((function() {
+                            $(ele_1).addClass(self.treeicon || defaultTreeIconClass);
+                        }), 0);
+                    }));
+                }
+            })) : "";
+        };
+        TreeComponent.prototype.modifyObjects = function(array) {
             var _this = this;
-            $(this.nativeElement).on("click", (function(evt) {
-                var target = $(evt.target), li = target.closest("li"), $i = target.is("i") ? target : target.siblings("i.collapsed,i.expanded");
-                evt.stopPropagation();
-                if (target.is("span.title")) {
-                    _this.selecteditem = {};
-                    _this.selectNode(evt, li);
+            array.forEach((function(obj) {
+                if (obj.label !== undefined) {
+                    obj.name = obj.label;
+                    delete obj.label;
                 }
-                if (target.is("i") || target.is("span.title") && _this.nodeclick === "expand") {
-                    _this.toggleExpandCollapseNode(evt, $i, li);
+                if (obj.children !== undefined) {
+                    _this.modifyObjects(obj.children);
                 }
             }));
+            return array;
         };
-        TreeDirective.prototype.findSelectedNodeParent = function($li) {
-            return $li.find("> span.title").parents(".app-tree li");
+        TreeComponent.prototype.setNodeChildren = function(nodes, depth, level, parentNode) {
+            if (depth <= 0) {
+                return nodes;
+            }
+            for (var i = 0; i < nodes.length; i++) {
+                var node = nodes[i];
+                if (depth === level) {
+                    parentNode = nodes[i];
+                }
+                if (node.children && node.children.length > 0) {
+                    if (level === 1) {
+                        parentNode.children = node.children.map((function(child) {
+                            return {
+                                name: child.name,
+                                children: child === null || child === void 0 ? void 0 : child.children
+                            };
+                        }));
+                        return;
+                    } else {
+                        this.setNodeChildren(node.children, depth, level - 1, parentNode);
+                    }
+                }
+            }
+            return nodes;
         };
-        TreeDirective.prototype.selectById = function(value) {
-            this.selectNode(undefined, value);
+        TreeComponent.prototype.countDepth = function(str) {
+            var e_1, _a;
+            var regex = /\[.*?\]/g;
+            var matches = str.match(regex);
+            var count = 1;
+            if (matches === null) return count;
+            try {
+                for (var matches_1 = __values(matches), matches_1_1 = matches_1.next(); !matches_1_1.done; matches_1_1 = matches_1.next()) {
+                    var match = matches_1_1.value;
+                    count++;
+                }
+            } catch (e_1_1) {
+                e_1 = {
+                    error: e_1_1
+                };
+            } finally {
+                try {
+                    if (matches_1_1 && !matches_1_1.done && (_a = matches_1.return)) _a.call(matches_1);
+                } finally {
+                    if (e_1) throw e_1.error;
+                }
+            }
+            return count;
         };
-        TreeDirective.prototype.deselectById = function(value) {
-            this.selecteditem = {};
-            this.selectById();
+        TreeComponent.prototype.renderTree = function() {
+            if (this.nodes) {
+                this.nativeElement.setAttribute("id", this.name);
+                this.nodes = this.modifyObjects(this.nodes);
+                this.setTreeTemplate(this.treeClass);
+                if (this.nodelabel) {
+                    var depth = 0;
+                    if (this.nodelabel.includes("children")) {
+                        depth = this.countDepth(this.nodelabel);
+                    }
+                    this.setNodeData(this.nodes, depth, depth, null, "name");
+                }
+                if (this.nodeicon) {
+                    var depth = 0;
+                    if (this.nodeicon.includes("children")) {
+                        depth = this.countDepth(this.nodeicon);
+                    }
+                    this.setNodeData(this.nodes, depth, depth, null, "icon");
+                }
+                if (this.nodechildren) {
+                    var depth = this.countDepth(this.nodechildren);
+                    if (depth > 1) {
+                        this.nodes = this.setNodeChildren(this.nodes, depth, depth, null);
+                    }
+                }
+            }
+            this.setting.view["nodeClasses"] = this.setNodeclasses;
+            this.setting.callback["onClick"] = this.onClick.bind(this);
+            this.setting.callback["onExpand"] = this.onExpand.bind(this);
+            var zTree = $.fn.zTree.init($('ul[name="' + this.name + '"]'), this.setting, this.nodes);
+            $.fn.zTreeKeyboardNavigation(zTree, $('ul[name="' + this.name + '"]'), null, this.treeicon || defaultTreeIconClass);
         };
-        return TreeDirective;
+        TreeComponent.prototype.ngAfterViewInit = function() {
+            var _this = this;
+            setTimeout((function() {
+                _this.changeTreeIcons(_this.treeicon || defaultTreeIconClass);
+            }), 200);
+        };
+        return TreeComponent;
     }(base.StylableComponent);
-    TreeDirective.initializeProps = registerProps();
-    TreeDirective.decorators = [ {
-        type: core$1.Directive,
+    TreeComponent.initializeProps = registerProps();
+    TreeComponent.decorators = [ {
+        type: core.Component,
         args: [ {
-            selector: "div[wmTree]",
-            providers: [ base.provideAsWidgetRef(TreeDirective) ]
+            selector: "ul[wmTree]",
+            template: '<ul #wmTree class="ztree" id="ztree"></ul>  ',
+            providers: [ base.provideAsWidgetRef(TreeComponent) ],
+            encapsulation: core.ViewEncapsulation.None
         } ]
     } ];
-    TreeDirective.ctorParameters = function() {
+    TreeComponent.ctorParameters = function() {
         return [ {
-            type: core$1.Injector
-        }, {
-            type: undefined,
-            decorators: [ {
-                type: core$1.Attribute,
-                args: [ "datavalue.bind" ]
-            } ]
-        }, {
-            type: undefined,
-            decorators: [ {
-                type: core$1.Attribute,
-                args: [ "nodelabel.bind" ]
-            } ]
-        }, {
-            type: undefined,
-            decorators: [ {
-                type: core$1.Attribute,
-                args: [ "nodeicon.bind" ]
-            } ]
-        }, {
-            type: undefined,
-            decorators: [ {
-                type: core$1.Attribute,
-                args: [ "nodechildren.bind" ]
-            } ]
-        }, {
-            type: undefined,
-            decorators: [ {
-                type: core$1.Attribute,
-                args: [ "nodeid.bind" ]
-            } ]
+            type: core.Injector
         } ];
     };
-    var components = [ TreeDirective ];
+    var components = [ TreeComponent ];
     var TreeModule = function() {
         function TreeModule() {}
         return TreeModule;
     }();
     TreeModule.decorators = [ {
-        type: core$1.NgModule,
+        type: core.NgModule,
         args: [ {
             imports: [ common.CommonModule, base.WmComponentsModule ],
             declarations: __spreadArray([], __read(components)),
@@ -23514,7 +23493,7 @@
             entryComponents: []
         } ]
     } ];
-    exports.TreeDirective = TreeDirective;
+    exports.TreeComponent = TreeComponent;
     exports.TreeModule = TreeModule;
     exports["\u0275a"] = registerProps;
     Object.defineProperty(exports, "__esModule", {
@@ -26924,22 +26903,24 @@
             configurable: true
         });
         DateTimePickerComponent.prototype.validateSelectedDate = function() {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e;
             if (!this.changedValue) {
                 return true;
             }
             var cd = moment(this.changedValue);
-            if (((_a = this._bsDatepickerConfig) === null || _a === void 0 ? void 0 : _a.minDate) && ((_b = this._bsDatepickerConfig) === null || _b === void 0 ? void 0 : _b.minDate) > this.changedValue) {
+            var minDate = (_a = this._bsDatepickerConfig) === null || _a === void 0 ? void 0 : _a.minDate;
+            var maxDate = (_b = this._bsDatepickerConfig) === null || _b === void 0 ? void 0 : _b.maxDate;
+            if (minDate && (this.mode === "DATE" && moment(minDate).startOf("day").toDate() > this.changedValue || this.mode !== "DATE" && minDate > this.changedValue)) {
                 return false;
             }
-            if (((_c = this._bsDatepickerConfig) === null || _c === void 0 ? void 0 : _c.maxDate) && ((_d = this._bsDatepickerConfig) === null || _d === void 0 ? void 0 : _d.maxDate) < this.changedValue) {
+            if (maxDate && (this.mode === "DATE" && moment(maxDate).endOf("day").toDate() < this.changedValue || this.mode !== "DATE" && maxDate < this.changedValue)) {
                 return false;
             }
-            if (((_f = (_e = this._bsDatepickerConfig) === null || _e === void 0 ? void 0 : _e.daysDisabled) === null || _f === void 0 ? void 0 : _f.indexOf(cd.day())) >= 0) {
+            if (((_d = (_c = this._bsDatepickerConfig) === null || _c === void 0 ? void 0 : _c.daysDisabled) === null || _d === void 0 ? void 0 : _d.indexOf(cd.day())) >= 0) {
                 return false;
             }
             var cdSt = cd.startOf("day").toDate().getTime();
-            if ((_g = this.excludedDatesToDisable) === null || _g === void 0 ? void 0 : _g.find((function(d) {
+            if ((_e = this.excludedDatesToDisable) === null || _e === void 0 ? void 0 : _e.find((function(d) {
                 return d.getTime() === cdSt;
             }))) {
                 return false;
@@ -26988,6 +26969,9 @@
                 newVal.setMilliseconds(oldVal.getMilliseconds());
             }
             this.changedValue = newVal;
+            if (this.mode === "DATE" && oldVal !== newVal && this.validateSelectedDate()) {
+                this.onOkClick();
+            }
         };
         DateTimePickerComponent.prototype.onTimeUpdate = function(newVal) {
             this.changedValue = newVal;
@@ -27009,6 +26993,10 @@
             this.triggerChange();
             this.hideModal();
         };
+        DateTimePickerComponent.prototype.setToday = function() {
+            var today = moment().startOf("day").toDate();
+            this.onDateUpdate(today);
+        };
         DateTimePickerComponent.prototype.reset = function() {
             this.changedValue = this._value;
         };
@@ -27043,7 +27031,7 @@
         type: core.Component,
         args: [ {
             selector: "wm-datetimepicker",
-            template: ' \n    <ng-template #datetimepickerTemplate>\n        <div class="app-datetime-picker">\n            <div class="modal-body">\n                <div class="mobile-datetime-picker-options">\n                    \n                </div>\n                <bs-datepicker-inline\n                    [bsConfig]="bsDatepickerConfig"\n                    [datesDisabled]="excludedDatesToDisable"\n                    bsDatepicker\n                    [bsValue]="changedValue"\n                    (bsValueChange)="onDateUpdate($event)"\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'DATE\'">\n                </bs-datepicker-inline>\n                <wm-timepicker\n                    [value]="changedValue"\n                    [min]="minTime"\n                    [max]="maxTime"\n                    (change)="onTimeUpdate($event)"\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'TIME\'"></wm-timepicker>\n                <span class="text-primary date-picker-value">\n                    {{getDateLabel()}}\n                </span>\n            </div>\n            <div class="modal-footer">\n                <button\n                    class="btn btn-secondary clear-btn"\n                    (click)="clear()">{{appLocale.MESSAGE_DATE_PICKER_CLEAR || "Clear" }}</button>\n                <button\n                    class="btn btn-primary pull-right ok-btn"\n                    (click)="onOkClick()">{{appLocale.MESSAGE_DATE_PICKER_OK || "Ok" }}</button>\n                <button\n                    class="btn btn-secondary pull-right cancel-btn"\n                    (click)="hideModal()">{{appLocale.MESSAGE_DATE_PICKER_CANCEL || "Cancel" }}</button>\n                \n            </div>\n        </div>\n    </ng-template>\n    '
+            template: ' \n    <ng-template #datetimepickerTemplate>\n        <div class="app-datetime-picker">\n            <div class="modal-body">\n                <div class="mobile-datetime-picker-options">\n                    \n                </div>\n                <bs-datepicker-inline\n                    [bsConfig]="bsDatepickerConfig"\n                    [datesDisabled]="excludedDatesToDisable"\n                    bsDatepicker\n                    [bsValue]="changedValue"\n                    (bsValueChange)="onDateUpdate($event)"\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'DATE\'">\n                </bs-datepicker-inline>\n                <wm-timepicker\n                    [value]="changedValue"\n                    [min]="minTime"\n                    [max]="maxTime"\n                    (change)="onTimeUpdate($event)"\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'TIME\'"></wm-timepicker>\n                <span class="text-primary date-picker-value">\n                    {{getDateLabel()}}\n                </span>\n            </div>\n            <div class="modal-footer">\n                <button\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'DATE\'"\n                    class="btn btn-secondary today-btn"\n                    (click)="setToday()">{{appLocale.MESSAGE_DATE_PICKER_TODAY || "Today" }}</button>\n                <button\n                    class="btn btn-primary pull-right ok-btn"\n                    *ngIf="mode === \'DATE_TIME\' || mode === \'TIME\'"\n                    (click)="onOkClick()">{{appLocale.MESSAGE_DATE_PICKER_OK || "Ok" }}</button>\n                <button\n                    class="btn btn-secondary pull-right clear-btn"\n                    (click)="clear()">{{appLocale.MESSAGE_DATE_PICKER_CLEAR || "Clear" }}</button>\n            </div>\n        </div>\n    </ng-template>\n    '
         } ]
     } ];
     DateTimePickerComponent.ctorParameters = function() {
@@ -27126,8 +27114,8 @@
             }
             return arr;
         };
-        TimePickerComponent.prototype.set = function(_h, unit) {
-            var index = _h.index, value = _h.value;
+        TimePickerComponent.prototype.set = function(_f, unit) {
+            var index = _f.index, value = _f.value;
             if (unit === "HOUR") {
                 this.value = moment(this.value).hour(parseInt(value)).toDate();
             } else if (unit === "MINUTE") {
@@ -36432,15 +36420,22 @@
             _this.dialogService = inj.get(core.AbstractDialogService);
             _this.bsModal = inj.get(modal.BsModalService);
             var router$1 = inj.get(router.Router);
-            var subscriptions = [ _this.bsModal.onShown.subscribe((function() {
+            var subscriptions = [ _this.bsModal.onShown.subscribe((function(_a) {
+                var id = _a.id;
                 var ref = _this.dialogService.getLastOpenedDialog();
                 if (ref === _this) {
                     invokeOpenedCallback(ref);
+                    _this.dialogId = id;
                 }
             })), _this.bsModal.onShow.subscribe((function() {
                 focusTrapObj.activeElement = document.activeElement;
             })), _this.bsModal.onHidden.subscribe((function(closeReason) {
-                var ref = closeReason === "esc" || closeReason === "backdrop-click" ? _this.dialogService.getLastOpenedDialog() : _this.dialogService.getDialogRefFromClosedDialogs();
+                var ref = _this.dialogService.getDialogRefFromClosedDialogs();
+                if (_this.dialogId && (closeReason === null || closeReason === void 0 ? void 0 : closeReason.id) === _this.dialogId) {
+                    ref = _this;
+                } else if (closeReason === "esc" || closeReason === "backdrop-click") {
+                    ref = _this.dialogService.getLastOpenedDialog();
+                }
                 if (ref === _this) {
                     _this.dialogService.removeFromOpenedDialogs(ref);
                     _this.dialogService.removeFromClosedDialogs(ref);
@@ -36480,7 +36475,7 @@
             Object.assign(this.context, initState);
             this.modalOptions.ariaLabelledBy = this.titleId;
             this.dialogRef = this.bsModal.show(this.getTemplateRef(), this.modalOptions);
-            if (this.dialogService.getOpenedDialogs().length === 1 && core.isMobileApp()) {
+            if (this.dialogService.getOpenedDialogs().length === 1 && (core.isMobile() || core.isMobileApp())) {
                 var parentSelector = $("body > app-root")[0];
                 parentSelector.setAttribute("aria-hidden", "true");
             }
@@ -42315,11 +42310,31 @@
                         $index: _this.dn.currentPage
                     });
                     _this.goToPage();
+                    if (_this.navigation === "Basic") {
+                        _this._setAriaForBasicNavigation();
+                    }
                 }
             }), base.DEBOUNCE_TIMES.PAGINATION_DEBOUNCE_TIME);
             base.styler(_this.nativeElement, _this);
             return _this;
         }
+        PaginationComponent.prototype._setAriaForBasicNavigation = function() {
+            _.forEach(this.nativeElement.getElementsByTagName("a"), (function(item) {
+                item.setAttribute("href", "javascript:void(0);");
+                var childNode = item.querySelector("span");
+                if ((childNode === null || childNode === void 0 ? void 0 : childNode.dataset.isacitvepage) === "true") {
+                    item.setAttribute("aria-current", "true");
+                    setTimeout((function() {
+                        return item.focus();
+                    }));
+                }
+                if ((childNode === null || childNode === void 0 ? void 0 : childNode.dataset.isdisabled) === "true") {
+                    item.setAttribute("aria-disabled", "true");
+                } else {
+                    item.removeAttribute("aria-disabled");
+                }
+            }));
+        };
         PaginationComponent.prototype.setResult = function(result) {
             this.result = result;
             this.resultEmitter.emit(this.result);
@@ -42436,9 +42451,7 @@
                     this.resetPageNavigation();
                 }
                 if (this.navigation === "Basic") {
-                    _.forEach(this.nativeElement.getElementsByTagName("a"), (function(item) {
-                        item.setAttribute("href", "javascript:void(0);");
-                    }));
+                    this._setAriaForBasicNavigation();
                 }
             } else {
                 if (newVal && !_.isString(newVal)) {
@@ -42715,7 +42728,7 @@
         type: core.Component,
         args: [ {
             selector: "[wmPagination]",
-            template: '\n<ul class="pagination advanced {{navigationClass}}" *ngIf="navcontrols === \'Classic\'">\n    <li [ngClass]="{\'disabled\':isDisableFirst}">\n        <a [title]="appLocale.LABEL_FIRST" name="first" href="javascript:void(0);" aria-label="First"\n           (click)="navigatePage(\'first\', $event)">\n            <span aria-hidden="true"><i class="wi wi-first-page"></i></span>\n            <span class="sr-only">{{appLocale.LABEL_FIRST}}</span>\n        </a>\n    </li>\n    <li [ngClass]="{\'disabled\':isDisablePrevious}">\n        <a [title]="appLocale.LABEL_PREVIOUS" name="prev" href="javascript:void(0);" aria-label="Previous"\n           (click)="navigatePage(\'prev\', $event)">\n            <span aria-hidden="true"><i class="wi wi-chevron-left"></i></span>\n            <span class="sr-only">{{appLocale.LABEL_PREVIOUS}}</span>\n        </a>\n    </li>\n    <li class="pagecount disabled">\n        <a><input type="number" [disabled]="isDisableCurrent" [(ngModel)]="dn.currentPage" [attr.aria-label]="\'Page Navigation \' + dn.currentPage"\n                  (keydown)="onKeyDown($event)" (change)="onModelChange($event)" class="form-control"/></a>\n    </li>\n    <li class="disabled">\n        <a [hidden]="isDisableCount"> / {{pageCount}}</a>\n    </li>\n    <li [ngClass]="{\'disabled\':isDisableNext}">\n        <a [title]="appLocale.LABEL_NEXT" name="next" href="javascript:void(0);" aria-label="Next"\n           (click)="navigatePage(\'next\', $event)">\n            <span aria-hidden="true"><i class="wi wi-chevron-right"></i></span>\n            <span class="sr-only">{{appLocale.LABEL_NEXT}}</span>\n        </a>\n    </li>\n    <li [ngClass]="{\'disabled\':isDisableLast}">\n        <a [title]="appLocale.LABEL_LAST" name="last" href="javascript:void(0);" aria-label="Last"\n           (click)="navigatePage(\'last\', $event)">\n            <span aria-hidden="true"><i class="wi wi-last-page"></i></span>\n            <span class="sr-only">{{appLocale.LABEL_LAST}}</span>\n        </a>\n    </li>\n    <li *ngIf="showrecordcount" class="totalcount disabled">\n        <a>{{appLocale.LABEL_TOTAL_RECORDS}}: {{dataSize}}</a>\n    </li>\n</ul>\n<ul class="pager {{navigationClass}}" *ngIf="navcontrols === \'Pager\'">\n    <li class="previous" [ngClass]="{\'disabled\':isDisablePrevious}">\n        <a href="javascript:void(0);" (click)="navigatePage(\'prev\', $event)" aria-label="Previous">\n            <span aria-hidden="true"><i class="wi wi-chevron-left"></i></span>\n            {{appLocale.LABEL_PREVIOUS}}\n            <span class="sr-only">{{appLocale.LABEL_PREVIOUS}}</span>\n        </a>\n    </li>\n    <li class="next" [ngClass]="{\'disabled\':isDisableNext}">\n        <a href="javascript:void(0);" (click)="navigatePage(\'next\', $event)" aria-label="Next">\n            {{appLocale.LABEL_NEXT}}\n            <span aria-hidden="true"><i class="wi wi-chevron-right"></i></span>\n            <span class="sr-only">{{appLocale.LABEL_NEXT}}</span>\n        </a>\n    </li>\n</ul>\n\n<pagination class="pagination basic" [ngClass]="navigationClass" *ngIf="navcontrols === \'Basic\'" role="navigation"\n            [itemsPerPage]="maxResults" [totalItems]="dataSize"\n            [ngModel]="dn.currentPage" (pageChanged)="pageChanged($event)"\n            [attr.aria-label]="\'Page \' + dn.currentPage + \' of \' + pageCount + \' pages\'"\n            [boundaryLinks]="boundarylinks" [maxSize]="maxsize"\n            [directionLinks]="directionlinks" previousText="." nextText="." firstText="." lastText="."></pagination>\n\n<ul *ngIf="navcontrols === \'Basic\' && showrecordcount" class="pagination">\n    <li class="totalcount disabled basiccount"><a>{{appLocale.LABEL_TOTAL_RECORDS}}: {{dataSize}}</a></li>\n</ul>\n',
+            template: '\n<ul class="pagination advanced {{navigationClass}}" *ngIf="navcontrols === \'Classic\'">\n    <li [ngClass]="{\'disabled\':isDisableFirst}">\n        <a [title]="appLocale.LABEL_FIRST" name="first" href="javascript:void(0);"\n           [attr.aria-disabled]="isDisableFirst"\n           (click)="navigatePage(\'first\', $event)">\n            <span aria-hidden="true"><i class="wi wi-first-page"></i></span>\n            <span class="sr-only">Go to first page {{ isDisableFirst ? \' , Disabled\' : \'\'}}</span>\n        </a>\n    </li>\n    <li [ngClass]="{\'disabled\':isDisablePrevious}">\n        <a [title]="appLocale.LABEL_PREVIOUS" name="prev" href="javascript:void(0);"\n            [attr.aria-disabled]="isDisablePrevious"\n            (click)="navigatePage(\'prev\', $event)">\n            <span aria-hidden="true"><i class="wi wi-chevron-left"></i></span>\n            <span class="sr-only">Go to previous page {{ isDisablePrevious ? \', Disabled\' : \'\'}}</span>\n        </a>\n    </li>\n    <li class="pagecount disabled">\n        <a href="javascript:void(0);">\n            <input type="number" [disabled]="isDisableCurrent" [(ngModel)]="dn.currentPage" [attr.aria-label]="\'Showing Page \' + dn.currentPage + \' of \' + pageCount"\n                  (keydown)="onKeyDown($event)" (change)="onModelChange($event)" class="form-control"/>\n        </a>\n    </li>\n    <li class="disabled">\n        <a [hidden]="isDisableCount"> / {{pageCount}}</a>\n    </li>\n    <li [ngClass]="{\'disabled\':isDisableNext}">\n        <a [title]="appLocale.LABEL_NEXT" name="next" href="javascript:void(0);"\n           [attr.aria-disabled]="isDisableNext"\n           (click)="navigatePage(\'next\', $event)">\n            <span aria-hidden="true"><i class="wi wi-chevron-right"></i></span>\n            <span class="sr-only">Go to next page {{ isDisableNext ? \' , Disabled\' : \'\'}}</span>\n        </a>\n    </li>\n    <li [ngClass]="{\'disabled\':isDisableLast}">\n        <a [title]="appLocale.LABEL_LAST" name="last" href="javascript:void(0);"\n           [attr.aria-disabled]="isDisableLast"\n           (click)="navigatePage(\'last\', $event)">\n            <span aria-hidden="true"><i class="wi wi-last-page"></i></span>\n            <span class="sr-only">Go to last page {{ isDisableLast ? \' , Disabled\' : \'\'}}</span>\n        </a>\n    </li>\n    <li *ngIf="showrecordcount" class="totalcount disabled">\n        <a href="javascript:void(0);" tabindex="-1" aria-disabled="true">{{appLocale.LABEL_TOTAL_RECORDS}}: {{dataSize}}</a>\n    </li>\n</ul>\n<ul class="pager {{navigationClass}}" *ngIf="navcontrols === \'Pager\'">\n    <li class="previous" [ngClass]="{\'disabled\':isDisablePrevious}">\n        <a href="javascript:void(0);" (click)="navigatePage(\'prev\', $event)"\n           [attr.aria-disabled]="isDisablePrevious">\n            <span aria-hidden="true"><i class="wi wi-chevron-left"></i></span>\n            {{appLocale.LABEL_PREVIOUS}}\n            <span class="sr-only">{{ isDisablePrevious ? \' , Disabled\' : \'\'}}</span>\n        </a>\n    </li>\n    <li class="next" [ngClass]="{\'disabled\':isDisableNext}">\n        <a href="javascript:void(0);" (click)="navigatePage(\'next\', $event)"\n           [attr.aria-disabled]="isDisableNext">\n            <span aria-hidden="true"><i class="wi wi-chevron-right"></i></span>\n            {{appLocale.LABEL_NEXT}}\n            <span class="sr-only">{{ isDisableNext ? \' , Disabled\' : \'\'}}</span>\n        </a>\n    </li>\n</ul>\n\n<pagination class="pagination basic" [ngClass]="navigationClass" *ngIf="navcontrols === \'Basic\'" role="navigation"\n            [itemsPerPage]="maxResults" [totalItems]="dataSize"\n            [ngModel]="dn.currentPage" (pageChanged)="pageChanged($event)"\n            [attr.aria-label]="\'Showing Page \' + dn.currentPage + \' of \' + pageCount + \' pages\'"\n            [boundaryLinks]="boundarylinks" [maxSize]="maxsize"\n            [directionLinks]="directionlinks"\n            firstText="Firtst" lastText="Last"\n            [customPreviousTemplate]="prevTemplate"\n            [customNextTemplate]="nextTemplate"\n            [customPageTemplate]="pageTemplate"></pagination>\n\n<ul *ngIf="navcontrols === \'Basic\' && showrecordcount" class="pagination">\n    <li class="totalcount disabled basiccount">\n        <a href="javascript:void(0);" tabindex="-1" aria-disabled="true">{{appLocale.LABEL_TOTAL_RECORDS}}: {{dataSize}}</a>\n    </li>\n</ul>\n\n<ng-template #pageTemplate let-page>\n    <span class="sr-only" [attr.data-isacitvepage]="page.active">{{\'Page \'}}</span>\n    {{page.number}}\n    <span class="sr-only" *ngIf="page.active"> {{\', Showing page \' + page.number + \' of \' + pageCount}}</span>\n</ng-template>\n<ng-template #prevTemplate let-disabled="disabled">\n    <span class="sr-only" [attr.data-isdisabled]="disabled">Go to Previous page {{disabled ? \', Disabled\' : \'\'}}</span>\n</ng-template>\n<ng-template #nextTemplate let-disabled="disabled">\n    <span class="sr-only" [attr.data-isdisabled]="disabled">Go to Next page {{disabled ? \', Disabled\' : \'\'}}</span>\n</ng-template>\n',
             providers: [ base.provideAsWidgetRef(PaginationComponent) ]
         } ]
     } ];
@@ -44748,7 +44761,7 @@
             return this.datasource.execute(operation, options);
         };
         ListComponent.prototype.handleKeyDown = function($event, action) {
-            var _this = this;
+            var _d, _e;
             $event.stopPropagation();
             if ($event.keyCode !== 13 && $event.keyCode !== 9 && !(($event.target.classList.contains("form-control") || $event.target.classList.contains("note-editable")) && $event.keyCode === 32)) {
                 $event.preventDefault();
@@ -44790,27 +44803,21 @@
             }
             if (action === "focusPrev") {
                 if (this.isListElementMovable) {
-                    var prev_1;
                     presentIndex = presentIndex <= 0 ? 0 : presentIndex;
-                    this.lastSelectedItem = this.getListItemByIndex(presentIndex);
                     if (presentIndex === 0) {
-                        prev_1 = this.listItems.last;
                         return;
                     }
-                    this.listItems.forEach((function($liItem, idx) {
-                        if (idx === presentIndex) {
-                            prev_1.nativeElement.before($liItem.nativeElement);
-                            _this.lastSelectedItem.nativeElement.focus();
-                            var arr = _this.listItems.toArray();
-                            var temp = arr[presentIndex];
-                            arr[presentIndex] = arr[presentIndex - 1];
-                            arr[presentIndex - 1] = temp;
-                            _this.listItems.reset(arr);
-                            _this.currentIndex = presentIndex;
-                            _this.ariaText = "selected ";
-                        }
-                        prev_1 = $liItem;
-                    }));
+                    this.lastSelectedItem = this.getListItemByIndex(presentIndex);
+                    var prevElt = this.getListItemByIndex(presentIndex - 1);
+                    prevElt.nativeElement.before(this.lastSelectedItem.nativeElement);
+                    this.lastSelectedItem.nativeElement.focus();
+                    this.statePersistence.removeWidgetState(this, "selectedItem");
+                    var arr = this.listItems.toArray();
+                    _d = __read([ arr[presentIndex], arr[presentIndex - 1] ], 2), arr[presentIndex - 1] = _d[0], 
+                    arr[presentIndex] = _d[1];
+                    this.listItems.reset(arr);
+                    this.currentIndex = presentIndex;
+                    this.ariaText = "selected ";
                 } else {
                     presentIndex = presentIndex <= 0 ? 0 : presentIndex - 1;
                     this.lastSelectedItem = this.getListItemByIndex(presentIndex);
@@ -44820,27 +44827,21 @@
                 }
             } else if (action === "focusNext") {
                 if (this.isListElementMovable) {
-                    var prev_2;
                     presentIndex = presentIndex < listItems.length - 1 ? presentIndex : listItems.length - 1;
-                    this.lastSelectedItem = this.getListItemByIndex(presentIndex);
                     if (presentIndex === this.listItems.length - 1) {
-                        prev_2 = this.listItems.first;
                         return;
                     }
-                    this.listItems.forEach((function($liItem, idx) {
-                        if (idx === presentIndex + 1) {
-                            prev_2.nativeElement.before($liItem.nativeElement);
-                            _this.lastSelectedItem.nativeElement.focus();
-                            var arr = _this.listItems.toArray();
-                            var temp = arr[presentIndex + 1];
-                            arr[presentIndex + 1] = arr[presentIndex];
-                            arr[presentIndex] = temp;
-                            _this.listItems.reset(arr);
-                            _this.currentIndex = idx + 1;
-                            _this.ariaText = "selected ";
-                        }
-                        prev_2 = $liItem;
-                    }));
+                    this.lastSelectedItem = this.getListItemByIndex(presentIndex);
+                    var nextElt = this.getListItemByIndex(presentIndex + 1);
+                    nextElt.nativeElement.after(this.lastSelectedItem.nativeElement);
+                    this.lastSelectedItem.nativeElement.focus();
+                    this.statePersistence.removeWidgetState(this, "selectedItem");
+                    var arr = this.listItems.toArray();
+                    _e = __read([ arr[presentIndex + 1], arr[presentIndex] ], 2), arr[presentIndex] = _e[0], 
+                    arr[presentIndex + 1] = _e[1];
+                    this.listItems.reset(arr);
+                    this.currentIndex = presentIndex + 2;
+                    this.ariaText = "selected ";
                 } else {
                     presentIndex = presentIndex < listItems.length - 1 ? presentIndex + 1 : listItems.length - 1;
                     this.lastSelectedItem = this.getListItemByIndex(presentIndex);
@@ -44862,11 +44863,10 @@
                 this.isListElementMovable = !this.isListElementMovable;
                 this.onItemClick($event, this.getListItemByIndex(presentIndex));
                 this.currentIndex = presentIndex + 1;
-                var name = this.getListItemByIndex(presentIndex).item.name;
                 if (this.isListElementMovable) {
-                    this.ariaText = name + " grabbed, current position ";
+                    this.ariaText = "Item " + this.currentIndex + " grabbed, current position ";
                 } else {
-                    this.ariaText = name + " dropped, final position ";
+                    this.ariaText = "Item " + this.currentIndex + " dropped, final position ";
                 }
             }
         };
@@ -45104,7 +45104,7 @@
         type: core$1.Component,
         args: [ {
             selector: "div[wmList]",
-            template: '<div class="panel-heading" *ngIf="title || subheading || iconclass">\n    <h3 class="panel-title">\n        <div class="pull-left">\n            <i class="app-icon panel-icon {{iconclass}}" aria-hidden="true" [hidden]="!iconclass"></i>\n        </div>\n        <div class="pull-left">\n            <div class="heading" [innerHTML]="title"></div>\n            <div class="description" [innerHTML]="subheading"></div>\n        </div>\n    </h3>\n</div>\n\n<nav class="app-datanavigator" [attr.aria-disabled]="dataNavigator.isDisablePrevious" aria-label="Page navigation" *ngIf="navigation === \'Inline\' && !noDataFound">\n    <ul class="pager">\n        <li class="previous" [ngClass]="{\'disabled\': (dataNavigator ? dataNavigator.isDisablePrevious : true)}">\n            <a href="javascript:void(0);" (click)="dataNavigator.navigatePage(\'prev\', $event)">\n                <i class="wi wi-chevron-left" aria-hidden="true"></i>\n                <span class="sr-only">Previous</span>\n            </a>\n        </li>\n    </ul>\n</nav>\n<div *ngIf="navigation === \'Inline\' && !noDataFound" aria-live="polite" aria-atomic="true" class="sr-only"> {{\'Item \' + dataNavigator.dn.currentPage + \' of \' + dataNavigator.pageCount }}</div>\n\n<div>\n    <div id={{titleId}} class="sr-only" *ngIf="enablereorder">\n        Press space bar to toggle drag drop mode, use arrow keys to move selected elements.\n    </div>\n\n    <div aria-live="assertive" *ngIf="listItems && enablereorder && currentIndex" class="sr-only" >\n        {{ariaText + currentIndex + \' of \' +  listItems.length}}\n    </div>    \n</div>\n\n<ul [attr.tabindex]="tabindex" [attr.aria-describedby] = "titleId"  class="app-livelist-container clearfix {{direction === \'horizontal\' ? \'app-horizontal-list\': \'\'}} {{listclass}}" role="list"\n    (keydown.enter)="handleKeyDown($event, \'select\')"\n\n    (keydown.space)="handleKeyDown($event, \'space\')"\n\n    (keydown.arrowup)="handleKeyDown($event, \'focusPrev\')"\n    (keydown.arrowdown)="handleKeyDown($event, \'focusNext\')"\n    (keydown.arrowleft)="handleKeyDown($event, \'focusPrev\')"\n    (keydown.arrowright)="handleKeyDown($event, \'focusNext\')"\n\n    (keydown.shift.arrowup)="handleKeyDown($event, \'selectPrev\')"\n    (keydown.shift.arrowdown)="handleKeyDown($event, \'selectNext\')"\n    (keydown.shift.arrowleft)="handleKeyDown($event, \'selectPrev\')"\n    (keydown.shift.arrowright)="handleKeyDown($event, \'selectNext\')"\n    [hidden]="noDataFound && !variableInflight"\n>\n    <ng-template [ngIf]="!groupby" [ngIfElse]="groupedListTemplate">\n        <li *ngFor="let item of fieldDefs; index as $index; first as $first; last as $last;" class="app-list-item {{direction === \'horizontal\' ? \'\' : itemsPerRowClass}}" [ngClass]="listItemRef.itemClass"\n            [wmListItem]="item"\n            #listItemRef="listItemRef"\n            [attr.tabindex]="tabindex"\n            role="listitem">\n            <ng-container [ngTemplateOutlet]="listTemplate" [ngTemplateOutletContext]="{item: item, $index: $index, itemRef: listItemRef, $first: $first, $last: $last, currentItemWidgets: listItemRef.currentItemWidgets}"></ng-container>\n        </li>\n    </ng-template>\n    <ng-container [ngTemplateOutlet]="listLeftActionTemplate"></ng-container>\n    <ng-container [ngTemplateOutlet]="listRightActionTemplate"></ng-container>\n</ul>\n\n<div class="no-data-msg" *ngIf="noDataFound && !variableInflight" [textContent]="nodatamessage"></div>\n\n<div class="loading-data-msg" *ngIf="variableInflight && !pulltorefresh">\n    <span>\n        <i class="app-icon panel-icon fa-spin" aria-hidden="true" [ngClass]="loadingicon"></i>\n        <span class="sr-only">Loading</span>\n        <span class="loading-text" [textContent]="loadingdatamsg"></span>\n    </span>\n</div>\n\n<nav class="app-datanavigator" [attr.aria-disabled]="dataNavigator.isDisableNext" *ngIf="navigation === \'Inline\' && !noDataFound">\n    <ul class="pager">\n        <li class="next" [ngClass]="{\'disabled\': (dataNavigator ? dataNavigator.isDisableNext  : true)}">\n            <a href="javascript:void(0);" (click)="dataNavigator.navigatePage(\'next\', $event)">\n                <i class="wi wi-chevron-right" aria-hidden="true"></i>\n                <span class="sr-only">Next</span>\n            </a>\n        </li>\n    </ul>\n</nav>\n\n<div class="panel-footer" *ngIf="navigation !== \'None\'" [hidden]="!showNavigation || (onDemandLoad && dataNavigator.isDisableNext) || (dataNavigator.dataSize <= pagesize) || (!dataNavigator.dataSize && !dataNavigator.datasource?.pagination?.next)">\n    <nav wmPagination\n         navigationalign.bind="navigationalign"\n         navigation.bind="navControls"\n         showrecordcount.bind="showrecordcount"\n         maxsize.bind="maxsize"\n         boundarylinks.bind="boundarylinks"\n         forceellipses.bind="forceellipses"\n         directionlinks.bind="directionlinks"\n         show.bind="!onDemandLoad"\n         paginationchange.event="beforePaginationChange($event, $index)"\n    ></nav>\n    <a *ngIf="onDemandLoad" href="javascript:void(0);"\n       (click)="dataNavigator.navigatePage(\'next\', $event)"\n       class="app-button btn btn-block"\n       [ngClass]="paginationclass"\n       [textContent]="ondemandmessage"\n    ></a>\n</div>\n\n\x3c!--This template will be displayed when groupby is specified--\x3e\n<ng-template #groupedListTemplate>\n    <li *ngFor="let groupObj of groupedData" class="app-list-item-group clearfix">\n        <ul [attr.tabindex]="tabindex" class="list-group item-group" [ngClass]="listclass">\n            <li class="app-list-item-header list-item list-group-header" (click)="handleHeaderClick($event)" [ngClass]="{\'collapsible-content\': collapsible}">\n            <h4>{{groupObj.key}}\n                <div class="header-action">\n                    <i class="app-icon wi action wi-chevron-up" *ngIf="collapsible"></i>\n                    <span *ngIf="showcount" class="label label-default">{{groupObj.data.length}}</span>\n                    </div>\n                </h4>\n            </li>\n            <ul class="list-group clearfix {{direction === \'horizontal\' ? \'app-horizontal-list\': \'\'}}">\n                <li *ngFor="let item of groupObj.data; index as $index; first as $first; last as $last;" [attr.tabindex]="tabindex"\n                    class="app-list-item group-list-item {{itemsPerRowClass}}"\n                    [ngClass]="listItemRef.itemClass"\n                    [wmListItem]="item" #listItemRef="listItemRef">\n                    <ng-container [ngTemplateOutlet]="listTemplate" [ngTemplateOutletContext]="{item: item, $index: $index, itemRef: listItemRef, $first: $first, $last: $last, currentItemWidgets: listItemRef.currentItemWidgets}"></ng-container>\n                </li>\n            </ul>\n        </ul>\n    </li>\n</ng-template>\n',
+            template: '<div class="panel-heading" *ngIf="title || subheading || iconclass">\n    <h3 class="panel-title">\n        <div class="pull-left">\n            <i class="app-icon panel-icon {{iconclass}}" aria-hidden="true" [hidden]="!iconclass"></i>\n        </div>\n        <div class="pull-left">\n            <div class="heading" [innerHTML]="title"></div>\n            <div class="description" [innerHTML]="subheading"></div>\n        </div>\n    </h3>\n</div>\n\n<div class="app-datanavigator" [attr.aria-disabled]="dataNavigator.isDisablePrevious" aria-label="Page navigation" *ngIf="navigation === \'Inline\' && !noDataFound">\n    <ul class="pager">\n        <li class="previous" [ngClass]="{\'disabled\': (dataNavigator ? dataNavigator.isDisablePrevious : true)}">\n            <a href="javascript:void(0);" (click)="dataNavigator.navigatePage(\'prev\', $event)"\n               [attr.aria-disabled]="dataNavigator.isDisablePrevious">\n                <i class="wi wi-chevron-left" aria-hidden="true"></i>\n                <span class="sr-only">Go to Previous page {{dataNavigator.isDisablePrevious ? \', Disabled\' : \'\'}}</span>\n            </a>\n        </li>\n    </ul>\n</div>\n<div *ngIf="navigation === \'Inline\' && !noDataFound" aria-live="polite" aria-atomic="true" class="sr-only"> {{\'Page \' + dataNavigator.dn.currentPage + \' of \' + dataNavigator.pageCount }}</div>\n\n<div>\n    <div id={{titleId}} class="sr-only" *ngIf="enablereorder">\n        Press space bar to toggle drag drop mode, use arrow keys to move selected elements.\n    </div>\n\n    <div aria-live="assertive" *ngIf="listItems && enablereorder && currentIndex" class="sr-only" >\n        {{ariaText + currentIndex + \' of \' +  listItems.length}}\n    </div>\n</div>\n\n<ul [attr.tabindex]="tabindex" [attr.aria-describedby] = "titleId"  class="app-livelist-container clearfix {{direction === \'horizontal\' ? \'app-horizontal-list\': \'\'}} {{listclass}}" role="list"\n    (keydown.enter)="handleKeyDown($event, \'select\')"\n\n    (keydown.space)="handleKeyDown($event, \'space\')"\n\n    (keydown.arrowup)="handleKeyDown($event, \'focusPrev\')"\n    (keydown.arrowdown)="handleKeyDown($event, \'focusNext\')"\n    (keydown.arrowleft)="handleKeyDown($event, \'focusPrev\')"\n    (keydown.arrowright)="handleKeyDown($event, \'focusNext\')"\n\n    (keydown.shift.arrowup)="handleKeyDown($event, \'selectPrev\')"\n    (keydown.shift.arrowdown)="handleKeyDown($event, \'selectNext\')"\n    (keydown.shift.arrowleft)="handleKeyDown($event, \'selectPrev\')"\n    (keydown.shift.arrowright)="handleKeyDown($event, \'selectNext\')"\n    [hidden]="noDataFound && !variableInflight"\n>\n    <ng-template [ngIf]="!groupby" [ngIfElse]="groupedListTemplate">\n        <li *ngFor="let item of fieldDefs; index as $index; first as $first; last as $last;" class="app-list-item {{direction === \'horizontal\' ? \'\' : itemsPerRowClass}}" [ngClass]="listItemRef.itemClass"\n            [wmListItem]="item"\n            #listItemRef="listItemRef"\n            [attr.tabindex]="tabindex"\n            role="listitem">\n            <ng-container [ngTemplateOutlet]="listTemplate" [ngTemplateOutletContext]="{item: item, $index: $index, itemRef: listItemRef, $first: $first, $last: $last, currentItemWidgets: listItemRef.currentItemWidgets}"></ng-container>\n        </li>\n    </ng-template>\n    <ng-container [ngTemplateOutlet]="listLeftActionTemplate"></ng-container>\n    <ng-container [ngTemplateOutlet]="listRightActionTemplate"></ng-container>\n</ul>\n\n<div class="no-data-msg" *ngIf="noDataFound && !variableInflight" [textContent]="nodatamessage"></div>\n\n<div class="loading-data-msg" *ngIf="variableInflight && !pulltorefresh">\n    <span>\n        <i class="app-icon panel-icon fa-spin" aria-hidden="true" [ngClass]="loadingicon"></i>\n        <span class="sr-only">Loading</span>\n        <span class="loading-text" [textContent]="loadingdatamsg"></span>\n    </span>\n</div>\n\n<div class="app-datanavigator" [attr.aria-disabled]="dataNavigator.isDisableNext" *ngIf="navigation === \'Inline\' && !noDataFound">\n    <ul class="pager">\n        <li class="next" [ngClass]="{\'disabled\': (dataNavigator ? dataNavigator.isDisableNext  : true)}">\n            <a href="javascript:void(0);" (click)="dataNavigator.navigatePage(\'next\', $event)"\n               [attr.aria-disabled]="dataNavigator.isDisableNext">\n                <i class="wi wi-chevron-right" aria-hidden="true"></i>\n                <span class="sr-only">Go to Next page {{dataNavigator.isDisableNext ? \', Disabled\' : \'\'}}</span>\n            </a>\n        </li>\n    </ul>\n</div>\n\n<div class="panel-footer" *ngIf="navigation !== \'None\'" [hidden]="!showNavigation || (onDemandLoad && dataNavigator.isDisableNext) || (dataNavigator.dataSize <= pagesize) || (!dataNavigator.dataSize && !dataNavigator.datasource?.pagination?.next)">\n    <nav wmPagination\n         navigationalign.bind="navigationalign"\n         navigation.bind="navControls"\n         showrecordcount.bind="showrecordcount"\n         maxsize.bind="maxsize"\n         boundarylinks.bind="boundarylinks"\n         forceellipses.bind="forceellipses"\n         directionlinks.bind="directionlinks"\n         show.bind="!onDemandLoad"\n         paginationchange.event="beforePaginationChange($event, $index)"\n    ></nav>\n    <a *ngIf="onDemandLoad" href="javascript:void(0);"\n       (click)="dataNavigator.navigatePage(\'next\', $event)"\n       class="app-button btn btn-block"\n       [ngClass]="paginationclass"\n       [textContent]="ondemandmessage"\n    ></a>\n</div>\n\n\x3c!--This template will be displayed when groupby is specified--\x3e\n<ng-template #groupedListTemplate>\n    <li *ngFor="let groupObj of groupedData" class="app-list-item-group clearfix">\n        <ul [attr.tabindex]="tabindex" class="list-group item-group" [ngClass]="listclass">\n            <li class="app-list-item-header list-item list-group-header" (click)="handleHeaderClick($event)" [ngClass]="{\'collapsible-content\': collapsible}">\n            <h4>{{groupObj.key}}\n                <div class="header-action">\n                    <i class="app-icon wi action wi-chevron-up" *ngIf="collapsible"></i>\n                    <span *ngIf="showcount" class="label label-default">{{groupObj.data.length}}</span>\n                    </div>\n                </h4>\n            </li>\n            <ul class="list-group clearfix {{direction === \'horizontal\' ? \'app-horizontal-list\': \'\'}}">\n                <li *ngFor="let item of groupObj.data; index as $index; first as $first; last as $last;" [attr.tabindex]="tabindex"\n                    class="app-list-item group-list-item {{itemsPerRowClass}}"\n                    [ngClass]="listItemRef.itemClass"\n                    [wmListItem]="item" #listItemRef="listItemRef">\n                    <ng-container [ngTemplateOutlet]="listTemplate" [ngTemplateOutletContext]="{item: item, $index: $index, itemRef: listItemRef, $first: $first, $last: $last, currentItemWidgets: listItemRef.currentItemWidgets}"></ng-container>\n                </li>\n            </ul>\n        </ul>\n    </li>\n</ng-template>\n',
             providers: [ base.provideAsWidgetRef(ListComponent) ]
         } ]
     } ];
@@ -45724,6 +45724,7 @@
             _this.rowDef = {};
             _this.rowInstance = {};
             _this.fullFieldDefs = [];
+            _this.variableInflight = true;
             _this.applyProps = new Map;
             _this.redraw = _.debounce(_this._redraw, 150);
             _this.debouncedHandleLoading = _.debounce(_this.handleLoading, 350);
@@ -46469,6 +46470,9 @@
             set: function(newValue) {
                 var _a;
                 this.isDataLoading = false;
+                if (this.variableInflight && _.isEmpty(newValue)) {
+                    return;
+                }
                 this.variableInflight = false;
                 if (this.gridOptions.isNavTypeScrollOrOndemand()) {
                     _a = __read(this.paginationService.updateFieldsOnPagination(this, newValue), 2), 
@@ -46922,6 +46926,9 @@
         };
         TableComponent.prototype.setGridData = function(serverData) {
             var data = this.filternullrecords ? this.removeEmptyRecords(serverData) : serverData;
+            if (_.get(this.datasource, "category") === "wm.Variable") {
+                this.variableInflight = false;
+            }
             if (!this.variableInflight) {
                 if (data && data.length === 0) {
                     this.callDataGridMethod("setStatus", "nodata", this.nodatamessage);
@@ -47216,10 +47223,8 @@
                     this.variableInflight = false;
                     this.callDataGridMethod("setStatus", "nodata", this.nodatamessage);
                 }
-                if (this.dataset) {
-                    this.watchVariableDataSet(this.dataset);
-                    this.onDataSourceChange();
-                }
+                this.watchVariableDataSet(this.dataset);
+                this.onDataSourceChange();
                 break;
 
               case "dataset":
@@ -58397,40 +58402,36 @@
     var TabsAnimator = function(_super) {
         __extends(TabsAnimator, _super);
         function TabsAnimator(tabs) {
-            var e_1, _a;
             var _this = _super.call(this) || this;
             _this.tabs = tabs;
             _this._$el = $(_this.tabs.getNativeElement()).find(">.tab-content");
-            var childEls = _this._$el.find(">[wmTabPane]");
-            _this._noOfTabs = childEls.length;
-            var maxWidth = _this._noOfTabs * 100 + "%";
-            core.addClass(_this.tabs.getNativeElement(), "has-transition");
-            core.setCSSFromObj(_this._$el[0], {
-                maxWidth: maxWidth,
-                width: maxWidth
-            });
-            var width = 100 / _this._noOfTabs + "%";
-            try {
-                for (var _b = __values(Array.from(childEls)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var child = _c.value;
-                    core.setCSS(child, "width", width);
-                }
-            } catch (e_1_1) {
-                e_1 = {
-                    error: e_1_1
-                };
-            } finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                } finally {
-                    if (e_1) throw e_1.error;
-                }
-            }
             _this.init(_this._$el);
             return _this;
         }
+        TabsAnimator.prototype.calibrate = function() {
+            var activeTabIndex = this.tabs.getActiveTabIndex();
+            var panes = this._$el.find(">.tab-pane");
+            var activeTabVisibleIndex = 0;
+            var noOfVisiblePanes = 0;
+            var visiblePanes = [];
+            panes.each((function(i, p) {
+                if (!$(p).prop("hidden")) {
+                    noOfVisiblePanes++;
+                    if (i === activeTabIndex) {
+                        activeTabVisibleIndex = noOfVisiblePanes - 1;
+                    }
+                    visiblePanes.push(p);
+                }
+                return true;
+            }));
+            return {
+                activeTabIndex: activeTabVisibleIndex,
+                noOfTabs: noOfVisiblePanes,
+                panes: visiblePanes
+            };
+        };
         TabsAnimator.prototype.bounds = function() {
-            var activeTabIndex = this.tabs.getActiveTabIndex(), w = this._$el.find(">.tab-pane").first().width(), noOfTabs = this._$el.find(">.tab-pane:visible").length, centerVal = -1 * activeTabIndex * w;
+            var _a = this.calibrate(), activeTabIndex = _a.activeTabIndex, noOfTabs = _a.noOfTabs, panes = _a.panes, w = $(panes[0]).width(), centerVal = -1 * activeTabIndex * w;
             this.clearContentFocus();
             return {
                 strict: false,
@@ -58457,8 +58458,18 @@
             }
         };
         TabsAnimator.prototype.transitionTabIntoView = function() {
-            var activeTabIndex = this.tabs.getActiveTabIndex();
-            core.setCSS(this._$el[0], "transform", "translate3d(" + -1 * activeTabIndex / this._noOfTabs * 100 + "%, 0, 0)");
+            var _a = this.calibrate(), activeTabIndex = _a.activeTabIndex, noOfTabs = _a.noOfTabs, panes = _a.panes;
+            var maxWidth = noOfTabs * 100 + "%";
+            core.setCSSFromObj(this._$el[0], {
+                maxWidth: maxWidth,
+                width: maxWidth
+            });
+            core.addClass(this.tabs.getNativeElement(), "has-transition");
+            var width = 100 / noOfTabs + "%";
+            panes.forEach((function(p) {
+                core.setCSS(p, "width", width);
+            }));
+            core.setCSS(this._$el[0], "transform", "translate3d(" + -1 * activeTabIndex / noOfTabs * 100 + "%, 0, 0)");
         };
         TabsAnimator.prototype.onUpper = function($event) {
             this.tabs.prev($event);
@@ -58584,6 +58595,7 @@
         };
         TabPaneComponent.prototype.onPropertyChange = function(key, nv, ov) {
             var _this = this;
+            var _a;
             if (key === "content") {
                 if (this.isActive) {
                     setTimeout((function() {
@@ -58594,6 +58606,10 @@
                 this.nativeElement.hidden = !nv;
                 if (this._isFirstLoad) {
                     this.tabsRef.selectDefaultPaneByIndex(this.tabsRef.defaultpaneindex);
+                } else if (!nv && this.isActive) {
+                    this.tabsRef.next();
+                } else if (nv || !this.isActive) {
+                    (_a = this.tabsRef.tabsAnimator) === null || _a === void 0 ? void 0 : _a.transitionTabIntoView();
                 }
                 this._isFirstLoad = false;
             } else {
@@ -67549,10 +67565,10 @@
 }));
 
 (function(global, factory) {
-    typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@angular/core"), require("@wm/core"), require("@wm/components/base"), require("@wm/components/page"), require("@wm/mobile/core"), require("@angular/common")) : typeof define === "function" && define.amd ? define("@wm/mobile/components/page", [ "exports", "@angular/core", "@wm/core", "@wm/components/base", "@wm/components/page", "@wm/mobile/core", "@angular/common" ], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, 
+    typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@angular/core"), require("@wm/core"), require("@wm/components/base"), require("ngx-bootstrap/modal"), require("@wm/components/page"), require("@wm/mobile/core"), require("@angular/common")) : typeof define === "function" && define.amd ? define("@wm/mobile/components/page", [ "exports", "@angular/core", "@wm/core", "@wm/components/base", "ngx-bootstrap/modal", "@wm/components/page", "@wm/mobile/core", "@angular/common" ], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, 
     factory((global.wm = global.wm || {}, global.wm.mobile = global.wm.mobile || {}, 
-    global.wm.mobile.components = global.wm.mobile.components || {}, global.wm.mobile.components.page = {}), global.ng.core, global.wm.core, global.wm.components.base, global.wm.components.page, global.wm.mobile.core, global.ng.common));
-})(this, (function(exports, core$1, core, base, page, core$2, common) {
+    global.wm.mobile.components = global.wm.mobile.components || {}, global.wm.mobile.components.page = {}), global.ng.core, global.wm.core, global.wm.components.base, global.modal, global.wm.components.page, global.wm.mobile.core, global.ng.common));
+})(this, (function(exports, core$1, core, base, modal, page, core$2, common) {
     "use strict";
     var PageContentLoaderComponent = function() {
         function PageContentLoaderComponent(el) {
@@ -67574,18 +67590,30 @@
         } ];
     };
     var MobilePageDirective = function() {
-        function MobilePageDirective(app, elRef, deviceService, page, navigationService) {
+        function MobilePageDirective(app, elRef, modalService, deviceService, page, navigationService) {
             var _this = this;
+            this.modalService = modalService;
             this.deviceService = deviceService;
             this.page = page;
             this.navigationService = navigationService;
+            this.subscriptions = [];
             core.addClass(elRef.nativeElement, "mobile-app-page");
             this._$ele = $(elRef.nativeElement);
             page.subscribe("wmMobileTabbar:ready", (function() {
                 return _this._$ele.addClass("has-tabbar");
             }));
+            var modalsOpened = [];
+            this.subscriptions = [ modalService.onShown.subscribe((function(_a) {
+                var id = _a.id;
+                id && modalsOpened.push(id);
+            })), modalService.onHidden.subscribe((function(_a) {
+                var id = _a.id;
+                id && _.remove(modalsOpened, id);
+            })) ];
             this._backBtnListenerDestroyer = deviceService.onBackButtonTap((function($event) {
-                if (app.landingPageName === app.activePageName) {
+                if (modalsOpened.length > 0) {
+                    modalService.hide(modalsOpened.pop());
+                } else if (app.landingPageName === app.activePageName) {
                     window.navigator["app"].exitApp();
                 } else {
                     _this.navigationService.goToPrevious();
@@ -67594,6 +67622,9 @@
             }));
         }
         MobilePageDirective.prototype.ngOnDestroy = function() {
+            this.subscriptions.map((function(s) {
+                return s.unsubscribe();
+            }));
             this._backBtnListenerDestroyer();
         };
         return MobilePageDirective;
@@ -67609,6 +67640,8 @@
             type: core.App
         }, {
             type: core$1.ElementRef
+        }, {
+            type: modal.BsModalService
         }, {
             type: core$2.DeviceService
         }, {
@@ -72942,6 +72975,13 @@
             type: core.AbstractHttpService
         } ];
     };
+    var Formatter = function() {
+        function Formatter() {}
+        Formatter.prototype.format = function(value, format) {
+            return exports.appManager.getPipe("date").transform(value, format);
+        };
+        return Formatter;
+    }();
     var VariablesService = function() {
         function VariablesService(httpService, metadataService, navigationService, routerService, toasterService, oAuthService, securityService, dialogService) {
             this.httpService = httpService;
@@ -73048,6 +73088,7 @@
                 if (this.isVariableSeperated(variablesJson, variableName)) {
                     this.processBinding(varInstance, scope, "dataBinding", this.getBindSourceTarget(varInstance));
                     varInstance.httpService = this.httpService;
+                    varInstance.dateFormatter = new Formatter;
                     varInstance.subscribe("afterInvoke", (function() {
                         return core.$invokeWatchers(true);
                     }));
@@ -73137,6 +73178,7 @@
     exports.DB_CONSTANTS = DB_CONSTANTS;
     exports.DeviceVariableManager = DeviceVariableManager;
     exports.DeviceVariableService = DeviceVariableService;
+    exports.Formatter = Formatter;
     exports.MetadataService = MetadataService;
     exports.SWAGGER_CONSTANTS = SWAGGER_CONSTANTS;
     exports.VARIABLE_CONSTANTS = VARIABLE_CONSTANTS;